Fix 3870 and 4524: no quirks / SPAs applied to Artillery weapons #4792
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.
It looks like the Quirk and SPA check paths got broken for Artillery back when the artillery handling was split out from regular attacks.
I've combined all Attacker Quirks, Attacker SPAs, and Defender SPAs into functions and consolidated the calls to these functions to three locations:
I believe this will apply all relevant modifiers to all weapon types, provided the game options to enable Quirks and SPAs are set correctly.
Also cleaned up some NPE paths:
Testing:
Edit:
close #3870
close #4524