Fixes items preventing other switch in effects #5732
+230
−184
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.
Fixes #5427
Despite the description of the issue, this was an issue with items. After a switch in when items are triggered they blocked all other effect from happening. The problem was the place they were invoked from. To fix this I Introduced
ITEMEFFECT_ON_SWITCH_IN_FIRST_TURN
which will only work for first turn effects andITEMEFFECT_ON_SWITCH_IN
will be used for the rest. By passing the caseID as the argument we can easily switch between the scripts we want to run.Tests were provided by @PhallenTree