From a35e31ae5673ca2c79b00a4f2a8fe5748733ac27 Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Sat, 4 Jun 2022 16:46:57 +0100 Subject: [PATCH] Added MOR token images --- .../plugins/card/dl/sources/ScryfallImageSupportTokens.java | 5 +++++ Mage.Client/src/main/resources/card-pictures-tok.txt | 5 ----- .../main/java/mage/game/permanent/token/ElfWarriorToken.java | 2 +- .../java/mage/game/permanent/token/GiantWarriorToken.java | 4 ++++ .../java/mage/game/permanent/token/KithkinSoldierToken.java | 2 +- .../java/mage/game/permanent/token/TreefolkShamanToken.java | 4 ++++ Mage/src/main/java/mage/game/permanent/token/WolfToken.java | 2 +- 7 files changed, 16 insertions(+), 8 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 e5cc564e9f..b299d3cecb 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 @@ -1206,6 +1206,11 @@ public class ScryfallImageSupportTokens { put ("ALA/Thopter", "https://api.scryfall.com/cards/tala/3/en?format=image"); put ("ALA/Zombie", "https://api.scryfall.com/cards/tala/5/en?format=image"); + // MOR + put ("MOR/Faerie Rogue", "https://api.scryfall.com/cards/tmor/2/en?format=image"); + put ("MOR/Giant Warrior", "https://api.scryfall.com/cards/tmor/1/en?format=image"); + put ("MOR/Treefolk Shaman", "https://api.scryfall.com/cards/tmor/3/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 a989ebc994..6faacc0de4 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -930,14 +930,9 @@ |Generate|TOK:MMQ|Soldier|||SoldierToken| |Generate|TOK:MMQ|Spirit|||SpiritWhiteToken| |Generate|TOK:MMQ|Zombie|||ZombieToken| -|Generate|TOK:MOR|Elemental|||WalkerOfTheGroveToken| -|Generate|TOK:MOR|Elf Warrior|||ElfWarriorToken| |Generate|TOK:MOR|Faerie Rogue|||FaerieRogueToken| |Generate|TOK:MOR|Giant Warrior|||GiantWarriorToken| -|Generate|TOK:MOR|Goblin Rogue|||GoblinRogueToken| -|Generate|TOK:MOR|Kithkin Soldier|||KithkinSoldierToken| |Generate|TOK:MOR|Treefolk Shaman|||TreefolkShamanToken| -|Generate|TOK:MOR|Wolf|||WolfToken| |Generate|TOK:MRD|Beast|||OneDozenEyesBeastToken| |Generate|TOK:MRD|Demon|||ReignOfThePitToken| |Generate|TOK:MRD|Elemental|||ElementalTokenWithHaste| 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 5def381270..ffd52fea90 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", "MOR", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU", "CMA"); + availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU", "CMA"); } public ElfWarriorToken(final ElfWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java index 4efe2970fb..909b973470 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java @@ -5,6 +5,8 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; +import java.util.Arrays; + /** * * @author spjspj @@ -19,6 +21,8 @@ public final class GiantWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(5); toughness = new MageInt(5); + + availableImageSetCodes = Arrays.asList("MOR", "MMA"); } public GiantWarriorToken(final GiantWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java index 034b7ec801..ec66e8f757 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java @@ -20,7 +20,7 @@ public final class KithkinSoldierToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("CMD", "EVE", "LRW", "MMA", "MOR", "SHM", "MMA", "KHC", "CMA"); + availableImageSetCodes = Arrays.asList("CMD", "EVE", "LRW", "MMA", "SHM", "MMA", "KHC", "CMA"); } public KithkinSoldierToken(final KithkinSoldierToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java index fe2cc6cc0f..ed90215fd4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java @@ -5,6 +5,8 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; +import java.util.Arrays; + /** * * @author spjspj @@ -19,6 +21,8 @@ public final class TreefolkShamanToken extends TokenImpl { subtype.add(SubType.SHAMAN); power = new MageInt(2); toughness = new MageInt(5); + + availableImageSetCodes = Arrays.asList("MOR", "MMA"); } public TreefolkShamanToken(final TreefolkShamanToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java index 674f1ad81b..5fe745c83e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java @@ -22,7 +22,7 @@ public final class WolfToken extends TokenImpl { toughness = new MageInt(2); availableImageSetCodes = Arrays.asList("BNG", "C14", "C15", "CMA", "CMD", "CNS", "DKA", "EVE", "ISD", - "LRW", "M10", "M14", "MM2", "MOR", "SHM", "SOI", "SOM", "V10", "WWK", "ZEN", "WAR", "M20", + "LRW", "M10", "M14", "MM2", "SHM", "SOI", "SOM", "V10", "WWK", "ZEN", "WAR", "M20", "THB", "AFR", "MID", "VOW", "2XM"); }