From 2ccf911fc43d072297af6c1eb595c001ca15cf2c Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Sat, 4 Jun 2022 20:59:19 +0100 Subject: [PATCH] Added GTC token images --- .../card/dl/sources/ScryfallImageSupportTokens.java | 10 ++++++++++ Mage.Client/src/main/resources/card-pictures-tok.txt | 9 +++------ .../mage/game/command/emblems/DomriRadeEmblem.java | 2 +- .../mage/game/permanent/token/DeathpactAngelToken.java | 4 ++++ .../mage/game/permanent/token/FrogLizardToken.java | 2 +- .../game/permanent/token/NightwingHorrorToken.java | 4 ++++ .../game/permanent/token/SoldierTokenWithHaste.java | 3 --- .../game/permanent/token/WhiteBlackSpiritToken.java | 2 +- 8 files changed, 24 insertions(+), 12 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 34d99516c1..1f6521a918 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 @@ -1348,6 +1348,16 @@ public class ScryfallImageSupportTokens { put ("RTR/Soldier", "https://api.scryfall.com/cards/trtr/3/en?format=image"); put ("RTR/Wurm", "https://api.scryfall.com/cards/trtr/11/en?format=image"); + // GTC + put ("GTC/Angel", "https://api.scryfall.com/cards/tgtc/1/en?format=image"); + put ("GTC/Cleric", "https://api.scryfall.com/cards/tgtc/4/en?format=image"); + put ("GTC/Emblem Domri Rade", "https://api.scryfall.com/cards/tgtc/8/en?format=image"); + put ("GTC/Frog Lizard", "https://api.scryfall.com/cards/tgtc/3/en?format=image"); + put ("GTC/Horror", "https://api.scryfall.com/cards/tgtc/5/en?format=image"); + put ("GTC/Rat", "https://api.scryfall.com/cards/tgtc/2/en?format=image"); + put ("GTC/Soldier", "https://api.scryfall.com/cards/tgtc/6/en?format=image"); + put ("GTC/Spirit", "https://api.scryfall.com/cards/tgtc/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 efdc0dacfc..b595bfeac7 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -668,14 +668,11 @@ |Generate|TOK:GPT|Wurm|||WurmToken| |Generate|TOK:GTC|Angel|||AngelToken| |Generate|TOK:GTC|Cleric|||DeathpactAngelToken| -|Generate|TOK:GTC|Frog Lizard|||RapidHybridizationToken| +|Generate|TOK:GTC|Frog Lizard|||FrogLizardToken| |Generate|TOK:GTC|Horror|||NightwingHorrorToken| -|Generate|TOK:GTC|Knight|||KnightWatch| -|Generate|TOK:GTC|Ooze|||MysticGenesisOozeToken| |Generate|TOK:GTC|Rat|||RatToken| -|Generate|TOK:GTC|Soldier|1||SoldierToken| -|Generate|TOK:GTC|Soldier|2||SoldierTokenWithHaste| -|Generate|TOK:GTC|Spirit|||TeysaEnvoyOfGhostsToken| +|Generate|TOK:GTC|Soldier|||SoldierTokenWithHaste| +|Generate|TOK:GTC|Spirit|||WhiteBlackSpiritToken| |Generate|TOK:H17|Dragon|||DragonTokenGold| |Generate|TOK:HML|Plant Wall|||KelpToken| |Generate|TOK:HML|Serf|||SerfToken| diff --git a/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java b/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java index 700f2ebbdf..ecbccacaf8 100644 --- a/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java @@ -22,7 +22,7 @@ public final class DomriRadeEmblem extends Emblem { // "Creatures you control have double strike, trample, hexproof and haste." public DomriRadeEmblem() { - this.setName("Emblem Domri Rade"); + this.setName("Emblem Domri"); FilterPermanent filter = new FilterControlledCreaturePermanent("Creatures"); CompoundAbility compoundAbilities = new CompoundAbility( diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java index 4c97e0ba83..5185271831 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java @@ -15,6 +15,8 @@ import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.Arrays; + /** * * @author spjspj @@ -44,6 +46,8 @@ public final class DeathpactAngelToken extends TokenImpl { ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); + + availableImageSetCodes = Arrays.asList("GTC", "GK2"); } public DeathpactAngelToken(final DeathpactAngelToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java b/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java index 80ceb52f1a..a271cdecd4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java @@ -20,7 +20,7 @@ public final class FrogLizardToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("RNA", "C15", "C21"); + availableImageSetCodes = Arrays.asList("GTC", "RNA", "C15", "C21"); } public FrogLizardToken(final FrogLizardToken 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 01096f3fb8..0095b9532b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -23,6 +25,8 @@ public final class NightwingHorrorToken extends TokenImpl { // Flying this.addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("GTC"); } public NightwingHorrorToken(final NightwingHorrorToken token) { 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 dae21c55d2..5212a11590 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java @@ -30,9 +30,6 @@ public final class SoldierTokenWithHaste extends TokenImpl { public void setExpansionSetCodeForImage(String code) { super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GTC")) { - setTokenType(2); - } if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MM3")) { setTokenType(2); } diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java index 4fb73cf10b..30b0d3c013 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java @@ -22,7 +22,7 @@ public final class WhiteBlackSpiritToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - availableImageSetCodes.addAll(Arrays.asList("MH1", "C15", "C21", "UMA")); + availableImageSetCodes.addAll(Arrays.asList("GTC", "MH1", "C15", "C21", "UMA")); } @Override