From e8fd84580c8eaa2365ffe5e0ebeda57b1afe9777 Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Sat, 4 Jun 2022 21:09:49 +0100 Subject: [PATCH] Added DGM token images --- .../card/dl/sources/ScryfallImageSupportTokens.java | 3 +++ Mage.Client/src/main/resources/card-pictures-tok.txt | 8 -------- .../java/mage/game/permanent/token/BirdToken.java | 2 +- .../java/mage/game/permanent/token/CentaurToken.java | 2 +- .../java/mage/game/permanent/token/KnightToken.java | 2 +- .../java/mage/game/permanent/token/RhinoToken.java | 2 +- .../java/mage/game/permanent/token/Wurm55Token.java | 11 +---------- .../game/permanent/token/WurmWithTrampleToken.java | 2 +- 8 files changed, 9 insertions(+), 23 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 6ea2ee321d..3233b34c34 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 @@ -1361,6 +1361,9 @@ public class ScryfallImageSupportTokens { // DDK put ("DDK/Spirit", "https://api.scryfall.com/cards/tddk/1/en?format=image"); + // DGM + put ("DGM/Elemental", "https://api.scryfall.com/cards/tdgm/1/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 76ebc32fc3..5830fefb37 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -549,15 +549,7 @@ |Generate|TOK:DDQ|Human|||HumanToken| |Generate|TOK:DDQ|Spirit|||SpiritWhiteToken| |Generate|TOK:DDQ|Zombie|||ZombieToken| -|Generate|TOK:DGM|Bird|||BirdToken| -|Generate|TOK:DGM|Centaur|||CentaurToken| |Generate|TOK:DGM|Elemental|||VoiceOfResurgenceToken| -|Generate|TOK:DGM|Knight|||KnightToken| -|Generate|TOK:DGM|Rhino|||RhinoToken| -|Generate|TOK:DGM|Soldier|||SoldierTokenWithHaste| -|Generate|TOK:DGM|Spirit|||TeysaEnvoyOfGhostsToken| -|Generate|TOK:DGM|Wurm|1||WurmWithTrampleToken| -|Generate|TOK:DGM|Wurm|2||Wurm55Token| |Generate|TOK:DIS|Bird|||WhiteBlueBirdToken| |Generate|TOK:DIS|Drake|||LeafdrakeRoostDrakeToken| |Generate|TOK:DIS|Elemental|||ResearchDevelopmentToken| diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java index a8f1103c6c..687910841e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java @@ -23,7 +23,7 @@ public final class BirdToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("BNG", "CSP", "DGM", "JUD", "MM3", "RTR", "VMA", "ZEN", + availableImageSetCodes = Arrays.asList("BNG", "CSP", "JUD", "MM3", "RTR", "VMA", "ZEN", "MH1", "C16", "C20", "M21", "ZNC", "KHC", "MH2", "IMA", "CM2"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java index a0ee1ec9bf..82f728280f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java @@ -20,7 +20,7 @@ public final class CentaurToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("C19", "DGM", "ONS", "RTR", "RNA", "MIC"); + availableImageSetCodes = Arrays.asList("C19", "ONS", "RTR", "RNA", "MIC"); } public CentaurToken(final CentaurToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java index 1464a9f0ad..6b214769aa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java @@ -23,7 +23,7 @@ public final class KnightToken extends TokenImpl { toughness = new MageInt(2); this.addAbility(VigilanceAbility.getInstance()); - availableImageSetCodes = Arrays.asList("C15", "CMA", "DGM", "ORI", "RTR", "M19", "ELD", "M21", "AFC", "MIC", "DOM"); + availableImageSetCodes = Arrays.asList("C15", "CMA", "ORI", "RTR", "M19", "ELD", "M21", "AFC", "MIC", "DOM"); } public KnightToken(final KnightToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java index f8b8e06e8a..e2c4c1948b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java @@ -21,7 +21,7 @@ public final class RhinoToken extends TokenImpl { toughness = new MageInt(4); addAbility(TrampleAbility.getInstance()); - availableImageSetCodes = Arrays.asList("DGM", "RTR", "MH1", "C19", "MIC"); + availableImageSetCodes = Arrays.asList("RTR", "MH1", "C19", "MIC"); } public RhinoToken(final RhinoToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java index 8756bf867d..d62c2bb4f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java @@ -19,16 +19,7 @@ public final class Wurm55Token extends TokenImpl { power = new MageInt(5); toughness = new MageInt(5); - availableImageSetCodes = Arrays.asList("AKH", "DGM", "NCC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("DGM")) { - this.setTokenType(2); - } + availableImageSetCodes = Arrays.asList("AKH", "NCC"); } public Wurm55Token(final Wurm55Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java index 2fc0053078..ea47aa04be 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java @@ -21,7 +21,7 @@ public final class WurmWithTrampleToken extends TokenImpl { toughness = new MageInt(5); addAbility(TrampleAbility.getInstance()); - availableImageSetCodes = Arrays.asList("DGM", "RTR"); + availableImageSetCodes = Arrays.asList("RTR"); } public WurmWithTrampleToken(final WurmWithTrampleToken token) {