From 47670266cd489871a46e5e8114536d22f73eba48 Mon Sep 17 00:00:00 2001 From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com> Date: Thu, 22 Sep 2022 22:08:13 +0100 Subject: [PATCH] Added DMU token images --- .../dl/sources/ScryfallImageSupportTokens.java | 16 ++++++++++++++++ .../src/main/resources/card-pictures-tok.txt | 18 +++++++++++++++++- .../mage/game/permanent/token/BeastToken.java | 3 ++- .../mage/game/permanent/token/BirdToken.java | 5 ++++- .../game/permanent/token/BlackBirdToken.java | 10 ++++++++++ .../mage/game/permanent/token/DragonToken.java | 2 +- .../token/Elemental21TrampleHasteToken.java | 1 + .../mage/game/permanent/token/GoblinToken.java | 4 +++- .../game/permanent/token/SaprolingToken.java | 3 ++- .../game/permanent/token/SoldierToken.java | 2 +- 10 files changed, 57 insertions(+), 7 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 f914912c64..91fdfaa7ed 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 @@ -1744,6 +1744,22 @@ public class ScryfallImageSupportTokens { put ("CC2/Snake", "https://api.scryfall.com/cards/cc2/9/en?format=image&face=front"); put ("CC2/Zombie", "https://api.scryfall.com/cards/cc2/9/en?format=image&face=back"); + // DMU + put ("DMU/Emblem Ajani, Sleeper Agent", "https://api.scryfall.com/cards/tdmu/25/en?format=image"); + put ("DMU/Beast", "https://api.scryfall.com/cards/tdmu/16/en?format=image"); + put ("DMU/Bird/1", "https://api.scryfall.com/cards/tdmu/6/en?format=image"); + put ("DMU/Bird/2", "https://api.scryfall.com/cards/tdmu/2/en?format=image"); + put ("DMU/Dragon", "https://api.scryfall.com/cards/tdmu/10/en?format=image"); + put ("DMU/Elemental", "https://api.scryfall.com/cards/tdmu/11/en?format=image"); + put ("DMU/Goblin", "https://api.scryfall.com/cards/tdmu/12/en?format=image"); + put ("DMU/Emblem Jaya, Fiery Negotiator", "https://api.scryfall.com/cards/tdmu/26/en?format=image"); + put ("DMU/Monk", "https://api.scryfall.com/cards/tdmu/14/en?format=image"); + put ("DMU/Ornithopter", "https://api.scryfall.com/cards/tdmu/22/en?format=image"); + put ("DMU/Phyrexian", "https://api.scryfall.com/cards/tdmu/8/en?format=image"); + put ("DMU/Powerstone", "https://api.scryfall.com/cards/tdmu/23/en?format=image"); + 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"); + // 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 cb7b7be5cb..2ff81d4f0f 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -135,6 +135,8 @@ |Generate|EMBLEM:NEO|Kaito Shizuki||Emblem Kaito|KaitoShizukiEmblem| |Generate|EMBLEM:NEO|Tezzeret, Betrayer of Flesh||Emblem Tezzeret|TezzeretBetrayerOfFleshEmblem| |Generate|EMBLEM:2X2|Wrenn and Six||Emblem Wrenn|WrennAndSixEmblem| +|Generate|EMBLEM:DMU|Ajani, Sleeper Agent||Emblem Ajani|AjaniSleeperAgentEmblem| +|Generate|EMBLEM:DMU|Jaya, Fiery Negotiator||Emblem Jaya|JayaFieryNegotiatorEmblem| # Planes |Generate|PLANE:PCA|Plane - Academy at Tolaria West|||AcademyAtTolariaWestPlane| @@ -1864,4 +1866,18 @@ # CC2 |Generate|TOK:CC2|Snake|||OphiomancerSnakeToken| -|Generate|TOK:CC2|Zombie|||ZombieToken| \ No newline at end of file +|Generate|TOK:CC2|Zombie|||ZombieToken| + +# DMU +|Generate|TOK:DMU|Beast|||BeastToken| +|Generate|TOK:DMU|Bird|1||BlackBirdToken| +|Generate|TOK:DMU|Bird|2||BirdToken| +|Generate|TOK:DMU|Dragon|||DragonToken| +|Generate|TOK:DMU|Elemental|||Elemental21TrampleHasteToken| +|Generate|TOK:DMU|Goblin|||GoblinToken| +|Generate|TOK:DMU|Monk|||MonkRedToken| +|Generate|TOK:DMU|Ornithopter|||OrnithopterToken| +|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 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 61cd08aa3b..6dff7fc23f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java @@ -22,7 +22,8 @@ public final class BeastToken extends TokenImpl { availableImageSetCodes = Arrays.asList("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"); + "M13", "M14", "M15", "MM3", "NPH", "PC2", "USG", "M19", "IKO", "M21", "CMR", "C21", + "AFC", "MIC", "NEC", "2XM", "NCC", "BBD", "PCA", "CLB", "DMU"); } @Override 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 6b1583d68e..5b0c085796 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java @@ -24,7 +24,7 @@ public final class BirdToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); availableImageSetCodes = Arrays.asList("BNG", "CSP", "JUD", "MM3", "RTR", "VMA", "ZEN", - "MH1", "C16", "C20", "M21", "ZNC", "KHC", "MH2", "IMA", "CM2"); + "MH1", "C16", "C20", "M21", "ZNC", "KHC", "MH2", "IMA", "CM2", "DMU"); } public BirdToken(final BirdToken token) { @@ -46,5 +46,8 @@ public final class BirdToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("BNG")) { setTokenType(2); } + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DMU")) { + setTokenType(2); + } } } diff --git a/Mage/src/main/java/mage/game/permanent/token/BlackBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/BlackBirdToken.java index 3151beb5a3..72e9811862 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BlackBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BlackBirdToken.java @@ -19,6 +19,7 @@ public final class BlackBirdToken extends TokenImpl { subtype.add(SubType.BIRD); power = new MageInt(1); toughness = new MageInt(1); + setOriginalExpansionSetCode("DMU"); addAbility(FlyingAbility.getInstance()); addAbility(new CantBlockAbility()); @@ -32,4 +33,13 @@ public final class BlackBirdToken extends TokenImpl { public BlackBirdToken copy() { return new BlackBirdToken(this); } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DMU")) { + setTokenType(1); + } + } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java index cac839046c..12c8b4ef38 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java @@ -17,7 +17,7 @@ public final class DragonToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA", "MM3", "C17", "WAR", "MED", "CLB")); + tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA", "MM3", "C17", "WAR", "MED", "CLB", "DMU")); } public DragonToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/Elemental21TrampleHasteToken.java b/Mage/src/main/java/mage/game/permanent/token/Elemental21TrampleHasteToken.java index c8a05b8fa4..7d8799392e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Elemental21TrampleHasteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/Elemental21TrampleHasteToken.java @@ -19,6 +19,7 @@ public final class Elemental21TrampleHasteToken extends TokenImpl { subtype.add(SubType.ELEMENTAL); power = new MageInt(2); toughness = new MageInt(1); + setOriginalExpansionSetCode("DMU"); this.addAbility(TrampleAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); } diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java index 9bd60901f5..166bd47cc2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java @@ -32,7 +32,9 @@ public final class GoblinToken extends TokenImpl { availableImageSetCodes = Arrays.asList("10E", "ALA", "SOM", "M10", "M13", "RTR", "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", - "MM3", "EMA", "DOM", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", "NEC", "M19", "CM2", "PCA", "DD1", "DDS", "DDT", "A25", "GRN", "GK1"); + "MM3", "EMA", "DOM", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", + "NEC", "M19", "CM2", "PCA", "DD1", "DDS", "DDT", "A25", "GRN", + "GK1", "DMU"); } public GoblinToken(final GoblinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java index 84b658f495..1fe42175c5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java @@ -55,7 +55,8 @@ public final class SaprolingToken extends TokenImpl { "GK1", "GK2", "CLB", - "2X2" + "2X2", + "DMU" )); } diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java index 7bc4ac788f..75824e976a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java @@ -22,7 +22,7 @@ public final class SoldierToken extends TokenImpl { availableImageSetCodes = Arrays.asList("10E", "M15", "C14", "ORI", "ALA", "DDF", "THS", "M12", "M13", "MM2", "MMA", "RTR", "SOM", "DDO", "M10", "ORI", "EMN", "EMA", "CN2", "C16", "C18", "MM3", "E01", - "DOM", "MH1", "M20", "C20", "M21", "CMR", "KHC", "TSR", "2XM", "MED", "M19", "MD1", "A25", "CLB", "2X2"); + "DOM", "MH1", "M20", "C20", "M21", "CMR", "KHC", "TSR", "2XM", "MED", "M19", "MD1", "A25", "CLB", "2X2", "DMU"); } public SoldierToken(final SoldierToken token) {