Revert "multi tokens images on same source"

This reverts commit 8c9d2d6f1d.

projects/mtg/include/AllAbilities.h

@@ -3547,7 +3547,6 @@ public:
     vector<MTGAbility *> currentAbilities;
     MTGAbility * andAbility;
     Player * tokenReciever;
-    string cID;
     //by id
     ATokenCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable *, ManaCost * _cost, int tokenId,string starfound, WParsedInt * multiplier = NULL,
         int who = 0,bool aLivingWeapon = false) :
@@ -3558,7 +3557,6 @@ public:
         if (card) name = card->data->getName();
         battleReady = false;
         andAbility = NULL;
-        cID = "";
     }
     //by name, card still require valid card.dat info, this just makes the primitive code far more readable. token(Eldrazi scion) instead of token(-1234234)...
     ATokenCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable *, ManaCost * _cost, string cardName, string starfound, WParsedInt * multiplier = NULL,
@@ -3571,11 +3569,10 @@ public:
         if (card) name = card->data->getName();
         battleReady = false;
         andAbility = NULL;
-        cID = "";
     }
     //by construction
     ATokenCreator(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable *, ManaCost * _cost, string sname, string stypes, int _power, int _toughness,
-        string sabilities, string starfound,WParsedInt * multiplier = NULL, int _who = 0,bool aLivingWeapon = false,string spt = "", string tnum = "") :
+        string sabilities, string starfound,WParsedInt * multiplier = NULL, int _who = 0,bool aLivingWeapon = false,string spt = "") :
     ActivatedAbility(observer, _id, _source, _cost, 0),sabilities(sabilities),starfound(starfound), multiplier(multiplier), who(_who),aLivingWeapon(aLivingWeapon),spt(spt)
     {
         power = _power;
@@ -3585,7 +3582,6 @@ public:
         aType = MTGAbility::STANDARD_TOKENCREATOR;
         battleReady = false;
         andAbility = NULL;
-        cID = tnum;
         if (!multiplier) this->multiplier = NEW WParsedInt(1);
         //TODO this is a copy/past of other code that's all around the place, everything should be in a dedicated parser class;
 
@@ -3687,16 +3683,6 @@ public:
                 }
             }
             string tokenText = "";
-            if(!cID.empty())
-            {
-                string customId = "";
-                ostringstream tokID;
-                tokID << abs(myToken->getId());
-                customId.append(""+tokID.str()+cID);
-                customId = cReplaceString(customId," ","");
-                WParsedInt newID(customId, NULL, source);
-                myToken->setMTGId(-newID.getValue());
-            }
             if(sabilities.find("token(") == string::npos)
             {
                 tokenText = "(";

projects/mtg/src/MTGAbility.cpp

@@ -2420,21 +2420,15 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
         string sname = tokenParameters[0];
         string stypes = tokenParameters[1];
         string spt = tokenParameters[2];
-        string cID = "";
+
         //reconstructing string abilities from the split version,
         // then we re-split it again in the token constructor,
         // this needs to be improved
         string sabilities = (tokenParameters.size() > 3)? tokenParameters[3] : "";
         for (size_t i = 4; i < tokenParameters.size(); ++i)
         {
-            string tnum = tokenParameters[i];
+            sabilities.append(",");
-            if(tnum.find("tnum:"))
+            sabilities.append(tokenParameters[i]);
-                cID = cReplaceString(tnum,"tnum:","");
-            else
-            {
-                sabilities.append(",");
-                sabilities.append(tokenParameters[i]);
-            }
         }
         int value = 0;
         if (spt.find("xx/xx") != string::npos)
@@ -2447,7 +2441,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
         
         ATokenCreator * tok = NEW ATokenCreator(
             observer, id, card,target, NULL, sname, stypes, power + value, toughness + value,
-            sabilities, starfound, multiplier, who, aLivingWeapon, spt, cID);
+            sabilities, starfound, multiplier, who, aLivingWeapon, spt);
         tok->oneShot = 1;
         if(aLivingWeapon)
             tok->forceDestroy = 1;