From 2ed55094a76715032899ace0068e1a2914d3fecb Mon Sep 17 00:00:00 2001 From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com> Date: Wed, 8 Jun 2022 23:31:12 +0100 Subject: [PATCH] Removed CMD as an available token image source (no token images) --- .../src/main/resources/card-pictures-tok.txt | 17 ----------------- .../mage/game/permanent/token/BeastToken.java | 5 +---- .../mage/game/permanent/token/BeastToken2.java | 2 +- .../token/CallTheSkyBreakerElementalToken.java | 2 +- .../mage/game/permanent/token/DragonToken2.java | 2 +- .../game/permanent/token/EldraziSpawnToken.java | 2 +- .../game/permanent/token/ElephantToken.java | 2 +- .../permanent/token/KithkinSoldierToken.java | 2 +- .../mage/game/permanent/token/PegasusToken.java | 2 +- .../mage/game/permanent/token/SnakeToken.java | 2 +- .../game/permanent/token/SquirrelToken.java | 2 +- .../mage/game/permanent/token/WolfToken.java | 2 +- 12 files changed, 11 insertions(+), 31 deletions(-) diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index cd57ecb10d..1ba1fa7fa2 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -449,23 +449,6 @@ |Generate|TOK:CMA|Wolf|1||WolfToken| |Generate|TOK:CMA|Wolf|2||WolfToken| |Generate|TOK:CMA|Zombie|||ZombieToken| -|Generate|TOK:CMD|Beast|1||BeastToken2| -|Generate|TOK:CMD|Beast|2||BeastToken| -|Generate|TOK:CMD|Dragon|||DragonToken2| -|Generate|TOK:CMD|Eldrazi Spawn|||EldraziSpawnToken| -|Generate|TOK:CMD|Elemental|||CallTheSkyBreakerElementalToken| -|Generate|TOK:CMD|Elephant|||ElephantToken| -|Generate|TOK:CMD|Insect|||InsectToken| -|Generate|TOK:CMD|Kithkin Soldier|||KithkinSoldierToken| -|Generate|TOK:CMD|Pegasus|||PegasusToken| -|Generate|TOK:CMD|Saproling|||SaprolingToken| -|Generate|TOK:CMD|Snake|||SnakeToken| -|Generate|TOK:CMD|Soldier|||SoldierToken| -|Generate|TOK:CMD|Spirit|||SpiritWhiteToken| -|Generate|TOK:CMD|Squirrel|||SquirrelToken| -|Generate|TOK:CMD|Triskelavite|||TriskelaviteToken| -|Generate|TOK:CMD|Wolf|||WolfToken| -|Generate|TOK:CMD|Zombie|||ZombieToken| |Generate|TOK:CN2|Assassin|||QueenMarchesaAssassinToken| |Generate|TOK:CN2|Beast|||BeastToken| |Generate|TOK:CN2|Construct|||DarettiConstructToken| diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java index eb40aaee14..f6427498c9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java @@ -20,7 +20,7 @@ public final class BeastToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("5DN", "C14", "C16", "C19", "CMA", "CMD", "CN2", "GVL", + availableImageSetCodes = Arrays.asList("5DN", "C14", "C16", "C19", "CMA", "CN2", "GVL", "DD3C", "DD3GVL", "DDD", "DDL", "DST", "E01", "EVE", "LRW", "M10", "M11", "M12", "M13", "M14", "M15", "MM3", "NPH", "PC2", "USG", "M19", "IKO", "M21", "CMR", "C21", "AFC", "MIC", "NEC", "2XM", "NCC", "BBD", "PCA", "CLB"); } @@ -32,9 +32,6 @@ public final class BeastToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("M15")) { this.setTokenType(2); } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMD")) { - this.setTokenType(2); - } if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GVL")) { this.setTokenType(1); } diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java index 4f6634980f..80eba22f24 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java @@ -19,7 +19,7 @@ public final class BeastToken2 extends TokenImpl { power = new MageInt(4); toughness = new MageInt(4); - availableImageSetCodes = Arrays.asList("C14", "C15", "C18", "C19", "CMA", "CMD", "GVL", "DDD", + availableImageSetCodes = Arrays.asList("C14", "C15", "C18", "C19", "CMA", "GVL", "DDD", "E01", "ODY", "SCG", "ZEN", "C20", "ZNC", "CMR", "C21", "MH2", "MID", "IMA", "MM3", "DDS"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java index 1bd9255181..f18d24e776 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java @@ -23,7 +23,7 @@ public final class CallTheSkyBreakerElementalToken extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("C15", "CMD", "EMA", "EVE", "C21", "NCC"); + availableImageSetCodes = Arrays.asList("C15", "EMA", "EVE", "C21", "NCC"); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java index 44d4d0e4a7..63fe7a7550 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java @@ -22,7 +22,7 @@ public final class DragonToken2 extends TokenImpl { addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "CMD", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA", "CN2", "GN2", "CLB"); + availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA", "CN2", "GN2", "CLB"); } public DragonToken2(final DragonToken2 token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java index 24eab9b271..106b6ddda6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java @@ -26,7 +26,7 @@ public final class EldraziSpawnToken extends TokenImpl { toughness = new MageInt(1); addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new SacrificeSourceCost())); - availableImageSetCodes = Arrays.asList("C17", "CMD", "DDP", "MM2", "PC2", "ROE", "MIC", "2XM", "NCC", "PCA"); + availableImageSetCodes = Arrays.asList("C17", "DDP", "MM2", "PC2", "ROE", "MIC", "2XM", "NCC", "PCA"); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java index 58086f76e2..ca32b24162 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java @@ -19,7 +19,7 @@ public final class ElephantToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("C14", "C15", "CMA", "CMD", "CNS", "GVL", "DDD", + availableImageSetCodes = Arrays.asList("C14", "C15", "CMA", "CNS", "GVL", "DDD", "EMA", "INV", "JUD", "MM2", "ODY", "TSP", "VMA", "WWK", "MH1", "CMR", "C21", "MIC", "NEC", "2XM", "NCC", "MM3", "DDS"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java index fd3d9c469f..d6f0f1e9bf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java @@ -20,7 +20,7 @@ public final class KithkinSoldierToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("CMD", "LRW", "MMA", "SHM", "MMA", "KHC", "CMA"); + availableImageSetCodes = Arrays.asList("LRW", "SHM", "MMA", "KHC", "CMA"); } public KithkinSoldierToken(final KithkinSoldierToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java index e1efc4ca2b..6cd34df1a2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java @@ -22,7 +22,7 @@ public final class PegasusToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("C14", "C19", "CMD", "EXO", "GPT", "MIR", "TMP", "TSP", "THB", "KHC", "CLB"); + availableImageSetCodes = Arrays.asList("C14", "C19", "EXO", "GPT", "MIR", "TMP", "TSP", "THB", "KHC", "CLB"); } public PegasusToken(final PegasusToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java index 1ddf2f7d05..cd7e8ab191 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java @@ -19,7 +19,7 @@ public final class SnakeToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("6ED", "C15", "C19", "CHK", "CMD", "KTK", "MM2", "MMQ", "SOK", + availableImageSetCodes = Arrays.asList("6ED", "C15", "C19", "CHK", "KTK", "MM2", "MMQ", "SOK", "VIS", "ZEN", "C20", "MIC"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java index 253231ba3b..4ee42f702d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java @@ -19,7 +19,7 @@ public final class SquirrelToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("CMD", "CNS", "ODY", "PCY", "TOR", "ULG", "UNH", "WMA", + availableImageSetCodes = Arrays.asList("CNS", "ODY", "PCY", "TOR", "ULG", "UNH", "WMA", "WTH", "MH1", "MH2", "2XM", "CLB"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java index 0ede9b3c1e..b09eabd2ab 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java @@ -21,7 +21,7 @@ public final class WolfToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); - availableImageSetCodes = Arrays.asList("BNG", "C14", "C15", "CMA", "CMD", "CNS", "ISD", + availableImageSetCodes = Arrays.asList("BNG", "C14", "C15", "CMA", "CNS", "ISD", "LRW", "M10", "M14", "MM2", "SHM", "SOI", "SOM", "V10", "ZEN", "WAR", "M20", "THB", "AFR", "MID", "VOW", "2XM", "A25", "CLB"); }