From c0931391d716b6ae6127ac1a93aeab2b5bcfe607 Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 6 Feb 2012 10:00:07 +0000 Subject: [PATCH] - Added the keyword "Skip your next untap step.", fixed Brine Elemental. --- res/cardsfolder/b/brine_elemental.txt | 2 +- src/main/java/forge/PhaseUtil.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/res/cardsfolder/b/brine_elemental.txt b/res/cardsfolder/b/brine_elemental.txt index 5af8af3f177..9e7fe59a164 100644 --- a/res/cardsfolder/b/brine_elemental.txt +++ b/res/cardsfolder/b/brine_elemental.txt @@ -5,7 +5,7 @@ Text:no text PT:5/4 K:Morph:5 U U T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME is turned face up, each opponent skips his or her next untap step. -SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Opponent | KW$ Skip your next draw step. | Permanent$ True +SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Opponent | KW$ Skip your next untap step. | Permanent$ True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/brine_elemental.jpg SetInfo:TSP|Uncommon|http://magiccards.info/scans/en/ts/50.jpg diff --git a/src/main/java/forge/PhaseUtil.java b/src/main/java/forge/PhaseUtil.java index c2e04960084..9a639a157bf 100644 --- a/src/main/java/forge/PhaseUtil.java +++ b/src/main/java/forge/PhaseUtil.java @@ -44,6 +44,12 @@ public class PhaseUtil { * @return a boolean. */ private static boolean skipUntap(final Player p) { + + if (p.hasKeyword("Skip your next untap step.")) { + p.removeKeyword("Skip your next untap step."); + return true; + } + if (AllZoneUtil.isCardInPlay("Sands of Time") || AllZoneUtil.isCardInPlay("Stasis")) { return true; }