Erwan

- fix issue 304 (Momir + persist)
- some minor cleanup

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

@@ -504,9 +504,10 @@ Zombie_Infestation.txt
 zombie_master.txt
 zombify.txt
 ########################
-#Momir Basic Tests
+#Momir Tests
 ########################
 momir/keldon_warlord.txt
+momir/persist_i304.txt
 momir/overcost.txt
 ########################
 #AI Tests

projects/mtg/bin/Res/test/momir/persist_i304.txt

@@ -0,0 +1,37 @@
+#Creatures with persist shouldn't go back from the graveyard if they are tokens
+MOMIR
+[INIT]
+SECONDMAIN
+[PLAYER1]
+hand:plains
+manapool:{3}
+[PLAYER2]
+inplay:Rock Badger
+[DO]
+plains -momir- Rendclaw Trow
+eot
+next
+#upkeep
+next
+#draw
+next
+#main
+next
+#combat begins
+next
+#attackers
+Rock Badger
+next
+#blockers
+Rendclaw Trow
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+graveyard:plains
+[PLAYER2]
+inplay:rock badger
+[END]