Erwan

-fix issue 300 (silver seraph)

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

@@ -394,7 +394,7 @@ rarity=R
 mana={5}{W}{W}{W}
 type=Creature
 subtype=Angel
-auto=aslongas(*|mygraveyard) lord(creature other|myBattlefield) 2/2 >6
+auto=aslongas(*|mygraveyard) lord(other creature|myBattlefield) 2/2 >6
 power=6
 toughness=6
 abilities=flying

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

@@ -348,6 +348,7 @@ seedcradle_witch.txt
 seismic_assault.txt
 seismic_spike_i191.txt
 selesnya_guildmage.txt
+silver_seraph_i300.txt
 skullcage0_i239.txt
 skullcage1_i239.txt
 skullcage2_i239.txt

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

@@ -0,0 +1,31 @@
+#Bug: Silver Seraph's theshold ability doesn't work
+#see http://gatherer.wizards.com/Pages/Card/Details.aspx?multiverseid=36036
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:plains,forest,mountain,swamp,island,grizzly bears,raging goblin,black knight
+inplay:white knight
+hand:Silver Seraph
+manapool:{5}{W}{W}{W}
+[PLAYER2]
+[DO]
+silver seraph
+next
+#begin
+next
+#attackers
+white knight
+next
+#blockers
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+graveyard:plains,forest,mountain,swamp,island,grizzly bears,raging goblin,black knight
+inplay:white knight,Silver Seraph
+[PLAYER2]
+life:16
+[END]

projects/mtg/src/MTGAbility.cpp

@@ -174,7 +174,6 @@ MTGAbility * AbilityFactory::getCoreAbility(MTGAbility * a){
   return a;
 }
 
-
 //Parses a string and returns the corresponding MTGAbility object
 // Returns NULL if parsing failed
 //Beware, Spell CAN be null when the function is called by the AI trying to analyze the effects of a given card
@@ -346,10 +345,10 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
     }
     if (end != string::npos){
       int lordIncludeSelf = 1;
-      size_t other = s1.find("other");
+      size_t other = s1.find(" other");
       if ( other != string::npos){
         lordIncludeSelf = 0;
-        s1.replace(other, 5,"");
+        s1.replace(other, 6,"");
       }
       string lordTargetsString = s.substr(found+header,end-found-header);
       TargetChooserFactory tcf;