From 74756be1bcf3ffaf050c1e71fea0f296ab1d095a Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Mon, 6 Jun 2022 16:19:52 +0100 Subject: [PATCH] Added GK1 token images --- .../dl/sources/ScryfallImageSupportTokens.java | 12 ++++++++++++ .../src/main/resources/card-pictures-tok.txt | 14 +++++++++++++- .../mage/game/permanent/token/CentaurToken.java | 2 +- .../mage/game/permanent/token/GoblinToken.java | 2 +- .../game/permanent/token/NightwingHorrorToken.java | 2 +- .../mage/game/permanent/token/SaprolingToken.java | 6 +++++- .../permanent/token/SoldierTokenWithHaste.java | 2 +- .../java/mage/game/permanent/token/VojaToken.java | 4 ++++ .../java/mage/game/permanent/token/WeirdToken.java | 4 ++++ .../game/permanent/token/WurmWithTrampleToken.java | 2 +- 10 files changed, 43 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 889654db52..fbc04ab1c5 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 @@ -1624,6 +1624,18 @@ public class ScryfallImageSupportTokens { // GS1 put ("GS1/Mowu", "https://api.scryfall.com/cards/gs1/T1/en?format=image"); + // GK1 + put ("GK1/Centaur", "https://api.scryfall.com/cards/tgk1/10/en?format=image&face=back"); + put ("GK1/Elemental", "https://api.scryfall.com/cards/tgk1/10/en?format=image"); + put ("GK1/Goblin", "https://api.scryfall.com/cards/tgk1/3/en?format=image&face=back"); + put ("GK1/Horror", "https://api.scryfall.com/cards/tgk1/1/en?format=image&face=back"); + put ("GK1/Saproling/1", "https://api.scryfall.com/cards/tgk1/8/en?format=image"); + put ("GK1/Saproling/2", "https://api.scryfall.com/cards/tgk1/5/en?format=image"); + put ("GK1/Soldier", "https://api.scryfall.com/cards/tgk1/6/en?format=image"); + put ("GK1/Voja", "https://api.scryfall.com/cards/tgk1/11/en?format=image"); + put ("GK1/Weird", "https://api.scryfall.com/cards/tgk1/3/en?format=image"); + put ("GK1/Wurm", "https://api.scryfall.com/cards/tgk1/9/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 37cdb2f45a..9802915cb5 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -1833,4 +1833,16 @@ |Generate|TOK:A25|Wolf|||WolfToken| # GS1 -|Generate|TOK:GS1|Mowu|||MowuToken| \ No newline at end of file +|Generate|TOK:GS1|Mowu|||MowuToken| + +# GK1 +|Generate|TOK:GK1|Centaur|||CentaurToken| +|Generate|TOK:GK1|Elemental|||GreenAndWhiteElementalToken| +|Generate|TOK:GK1|Goblin|||GoblinToken| +|Generate|TOK:GK1|Horror|||NightwingHorrorToken| +|Generate|TOK:GK1|Saproling|1||SaprolingToken| +|Generate|TOK:GK1|Saproling|2||SaprolingToken| +|Generate|TOK:GK1|Soldier|||SoldierTokenWithHaste| +|Generate|TOK:GK1|Voja|||VojaToken| +|Generate|TOK:GK1|Weird|||WeirdToken| +|Generate|TOK:GK1|Wurm|||WurmWithTrampleToken| \ No newline at end of file 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 a1cf587cf7..6737e61500 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", "RTR", "RNA", "MIC", "MM3"); + availableImageSetCodes = Arrays.asList("C19", "RTR", "RNA", "MIC", "MM3", "GK1"); } public CentaurToken(final CentaurToken token) { 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 a3039d7eb8..2743f06ef5 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,7 @@ public final class GoblinToken extends TokenImpl { availableImageSetCodes = Arrays.asList("10E", "ALA", "SOM", "M10", "M13", "RTR", "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", "MM2", - "MM3", "EMA", "C16", "DOM", "ANA", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", "NEC", "M19", "CM2", "PCA", "DD1", "DDS", "DDT", "A25", "GRN"); + "MM3", "EMA", "C16", "DOM", "ANA", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", "NEC", "M19", "CM2", "PCA", "DD1", "DDS", "DDT", "A25", "GRN", "GK1"); } public GoblinToken(final GoblinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java index 0095b9532b..11e3dc0735 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java @@ -26,7 +26,7 @@ public final class NightwingHorrorToken extends TokenImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("GTC"); + availableImageSetCodes = Arrays.asList("GTC", "GK1"); } public NightwingHorrorToken(final NightwingHorrorToken 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 20ea0086f8..76a511d2e5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java @@ -51,7 +51,8 @@ public final class SaprolingToken extends TokenImpl { "2XM", "NCC", "CM2", - "PCA" + "PCA", + "GK1" )); } @@ -90,5 +91,8 @@ public final class SaprolingToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DOM")) { this.setTokenType(RandomUtil.nextInt(3) + 1); } + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GK1")) { + this.setTokenType(RandomUtil.nextInt(2) + 1); + } } } \ No newline at end of file diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java index 5212a11590..efdc2a7665 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java @@ -22,7 +22,7 @@ public final class SoldierTokenWithHaste extends TokenImpl { toughness = new MageInt(1); addAbility(HasteAbility.getInstance()); - availableImageSetCodes = Arrays.asList("GTC", "MM3", "NCC"); + availableImageSetCodes = Arrays.asList("GTC", "MM3", "NCC", "GK1"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/VojaToken.java b/Mage/src/main/java/mage/game/permanent/token/VojaToken.java index 218c959c04..c2035ffcfa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VojaToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VojaToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.constants.SuperType; +import java.util.Arrays; + /** * * @author spjspj @@ -22,6 +24,8 @@ public final class VojaToken extends TokenImpl { this.color.setWhite(true); this.power = new MageInt(2); this.toughness = new MageInt(2); + + availableImageSetCodes = Arrays.asList("GK1"); } public VojaToken(final VojaToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java b/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java index 60c22c217f..6a688c49e7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java @@ -7,6 +7,8 @@ import mage.MageInt; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -22,6 +24,8 @@ public final class WeirdToken extends TokenImpl { toughness = new MageInt(3); this.addAbility(DefenderAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("GK1"); } public WeirdToken(final WeirdToken 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 38467dccfa..31162fc2cf 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("RTR", "MM3"); + availableImageSetCodes = Arrays.asList("RTR", "MM3", "GK1"); } public WurmWithTrampleToken(final WurmWithTrampleToken token) {