From e065e77f7c014429fa794ba683ae93bb8005a71c Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Sat, 4 Jun 2022 18:55:58 +0100 Subject: [PATCH] Added NPH token images --- .../card/dl/sources/ScryfallImageSupportTokens.java | 6 ++++++ Mage.Client/src/main/resources/card-pictures-tok.txt | 10 +++------- .../java/mage/game/permanent/token/GoblinToken.java | 2 +- .../java/mage/game/permanent/token/GolemToken.java | 2 +- .../main/java/mage/game/permanent/token/MyrToken.java | 2 +- .../mage/game/permanent/token/PhyrexianGermToken.java | 2 +- .../mage/game/permanent/token/PhyrexianMyrToken.java | 4 ++++ 7 files changed, 17 insertions(+), 11 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 0170d3c83c..fd6b23e3bc 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 @@ -1288,6 +1288,12 @@ public class ScryfallImageSupportTokens { // DDG put ("DDG/Goblin", "https://api.scryfall.com/cards/tddg/1/en?format=image"); + // NPH + put ("NPH/Beast", "https://api.scryfall.com/cards/tnph/1/en?format=image"); + put ("NPH/Phyrexian Goblin", "https://api.scryfall.com/cards/tnph/2/en?format=image"); + put ("NPH/Phyrexian Golem", "https://api.scryfall.com/cards/tnph/3/en?format=image"); + put ("NPH/Phyrexian Myr", "https://api.scryfall.com/cards/tnph/4/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 35f31d1411..000abc80b8 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -933,13 +933,9 @@ |Generate|TOK:NEM|Saproling|1||SaprolingBurstToken| |Generate|TOK:NEM|Saproling|2||SaprolingToken| |Generate|TOK:NPH|Beast|||BeastToken| -|Generate|TOK:NPH|Germ|||PhyrexianGermToken| -|Generate|TOK:NPH|Goblin|||GoblinTokenWithHaste| -|Generate|TOK:NPH|Goblin|||GoblinToken| -|Generate|TOK:NPH|Golem|||GolemToken| -|Generate|TOK:NPH|Insect|||InsectInfectToken| -|Generate|TOK:NPH|Insect|||InsectToken| -|Generate|TOK:NPH|Myr|||MyrToken| +|Generate|TOK:NPH|Phyrexian Goblin|||PhyrexianGoblinToken| +|Generate|TOK:NPH|Phyrexian Golem|||PhyrexianGolemToken| +|Generate|TOK:NPH|Phyrexian Myr|||PhyrexianMyrToken| |Generate|TOK:ODY|Bear|||BearToken| |Generate|TOK:ODY|Beast|||BeastToken2| |Generate|TOK:ODY|Elephant|||ElephantToken| 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 85058c052a..b92731bd61 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java @@ -30,7 +30,7 @@ public final class GoblinToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("10E", "ALA", "SOM", "M10", "NPH", "M13", "RTR", + availableImageSetCodes = Arrays.asList("10E", "ALA", "SOM", "M10", "M13", "RTR", "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", "EVG", "MM2", "MM3", "EMA", "C16", "DOM", "ANA", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", "NEC", "M19", "CM2", "PCA", "DD1"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java index c34d881b31..edd108c62d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java @@ -19,7 +19,7 @@ public final class GolemToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("MM2", "NPH", "SOM", "MH1", "M20", "CMR", "2XM"); + availableImageSetCodes = Arrays.asList("MM2", "SOM", "MH1", "M20", "CMR", "2XM"); } public GolemToken(final GolemToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java index 7ee9f53de1..168a6798fc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java @@ -16,7 +16,7 @@ public final class MyrToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("C14", "C16", "C18", "DST", "MM2", "MRD", "NPH", "SOM", "MH1", "C21", "NEC", "2XM", "BBD", "DDU", "CM2"); + availableImageSetCodes = Arrays.asList("C14", "C16", "C18", "DST", "MM2", "MRD", "SOM", "MH1", "C21", "NEC", "2XM", "BBD", "DDU", "CM2"); } public MyrToken(final MyrToken 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 bc4e3a730d..a05956db22 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", "CMA", "PCA"); + availableImageSetCodes = Arrays.asList("C14", "C15", "C16", "MBS", "MM2", "PC2", "MH2", "NEC", "2XM", "CM2", "CMA", "PCA"); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java index f79360365e..e32a16fbae 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java @@ -4,6 +4,8 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; +import java.util.Arrays; + public final class PhyrexianMyrToken extends TokenImpl { public PhyrexianMyrToken() { @@ -14,6 +16,8 @@ public final class PhyrexianMyrToken extends TokenImpl { subtype.add(SubType.MYR); power = new MageInt(1); toughness = new MageInt(1); + + availableImageSetCodes = Arrays.asList("NPH"); } public PhyrexianMyrToken(final PhyrexianMyrToken token) {