From fd63bda12ae7b16e5b12dd950e688e084e6be0ed Mon Sep 17 00:00:00 2001 From: moomarc Date: Fri, 19 Jul 2013 15:23:48 +0000 Subject: [PATCH] - Added scheme: Drench the Soil in Their Blood - Archenemy schemes will only be played on pre-combat main phases. --- .gitattributes | 1 + .../d/drench_the_soil_in_their_blood.txt | 8 ++++++++ src/main/java/forge/game/phase/PhaseHandler.java | 13 ++++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 res/cardsfolder/d/drench_the_soil_in_their_blood.txt diff --git a/.gitattributes b/.gitattributes index 39f541d42f1..ab31b12360d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2997,6 +2997,7 @@ res/cardsfolder/d/dregs_of_sorrow.txt svneol=native#text/plain res/cardsfolder/d/dregscape_zombie.txt svneol=native#text/plain res/cardsfolder/d/drekavac.txt svneol=native#text/plain res/cardsfolder/d/drelnoch.txt svneol=native#text/plain +res/cardsfolder/d/drench_the_soil_in_their_blood.txt -text res/cardsfolder/d/drift_of_phantasms.txt svneol=native#text/plain res/cardsfolder/d/drift_of_the_dead.txt svneol=native#text/plain res/cardsfolder/d/drifter_il_dal.txt svneol=native#text/plain diff --git a/res/cardsfolder/d/drench_the_soil_in_their_blood.txt b/res/cardsfolder/d/drench_the_soil_in_their_blood.txt new file mode 100644 index 00000000000..7abf4ce7d52 --- /dev/null +++ b/res/cardsfolder/d/drench_the_soil_in_their_blood.txt @@ -0,0 +1,8 @@ +Name:Drench the Soil in Their Blood +ManaCost:no cost +Types:Scheme +T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ BloodyCombat | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, after the main phase, there is an additional combat phase followed by an additional main phase. Creatures you control gain vigilance until end of turn. +SVar:BloodyCombat:DB$ AddPhase | ExtraPhase$ BeginCombat | FollowedBy$ ThisPhase | ConditionPhases$ Main1,Main2 | SubAbility$ MakeVigilant +SVar:MakeVigilant:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Vigilance +SVar:Picture:http://www.cardforge.org/fpics/lq_schemes/drench_the_soil_in_their_blood.jpg +Oracle:When you set this scheme in motion, after the main phase, there is an additional combat phase followed by an additional main phase. Creatures you control gain vigilance until end of turn. diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java index 4fc780232e7..c63c1876a8a 100644 --- a/src/main/java/forge/game/phase/PhaseHandler.java +++ b/src/main/java/forge/game/phase/PhaseHandler.java @@ -295,7 +295,7 @@ public class PhaseHandler implements java.io.Serializable { break; case MAIN1: - if (this.getPlayerTurn().isArchenemy()) { + if (this.getPlayerTurn().isArchenemy() && this.isPreCombatMain()) { this.getPlayerTurn().setSchemeInMotion(); } break; @@ -888,6 +888,17 @@ public class PhaseHandler implements java.io.Serializable { return (this.nUpkeepsThisTurn == 1); } + /** + *

+ * isPreCombatMain. + *

+ * + * @return a boolean. + */ + public final boolean isPreCombatMain() { + return (this.nCombatsThisTurn == 0); + } + private final static boolean DEBUG_PHASES = false; public void startFirstTurn(Player goesFirst) {