Erwan

-fix for issue 408 (issues with life + targetcontroller + targets on the stack)

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -55867,7 +55867,7 @@ subtype=Island Swamp
 name=Undermine
 target=*|stack
 auto=fizzle
-auto=life:-3 opponent
+auto=life:-3 targetController
 text=Counter target spell. Its controller loses 3 life.
 mana={U}{U}{B}
 type=Instant

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

@@ -476,6 +476,7 @@ twinstrike.txt
 twinstrike2.txt
 twinstrike3.txt
 twitch.txt
+undermine_i408.txt
 underworld_dreams.txt
 unearth1.txt
 unearth2.txt

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

@@ -0,0 +1,24 @@
+#Testing undermine on bad moon
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Bad Moon
+manapool:{1}{B}
+[PLAYER2]
+hand:Undermine
+manapool:{U}{U}{B}
+[DO]
+Bad Moon
+no
+yes
+Undermine
+Bad Moon
+endinterruption
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:Bad Moon
+life:17
+[PLAYER2]
+graveyard:Undermine
+[END]

projects/mtg/src/MTGAbility.cpp

@@ -848,8 +848,8 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
       d = s.substr(start+1);
     }
     WParsedInt * damage = NEW WParsedInt(d,spell,card);
-    Damageable * t = NULL;
+    Targetable * t = NULL;
-    if (spell) t = spell->getNextDamageableTarget();
+    if (spell) t = spell->getNextTarget();
     MTGAbility * a =  NEW AADamager(id,card,t, damage, NULL, 0, who);
     a->oneShot = 1;
     return a;
@@ -922,9 +922,9 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
       life_s = s.substr(start+1);
     }
     WParsedInt * life = NEW WParsedInt(life_s,spell,card);
-    Damageable * d = NULL;
+    Targetable * t = NULL;
-    if (spell) d = spell->getNextDamageableTarget();
+    if (spell) t = spell->getNextTarget();
-    MTGAbility * a =  NEW AALifer(id,card,d,life,NULL,0,who);
+    MTGAbility * a =  NEW AALifer(id,card,t,life,NULL,0,who);
     a->oneShot = 1;
     return a;
   }