From 84bbd884ae94e19aad4ce25c9c12ad96b59fec59 Mon Sep 17 00:00:00 2001 From: moomarc Date: Thu, 8 Aug 2013 06:46:26 +0000 Subject: [PATCH] - Added Stranglehold --- .gitattributes | 1 + res/cardsfolder/s/stranglehold.txt | 7 +++++++ src/main/java/forge/game/phase/PhaseHandler.java | 3 +++ 3 files changed, 11 insertions(+) create mode 100644 res/cardsfolder/s/stranglehold.txt diff --git a/.gitattributes b/.gitattributes index 8136a48879e..b1c7d77e651 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10895,6 +10895,7 @@ res/cardsfolder/s/strands_of_night.txt svneol=native#text/plain res/cardsfolder/s/strands_of_undeath.txt svneol=native#text/plain res/cardsfolder/s/strandwalker.txt svneol=native#text/plain res/cardsfolder/s/strange_inversion.txt -text +res/cardsfolder/s/stranglehold.txt -text res/cardsfolder/s/strangleroot_geist.txt -text res/cardsfolder/s/strangling_soot.txt svneol=native#text/plain res/cardsfolder/s/strata_scythe.txt -text diff --git a/res/cardsfolder/s/stranglehold.txt b/res/cardsfolder/s/stranglehold.txt new file mode 100644 index 00000000000..32b9a56d9db --- /dev/null +++ b/res/cardsfolder/s/stranglehold.txt @@ -0,0 +1,7 @@ +Name:Stranglehold +ManaCost:3 R +Types:Enchantment +S:Mode$ Continuous | Affected$ Opponent | AddKeyword$ CantSearchLibrary | Description$ Your opponents can't search libraries. +S:Mode$ Continuous | Affected$ Opponent | AddKeyword$ If you would begin an extra turn, skip that turn instead. | Description$ If an opponent would begin an extra turn, that player skips that turn instead. +SVar:Picture:http://www.wizards.com/global/images/magic/general/stranglehold.jpg +Oracle:Your opponents can't search libraries.\nIf an opponent would begin an extra turn, that player skips that turn instead. diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java index 1df20e275c0..78f8a54d457 100644 --- a/src/main/java/forge/game/phase/PhaseHandler.java +++ b/src/main/java/forge/game/phase/PhaseHandler.java @@ -751,6 +751,9 @@ public class PhaseHandler implements java.io.Serializable { if (!this.extraTurns.isEmpty()) { ExtraTurn extraTurn = this.extraTurns.pop(); nextTurn = extraTurn.getPlayer(); + if (nextTurn.hasKeyword("If you would begin an extra turn, skip that turn instead.")) { + return getNextActivePlayer(); + } if (nextTurn.hasKeyword("Skip your next turn.")) { nextTurn.removeKeyword("Skip your next turn."); return getNextActivePlayer();