From 8a4482ae93fb2cd900975e46134942caf7106d20 Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Wed, 1 Jun 2022 23:43:53 +0100 Subject: [PATCH] Added support for and assigned CMA token images --- .../sources/ScryfallImageSupportTokens.java | 21 +++++++++++++++++++ .../src/main/resources/card-pictures-tok.txt | 8 +++++-- .../permanent/token/AssemblyWorkerToken.java | 2 +- .../mage/game/permanent/token/BeastToken.java | 4 +++- .../game/permanent/token/ElfDruidToken.java | 2 +- .../game/permanent/token/ElfWarriorToken.java | 2 +- .../permanent/token/KithkinSoldierToken.java | 2 +- .../permanent/token/PhyrexianGermToken.java | 2 +- .../game/permanent/token/SpiderToken.java | 2 +- .../mage/game/permanent/token/WolfToken.java | 3 +++ 10 files changed, 39 insertions(+), 9 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java index 8962e98d6f..21323c7169 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java @@ -1069,6 +1069,27 @@ public class ScryfallImageSupportTokens { put ("CM2/Phyrexian Wurm/2", "https://api.scryfall.com/cards/tcm2/17/en?format=image"); put ("CM2/Zombie", "https://api.scryfall.com/cards/tcm2/7/en?format=image"); + // CMA + put ("CMA/Beast/1", "https://api.scryfall.com/cards/tcma/7/en?format=image"); + put ("CMA/Beast/2", "https://api.scryfall.com/cards/tcma/8/en?format=image"); + put ("CMA/Dragon", "https://api.scryfall.com/cards/tcma/6/en?format=image"); + put ("CMA/Drake", "https://api.scryfall.com/cards/tcma/18/en?format=image"); + put ("CMA/Elemental", "https://api.scryfall.com/cards/tcma/9/en?format=image"); + put ("CMA/Elephant", "https://api.scryfall.com/cards/tcma/10/en?format=image"); + put ("CMA/Elf Druid", "https://api.scryfall.com/cards/tcma/11/en?format=image"); + put ("CMA/Elf Warrior", "https://api.scryfall.com/cards/tcma/12/en?format=image"); + put ("CMA/Gargoyle", "https://api.scryfall.com/cards/tcma/19/en?format=image"); + put ("CMA/Phyrexian Germ", "https://api.scryfall.com/cards/tcma/4/en?format=image"); + put ("CMA/Kithkin Soldier", "https://api.scryfall.com/cards/tcma/1/en?format=image"); + put ("CMA/Knight", "https://api.scryfall.com/cards/tcma/2/en?format=image"); + put ("CMA/Saproling", "https://api.scryfall.com/cards/tcma/13/en?format=image"); + put ("CMA/Spider", "https://api.scryfall.com/cards/tcma/14/en?format=image"); + put ("CMA/Spirit", "https://api.scryfall.com/cards/tcma/3/en?format=image"); + put ("CMA/Treefolk", "https://api.scryfall.com/cards/tcma/15/en?format=image"); + put ("CMA/Wolf/1", "https://api.scryfall.com/cards/tcma/16/en?format=image"); + put ("CMA/Wolf/2", "https://api.scryfall.com/cards/tcma/17/en?format=image"); + put ("CMA/Zombie", "https://api.scryfall.com/cards/tcma/5/en?format=image"); + // generate supported sets supportedSets.clear(); for (String cardName : this.keySet()) { diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index c3b8acda0f..ce4447b6eb 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -448,14 +448,18 @@ |Generate|TOK:CMA|Drake|||LeafdrakeRoostDrakeToken| |Generate|TOK:CMA|Elemental|||TitaniaProtectorOfArgothElementalToken| |Generate|TOK:CMA|Elephant|||ElephantToken| -|Generate|TOK:CMA|Elf Warrior|| +|Generate|TOK:CMA|Elf Druid|||ElfDruidToken| +|Generate|TOK:CMA|Elf Warrior|||ElfWarriorToken| |Generate|TOK:CMA|Gargoyle|||GargoyleToken| +|Generate|TOK:CMA|Phyrexian Germ|||PhyrexianGermToken| |Generate|TOK:CMA|Kithkin Soldier|||KithkinSoldierToken| |Generate|TOK:CMA|Knight|||KnightToken| |Generate|TOK:CMA|Saproling|||SaprolingToken| +|Generate|TOK:CMA|Spider|||SpiderToken| |Generate|TOK:CMA|Spirit|||SpiritWhiteToken| |Generate|TOK:CMA|Treefolk|||SylvanOfferingTreefolkToken| -|Generate|TOK:CMA|Wolf|||WolfToken| +|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| diff --git a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java index 29222ca9e8..4592fc39b7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java @@ -22,7 +22,7 @@ public final class AssemblyWorkerToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); - availableImageSetCodes = Arrays.asList("4ED", "ATQ", "DDF", "EMA", "TSR"); + availableImageSetCodes = Arrays.asList("4ED", "ATQ", "DDF", "TSR"); } public AssemblyWorkerToken(final AssemblyWorkerToken token) { 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 0bd9a3b41a..44e9bd370d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java @@ -41,13 +41,15 @@ public final class BeastToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) { this.setTokenType(1); } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DD3C")) { setTokenType(RandomUtil.nextInt(2) + 1); } if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MM3")) { setTokenType(RandomUtil.nextInt(2) + 1); } + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMA")) { + setTokenType(1); + } } public BeastToken(final BeastToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java index 9e14c28ebb..d18cc1a653 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfDruidToken.java @@ -36,7 +36,7 @@ public final class ElfDruidToken extends TokenImpl { // {T}: Add {G}. this.addAbility(new GreenManaAbility()); - availableImageSetCodes = Arrays.asList("C14"); + availableImageSetCodes = Arrays.asList("C14", "CMA"); } public ElfDruidToken(final ElfDruidToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java index 479d59ede8..5def381270 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java @@ -20,7 +20,7 @@ public final class ElfWarriorToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "MOR", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU"); + availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "MOR", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU", "CMA"); } public ElfWarriorToken(final ElfWarriorToken token) { 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 7bb85e89cc..034b7ec801 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", "EVE", "LRW", "MMA", "MOR", "SHM", "MMA", "KHC"); + availableImageSetCodes = Arrays.asList("CMD", "EVE", "LRW", "MMA", "MOR", "SHM", "MMA", "KHC", "CMA"); } public KithkinSoldierToken(final KithkinSoldierToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java index 074d97aa0d..5a5e8a6bb9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java @@ -20,7 +20,7 @@ public final class PhyrexianGermToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(0); - availableImageSetCodes = Arrays.asList("C14", "C15", "C16", "MBS", "MM2", "NPH", "PC2", "MH2", "NEC", "2XM", "CM2"); + availableImageSetCodes = Arrays.asList("C14", "C15", "C16", "MBS", "MM2", "NPH", "PC2", "MH2", "NEC", "2XM", "CM2", "CMA"); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java index 6fad2540ef..49d6998e05 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java @@ -22,7 +22,7 @@ public final class SpiderToken extends TokenImpl { this.addAbility(ReachAbility.getInstance()); - availableImageSetCodes.addAll(Arrays.asList("C15", "EMN", "ISD", "SHM", "MH1", "THB", "MID", "UMA", "NCC")); + availableImageSetCodes.addAll(Arrays.asList("C15", "EMN", "ISD", "SHM", "MH1", "THB", "MID", "UMA", "NCC", "CMA")); } public SpiderToken(final SpiderToken token) { 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 ab117f8133..674f1ad81b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java @@ -33,6 +33,9 @@ public final class WolfToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ISD")) { this.setTokenType(RandomUtil.nextInt(2) + 1); // 2 images } + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMA")) { + this.setTokenType(RandomUtil.nextInt(2) + 1); // 2 images + } } public WolfToken(final WolfToken token) {