Erwan

- A few card fixes

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

@@ -929,8 +929,8 @@ mana={1}{G}
 [/card]
 [card]
 text={T}: Orcish Cannoneers deals 2 damage to target creature or player and 3 damage to you.
+auto={T}:damage:2 target(creature,player) && damage:3 controller
 id=2641
-alias=1309
 name=Orcish Cannoneers
 rarity=U
 type=Creature 

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

@@ -715,8 +715,8 @@ toughness=1
 [/card]
 [card]
 text=Whenever a nontoken permanent is put into a player's graveyard from play, that player loses 1 life.
-auto=@movedTo(land,enchantment,creature,artifact|opponentGraveyard):life:-1 opponent
-auto=@movedTo(land,enchantment,creature,artifact|myGraveyard):life:-1 controller
+auto=@movedTo(land,enchantment,creature,artifact|opponentGraveyard) from(battlefield):life:-1 opponent
+auto=@movedTo(land,enchantment,creature,artifact|myGraveyard) from(battlefield):life:-1 controller
 id=19706
 name=Liability
 rarity=R
@@ -1424,4 +1424,4 @@ name=Worry Beads
 rarity=R
 type=Artifact
 mana={3}
-[/card]
+[/card]

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

@@ -14,6 +14,7 @@ generic/legendary.txt
 generic/lifelink.txt
 generic/persist.txt
 generic/persist2.txt
+generic/persist3.txt
 generic/phases.txt
 generic/rampage.txt
 generic/regenerate.txt
@@ -126,6 +127,7 @@ kudzu.txt
 kudzu2.txt
 leveler.txt
 lhurgoyf.txt
+liability.txt
 lifeforce.txt
 living_lands.txt
 lord_of_the_pit.txt
@@ -187,6 +189,7 @@ stronghold_discipline.txt
 sword_to_plowshares.txt
 telekinetic_sliver.txt
 terror.txt
+terror2.txt
 titanic_ultimatum.txt
 tranquil_domain.txt
 volcanic_island.txt

projects/mtg/bin/Res/test/generic/persist3.txt

@@ -0,0 +1,21 @@
+#Testing Persist
+#bug : When controlling some boosting cards (Glorious Anthem, Honor of the Pure...), returning persist creatures usually come back with their regular P-1/T-1 but are not boosted like they should.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Lingering Tormentor,bad moon,prodigal sorcerer
+hand:lightning bolt
+manapool:{R}
+[PLAYER2]
+[DO]
+lightning bolt
+lingering tormentor
+prodigal sorcerer
+lingering tormentor
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Lingering Tormentor,bad moon,prodigal sorcerer
+graveyard:lightning bolt
+[PLAYER2]
+[END]

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

@@ -0,0 +1,18 @@
+#Bug: depleting shouldn't trigger liability
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:ambassador laquatus,liability
+manapool:{3}
+[PLAYER2]
+library:swamp,mountain,plains
+[DO]
+ambassador laquatus
+p2
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:ambassador laquatus,liability
+[PLAYER2]
+graveyard:swamp,mountain,plains
+[END]

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

@@ -0,0 +1,19 @@
+#Bug: terror can be cast on black creatures
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Terror
+manapool:{B}{B}
+[PLAYER2]
+inplay:bog wraith
+[DO]
+terror
+bog wraith
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+hand:Terror
+manapool:{B}{B}
+[PLAYER2]
+inplay:bog wraith
+[END]