From 21eb34d0fa8290e5ab8f10ec4a351f79da3a02f3 Mon Sep 17 00:00:00 2001
From: "wagic.the.homebrew@gmail.com"
 <wagic.the.homebrew@gmail.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Sat, 6 Feb 2010 08:04:12 +0000
Subject: [PATCH] Erwan -fix Scourglass. I'm not happy with the fix but there's
 a huge limitation with the parser here and I'm too lazy to deal with it
 currently...

---
 projects/mtg/bin/Res/sets/primitives/mtg.txt |  2 +-
 projects/mtg/bin/Res/test/_tests.txt         |  1 +
 projects/mtg/bin/Res/test/scourglass.txt     | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 projects/mtg/bin/Res/test/scourglass.txt

diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 9092dab9a..697567846 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -32296,7 +32296,7 @@ toughness=6
 [/card]
 [card]
 name=Scourglass
-auto={T}{S}:destroy all(*[-artifact;-land]) myUpkeepOnly
+auto={T}{S}:all(*[-artifact;-land]) destroy myUpkeepOnly
 text={T}, Sacrifice Scourglass: Destroy all permanents except for artifacts and lands. Play this ability only during your upkeep.
 mana={3}{W}{W}
 type=Artifact
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 4bbef9a3b..0cd89ca83 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -348,6 +348,7 @@ sacred_foundry_i275.txt
 safehold_duo.txt
 scourge_of_kher_ridges.txt
 scourge_of_kher_ridges2.txt
+scourglass.txt
 scouts_warning.txt
 sedge_sliver.txt
 seedcradle_witch.txt
diff --git a/projects/mtg/bin/Res/test/scourglass.txt b/projects/mtg/bin/Res/test/scourglass.txt
new file mode 100644
index 000000000..3dbfdc63e
--- /dev/null
+++ b/projects/mtg/bin/Res/test/scourglass.txt
@@ -0,0 +1,18 @@
+#Bug:Scourglass
+[INIT]
+UNTAP
+[PLAYER1]
+inplay:scourglass
+[PLAYER2]
+inplay:mountain,plains,swamp,grizzly bears
+[DO]
+next
+scourglass
+[ASSERT]
+UPKEEP
+[PLAYER1]
+graveyard:scourglass
+[PLAYER2]
+inplay:mountain,plains,swamp
+graveyard:grizzly bears
+[END]
\ No newline at end of file