From 188e6dd8c197fd08d5d677b5b8536f0c1130ce55 Mon Sep 17 00:00:00 2001
From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com>
Date: Sat, 6 Aug 2022 21:54:15 +0100
Subject: [PATCH] Added default image set codes for several tokens

---
 .../mage/game/permanent/token/AjanisPridemateToken.java  | 1 +
 .../permanent/token/ArchitectOfTheUntamedBeastToken.java | 2 ++
 .../mage/game/permanent/token/ArtifactWallToken.java     | 1 +
 .../game/permanent/token/AshiokNightmareMuseToken.java   | 1 +
 .../java/mage/game/permanent/token/AvatarToken2.java     | 1 +
 .../mage/game/permanent/token/BirdIllusionToken.java     | 4 ++++
 .../java/mage/game/permanent/token/BirdSoldierToken.java | 1 +
 .../java/mage/game/permanent/token/CatBirdToken.java     | 1 +
 .../mage/game/permanent/token/ConstructRedToken.java     | 1 +
 .../mage/game/permanent/token/CorpseweftZombieToken.java | 1 +
 .../mage/game/permanent/token/CrestedSunmareToken.java   | 1 +
 .../mage/game/permanent/token/DeathtouchSnakeToken.java  | 2 ++
 .../mage/game/permanent/token/DefenderPlantToken.java    | 9 +--------
 .../token/DevastatingSummonsElementalToken.java          | 1 +
 .../mage/game/permanent/token/DinosaurBeastToken.java    | 1 +
 .../java/mage/game/permanent/token/DinosaurCatToken.java | 1 +
 .../mage/game/permanent/token/DinosaurHasteToken.java    | 1 +
 .../game/permanent/token/DokaiWeaverofLifeToken.java     | 1 +
 .../permanent/token/DragonBroodmotherDragonToken.java    | 1 +
 .../mage/game/permanent/token/DragonSpiritToken.java     | 1 +
 .../main/java/mage/game/permanent/token/DwarfToken.java  | 1 +
 .../permanent/token/FableOfTheMirrorBreakerToken.java    | 1 +
 .../java/mage/game/permanent/token/FeatherToken.java     | 1 +
 .../permanent/token/NestOfScarabsBlackInsectToken.java   | 2 ++
 24 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/Mage/src/main/java/mage/game/permanent/token/AjanisPridemateToken.java b/Mage/src/main/java/mage/game/permanent/token/AjanisPridemateToken.java
