From 18b515ba5caa8dcd72b560f61969345158ec2599 Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Mon, 6 Jun 2022 16:33:49 +0100 Subject: [PATCH] Added GK2 token images --- .../card/dl/sources/ScryfallImageSupportTokens.java | 11 +++++++++++ .../src/main/resources/card-pictures-tok.txt | 13 ++++++++++++- .../java/mage/game/permanent/token/BatToken.java | 2 +- .../permanent/token/RakdosGuildmageGoblinToken.java | 4 ++++ .../mage/game/permanent/token/SaprolingToken.java | 3 ++- .../mage/game/permanent/token/SpiritWhiteToken.java | 2 +- .../permanent/token/UtvaraHellkiteDragonToken.java | 2 +- .../game/permanent/token/WhiteBlueBirdToken.java | 4 ++++ .../java/mage/game/permanent/token/WurmToken.java | 2 +- 9 files changed, 37 insertions(+), 6 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 fbc04ab1c5..d54e5507df 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 @@ -1636,6 +1636,17 @@ public class ScryfallImageSupportTokens { 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"); + // GK2 + put ("GK2/Bat", "https://api.scryfall.com/cards/tgk2/3/en?format=image"); + put ("GK2/Bird", "https://api.scryfall.com/cards/tgk2/1/en?format=image"); + put ("GK2/Cleric", "https://api.scryfall.com/cards/tgk2/4/en?format=image"); + put ("GK2/Dragon", "https://api.scryfall.com/cards/tgk2/5/en?format=image"); + put ("GK2/Goblin", "https://api.scryfall.com/cards/tgk2/6/en?format=image"); + put ("GK2/Ooze", "https://api.scryfall.com/cards/tgk2/9/en?format=image"); + put ("GK2/Saproling", "https://api.scryfall.com/cards/tgk2/7/en?format=image"); + put ("GK2/Spirit", "https://api.scryfall.com/cards/tgk2/2/en?format=image"); + put ("GK2/Wurm", "https://api.scryfall.com/cards/tgk2/8/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 9802915cb5..2506342c03 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -1845,4 +1845,15 @@ |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 +|Generate|TOK:GK1|Wurm|||WurmWithTrampleToken| + +# GK2 +|Generate|TOK:GK2|Bat|||BatToken| +|Generate|TOK:GK2|Bird|||WhiteBlueBirdToken| +|Generate|TOK:GK2|Cleric|||DeathpactAngelToken| +|Generate|TOK:GK2|Dragon|||UtvaraHellkiteDragonToken| +|Generate|TOK:GK2|Goblin|||RakdosGuildmageGoblinToken| +|Generate|TOK:GK2|Ooze|||OozeToken| +|Generate|TOK:GK2|Saproling|||SaprolingToken| +|Generate|TOK:GK2|Spirit|||SpiritWhiteToken| +|Generate|TOK:GK2|Wurm|||WurmToken| \ No newline at end of file diff --git a/Mage/src/main/java/mage/game/permanent/token/BatToken.java b/Mage/src/main/java/mage/game/permanent/token/BatToken.java index e65c109d82..1bdcdc1964 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BatToken.java @@ -18,7 +18,7 @@ public final class BatToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("C17", "GVL", "GPT", "MMA", "M19", "MID", "VOC"); + availableImageSetCodes = Arrays.asList("C17", "GVL", "GPT", "MMA", "M19", "MID", "VOC", "GK2"); } public BatToken(final BatToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java index acd488a355..7d2e25f837 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -20,6 +22,8 @@ public final class RakdosGuildmageGoblinToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("GK2"); } public RakdosGuildmageGoblinToken(final RakdosGuildmageGoblinToken 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 76a511d2e5..95417d7ed4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java @@ -52,7 +52,8 @@ public final class SaprolingToken extends TokenImpl { "NCC", "CM2", "PCA", - "GK1" + "GK1", + "GK2" )); } diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java index 1e53acb52b..f8a435d3e8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java @@ -24,7 +24,7 @@ public final class SpiritWhiteToken extends TokenImpl { availableImageSetCodes = Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM", "SOI", "EMA", "C16", "MM3", "CMA", "E01", "ANA", "GPT", "RAV", "EMN", "RNA", "M20", "C19", "C20", "CMR", "KHM", - "MID", "VOW", "UMA", "BBD", "IMA", "CM2", "MD1", "DVD", "DDQ", "CN2", "A25"); + "MID", "VOW", "UMA", "BBD", "IMA", "CM2", "MD1", "DVD", "DDQ", "CN2", "A25", "GK2"); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java index 7de30186e1..2ea05ffeee 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java @@ -17,7 +17,7 @@ public final class UtvaraHellkiteDragonToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("RTR", "C17")); + tokenImageSets.addAll(Arrays.asList("RTR", "C17", "GK2")); } public UtvaraHellkiteDragonToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteBlueBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteBlueBirdToken.java index 1cdfdabfde..b8737e47fd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteBlueBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteBlueBirdToken.java @@ -4,6 +4,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -19,6 +21,8 @@ public final class WhiteBlueBirdToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("GK2"); } public WhiteBlueBirdToken(final WhiteBlueBirdToken token) { super(token); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken.java index 3ec8b21af9..023bfa0d9c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken.java @@ -19,7 +19,7 @@ public final class WurmToken extends TokenImpl { power = new MageInt(6); toughness = new MageInt(6); - availableImageSetCodes = Arrays.asList("C19", "EMA", "GPT", "JUD", "M12", "M13", "MM3", "ODY", "VMA", "C21", "DDS"); + availableImageSetCodes = Arrays.asList("C19", "EMA", "GPT", "JUD", "M12", "M13", "MM3", "ODY", "VMA", "C21", "DDS", "GK2"); } @Override