From 2b74c85e08cd1614320d3babe74153608cd92241 Mon Sep 17 00:00:00 2001 From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com> Date: Thu, 22 Sep 2022 22:55:57 +0100 Subject: [PATCH] Added DMC token images --- .../sources/ScryfallImageSupportTokens.java | 25 +++++++++++++++++ .../src/main/resources/card-pictures-tok.txt | 28 ++++++++++++++++++- .../src/mage/cards/z/ZeriamGoldenWind.java | 1 - .../permanent/token/AngelVigilanceToken.java | 2 +- .../game/permanent/token/AtlaPalaniToken.java | 2 +- .../mage/game/permanent/token/BearToken.java | 2 +- .../game/permanent/token/CatWarriorToken.java | 2 +- .../game/permanent/token/ElephantToken.java | 2 +- .../game/permanent/token/GriffinToken.java | 2 +- .../token/HazezonTamarSandWarriorToken.java | 1 + .../mage/game/permanent/token/HumanToken.java | 2 +- .../permanent/token/KavuAllColorToken.java | 2 +- .../permanent/token/KherKeepKoboldToken.java | 2 +- .../game/permanent/token/KnightToken.java | 6 +++- .../game/permanent/token/MerfolkToken.java | 2 +- .../game/permanent/token/RagavanToken.java | 5 +++- .../permanent/token/RasputinKnightToken.java | 9 ++++++ .../mage/game/permanent/token/SnakeToken.java | 2 +- .../game/permanent/token/StanggTwinToken.java | 2 +- .../game/permanent/token/TreasureToken.java | 5 +++- .../permanent/token/WarriorVigilantToken.java | 2 +- .../game/permanent/token/Wurm44Token.java | 3 +- .../permanent/token/XiraBlackInsectToken.java | 28 +++++++++++++++++++ .../token/ZaxaraTheExemplaryHydraToken.java | 2 +- .../permanent/token/ZombieKnightToken.java | 3 +- .../game/permanent/token/ZombieToken.java | 2 +- 26 files changed, 120 insertions(+), 24 deletions(-) create mode 100644 Mage/src/main/java/mage/game/permanent/token/XiraBlackInsectToken.java 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 91fdfaa7ed..94c3da89c4 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 @@ -1760,6 +1760,31 @@ public class ScryfallImageSupportTokens { put ("DMU/Saproling", "https://api.scryfall.com/cards/tdmu/18/en?format=image"); put ("DMU/Soldier", "https://api.scryfall.com/cards/tdmu/4/en?format=image"); + // DMC + put ("DMC/Angel", "https://api.scryfall.com/cards/tdmu/1/en?format=image"); + put ("DMC/Badger", "https://api.scryfall.com/cards/tdmu/15/en?format=image"); + put ("DMC/Bear", "https://api.scryfall.com/cards/tdmc/7/en?format=image"); + put ("DMC/Cat Warrior", "https://api.scryfall.com/cards/tdmu/17/en?format=image"); + put ("DMC/Egg", "https://api.scryfall.com/cards/tdmc/8/en?format=image"); + put ("DMC/Elephant", "https://api.scryfall.com/cards/tdmc/9/en?format=image"); + put ("DMC/Griffin", "https://api.scryfall.com/cards/tdmc/1/en?format=image"); + put ("DMC/Human", "https://api.scryfall.com/cards/tdmc/2/en?format=image"); + put ("DMC/Hydra", "https://api.scryfall.com/cards/tdmc/10/en?format=image"); + put ("DMC/Insect", "https://api.scryfall.com/cards/tdmu/7/en?format=image"); + put ("DMC/Kavu", "https://api.scryfall.com/cards/tdmc/12/en?format=image"); + put ("DMC/Knight/1", "https://api.scryfall.com/cards/tdmc/3/en?format=image"); + put ("DMC/Knight/2", "https://api.scryfall.com/cards/tdmu/3/en?format=image"); + put ("DMC/Kobolds of Kher Keep", "https://api.scryfall.com/cards/tdmu/13/en?format=image"); + put ("DMC/Merfolk", "https://api.scryfall.com/cards/tdmu/5/en?format=image"); + put ("DMC/Ragavan", "https://api.scryfall.com/cards/tdmc/6/en?format=image"); + put ("DMC/Sand Warrior", "https://api.scryfall.com/cards/tdmu/20/en?format=image"); + put ("DMC/Snake", "https://api.scryfall.com/cards/tdmc/11/en?format=image"); + put ("DMC/Stangg Twin", "https://api.scryfall.com/cards/tdmu/21/en?format=image"); + put ("DMC/Treasure", "https://api.scryfall.com/cards/tdmu/24/en?format=image"); + put ("DMC/Warrior", "https://api.scryfall.com/cards/tdmc/4/en?format=image"); + put ("DMC/Wurm", "https://api.scryfall.com/cards/tdmu/19/en?format=image"); + put ("DMC/Zombie", "https://api.scryfall.com/cards/tdmu/9/en?format=image"); + put ("DMC/Zombie Knight", "https://api.scryfall.com/cards/tdmc/5/en?format=image"); // generate supported sets supportedSets.clear(); diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index 2ff81d4f0f..ca906b1d29 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -1880,4 +1880,30 @@ |Generate|TOK:DMU|Phyrexian|||PhyrexianToken| |Generate|TOK:DMU|Powerstone|||PowerstoneToken| |Generate|TOK:DMU|Saproling|||SaprolingToken| -|Generate|TOK:DMU|Soldier|||SoldierToken| \ No newline at end of file +|Generate|TOK:DMU|Soldier|||SoldierToken| + +# DMC +|Generate|TOK:DMC|Angel|||AngelVigilanceToken| +|Generate|TOK:DMC|Badger|||BadgerToken| +|Generate|TOK:DMC|Bear|||BearToken| +|Generate|TOK:DMC|Cat Warrior|||CatWarriorToken| +|Generate|TOK:DMC|Egg|||AtlaPalaniToken| +|Generate|TOK:DMC|Elephant|||ElephantToken| +|Generate|TOK:DMC|Griffin|||GriffinToken| +|Generate|TOK:DMC|Human|||HumanToken| +|Generate|TOK:DMC|Hydra|||ZaxaraTheExemplaryHydraToken| +|Generate|TOK:DMC|Insect|||XiraBlackInsectToken| +|Generate|TOK:DMC|Kavu|||KavuAllColorToken| +|Generate|TOK:DMC|Knight|1||KnightToken| +|Generate|TOK:DMC|Knight|2||RasputinKnightToken| +|Generate|TOK:DMC|Kobolds of Kher Keep|||KherKeepKoboldToken| +|Generate|TOK:DMC|Merfolk|||MerfolkToken| +|Generate|TOK:DMC|Ragavan|||RagavanToken| +|Generate|TOK:DMC|Sand Warrior|||HazezonTamarSandWarriorToken| +|Generate|TOK:DMC|Snake|||SnakeToken| +|Generate|TOK:DMC|Stangg Twin|||StanggTwinToken| +|Generate|TOK:DMC|Treasure|||TreasureToken| +|Generate|TOK:DMC|Warrior|||WarriorVigilantToken| +|Generate|TOK:DMC|Wurm|||Wurm44Token| +|Generate|TOK:DMC|Zombie|||ZombieToken| +|Generate|TOK:DMC|Zombie Knight|||ZombieKnightToken| diff --git a/Mage.Sets/src/mage/cards/z/ZeriamGoldenWind.java b/Mage.Sets/src/mage/cards/z/ZeriamGoldenWind.java index ec2b5b35f0..986d8cd086 100644 --- a/Mage.Sets/src/mage/cards/z/ZeriamGoldenWind.java +++ b/Mage.Sets/src/mage/cards/z/ZeriamGoldenWind.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; -import mage.game.permanent.token.GoblinRogueToken; import mage.game.permanent.token.GriffinToken; /** diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java index ce20e04b5d..5f9027b403 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java @@ -20,7 +20,7 @@ public final class AngelVigilanceToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); addAbility(VigilanceAbility.getInstance()); - availableImageSetCodes = Arrays.asList("NEC", "MH1", "WAR", "GRN", "M19", "2X2"); + availableImageSetCodes = Arrays.asList("NEC", "MH1", "WAR", "GRN", "M19", "2X2", "DMC"); } public AngelVigilanceToken(final AngelVigilanceToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java b/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java index d9b89ca128..dc5c5c393b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java @@ -21,7 +21,7 @@ public final class AtlaPalaniToken extends TokenImpl { toughness = new MageInt(1); addAbility(DefenderAbility.getInstance()); - availableImageSetCodes = Arrays.asList("C19","2X2"); + availableImageSetCodes = Arrays.asList("C19", "2X2", "DMC"); } private AtlaPalaniToken(final AtlaPalaniToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BearToken.java b/Mage/src/main/java/mage/game/permanent/token/BearToken.java index f9d0347b51..6feb1b9293 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BearToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BearToken.java @@ -19,7 +19,7 @@ public final class BearToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); - availableImageSetCodes = Arrays.asList("C15", "JUD", "ODY", "VMA", "MH1", "ELD", "KHM"); + availableImageSetCodes = Arrays.asList("C15", "JUD", "ODY", "VMA", "MH1", "ELD", "KHM", "DMC"); } public BearToken(final BearToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java index 862c33af6a..2de0e79e6f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java @@ -19,7 +19,7 @@ public final class CatWarriorToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("C17", "C18")); + tokenImageSets.addAll(Arrays.asList("C17", "C18", "DMC")); } public CatWarriorToken() { 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 d228bdbf0c..71f7c51f4d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java @@ -20,7 +20,7 @@ public final class ElephantToken extends TokenImpl { toughness = new MageInt(3); availableImageSetCodes = Arrays.asList("C14", "C15", "CMA", "CNS", "GVL", "DDD", - "EMA", "INV", "JUD", "MM2", "ODY", "VMA", "WWK", "MH1", "CMR", "C21", "MIC", "NEC", "2XM", "NCC", "MM3", "DDS"); + "EMA", "INV", "JUD", "MM2", "ODY", "VMA", "WWK", "MH1", "CMR", "C21", "MIC", "NEC", "2XM", "NCC", "MM3", "DDS", "DMC"); } public ElephantToken(final ElephantToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java index cc8f969f99..50cfa75252 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java @@ -23,7 +23,7 @@ public final class GriffinToken extends TokenImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("DDH", "DDL", "M21", "TSR"); + availableImageSetCodes = Arrays.asList("DDH", "DDL", "M21", "TSR", "DMC"); } public GriffinToken(final GriffinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java index 7ca0cc46a0..943a016fbc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java @@ -21,6 +21,7 @@ public final class HazezonTamarSandWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(1); toughness = new MageInt(1); + setOriginalExpansionSetCode("DMC"); } public HazezonTamarSandWarriorToken(final HazezonTamarSandWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java index 5a0453b6c9..4728195f97 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java @@ -19,7 +19,7 @@ public final class HumanToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes.addAll(Arrays.asList("DKA", "AVR", "FNMP", "RNA", "ELD", "C19", "C20", "MID", "VOW", "NCC", "DDQ", "CLB")); + availableImageSetCodes.addAll(Arrays.asList("DKA", "AVR", "FNMP", "RNA", "ELD", "C19", "C20", "MID", "VOW", "NCC", "DDQ", "CLB", "DMC")); } public HumanToken(final HumanToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KavuAllColorToken.java b/Mage/src/main/java/mage/game/permanent/token/KavuAllColorToken.java index e74738573a..50b3bd2a74 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KavuAllColorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KavuAllColorToken.java @@ -24,8 +24,8 @@ public final class KavuAllColorToken extends TokenImpl { color.setGreen(true); power = new MageInt(3); toughness = new MageInt(3); - this.addAbility(TrampleAbility.getInstance()); this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("This creature is all colors"))); + this.addAbility(TrampleAbility.getInstance()); setOriginalExpansionSetCode("DMC"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java b/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java index f9125c2a4c..8b31d3bdc3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java @@ -21,7 +21,7 @@ public final class KherKeepKoboldToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("A25", "TSR", "CLB"); + availableImageSetCodes = Arrays.asList("A25", "TSR", "CLB", "DMC"); } public KherKeepKoboldToken(final KherKeepKoboldToken token) { super(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 b94a072287..03b9e64821 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", "ORI", "RTR", "M19", "ELD", "M21", "AFC", "MIC", "DOM", "2X2"); + availableImageSetCodes = Arrays.asList("C15", "CMA", "ORI", "RTR", "M19", "ELD", "M21", "AFC", "MIC", "DOM", "2X2", "DMC"); } public KnightToken(final KnightToken token) { @@ -45,5 +45,9 @@ public final class KnightToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DOM")) { setTokenType(RandomUtil.nextInt(2) + 1); } + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DMC")) { + setTokenType(1); + } } } diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java index cb92959db7..543e40d58c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java @@ -21,7 +21,7 @@ public final class MerfolkToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("ZEN"); + availableImageSetCodes = Arrays.asList("ZEN", "DMC"); } public MerfolkToken(final MerfolkToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java b/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java index 37ae5a96ad..0f5ed3c860 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java @@ -6,6 +6,8 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; +import java.util.Arrays; + /** * * @author spjspj @@ -14,13 +16,14 @@ public final class RagavanToken extends TokenImpl { public RagavanToken() { super("Ragavan", "Ragavan, a legendary 2/1 red Monkey creature token"); - this.setOriginalExpansionSetCode("AER"); this.supertype.add(SuperType.LEGENDARY); this.power = new MageInt(2); this.toughness = new MageInt(1); this.color.setRed(true); this.subtype.add(SubType.MONKEY); this.cardType.add(CardType.CREATURE); + + availableImageSetCodes = Arrays.asList("AER", "DMC"); } public RagavanToken(final RagavanToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RasputinKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/RasputinKnightToken.java index 8802598aee..9044893a20 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RasputinKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RasputinKnightToken.java @@ -29,4 +29,13 @@ public final class RasputinKnightToken extends TokenImpl { public RasputinKnightToken copy() { return new RasputinKnightToken(this); } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DMC")) { + setTokenType(2); + } + } } 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 cd7e8ab191..797b4af07b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java @@ -20,7 +20,7 @@ public final class SnakeToken extends TokenImpl { toughness = new MageInt(1); availableImageSetCodes = Arrays.asList("6ED", "C15", "C19", "CHK", "KTK", "MM2", "MMQ", "SOK", - "VIS", "ZEN", "C20", "MIC"); + "VIS", "ZEN", "C20", "MIC", "DMC"); } public SnakeToken(final SnakeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java b/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java index 727c207fc4..771cd0199b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java @@ -26,7 +26,7 @@ public final class StanggTwinToken extends TokenImpl { this.power = new MageInt(3); this.toughness = new MageInt(4); - availableImageSetCodes = Arrays.asList("A25"); + availableImageSetCodes = Arrays.asList("A25", "DMC"); } public StanggTwinToken(final StanggTwinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java index af0d00aab8..5a5146711d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java @@ -27,7 +27,10 @@ public final class TreasureToken extends TokenImpl { ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); - availableImageSetCodes = Arrays.asList("XLN", "RNA", "M20", "C19", "C20", "M21", "CMR", "KHM", "STX", "MH2", "AFR", "VOW", "NEO", "SLD", "2XM", "SNC", "CLB", "2X2"); + availableImageSetCodes = Arrays.asList("XLN", "RNA", "M20", "C19", "C20", + "M21", "CMR", "KHM", "STX", "MH2", + "AFR", "VOW", "NEO", "SLD", "2XM", + "SNC", "CLB", "2X2", "DMC"); } public TreasureToken(final TreasureToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java b/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java index 18ca24d4b2..9dd1a4e76a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java @@ -23,7 +23,7 @@ public final class WarriorVigilantToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(VigilanceAbility.getInstance()); - availableImageSetCodes.addAll(Arrays.asList("AKH")); + availableImageSetCodes.addAll(Arrays.asList("AKH", "DMC")); } public WarriorVigilantToken(final WarriorVigilantToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm44Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm44Token.java index 098113c6af..c820cf507e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Wurm44Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Wurm44Token.java @@ -18,8 +18,7 @@ public final class Wurm44Token extends TokenImpl { subtype.add(SubType.WURM); power = new MageInt(4); toughness = new MageInt(4); - - availableImageSetCodes = Arrays.asList("DMU"); + setOriginalExpansionSetCode("DMC"); } public Wurm44Token(final Wurm44Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/XiraBlackInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/XiraBlackInsectToken.java new file mode 100644 index 0000000000..d8b063f979 --- /dev/null +++ b/Mage/src/main/java/mage/game/permanent/token/XiraBlackInsectToken.java @@ -0,0 +1,28 @@ +package mage.game.permanent.token; + +import mage.MageInt; +import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; + +public final class XiraBlackInsectToken extends TokenImpl { + + public XiraBlackInsectToken() { + super("Insect Token", "1/1 black Insect creature token with flying"); + cardType.add(CardType.CREATURE); + color.setBlack(true); + subtype.add(SubType.INSECT); + power = new MageInt(1); + toughness = new MageInt(1); + this.addAbility(FlyingAbility.getInstance()); + setOriginalExpansionSetCode("DMC"); + } + + public XiraBlackInsectToken(final XiraBlackInsectToken token) { + super(token); + } + + public XiraBlackInsectToken copy() { + return new XiraBlackInsectToken(this); + } +} diff --git a/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java b/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java index 7ad03bc037..4d7b80b130 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZaxaraTheExemplaryHydraToken.java @@ -19,7 +19,7 @@ public class ZaxaraTheExemplaryHydraToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(0); - availableImageSetCodes = Arrays.asList("C20"); + availableImageSetCodes = Arrays.asList("C20", "DMC"); } private ZaxaraTheExemplaryHydraToken(final ZaxaraTheExemplaryHydraToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java index 57902cb298..46258b22aa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java @@ -13,13 +13,12 @@ public final class ZombieKnightToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("DOM")); + tokenImageSets.addAll(Arrays.asList("DOM", "DMC")); } public ZombieKnightToken(){ super("Zombie Knight Token", "a 2/2 black Zombie Knight creature token with menace"); availableImageSetCodes = tokenImageSets; - setOriginalExpansionSetCode("DOM"); color.setBlack(true); cardType.add(CardType.CREATURE); subtype.add(SubType.ZOMBIE, SubType.KNIGHT); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java index cabae34509..2c283dd48c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -33,7 +33,7 @@ public final class ZombieToken extends TokenImpl { "MIC", "VOW", "UMA", "NCC", "MED", "BBD", "M19", "CM2", "PCA", "AVR", "DDQ", "CN2", - "2X2", "CC2"); + "2X2", "CC2", "DMC"); } @Override