index 4a4df6a1502..6e890792a4b 100644
--- a/Mage/src/main/java/mage/game/permanent/token/AjanisPridemateToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/AjanisPridemateToken.java
@@ -20,6 +20,7 @@ public final class AjanisPridemateToken extends TokenImpl {
         subtype.add(SubType.SOLDIER);
         power = new MageInt(2);
         toughness = new MageInt(2);
+        setOriginalExpansionSetCode("M20");
 
         this.addAbility(new GainLifeControllerTriggeredAbility(
                 new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false
diff --git a/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java
index 4da70553dcc..ac5a3463db2 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java
@@ -19,6 +19,8 @@ public final class ArchitectOfTheUntamedBeastToken extends TokenImpl {
         subtype.add(SubType.BEAST);
         power = new MageInt(6);
         toughness = new MageInt(6);
+
+        setOriginalExpansionSetCode("KLD");
     }
 
     public ArchitectOfTheUntamedBeastToken(final ArchitectOfTheUntamedBeastToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java b/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java
index 7987966e4d7..90b7c374752 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ArtifactWallToken.java
@@ -14,6 +14,7 @@ public final class ArtifactWallToken extends TokenImpl {
         subtype.add(SubType.WALL);
         power = new MageInt(0);
         toughness = new MageInt(4);
+        setOriginalExpansionSetCode("THB");
 
         addAbility(DefenderAbility.getInstance());
     }
diff --git a/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java b/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java
index 1be43c33bcc..fde35984bd2 100644
--- a/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java
@@ -31,6 +31,7 @@ public final class AshiokNightmareMuseToken extends TokenImpl {
         subtype.add(SubType.NIGHTMARE);
         power = new MageInt(2);
         toughness = new MageInt(3);
+        setOriginalExpansionSetCode("THB");
         this.addAbility(new AttacksOrBlocksTriggeredAbility(new AshiokNightmareMuseTokenEffect(), false));
     }
 
diff --git a/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java b/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java
index 0f7993a1d8b..0991b40f9bc 100644
--- a/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java
+++ b/Mage/src/main/java/mage/game/permanent/token/AvatarToken2.java
@@ -14,6 +14,7 @@ public final class AvatarToken2 extends TokenImpl {
         subtype.add(SubType.AVATAR);
         power = new MageInt(4);
         toughness = new MageInt(4);
+        setOriginalExpansionSetCode("M19");
         addAbility(FlyingAbility.getInstance());
     }
 
diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java
index fffd727d161..c0c42a464be 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java
@@ -6,6 +6,8 @@ import mage.constants.SubType;
 import mage.MageInt;
 import mage.abilities.keyword.FlyingAbility;
 
+import java.util.Arrays;
+
 /**
  *
  * @author TheElk801
@@ -21,6 +23,8 @@ public final class BirdIllusionToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
         this.addAbility(FlyingAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("GRN", "C20");
     }
 
     public BirdIllusionToken(final BirdIllusionToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java
index 06ecbae0ad4..2c9f71c8e3b 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java
@@ -20,6 +20,7 @@ public final class BirdSoldierToken extends TokenImpl {
         color.setWhite(true);
         power = new MageInt(1);
         toughness = new MageInt(1);
+        setOriginalExpansionSetCode("ARB");
 
         addAbility(FlyingAbility.getInstance());
     }
diff --git a/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java
index 53f893bbbed..b212d15e0e0 100644
--- a/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/CatBirdToken.java
@@ -19,6 +19,7 @@ public final class CatBirdToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
         addAbility(FlyingAbility.getInstance());
+        setOriginalExpansionSetCode("IKO");
     }
 
     private CatBirdToken(final CatBirdToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java b/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java
index 697a75c1f64..b0853ba5007 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ConstructRedToken.java
@@ -19,6 +19,7 @@ public final class ConstructRedToken extends TokenImpl {
         power = new MageInt(3);
         toughness = new MageInt(1);
         addAbility(HasteAbility.getInstance());
+        setOriginalExpansionSetCode("NEO");
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java
index ec89e38b48f..b98ea1e8d63 100644
--- a/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java
@@ -23,6 +23,7 @@ public final class CorpseweftZombieToken extends TokenImpl {
         color.setBlack(true);
         this.power = new MageInt(power);
         this.toughness = new MageInt(toughness);
+        setOriginalExpansionSetCode("DTK");
     }
 
     public CorpseweftZombieToken(final CorpseweftZombieToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java
index b7ffbd0180f..821ec5eb8c1 100644
--- a/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java
@@ -18,6 +18,7 @@ public final class CrestedSunmareToken extends TokenImpl {
         color.setWhite(true);
         subtype.add(SubType.HORSE);
         cardType.add(CardType.CREATURE);
+        setOriginalExpansionSetCode("HOU");
     }
 
     public CrestedSunmareToken(final CrestedSunmareToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java
index 1434e2cbc7c..5f5a57c436d 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java
@@ -20,6 +20,8 @@ public final class DeathtouchSnakeToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
         addAbility(DeathtouchAbility.getInstance());
+
+        setOriginalExpansionSetCode("AKH");
     }
 
     public DeathtouchSnakeToken(final DeathtouchSnakeToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java b/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java
index e52f3fc1a58..66501de4e52 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java
@@ -13,20 +13,13 @@ import mage.constants.SubType;
 public final class DefenderPlantToken extends TokenImpl {
 
     public DefenderPlantToken() {
-        this(null, 0);
-    }
-
-    public DefenderPlantToken(String setCode) {
-        this(setCode, 0);
-    }
-
-    public DefenderPlantToken(String setCode, int tokenType) {
         super("Plant Token", "0/2 green Plant creature token with defender");
         color.setGreen(true);
         cardType.add(CardType.CREATURE);
         subtype.add(SubType.PLANT);
         power = new MageInt(0);
         toughness = new MageInt(2);
+        setOriginalExpansionSetCode("XLN");
 
         this.addAbility(DefenderAbility.getInstance());
     }
diff --git a/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java
index eacc378f4d2..fb00899c288 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java
@@ -15,6 +15,7 @@ public final class DevastatingSummonsElementalToken extends TokenImpl {
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         subtype.add(SubType.ELEMENTAL);
+        setOriginalExpansionSetCode("ROE");
     }
 
     public DevastatingSummonsElementalToken(final DevastatingSummonsElementalToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java
index f2948c89f60..b69a54ed871 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurBeastToken.java
@@ -22,6 +22,7 @@ public final class DinosaurBeastToken extends TokenImpl {
         power = new MageInt(xValue);
         toughness = new MageInt(xValue);
         addAbility(TrampleAbility.getInstance());
+        setOriginalExpansionSetCode("IKO");
     }
 
     private DinosaurBeastToken(final DinosaurBeastToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java
index 5d511b392f0..79faba774a2 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurCatToken.java
@@ -14,6 +14,7 @@ public final class DinosaurCatToken extends TokenImpl {
         subtype.add(SubType.CAT);
         power = new MageInt(2);
         toughness = new MageInt(2);
+        setOriginalExpansionSetCode("C20");
     }
 
     public DinosaurCatToken(final DinosaurCatToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java
index 5929502e4b5..fd363622cb7 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurHasteToken.java
@@ -18,6 +18,7 @@ public final class DinosaurHasteToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
         addAbility(HasteAbility.getInstance());
+        setOriginalExpansionSetCode("IKO");
     }
 
     private DinosaurHasteToken(final DinosaurHasteToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java
index 474949f21a0..bee359bece7 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java
@@ -30,6 +30,7 @@ public final class DokaiWeaverofLifeToken extends TokenImpl {
         toughness = new MageInt(0);
         DynamicValue controlledLands = new PermanentsOnBattlefieldCount(filterLands);
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(controlledLands, controlledLands, Duration.WhileOnBattlefield)));
+        setOriginalExpansionSetCode("C18");
     }
 
     public DokaiWeaverofLifeToken(final DokaiWeaverofLifeToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java
index f1e703849d7..7b64e602726 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java
@@ -24,6 +24,7 @@ public final class DragonBroodmotherDragonToken extends TokenImpl {
         toughness = new MageInt(1);
         addAbility(FlyingAbility.getInstance());
         addAbility(new DevourAbility(DevourEffect.DevourFactor.Devour2));
+        setOriginalExpansionSetCode("ARB");
     }
 
     public DragonBroodmotherDragonToken(final DragonBroodmotherDragonToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java
index b183ca19a2b..6deb6410e7d 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DragonSpiritToken.java
@@ -19,6 +19,7 @@ public final class DragonSpiritToken extends TokenImpl {
         power = new MageInt(5);
         toughness = new MageInt(5);
         addAbility(FlyingAbility.getInstance());
+        setOriginalExpansionSetCode("NEO");
     }
 
     public DragonSpiritToken(final DragonSpiritToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java b/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java
index dd6c349178f..1f29375acde 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DwarfToken.java
@@ -16,6 +16,7 @@ public final class DwarfToken extends TokenImpl {
         subtype.add(SubType.DWARF);
         power = new MageInt(1);
         toughness = new MageInt(1);
+        setOriginalExpansionSetCode("ELD");
     }
 
     private DwarfToken(final DwarfToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/FableOfTheMirrorBreakerToken.java b/Mage/src/main/java/mage/game/permanent/token/FableOfTheMirrorBreakerToken.java
index bb211bcd3b6..fd17dd47ce4 100644
--- a/Mage/src/main/java/mage/game/permanent/token/FableOfTheMirrorBreakerToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/FableOfTheMirrorBreakerToken.java
@@ -20,6 +20,7 @@ public class FableOfTheMirrorBreakerToken extends TokenImpl {
         power = new MageInt(2);
         toughness = new MageInt(2);
         addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new TreasureToken())).setTriggerPhrase("Whenever this creature attacks, "));
+        setOriginalExpansionSetCode("NEO");
     }
 
     private FableOfTheMirrorBreakerToken(final FableOfTheMirrorBreakerToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/FeatherToken.java b/Mage/src/main/java/mage/game/permanent/token/FeatherToken.java
index 4e056c3d6f3..65103ea4ad3 100644
--- a/Mage/src/main/java/mage/game/permanent/token/FeatherToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/FeatherToken.java
@@ -27,6 +27,7 @@ public final class FeatherToken extends TokenImpl {
         );
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
+        setOriginalExpansionSetCode("IKO");
     }
 
     private FeatherToken(final FeatherToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java
index 9233f73fb39..c69d849aae1 100644
--- a/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java
@@ -18,6 +18,8 @@ public final class NestOfScarabsBlackInsectToken extends TokenImpl {
         subtype.add(SubType.INSECT);
         power = new MageInt(1);
         toughness = new MageInt(1);
+
+        setOriginalExpansionSetCode("AKH");
     }
 
     public NestOfScarabsBlackInsectToken(final NestOfScarabsBlackInsectToken token) {