From cbf53f68a4b51a6a907447b52fe6eda8505f846a Mon Sep 17 00:00:00 2001 From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com> Date: Tue, 8 Nov 2022 16:11:59 +0000 Subject: [PATCH] Add token images to GN3 --- .../card/dl/sources/ScryfallImageSupportTokens.java | 12 ++++++++++++ Mage.Client/src/main/resources/card-pictures-tok.txt | 12 ++++++++++++ .../java/mage/game/permanent/token/AngelToken.java | 2 +- .../mage/game/permanent/token/BirdIllusionToken.java | 2 +- .../java/mage/game/permanent/token/DemonToken.java | 2 +- .../game/permanent/token/DragonEggDragonToken.java | 2 +- .../java/mage/game/permanent/token/DrakeToken.java | 3 +-- .../mage/game/permanent/token/ElfWarriorToken.java | 2 +- .../mage/game/permanent/token/HumanSoldierToken.java | 2 +- .../java/mage/game/permanent/token/SoldierToken.java | 2 +- .../mage/game/permanent/token/TreasureToken.java | 2 +- .../java/mage/game/permanent/token/ZombieToken.java | 2 +- 12 files changed, 34 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 94c3da89c4..c191f101c0 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 @@ -1786,6 +1786,18 @@ public class ScryfallImageSupportTokens { 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"); + // GN3 + put ("GN3/Angel", "https://api.scryfall.com/cards/tgn3/1/en?format=image"); + put ("GN3/Bird Illusion", "https://api.scryfall.com/cards/tgn3/4/en?format=image"); + put ("GN3/Demon", "https://api.scryfall.com/cards/tgn3/6/en?format=image"); + put ("GN3/Dragon", "https://api.scryfall.com/cards/tgn3/8/en?format=image"); + put ("GN3/Drake", "https://api.scryfall.com/cards/tgn3/5/en?format=image"); + put ("GN3/Elf Warrior", "https://api.scryfall.com/cards/tgn3/9/en?format=image"); + put ("GN3/Human Soldier", "https://api.scryfall.com/cards/tgn3/2/en?format=image"); + put ("GN3/Soldier", "https://api.scryfall.com/cards/tgn3/3/en?format=image"); + put ("GN3/Treasure", "https://api.scryfall.com/cards/tgn3/10/en?format=image"); + put ("GN3/Zombie", "https://api.scryfall.com/cards/tgn3/7/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 ca906b1d29..dc390f118b 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -1907,3 +1907,15 @@ |Generate|TOK:DMC|Wurm|||Wurm44Token| |Generate|TOK:DMC|Zombie|||ZombieToken| |Generate|TOK:DMC|Zombie Knight|||ZombieKnightToken| + +# GN3 +|Generate|TOK:GN3|Angel|||AngelToken| +|Generate|TOK:GN3|Bird Illusion|||BirdIllusionToken| +|Generate|TOK:GN3|Demon|||DemonToken| +|Generate|TOK:GN3|Dragon|||DragonEggDragonToken| +|Generate|TOK:GN3|Drake|||DrakeToken| +|Generate|TOK:GN3|Elf Warrior|||ElfWarriorToken| +|Generate|TOK:GN3|Human Soldier|||HumanSoldierToken| +|Generate|TOK:GN3|Soldier|||SoldierToken| +|Generate|TOK:GN3|Treasure|||TreasureToken| +|Generate|TOK:GN3|Zombie|||ZombieToken| diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java index 489490ca61..52b7ce47fc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java @@ -20,7 +20,7 @@ public final class AngelToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); availableImageSetCodes = Arrays.asList("APC", "AVR", "C14", "C15", "C18", "CON", "DDQ", "GTC", - "ISD", "M14", "MM3", "NEM", "OGW", "ORI", "PC2", "SCG", "SOI", "ZEN", "C20", "M21", "CMR", "AFC", "VOC", "2XM", "IMA", "PCA", "A25"); + "ISD", "M14", "MM3", "NEM", "OGW", "ORI", "PC2", "SCG", "SOI", "ZEN", "C20", "M21", "CMR", "AFC", "VOC", "2XM", "IMA", "PCA", "A25", "GN3"); } public AngelToken(final AngelToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java index c0c42a464b..721886caa6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdIllusionToken.java @@ -24,7 +24,7 @@ public final class BirdIllusionToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("GRN", "C20"); + availableImageSetCodes = Arrays.asList("GRN", "C20", "GN3"); } public BirdIllusionToken(final BirdIllusionToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java index c041a370c3..7fb9584c35 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java @@ -21,7 +21,7 @@ public final class DemonToken extends TokenImpl { toughness = new MageInt(5); addAbility(FlyingAbility.getInstance()); - availableImageSetCodes.addAll(Arrays.asList("AVR", "C14", "DD3A", "ISD", "ORI", "M20", "M21", "2XM", "DDR")); + availableImageSetCodes.addAll(Arrays.asList("AVR", "C14", "DD3A", "ISD", "ORI", "M20", "M21", "2XM", "DDR", "GN3")); } public DemonToken(final DemonToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java index 795448041c..ead623252a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java @@ -28,7 +28,7 @@ public final class DragonEggDragonToken extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); - availableImageSetCodes = Arrays.asList("C18", "EMA", "M14", "M15", "M19", "CMR", "IMA", "GN2"); + availableImageSetCodes = Arrays.asList("C18", "EMA", "M14", "M15", "M19", "CMR", "IMA", "GN2", "GN3"); } public DragonEggDragonToken(final DragonEggDragonToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java index 36cef34f30..4e1be9dbf9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java @@ -1,7 +1,6 @@ package mage.game.permanent.token; import mage.MageInt; -import mage.ObjectColor; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; @@ -24,7 +23,7 @@ public final class DrakeToken extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("AKH", "C15", "C19", "M13", "C20", "ZNR", "C21", "UMA", "NCC", "DDS", "2X2"); + availableImageSetCodes = Arrays.asList("AKH", "C15", "C19", "M13", "C20", "ZNR", "C21", "UMA", "NCC", "DDS", "2X2", "GN3"); } public DrakeToken(final DrakeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java index 2243ac7b08..1dcb4334f3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java @@ -20,7 +20,7 @@ public final class ElfWarriorToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU", "CMA", "DD1", "DDS", "A25"); + availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU", "CMA", "DD1", "DDS", "A25", "GN3"); } public ElfWarriorToken(final ElfWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java index c0aaf41b89..b5b41b3199 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java @@ -18,7 +18,7 @@ public final class HumanSoldierToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("SOI", "THB", "IKO", "MIC", "2XM", "NCC"); + availableImageSetCodes = Arrays.asList("SOI", "THB", "IKO", "MIC", "2XM", "NCC", "GN3"); } @Override 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 75824e976a..83c9010a96 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", "DMU"); + "DOM", "MH1", "M20", "C20", "M21", "CMR", "KHC", "TSR", "2XM", "MED", "M19", "MD1", "A25", "CLB", "2X2", "DMU", "GN3"); } public SoldierToken(final SoldierToken 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 5a5146711d..095bd57b0b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java @@ -30,7 +30,7 @@ public final class TreasureToken extends TokenImpl { availableImageSetCodes = Arrays.asList("XLN", "RNA", "M20", "C19", "C20", "M21", "CMR", "KHM", "STX", "MH2", "AFR", "VOW", "NEO", "SLD", "2XM", - "SNC", "CLB", "2X2", "DMC"); + "SNC", "CLB", "2X2", "DMC", "GN3"); } public TreasureToken(final TreasureToken token) { 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 2c283dd48c..78a1245f76 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", "DMC"); + "2X2", "CC2", "DMC", "GN3"); } @Override