From 4be7d5ebd360d9a4bdcace2bb2c339a6615ab649 Mon Sep 17 00:00:00 2001
From: "wagic.the.homebrew@gmail.com"
 <wagic.the.homebrew@gmail.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Wed, 23 Dec 2009 06:21:30 +0000
Subject: [PATCH] Erwan - pumped version up to 0.10.1 - Added fleshformer, so
 that conflux gets 80 cards :)

---
 projects/mtg/bin/Res/sets/CFX/_cards.dat  | 12 +++++++++
 projects/mtg/bin/Res/sets/CFX/todo.dat    | 14 ++--------
 projects/mtg/bin/Res/test/_tests.txt      |  1 +
 projects/mtg/bin/Res/test/fleshformer.txt | 32 +++++++++++++++++++++++
 projects/mtg/src/GameStateMenu.cpp        |  2 +-
 5 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 projects/mtg/bin/Res/test/fleshformer.txt

diff --git a/projects/mtg/bin/Res/sets/CFX/_cards.dat b/projects/mtg/bin/Res/sets/CFX/_cards.dat
index 209c078fd..45ec454aa 100644
--- a/projects/mtg/bin/Res/sets/CFX/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CFX/_cards.dat
@@ -330,6 +330,18 @@ type=Instant
 mana={5}{R}
 [/card]
 [card]
+text={W}{U}{B}{R}{G}: Fleshformer gets +2/+2 and gains fear until end of turn. Target creature gets -2/-2 until end of turn. Play this ability only during your turn.
+auto={W}{U}{B}{R}{G}:all(this) 2/2 && all(this) fear && -2/-2 target(creature) myTurnOnly
+id=179884
+name=Fleshformer
+rarity=U
+type=Creature
+mana={2}{B}
+power=2
+subtype=Human Wizard
+toughness=2
+[/card]
+[card]
 text=At the beginning of each player's draw step, that player draws two additional cards.
 id=189147
 auto=@each my draw:draw:2 controller
diff --git a/projects/mtg/bin/Res/sets/CFX/todo.dat b/projects/mtg/bin/Res/sets/CFX/todo.dat
index 376e1ce34..f8343d294 100644
--- a/projects/mtg/bin/Res/sets/CFX/todo.dat
+++ b/projects/mtg/bin/Res/sets/CFX/todo.dat
@@ -68,7 +68,7 @@ mana={3}{W}{U}{B}{R}{G}
 text=Dark Temper deals 2 damage to target creature. If you control a black permanent, destroy the creature instead.
 id=185143
 target=creature
-auto=aslongas(*[black]|myinplay):destroy
+auto=aslongas(*[black]|myinplay)destroy
 auto=damage:2
 name=Dark Temper
 rarity=C
@@ -158,17 +158,7 @@ rarity=U
 type=Instant
 mana={2}{G}
 [/card]
-[card]
-text={W}{U}{B}{R}{G}: Fleshformer gets +2/+2 and gains fear until end of turn. Target creature gets -2/-2 until end of turn. Play this ability only during your turn.
-id=179884
-name=Fleshformer
-rarity=U
-type=Creature
-mana={2}{B}
-power=2
-subtype=Human Wizard
-toughness=2
-[/card]
+
 [card]
 text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)  {U}, {T}: Draw a card, then discard a card.
 id=184993
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index dbebf87bc..224b472d7 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -194,6 +194,7 @@ flame_fusillade_i265.txt
 flare.txt
 fledgling_imp.txt
 fledgling_imp2.txt
+fleshformer.txt
 flowstone_hellion.txt
 flowstone_slide.txt
 fog.txt
diff --git a/projects/mtg/bin/Res/test/fleshformer.txt b/projects/mtg/bin/Res/test/fleshformer.txt
new file mode 100644
index 000000000..765665188
--- /dev/null
+++ b/projects/mtg/bin/Res/test/fleshformer.txt
@@ -0,0 +1,32 @@
+#Testing fleshformer
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:fleshformer
+manapool:{W}{U}{B}{R}{G}
+[PLAYER2]
+inplay:grizzly bears,black knight
+[DO]
+fleshformer
+black knight
+next
+#begin
+next
+#attackers
+fleshformer
+next
+#blockers
+grizzly bears
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+inplay:fleshformer
+[PLAYER2]
+inplay:grizzly bears
+graveyard:black knight
+life:16
+[END]
\ No newline at end of file
diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp
index 873f3ca3e..d43b95ec9 100644
--- a/projects/mtg/src/GameStateMenu.cpp
+++ b/projects/mtg/src/GameStateMenu.cpp
@@ -11,7 +11,7 @@
 #include "../include/utils.h"
 #include "../include/DeckDataWrapper.h"
 
-static const char* GAME_VERSION = "WTH?! 0.10.0 - by wololo";
+static const char* GAME_VERSION = "WTH?! 0.10.1 - by wololo";
 
 #define DEFAULT_ANGLE_MULTIPLIER 0.4
 #define MAX_ANGLE_MULTIPLIER (3*M_PI)