refactor spells to use "shape" enums #44481
Merged
Conversation
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
KorGgenT
added
[JSON]
This was referenced Oct 5, 2020
chaosvolt
added a commit
to chaosvolt/cdda-arcana-mod
that referenced
this pull request
Oct 9, 2020
* Updated spells to have shapes as warranted by CleverRaven/Cataclysm-DDA#44481. Would've saved a lot of excess JSON to just assume "blast" to be a default, but oh well. Now I have suffered as Korg suffered. * Converted all uses of line, cone, etc attacks to use attacks with the correct shape. * Dumped in `NO_PROJECTILE` into appropriate places. There are PROBABLY more places that could use it but 90% of the time there's no effective difference between a projectile spell and a non-projectile spell since you can't actually miss. * Also, a fine time to cleanse this world of obsolete.,json since it had spells in it that likely have not been on anyone's save file in ages.
chaosvolt
added a commit
to chaosvolt/nocts_cata_mod
that referenced
this pull request
Oct 11, 2020
* Updated spells due to CleverRaven/Cataclysm-DDA#44481 * Changed use of lockpicking skill to trapping and removed use of barter skill, now that lockpicking and trapping have been merged, and speech is now used for both functions. I guess now I'm glad I never got free time to make a Rebuilding Civilization pair for lockpicking. Speaking of... * Obsoleted the encyclopedias for barter for now, changed their skills to refer to speech just in case they delete barter'a obosleted JSON outright, and removed its spawns. * Updated gunmod data for un-CBM'd monomolecular blade and sword to fix a minor load error, uses the same general data as basically all other bayonets in vanilla. No idea why bayonets all need 20 minutes to install, seems a bit excessive. :/ * And gave install times to gunmods missing it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
SUMMARY: Infrastructure "refactor spells to use shape as an additional json member"Purpose of change
There's a couple reasons I wanted to do this.
Describe the solution
add two new spell_type members: an enum for the spell shape which is used for a map to a function, and the function itself. in every spell effect function, refactor the way they calculate the set of tripoints that end up being the targets so it can be generalized.
Testing
wip, intending to write some tests for this.