Fix research grant to work with team sponsorship #4016
Merged
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 #3390
Fixes as suggested by @nealterrell in the original issue.
Basically moves the requirement to when the effect triggers (So the effect will always fire, but only ends up resolving if the trigger works) and adds interactive so that the user gets to order them manually, instead of the game ordering it manually.
The way the simultaneous triggers work become obvious if there are 2 copies of team sponsorship rezzed, in which case the first trigger adds Research's grants trigger to the simultaneous trigger selection but allows the user to pick between the 2nd team sponsorship's trigger and the research grant's trigger.