Added / fixed primitives from ONE set, fixed Treasure name in all sets and primitives, updated missing cards by sets list, improved token creator ability by trying to retrieve the token id from the same set of source card (e.g. Urza's Saga), improved toxic ability adding a new target chooser "hastoxic" and adding a new keyword "toxicity" to retrieve the toxic amount of card.

projects/mtg/include/AllAbilities.h

@@ -1747,7 +1747,7 @@ class ANewAffinity: public MTGAbility
 public:
     string tcString;
     string manaString;
-    ANewAffinity(GameObserver* observer, int _id, MTGCardInstance * _source,string Tc = "", string mana ="");
+    ANewAffinity(GameObserver* observer, int _id, MTGCardInstance * _source, string Tc = "", string mana ="");
     void Update(float dt);
     int testDestroy();
     ANewAffinity * clone() const;
@@ -3646,9 +3646,11 @@ public:
         ActivatedAbility(observer, _id, _source, _cost, 0), _cardName(cardName), starfound(starfound), multiplier(multiplier), who(who), aLivingWeapon(aLivingWeapon)
     {
         if (!multiplier) this->multiplier = NEW WParsedInt(1);
-        MTGCard * card = MTGCollection()->getCardByName(_cardName);
-        tokenId = card->getId();
-        if (card) name = card->data->getName();
+        MTGCard * card = MTGCollection()->getCardByName(_cardName, _source->setId); // Try to retrieve token id from the same set of source card (e.g. Urza's Saga).
+        if (card) {
+            tokenId = card->getId();
+            name = card->data->getName();
+        }
         battleReady = false;
         andAbility = NULL;
         cID = "";
@@ -3742,7 +3744,6 @@ public:
         }
         for (int i = 0; i < Tokenizer(); ++i)
         {
-            //MTGCardInstance * myToken;
             if (tokenId)
             {
                 MTGCard * card = MTGCollection()->getCardById(tokenId);

projects/mtg/include/CardDescriptor.h

@@ -52,18 +52,20 @@ class CardDescriptor: public MTGCardInstance
   int hasFlashbackCost;
   int hasBackSide;
   int modified;
+  int toxicity;
   int hasPartner;
   int hasXCost;
   int anyCounter;
   int init();
   CardDescriptor();
-  void unsecureSetKicked(int i);
-  void unsecureSetHasKickerCost(int i);
-  void unsecureSetHasConvokeCost(int i);
-  void unsecureSetHasFlashbackCost(int i);
-  void unsecureSetHasBackSide(int i);
-  void unsecureSetModified(int i);
-  void unsecureSetHasPartner(int i);
+  void unsecureSetKicked(int k);
+  void unsecureSetHasKickerCost(int k);
+  void unsecureSetHasConvokeCost(int k);
+  void unsecureSetHasFlashbackCost(int k);
+  void unsecureSetHasBackSide(int k);
+  void unsecureSetModified(int k);
+  void unsecureSetHasToxic(int k);
+  void unsecureSetHasPartner(int k);
   void unsecureSetTapped(int i);
   void unsecuresetfresh(int k);
   void unsecuresetrecent(int j);

projects/mtg/include/MTGCardInstance.h

@@ -210,6 +210,7 @@ public:
     int stepPower(CombatStep step);
     int afterDamage();
     int has(int ability);
+    int getToxicity();
     int cleanup();
 
     MTGCard * model;

projects/mtg/include/MTGDeck.h

@@ -129,7 +129,7 @@ public:
     void prefetchCardNameCache();
 #endif
 
-    MTGCard * getCardByName(string name);
+    MTGCard * getCardByName(string name, int forcedSetId = -1);
     void loadFolder(const string& folder, const string& filename="" );
 
     int load(const string& config_file);

projects/mtg/include/MTGDefinitions.h

@@ -225,7 +225,7 @@ class Constants
       NOMANA = 97,
       ONLYMANA = 98,
       POISONDAMAGER = 99,
-      soulbond = 100,
+      SOULBOND = 100,
       LURE = 101,
       NOLEGEND = 102,
       CANPLAYFROMGRAVEYARD = 103,
@@ -355,7 +355,14 @@ class Constants
       AFFINITYATTACKINGCREATURES = 227,
       AFFINITYGRAVEINSTSORC = 228,
       CANLOYALTYTWICE = 229,
-      NB_BASIC_ABILITIES = 230,
+      POISONFOURTOXIC = 230,
+      POISONFIVETOXIC = 231,
+      POISONSIXTOXIC = 232,
+      POISONSEVENTOXIC = 233,
+      POISONEIGHTTOXIC = 234,
+      POISONNINETOXIC = 235,
+      POISONTENTOXIC = 236,
+      NB_BASIC_ABILITIES = 237,
 
     RARITY_S = 'S',   //Special Rarity
     RARITY_M = 'M',   //Mythics