external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sphinx2nd' into 'master'

Browse Source 
CMR: Sphinx of the Second Sun

See merge request core-developers/forge!3371
This commit is contained in:
Michael Kamensky
2020-11-11 04:08:31 +00:00
parent 0e57d35e16 cb9682a7b8
commit bfdeeade84
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java
View File

@@ -35,6 +35,9 @@ public class AddPhaseEffect extends SpellAbilityEffect {
followingExtra = PhaseType.smartValueOf(followedBy); followingExtra = PhaseType.smartValueOf(followedBy);
} }
PhaseType followingAfter = extra.equals(PhaseType.COMBAT_BEGIN) ? PhaseType.COMBAT_END : extra; PhaseType followingAfter = extra.equals(PhaseType.COMBAT_BEGIN) ? PhaseType.COMBAT_END : extra;
if (sa.hasParam("AdditionalBeginningPhase")) {
followingAfter = extra.equals(PhaseType.UNTAP) ? PhaseType.DRAW : extra;
}
phaseHandler.addExtraPhase(followingAfter, followingExtra); phaseHandler.addExtraPhase(followingAfter, followingExtra);
} }
} }

9
forge-gui/res/cardsfolder/upcoming/sphinx_of_the_second_sun.txt Executable file
View File

@@ -0,0 +1,9 @@
Name:Sphinx of the Second Sun
ManaCost:6 U U
Types:Creature Sphinx
PT:6/6
K:Flying
T:Mode$ Phase | Phase$ Main2 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAddPhase | TriggerDescription$ At the beginning of your postcombat main phase, you get an additional beginning phase after this phase. (The beginning phase includes the untap, upkeep, and draw steps.)
SVar:TrigAddPhase:DB$ AddPhase | ExtraPhase$ Untap | AdditionalBeginningPhase$ True | FollowedBy$ End of Turn
SVar:PlayMain1:TRUE
Oracle:Flying\nAt the beginning of your postcombat main phase, you get an additional beginning phase after this phase. (The beginning phase includes the untap, upkeep, and draw steps.)