From b9b9180898dc983fecea8e700fa33854ef6648fd Mon Sep 17 00:00:00 2001
From: Psyyringe <Psyyringe@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Wed, 11 Nov 2009 22:51:52 +0000
Subject: [PATCH] Psyringe - minor fix for Gamble (USG). The sequence of
 actions was wrong - you first search for a card, put it into your hand, and
 THEN discard a card at random. This means you may end up discarding the card
 you just searched for. Previously that wasn't possible, so the card was more
 powerful than it should be, especially when played from an otherwise empty
 hand.

Test script "gamble.txt" added to test suite.
---
 projects/mtg/bin/Res/sets/USG/_cards.dat |  2 +-
 projects/mtg/bin/Res/test/_tests.txt     |  1 +
 projects/mtg/bin/Res/test/gamble.txt     | 27 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 projects/mtg/bin/Res/test/gamble.txt

diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat
index 48e4c2c4d..05f5df321 100644
--- a/projects/mtg/bin/Res/sets/USG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/USG/_cards.dat
@@ -523,8 +523,8 @@ subtype=Aura
 [card]
 text=Search your library for a card, put that card into your hand, then discard a card at random. Then shuffle your library.
 target=*|myLibrary
-auto=discard:1
 auto=moveTo(myHand)
+auto=discard:1
 id=10654
 name=Gamble
 rarity=R
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 125fcca79..2ced45052 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -134,6 +134,7 @@ force_of_nature.txt
 force_of_nature2.txt
 force_of_nature3.txt
 fountain_of_youth.txt
+gamble.txt
 ghost_warden.txt
 giant_growth.txt
 giant_growth2.txt
diff --git a/projects/mtg/bin/Res/test/gamble.txt b/projects/mtg/bin/Res/test/gamble.txt
new file mode 100644
index 000000000..2a3ebb505
--- /dev/null
+++ b/projects/mtg/bin/Res/test/gamble.txt
@@ -0,0 +1,27 @@
+#NAME: Gamble sequence test
+#DESC: Gamble lets you *first* search a card
+#DESC: from your library, and *then* you have
+#DESC: to discard a random card. This means
+#DESC: you may end up discarding the card you
+#DESC: just searched for. The script tests this
+#DESC: by using Gamble from an otherwise empty
+#DESC: hand. If the sequence of actions is
+#DESC: correct, then you will have to discard
+#DESC: the card you just searched for (a
+#DESC: Mountain om this case).
+[INIT]
+firstmain
+[PLAYER1]
+hand:Gamble
+library:Mountain
+manapool:{R}
+[PLAYER2]
+[DO]
+Gamble
+Mountain
+[ASSERT]
+firstmain
+[PLAYER1]
+graveyard:Gamble,Mountain
+[PLAYER2]
+[END]