Erwan

- a few bug fixes with cards that bring other cards back to play (zombify, resurrection...)
- bug fix with abilities parsing "reachshadow"
- a few card fixes

projects/mtg/bin/Res/sets/LRW/_cards.dat

@@ -548,8 +548,8 @@ toughness=2
 [/card]
 [card]
 text=Other Giant creatures you control get +2/+2 and have trample.
-auto=lord(giant) 2/2 other
-auto=lord(giant) trample other
+auto=lord(giant|myinplay) 2/2 other
+auto=lord(giant|myinplay) trample other
 id=139667
 name=Sunrise Sovereign
 rarity=R

projects/mtg/bin/Res/sets/MIR/_cards.dat

@@ -1034,7 +1034,7 @@ id=3252
 name=Horrible Hordes
 type=Artifact Creature
 subtype=Spirit
-auto=rampage
+abilities=rampage
 mana={3}
 power=2
 toughness=2

projects/mtg/bin/Res/sets/ODY/_cards.dat

@@ -1074,7 +1074,7 @@ text=Return target creature card from your graveyard to play.
 id=29847
 name=Zombify
 target=Creature|mygraveyard
-alias=1360
+auto=moveTo(myInPlay)
 mana={3}{B}
 color=black
 type=Sorcery

projects/mtg/bin/Res/sets/TMP/_cards.dat

@@ -220,6 +220,7 @@ abilities={2}:regenerate
 [/card]
 [card]
 text=Flying     When Cloudchaser Eagle comes into play, destroy target enchantment.
+abilities=flying
 id=4871
 name=Cloudchaser Eagle
 auto=may destroy target(enchantment)

projects/mtg/bin/Res/test/_tests.txt

@@ -103,10 +103,13 @@ sword_to_plowshares.txt
 terror.txt
 tranquil_domain.txt
 volcanic_island.txt
+wall_of_diffusion.txt
+wall_of_diffusion2.txt
 white_knight1.txt
 wrath_of_god.txt
 zombie_master.txt
+zombify.txt
 ########################
 #Momir Basic Tests
 ########################
-momir/keldon_warlord.txt
+momir/keldon_warlord.txt

projects/mtg/bin/Res/test/wall_of_diffusion.txt

@@ -0,0 +1,24 @@
+#Bug: Wall of diffusion has reach
+[INIT]
+COMBATATTACKERS
+[PLAYER1]
+inplay:air elemental
+[PLAYER2]
+inplay:wall of diffusion
+[DO]
+air elemental
+next
+#blockers
+wall of diffusion
+next
+#damage
+next
+#end
+[ASSERT]
+COMBATEND
+[PLAYER1]
+inplay:air elemental
+[PLAYER2]
+inplay:wall of diffusion
+life:16
+[END]

projects/mtg/bin/Res/test/wall_of_diffusion2.txt

@@ -0,0 +1,23 @@
+#Wall of diffusionShadow
+[INIT]
+COMBATATTACKERS
+[PLAYER1]
+inplay:dauthi marauder
+[PLAYER2]
+inplay:wall of diffusion
+[DO]
+dauthi marauder
+next
+#blockers
+wall of diffusion
+next
+#damage
+next
+#end
+[ASSERT]
+COMBATEND
+[PLAYER1]
+inplay:dauthi marauder
+[PLAYER2]
+inplay:wall of diffusion
+[END]

projects/mtg/bin/Res/test/zombify.txt

@@ -0,0 +1,44 @@
+#Bug: zombify on a Roowalla doesn't give the rootwalla it's abilities back
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:zombify
+graveyard:rootwalla
+inplay:swamp,forest
+manapool:{3}{B}
+[PLAYER2]
+[DO]
+zombify
+rootwalla
+eot
+eot
+#untap
+next
+#upkeep
+next
+#draw
+next
+#main 1
+swamp
+forest
+rootwalla
+next
+#combat begins
+next
+#attackers
+rootwalla
+next
+#blockers
+next
+#damage
+next
+#end
+[ASSERT]
+COMBATEND
+[PLAYER1]
+graveyard:zombify
+inplay:swamp,forest,rootwalla
+manapool:{0}
+[PLAYER2]
+life:16
+[END]