From f10c0e06f157176949207a8b74bb35b2a1e57f46 Mon Sep 17 00:00:00 2001
From: swordshine <swordshine@cardforge.org>
Date: Mon, 1 Apr 2013 01:22:57 +0000
Subject: [PATCH] - Added Zur's Weirding and Vexing Shusher

---
 .gitattributes                                |  2 ++
 res/cardsfolder/v/vexing_shusher.txt          | 11 ++++++++++
 res/cardsfolder/z/zurs_weirding.txt           | 20 +++++++++++++++++++
 .../java/forge/card/ability/AbilityUtils.java |  9 +++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 res/cardsfolder/v/vexing_shusher.txt
 create mode 100644 res/cardsfolder/z/zurs_weirding.txt

diff --git a/.gitattributes b/.gitattributes
index a9533a40281..e2f2482de0a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11647,6 +11647,7 @@ res/cardsfolder/v/vex.txt svneol=native#text/plain
 res/cardsfolder/v/vexing_arcanix.txt -text
 res/cardsfolder/v/vexing_beetle.txt svneol=native#text/plain
 res/cardsfolder/v/vexing_devil.txt -text
+res/cardsfolder/v/vexing_shusher.txt -text
 res/cardsfolder/v/vexing_sphinx.txt -text
 res/cardsfolder/v/vhati_il_dal.txt -text
 res/cardsfolder/v/viashino_bladescout.txt svneol=native#text/plain
@@ -12456,6 +12457,7 @@ res/cardsfolder/z/zur_the_enchanter.txt svneol=native#text/plain
 res/cardsfolder/z/zuran_enchanter.txt svneol=native#text/plain
 res/cardsfolder/z/zuran_orb.txt svneol=native#text/plain
 res/cardsfolder/z/zuran_spellcaster.txt svneol=native#text/plain
+res/cardsfolder/z/zurs_weirding.txt -text
 res/defaults/editor.preferences svneol=native#text/xml
 res/defaults/editor.xml svneol=native#text/xml
 res/defaults/gauntlet/LOCKED_DotP[!!-~]Preconstructed.dat -text
diff --git a/res/cardsfolder/v/vexing_shusher.txt b/res/cardsfolder/v/vexing_shusher.txt
new file mode 100644
index 00000000000..6d23bec2d3a
--- /dev/null
+++ b/res/cardsfolder/v/vexing_shusher.txt
@@ -0,0 +1,11 @@
+Name:Vexing Shusher
+ManaCost:RG RG
+Types:Creature Goblin Shaman
+PT:2/2
+K:CARDNAME can't be countered.
+A:AB$ Pump | Cost$ RG | ValidTgts$ Card.inZoneStack | TgtZone$ Stack,Battlefield | PumpZone$ Stack | KW$ HIDDEN CARDNAME can't be countered. | SpellDescription$ Target spell can't be countered by spells or abilities.
+#Should include another zone otherwise the target would not be defined as a card
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/vexing_shusher.jpg
+Oracle:Vexing Shusher can't be countered.\n{R/G}: Target spell can't be countered by spells or abilities.
+SetInfo:SHM Rare
\ No newline at end of file
diff --git a/res/cardsfolder/z/zurs_weirding.txt b/res/cardsfolder/z/zurs_weirding.txt
new file mode 100644
index 00000000000..7ef0031af01
--- /dev/null
+++ b/res/cardsfolder/z/zurs_weirding.txt
@@ -0,0 +1,20 @@
+Name:Zur's Weirding
+ManaCost:3 U
+Types:Enchantment
+S:Mode$ Continuous | Affected$ Player | AddKeyword$ Play with your hand revealed. | Description$ Players play with their hands revealed.
+R:Event$ Draw | ActiveZones$ Battlefield | ValidPlayer$ Player | ReplaceWith$ RevealTop | Description$ If a player would draw a card, he or she reveals it instead. Then any other player may pay 2 life. If a player does, put that card into its owner's graveyard. Otherwise, that player draws a card.
+SVar:RevealTop:AB$ Dig | Cost$ 0 | Defined$ ReplacedPlayer | DigNum$ 1 | NoMove$ True | Reveal$ True | SubAbility$ DBCheck
+SVar:DBCheck:DB$ StoreSVar | SVar$ ZurCheck | Type$ Number | Expression$ 1 | UnlessPayer$ NonReplacedPlayer | UnlessCost$ PayLife<2> | SubAbility$ DBMill | StackDescription$ None
+SVar:DBMill:DB$ Mill | Defined$ ReplacedPlayer | NumCards$ 1 | SubAbility$ DBDraw | ConditionCheckSVar$ ZurCheck | ConditionSVarCompare$ EQ0 | StackDescription$ None
+SVar:DBDraw:DB$ Draw | Defined$ ReplacedPlayer | NumCards$ 1 | SubAbility$ DBReset | ConditionCheckSVar$ ZurCheck | ConditionSVarCompare$ EQ1 | StackDescription$ that player draws a card
+SVar:DBReset:DB$ StoreSVar | SVar$ ZurCheck | Type$ Number | Expression$ 0
+SVar:ZurCheck:Number$0
+SVar:RemAIDeck:True
+SVar:RemMultiplayer:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/zurs_weirding.jpg
+Oracle:Players play with their hands revealed.\nIf a player would draw a card, he or she reveals it instead. Then any other player may pay 2 life. If a player does, put that card into its owner's graveyard. Otherwise, that player draws a card.
+SetInfo:ICE Rare
+SetInfo:5ED Rare
+SetInfo:8ED Rare
+SetInfo:6ED Rare
+SetInfo:9ED Rare
\ No newline at end of file
diff --git a/src/main/java/forge/card/ability/AbilityUtils.java b/src/main/java/forge/card/ability/AbilityUtils.java
index 55d532622e1..bb4071d6cbb 100644
--- a/src/main/java/forge/card/ability/AbilityUtils.java
+++ b/src/main/java/forge/card/ability/AbilityUtils.java
@@ -219,6 +219,10 @@ public class AbilityUtils {
             else if (defined.startsWith("Tapped")) {
                 list = sa.getRootAbility().getPaidList("Tapped");
             }
+            
+            else if (defined.startsWith("Untapped")) {
+                list = sa.getRootAbility().getPaidList("Untapped");
+            }
 
             else if (defined.startsWith("Valid ")) {
                 String validDefined = defined.substring("Valid ".length());
@@ -829,6 +833,11 @@ public class AbilityUtils {
                     }
                 }
             }
+        } else if (defined.equals("NonReplacedPlayer")) {
+            final SpellAbility root = sa.getRootAbility();
+            Player p = (Player) root.getReplacingObject("Player");
+            players.addAll(sa.getActivatingPlayer().getGame().getPlayers());
+            players.remove(p);
         } else if (defined.equals("EnchantedController")) {
             if (card.getEnchantingCard() == null) {
                 return players;