From 8b55e9d417c8ae4cce2957dcd8b99f1c0bf78391 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 9 Nov 2020 22:59:39 -0500 Subject: [PATCH 1/2] sphinx_of_the_second_sun.txt --- .../cardsfolder/upcoming/sphinx_of_the_second_sun.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 forge-gui/res/cardsfolder/upcoming/sphinx_of_the_second_sun.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sphinx_of_the_second_sun.txt b/forge-gui/res/cardsfolder/upcoming/sphinx_of_the_second_sun.txt new file mode 100755 index 00000000000..f9957a4d313 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/sphinx_of_the_second_sun.txt @@ -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.) From cb9682a7b85f9371a783aed816fc806eedd6145c Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 9 Nov 2020 23:00:36 -0500 Subject: [PATCH 2/2] "AdditionalBeginningPhase" support --- .../main/java/forge/game/ability/effects/AddPhaseEffect.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java index 061b464ae0d..b10a6919e9f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/AddPhaseEffect.java @@ -35,6 +35,9 @@ public class AddPhaseEffect extends SpellAbilityEffect { followingExtra = PhaseType.smartValueOf(followedBy); } 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); } }