Merge pull request #36 from WagicProject/master

Getting master

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

@@ -45406,7 +45406,7 @@ type=Instant
 [/card]
 [card]
 name=Graf Mole
-auto=@sacrificed(creature|mybattlefield): life:3
+auto=@sacrificed(Clue|mybattlefield): life:3
 text=Whenever you sacrifice a Clue, you gain 3 life.
 mana={2}{G}
 type=Creature

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

@@ -0,0 +1,35 @@
+#Tireless Tracker counters
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Concordant Crossroads, Swamp, Tireless Tracker, Mortician Beetle
+library:Mountain
+hand:Plains
+[PLAYER2]
+[DO]
+Plains
+Swamp
+Plains
+Clue
+#begins
+next
+#attack
+next
+Tireless Tracker
+#Mortician sacrificed event must not trigger
+Mortician Beetle
+next
+#damage
+next
+#end
+eot
+#untap
+[ASSERT]
+UNTAP
+[PLAYER1]
+inplay:Concordant Crossroads, Swamp, Tireless Tracker, Plains, Mortician Beetle
+hand:Mountain
+life:20
+[PLAYER2]
+life:15
+[END]

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

@@ -682,6 +682,7 @@ tidal_warrior_i646.txt
 tidal_warrior_i649.txt
 tidal_warrior_i652.txt
 Timely_Reinforcements.txt
+TirelessTracker.txt
 titanic_ultimatum.txt
 tokenizer.txt
 tokenizer2.txt

projects/mtg/include/AllAbilities.h

@@ -1370,8 +1370,8 @@ public:
     {
         WEventCardSacrifice * e = dynamic_cast<WEventCardSacrifice *> (event);
         if (!e) return 0;
-        //if (e->istoken)
-        //    return 1;
+        if (e->istoken)
+            tc->setAllZones();
         MTGCardInstance * check = e->cardAfter;
         MTGGameZone * oldZone = e->cardAfter->currentZone;
         check->currentZone = check->previousZone;

projects/mtg/src/GameObserver.cpp

@@ -1132,20 +1132,22 @@ void GameObserver::Affinity()
                 }
                 ///we handle trisnisphere seperately because its a desaster.
                 if(card->getManaCost())//make sure we check, abiliy$!/token dont have a mancost object.
-                if (card->has(Constants::TRINISPHERE))
                 {
-                    for (int jj = card->getManaCost()->getConvertedCost(); jj < 3; jj++)
+                    if (card->has(Constants::TRINISPHERE))
                     {
-                        card->getManaCost()->add(Constants::MTG_COLOR_ARTIFACT, 1);
-                        card->countTrini++;
+                        for (int jj = card->getManaCost()->getConvertedCost(); jj < 3; jj++)
+                        {
+                            card->getManaCost()->add(Constants::MTG_COLOR_ARTIFACT, 1);
+                            card->countTrini++;
+                        }
                     }
-                }
-                else
-                {
-                    if (card->countTrini)
+                    else
                     {
-                        card->getManaCost()->remove(Constants::MTG_COLOR_ARTIFACT, card->countTrini);
-                        card->countTrini = 0;
+                        if (card->countTrini)
+                        {
+                            card->getManaCost()->remove(Constants::MTG_COLOR_ARTIFACT, card->countTrini);
+                            card->countTrini = 0;
+                        }
                     }
                 }
                 ///////////////////////