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 e9efc72aba5c..5866c5ddeef9 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 @@ -92,8 +92,8 @@ public class ScryfallImageSupportTokens { put("MH1/Squirrel", "https://api.scryfall.com/cards/tmh1/15/en?format=image"); put("MH1/Emblem Wrenn and Six", "https://api.scryfall.com/cards/tmh1/21/en?format=image"); put("MH1/Zombie", "https://api.scryfall.com/cards/tmh1/7/en?format=image"); - - //M19 + + // M19 put("M19/Emblem Ajani, Adversary of Tyrants", "https://api.scryfall.com/cards/tm19/15/en?format=image"); put("M19/Angel", "https://api.scryfall.com/cards/tm19/1/en?format=image"); put("M19/Avatar", "https://api.scryfall.com/cards/tm19/2/en?format=image"); @@ -111,7 +111,7 @@ public class ScryfallImageSupportTokens { put("M19/Thopter", "https://api.scryfall.com/cards/tm19/14/en?format=image"); put("M19/Emblem Vivien Reid", "https://api.scryfall.com/cards/tm19/17/en?format=image"); put("M19/Zombie", "https://api.scryfall.com/cards/tm19/8/en?format=image"); - + // M20 put("M20/Ajani's Pridemate", "https://api.scryfall.com/cards/tm20/1/en?format=image"); put("M20/Emblem Chandra, Awakened Inferno", "https://api.scryfall.com/cards/tm20/11/en?format=image"); @@ -125,8 +125,8 @@ public class ScryfallImageSupportTokens { put("M20/Treasure", "https://api.scryfall.com/cards/tm20/10/en?format=image"); put("M20/Wolf", "https://api.scryfall.com/cards/tm20/8/en?format=image"); put("M20/Zombie", "https://api.scryfall.com/cards/tm20/6/en?format=image"); - - //C18 + + // C18 put("C18/Angel", "https://api.scryfall.com/cards/tc18/3/en?format=image"); put("C18/Cat Warrior", "https://api.scryfall.com/cards/tc18/15/en?format=image"); put("C18/Cat", "https://api.scryfall.com/cards/tc18/5/en?format=image"); @@ -149,6 +149,26 @@ public class ScryfallImageSupportTokens { put("C18/Worm", "https://api.scryfall.com/cards/tc18/18/en?format=image"); put("C18/Zombie", "https://api.scryfall.com/cards/tc18/9/en?format=image"); + // ELD + put("ELD/Bear", "https://api.scryfall.com/cards/teld/8/en?format=image"); + put("ELD/Boar", "https://api.scryfall.com/cards/teld/9/en?format=image"); + put("ELD/Dwarf", "https://api.scryfall.com/cards/teld/7/en?format=image"); + put("ELD/Faerie", "https://api.scryfall.com/cards/teld/5/en?format=image"); + put("ELD/Food/1", "https://api.scryfall.com/cards/teld/15/en?format=image"); + put("ELD/Food/2", "https://api.scryfall.com/cards/teld/16/en?format=image"); + put("ELD/Food/3", "https://api.scryfall.com/cards/teld/17/en?format=image"); + put("ELD/Food/4", "https://api.scryfall.com/cards/teld/18/en?format=image"); + put("ELD/Emblem Garruk, Cursed Huntsman", "https://api.scryfall.com/cards/teld/19/en?format=image"); + put("ELD/Giant", "https://api.scryfall.com/cards/teld/10/en?format=image"); + put("ELD/Goat", "https://api.scryfall.com/cards/teld/1/en?format=image"); + put("ELD/Human Cleric", "https://api.scryfall.com/cards/teld/11/en?format=image"); + put("ELD/Human Rogue", "https://api.scryfall.com/cards/teld/12/en?format=image"); + put("ELD/Human Warrior", "https://api.scryfall.com/cards/teld/13/en?format=image"); + put("ELD/Human", "https://api.scryfall.com/cards/teld/2/en?format=image"); + put("ELD/Knight", "https://api.scryfall.com/cards/teld/3/en?format=image"); + put("ELD/Mouse", "https://api.scryfall.com/cards/teld/4/en?format=image"); + put("ELD/Rat", "https://api.scryfall.com/cards/teld/6/en?format=image"); + put("ELD/Wolf", "https://api.scryfall.com/cards/teld/14/en?format=image"); // generate supported sets supportedSets.clear(); diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index 253b394719b0..7f0eee9c74d6 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -95,6 +95,7 @@ |Generate|EMBLEM:M19|Vivien Reid||Emblem Vivien|VivienReidEmblem| |Generate|EMBLEM:M20|Chandra, Awakened Inferno||Emblem Chandra|ChandraAwakenedInfernoEmblem| |Generate|EMBLEM:M20|Mu Yanling, Sky Dancer||Emblem Yanling|MuYanlingSkyDancerEmblem| +|Generate|EMBLEM:ELD|Garruk, Cursed Huntsman||Emblem Garruk|GarrukCursedHuntsmanEmblem| |Generate|PLANE:PCA|Plane - Academy At Tolaria West|||AcademyAtTolariaWestPlane| |Generate|PLANE:PCA|Plane - Agyrem|||AgyremPlane| |Generate|PLANE:PCA|Plane - Akoum|||AkoumPlane| @@ -1285,3 +1286,21 @@ |Generate|TOK:M20|Treasure|||TreasureToken| |Generate|TOK:M20|Wolf|||WolfToken| |Generate|TOK:M20|Zombie|||ZombieToken| +|Generate|TOK:ELD|Bear|||BearToken| +|Generate|TOK:ELD|Boar|||WolfsQuarryToken| +|Generate|TOK:ELD|Dwarf|||DwarfToken| +|Generate|TOK:ELD|Faerie|||FaerieToken| +|Generate|TOK:ELD|Food|1||FoodToken| +|Generate|TOK:ELD|Food|2||FoodToken| +|Generate|TOK:ELD|Food|3||FoodToken| +|Generate|TOK:ELD|Food|4||FoodToken| +|Generate|TOK:ELD|Giant|||GiantOpportunityToken| +|Generate|TOK:ELD|Goat|||GoatToken| +|Generate|TOK:ELD|Human|||HumanToken| +|Generate|TOK:ELD|Human Cleric|||OutlawsMerrimentClericToken| +|Generate|TOK:ELD|Human Rogue|||OutlawsMerrimentRogueToken| +|Generate|TOK:ELD|Human Warrior|||OutlawsMerrimentWarriorToken| +|Generate|TOK:ELD|Knight|||KnightToken| +|Generate|TOK:ELD|Mouse|||MouseToken| +|Generate|TOK:ELD|Rat|||RatToken| +|Generate|TOK:ELD|Wolf|||GarrukCursedHuntsmanToken| \ No newline at end of file diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java index f2ac0a93409b..bc53e43870a4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java @@ -1,19 +1,17 @@ - - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; + import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author spjspj */ public final class FaerieToken extends TokenImpl { public FaerieToken() { - super("Faerie", "1/1 blue Faerie creature tokens with flying"); + super("Faerie", "1/1 blue Faerie creature token with flying"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.FAERIE); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java index d2d509018cbf..16c0ca7ba730 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java @@ -1,16 +1,14 @@ - - package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** - * * @author LoneFox */ public final class GoatToken extends TokenImpl { @@ -18,7 +16,7 @@ public final class GoatToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("EVE", "M13", "M14", "C14")); + tokenImageSets.addAll(Arrays.asList("EVE", "M13", "M14", "C14", "ELD")); } public GoatToken() { @@ -46,5 +44,5 @@ public GoatToken(final GoatToken token) { public GoatToken copy() { return new GoatToken(this); - } + } } diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java index b1509f116b55..3b565946cac4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java @@ -18,7 +18,7 @@ public HumanToken() { subtype.add(SubType.HUMAN); power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes.addAll(Arrays.asList("DKA", "AVR", "FNMP", "RNA")); + availableImageSetCodes.addAll(Arrays.asList("DKA", "AVR", "FNMP", "RNA", "ELD")); } public HumanToken(final HumanToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java index e69e3735b07b..35f63cd23b70 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java @@ -1,16 +1,16 @@ package mage.game.permanent.token; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; import mage.util.RandomUtil; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** - * * @author LevelX2 */ public final class KnightToken extends TokenImpl { @@ -18,7 +18,7 @@ public final class KnightToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("ORI", "RTR", "C15", "CMA", "DOM")); + tokenImageSets.addAll(Arrays.asList("ORI", "RTR", "C15", "CMA", "DOM", "ELD")); } public KnightToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/RatToken.java b/Mage/src/main/java/mage/game/permanent/token/RatToken.java index 20e05a5937c7..9cf4c9b9fc51 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RatToken.java @@ -1,30 +1,35 @@ - - package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** - * * @author LevelX2 */ public final class RatToken extends TokenImpl { - public RatToken() { - this("GTC"); + static final private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("GTC", "ELD")); } - - public RatToken(String setCode) { + + public RatToken() { super("Rat", "1/1 black Rat creature token"); - this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.RAT); power = new MageInt(1); toughness = new MageInt(1); + + availableImageSetCodes = tokenImageSets; } + public RatToken(final RatToken token) { super(token); }