From 9e608d10b17707f1270833a918258e3c5ffb8945 Mon Sep 17 00:00:00 2001
From: leungclj <leungclj@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Fri, 30 Oct 2009 17:54:48 +0000
Subject: [PATCH] JON4TH4N - fixed (ZEN) Hideous End and similar card, there is
 a bug on targetcontroller, test included

---
 projects/mtg/bin/Res/sets/POR/_cards.dat      |  3 +--
 projects/mtg/bin/Res/sets/USG/_cards.dat      |  3 +--
 projects/mtg/bin/Res/sets/ZEN/_cards.dat      |  3 +--
 projects/mtg/bin/Res/test/_tests.txt          |  3 +++
 .../test/generic/targetController_damage.txt  | 24 +++++++++++++++++++
 .../test/generic/targetController_life.txt    | 24 +++++++++++++++++++
 .../test/generic/targetController_life2.txt   | 24 +++++++++++++++++++
 7 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100644 projects/mtg/bin/Res/test/generic/targetController_damage.txt
 create mode 100644 projects/mtg/bin/Res/test/generic/targetController_life.txt
 create mode 100644 projects/mtg/bin/Res/test/generic/targetController_life2.txt

diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat
index 2523c7da2..7ef1896e6 100644
--- a/projects/mtg/bin/Res/sets/POR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/POR/_cards.dat
@@ -975,8 +975,7 @@ toughness=3
 text=Destroy target creature. Its owner gains 4 life.
 id=4389
 target=creature
-auto=destroy
-auto=life:4 targetController
+auto=destroy && life:4 targetController
 name=Path of Peace
 rarity=C
 mana={3}{W}
diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat
index 5845552b0..83d514ca6 100644
--- a/projects/mtg/bin/Res/sets/USG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/USG/_cards.dat
@@ -812,8 +812,7 @@ subtype=Aura
 text=Destroy target creature. Its owner gains 4 life.
 id=5684
 target=creature
-auto=destroy
-auto=life:4 targetController
+auto=destroy && life:4 targetController
 name=Path of Peace
 rarity=C
 mana={3}{W}
diff --git a/projects/mtg/bin/Res/sets/ZEN/_cards.dat b/projects/mtg/bin/Res/sets/ZEN/_cards.dat
index 3b45b2d8e..5c87c9026 100644
--- a/projects/mtg/bin/Res/sets/ZEN/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ZEN/_cards.dat
@@ -466,8 +466,7 @@ toughness=1
 [card]
 text=Destroy target nonblack creature. Its controller loses 2 life.
 target=creature[-black]
-auto=destroy
-auto=life:-2 targetController
+auto=destroy && life:-2 targetController
 id=180435
 name=Hideous End
 rarity=C
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 389d98773..0cc4d719d 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -27,6 +27,9 @@ generic/rampage2.txt
 generic/regenerate.txt
 generic/sacrifice.txt
 generic/summoning_sickness.txt
+generic/targetController_life.txt
+generic/targetController_life2.txt
+generic/targetController_damage.txt
 generic/tokens.txt
 generic/wither.txt
 ########################
diff --git a/projects/mtg/bin/Res/test/generic/targetController_damage.txt b/projects/mtg/bin/Res/test/generic/targetController_damage.txt
new file mode 100644
index 000000000..62bcef7f9
--- /dev/null
+++ b/projects/mtg/bin/Res/test/generic/targetController_damage.txt
@@ -0,0 +1,24 @@
+# Will targetController deal damage even not followed by &&?
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Poison the Well,Poison the Well
+inplay:Island
+manapool:{B}{B}{B}{B}{B}{B}{B}{B}
+[PLAYER2]
+inplay:Forest
+[DO]
+Poison the Well
+Island
+Poison the Well
+Forest
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:Poison the Well,Poison the Well,Island
+manapool:{0}
+life:18
+[PLAYER2]
+graveyard:Forest
+life:18
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/generic/targetController_life.txt b/projects/mtg/bin/Res/test/generic/targetController_life.txt
new file mode 100644
index 000000000..59a3ff322
--- /dev/null
+++ b/projects/mtg/bin/Res/test/generic/targetController_life.txt
@@ -0,0 +1,24 @@
+#Bug: targetController + life will not function if not followed by &&
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Hideous End,Hideous End
+inplay:Kraken Hatchling
+manapool:{B}{B}{B}{B}{B}{B}
+[PLAYER2]
+inplay:Grizzly Bears
+[DO]
+Hideous End
+Grizzly Bears
+Hideous End
+Kraken Hatchling
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:Hideous End,Hideous End,Kraken Hatchling
+manapool:{0}
+life:18
+[PLAYER2]
+graveyard:Grizzly Bears
+life:18
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/generic/targetController_life2.txt b/projects/mtg/bin/Res/test/generic/targetController_life2.txt
new file mode 100644
index 000000000..98691fbbe
--- /dev/null
+++ b/projects/mtg/bin/Res/test/generic/targetController_life2.txt
@@ -0,0 +1,24 @@
+#Bug: targetController + life will not function if not followed by &&
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Path of Peace,Path of Peace
+inplay:Kraken Hatchling
+manapool:{W}{W}{W}{W}{W}{W}{W}{W}
+[PLAYER2]
+inplay:Grizzly Bears
+[DO]
+Path of Peace
+Grizzly Bears
+Path of Peace
+Kraken Hatchling
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:Path of Peace,Path of Peace,Kraken Hatchling
+manapool:{0}
+life:24
+[PLAYER2]
+graveyard:Grizzly Bears
+life:24
+[END]
\ No newline at end of file