This repository has been archived by the owner on Dec 4, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 221
Trust Basics #364
Merged
Merged
Trust Basics #364
Changes from 112 commits
Commits
Show all changes
116 commits
Select commit
Hold shift + click to select a range
b14748b
Add new bindings: getJobLevel & hasJob (#386)
zach2good fa613df
Added the auto creation of a vector list of trust id's
Omnione bc229d5
style fixes, (not mine lol)
Omnione 9cd8d39
Changed iteration method of trust id's to query trust.
Omnione 3d34a94
new iteration and struct for spellid + capitalised names
Omnione 2967506
try again for AppVeyor
Omnione f87bf5f
Bring in line with trust master
Omnione e7fae40
• Added most trust scripts.
Omnione ad904fb
Remove unused include and format
TeoTwawki 293ea9a
Style change
zach2good f7a0fc7
Rebrand debug breaks
zach2good 128561c
Scripts branding
zach2good 3167fba
Cleanup
zach2good 6b27e22
Remove behaviour scripts
zach2good f09b9c2
Remove MSCV macro for each loops
zach2good 94a09d1
Add some trust handling code to targetfind
zach2good db854bc
Rename spell Shantotto_II -> shantotto_ii
zach2good 2acbfc8
General cleanup
zach2good 84af918
Revert "Add new bindings: getJobLevel & hasJob (#386)"
zach2good aa998f6
Pointer formatting
zach2good c5571a0
Clean up some warnings
zach2good 203b659
More cleanup
zach2good d673054
Stealing from various other branches
zach2good 59d3146
Shrink entity update
zach2good a0a81ed
More trust related items
zach2good 374fb9e
Another tweak
zach2good 95e40f8
Review: Move all trust onMagicCastingCheck and onSpellCast logic to t…
zach2good 04f29ed
Review: Remove canCastTrust core binding
zach2good 0eb8848
Return the things!
zach2good 3e0ab13
Remove currently unused trust party message helper
zach2good e413ad4
Some debugging of trust.canCast
zach2good a0752af
Misc fixes
zach2good 188a64e
TRUST lua zone status
zach2good 3274345
Misc party cleanup
zach2good 13964be
Little tidy
zach2good 994cbf1
Fill out Shantotto spell list
zach2good 91a74c5
Revert trust change in ai magic state
zach2good 8dab217
Clean up trust related utils
zach2good 1829430
Audit starting trusts spell lists and zero off spell/skill lists for …
zach2good b662b39
Zero out skill lists too until theres a plan
zach2good 6c553df
Shantotto spell lists are the same for now
zach2good 71d7dda
Add isValidHealTarget(caster, target) helper
zach2good aea9b9a
Add ForEachTrust and ForEachTrustInstance
zach2good 60834ff
Revert trust_sync packet until I understand how it works
zach2good 827d6c2
Stop trusts despawning when a mount is present
zach2good 402bc07
Reject trusts in an alliance by default
zach2good be83ea6
Move trust core logic to trustutils
zach2good 8a14dcb
Clean up trust loading SQL
zach2good e3de244
TODOs for trust.lua
zach2good 3c5276a
Little cleanup
zach2good be04a03
Add Monberaux trust spell script, because why not
zach2good 0410d7f
Include Trusts in getParty() and test ROV item limits
zach2good a423914
Re-add getTrustID binding and clean up getParty lua table building
zach2good 6159e2f
Fix Shantotto vs D Shantotto vs Shantotto II trust exclusion
zach2good 0caf9c0
Load packet_name of trust
zach2good 6dbfbef
Horrible bandaid over cast-on-trust-client-crash
zach2good bf88a20
The grand re-naming
zach2good 9f229c2
Fix missing '
zach2good c6f3b96
Spawn trust after creation!
zach2good d4fec87
OnMobSpawn/OnMobDespawn/OnMobDeath now support trusts
zach2good f4e801b
Add/fix/test some trust exclusions
zach2good d064bef
Trusts now die correctly
zach2good 1d97ec6
MobEntity cleanup
zach2good 8604e66
Add trust messages to message_standard.h
zach2good 98c319d
Add trust basic messages
zach2good aa9aebe
Fix compilation
zach2good d9170d2
FIX TRUST CASTING CRASH? WHAT?!
zach2good 7558b15
Upgrade !hp command to also use cursor target
zach2good 56acbe2
Add binding: getPartyTrusts
zach2good 6f4b976
return getParty to only returning a table of Players
zach2good 9e3f600
Make getPartySize usable
zach2good 179569e
Hook up trust.canCast with the last few binding changes
zach2good a7ee7fc
Use trust packet name in party entry
zach2good 0cb99ba
Basic spellcasting from lists and stability
zach2good fd5f023
Let Kupipi and Ajido Marujido cast spells from their lists
zach2good 67ebbe1
Remove Shantotto chat for now
zach2good 09c7691
Formatting + branding
zach2good c084d5d
Warp to owner when far away
zach2good d04c8d1
Add more mob-like stat and hp/mp calculation for trusts
zach2good 105225b
Job checking for MP
zach2good d8a76f4
Stability
zach2good 4a82db5
Audit a couple of trust jobs
zach2good 5e1718f
General cleanup and make things a little more robust
zach2good ef44c0a
Yet more cleanup
zach2good 9957143
messageParty placeholder
zach2good 1132d49
Trust random message selection
zach2good b930787
Tidy tidy
zach2good fde02e0
Audit all trust jobs
zach2good c1b9ce1
Hook up weapon speed
zach2good cfb014b
Remove fake party chat
zach2good d818688
Re-add Monberaux after confirming spell number from POLUtils
zach2good d9b607b
Add all remaining trust scripts
zach2good b92b5ac
Update scripts, rename
zach2good 62b2e98
Maybe fix extra spell
zach2good 4a52f9f
Remove Trust: Cornelia (1003) - she was removed May 2018
zach2good 4708c32
Clear trusts on death
zach2good 5d74550
Remove unused method
zach2good db0ce11
Add and use MasterHasTopEnmity()
zach2good 4f2506e
Audit mob families of all trusts
zach2good 1101736
Add somewhat-functional declumping
zach2good 36e1d26
lerp, lerp_position and experimenting with weights and distances
zach2good 4321461
Add basic Provoke mobskill
zach2good 22df9fd
Add super basic provoke to the starting tanks
zach2good 85ce5e3
Add listener for enmity changed
zach2good 0ae010a
Replace getPartyTrusts() with getPartyWithTrusts()
zach2good 347e070
Cleaner listener based provoke for Naji
zach2good fe6fa47
Add sentinel to curilla, basic WSs
zach2good 3dc313c
Remove mobstyle spell casting and add basic curing for Kupipi
zach2good 093516d
Review: Add trust I/II exclusions, fix copy-paste errors and typos
zach2good 8e27135
Review: Lua TODOs
zach2good 92a174f
Review: Core quick fixes
zach2good 1c1d51e
Review: Audit trusts jobs SQL
zach2good 997146a
Clean up trustData search
zach2good 1b7e74e
More obvious usage of GetName() and packetName in packets
zach2good a9f6110
Clear StateStack on Die()
zach2good 6853f99
ForParty is guaranteed to only be CCharEntity types
zach2good File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--------------------------------------------- | ||
-- Provoke | ||
--------------------------------------------- | ||
require("scripts/globals/msg") | ||
require("scripts/globals/status") | ||
--------------------------------------------- | ||
|
||
function onMobSkillCheck(target,mob,skill) | ||
return 0 | ||
end | ||
|
||
function onMobWeaponSkill(target, mob, skill) | ||
target:addEnmity(mob, 1, 1800) | ||
skill:setMsg(tpz.msg.basic.NONE) | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--------------------------------------------------- | ||
-- Sentinel | ||
--------------------------------------------------- | ||
require("scripts/globals/msg") | ||
require("scripts/globals/status") | ||
--------------------------------------------------- | ||
|
||
function onMobSkillCheck(target,mob,skill) | ||
return 0 | ||
end | ||
|
||
function onMobWeaponSkill(target, mob, skill) | ||
target:addEnmity(mob, 1, 1800) | ||
skill:setMsg(tpz.msg.basic.NONE) | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
-- Trust: AAEV | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
-- Trust: AAGK | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
-- Trust: AAHM | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
-- Trust: AAMR | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
-- Trust: AATT | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
-- Trust: Abenzio | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
-- Trust: Abquhbah | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
-- Trust: Adelheid | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
----------------------------------------- | ||
-- Trust: Ajido-Marujido | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
zach2good marked this conversation as resolved.
Show resolved
Hide resolved
|
||
-- Trust: Aldo | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
zach2good marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return tpz.trust.canCast(caster, spell, 1007) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
-- Trust: Aldo UC | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We might need some additional Unity logic later. I don't know how we'd handle adding/removing Unity trusts. But this is far, far in the future. Just noting it here. And our favorite head of a criminal organization might need to check for himself. |
||
return tpz.trust.canCast(caster, spell, 930) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
-- Trust: Amchuchu | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
----------------------------------------- | ||
-- Trust: Apururu UC | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
----------------------------------------- | ||
-- Trust: Arciela | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell, 1017) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
----------------------------------------- | ||
-- Trust: Arciela II | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell, 965) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
----------------------------------------- | ||
-- Trust: Areuhat | ||
----------------------------------------- | ||
require("scripts/globals/trust") | ||
----------------------------------------- | ||
|
||
function onMagicCastingCheck(caster, target, spell) | ||
return tpz.trust.canCast(caster, spell) | ||
end | ||
|
||
function onSpellCast(caster, target, spell) | ||
return tpz.trust.spawn(caster, spell) | ||
end | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mainly to everyone, not necessarily you, Zach:
I'm okay with these new scripts for now as a testing bed, but we're going to have to come up with some solution to trusts having all the same abilities that players do! The last thing I want is additional burden to maintain an additional copy of weaponskills.