From 7793a75dc7737dcd50105501bdfc66ddbbbd5484 Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Mon, 6 Jun 2022 01:55:16 +0100 Subject: [PATCH] Added CN2 token images --- .../sources/ScryfallImageSupportTokens.java | 11 ++++++++++ .../src/main/resources/card-pictures-tok.txt | 20 +++++++++---------- .../game/permanent/token/DragonToken2.java | 2 +- .../game/permanent/token/InsectToken.java | 2 +- .../token/QueenMarchesaAssassinToken.java | 4 ++++ .../game/permanent/token/SoldierToken.java | 6 ------ .../permanent/token/SpiritWhiteToken.java | 2 +- .../game/permanent/token/ZombieToken.java | 2 +- 8 files changed, 28 insertions(+), 21 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 01e9b62cf4..e99fd4a7e3 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 @@ -1540,6 +1540,17 @@ public class ScryfallImageSupportTokens { // V16 put ("V16/Marit Lage", "https://api.scryfall.com/cards/v16/16/en?format=image"); + // CN2 + put ("CN2/Assassin", "https://api.scryfall.com/cards/tcn2/5/en?format=image"); + put ("CN2/Beast", "https://api.scryfall.com/cards/tcn2/10/en?format=image"); + put ("CN2/Construct", "https://api.scryfall.com/cards/tcn2/12/en?format=image"); + put ("CN2/Dragon", "https://api.scryfall.com/cards/tcn2/7/en?format=image"); + put ("CN2/Insect", "https://api.scryfall.com/cards/tcn2/11/en?format=image"); + put ("CN2/Lizard", "https://api.scryfall.com/cards/tcn2/9/en?format=image"); + put ("CN2/Soldier", "https://api.scryfall.com/cards/tcn2/2/en?format=image"); + put ("CN2/Spirit", "https://api.scryfall.com/cards/tcn2/4/en?format=image"); + put ("CN2/Zombie", "https://api.scryfall.com/cards/tcn2/6/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 026512de48..bb798a0c20 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -469,17 +469,15 @@ |Generate|TOK:CMD|Triskelavite|||TriskelaviteToken| |Generate|TOK:CMD|Wolf|||WolfToken| |Generate|TOK:CMD|Zombie|||ZombieToken| -|Generate|TOK:CN2|Assassin|| -|Generate|TOK:CN2|Beast|| -|Generate|TOK:CN2|Construct|| -|Generate|TOK:CN2|Dragon|| -|Generate|TOK:CN2|Goblin|| -|Generate|TOK:CN2|Insect|| -|Generate|TOK:CN2|Lizard|| -|Generate|TOK:CN2|Soldier|1| -|Generate|TOK:CN2|Soldier|2| -|Generate|TOK:CN2|Spirit|| -|Generate|TOK:CN2|Zombie|| +|Generate|TOK:CN2|Assassin|||QueenMarchesaAssassinToken| +|Generate|TOK:CN2|Beast|||BeastToken| +|Generate|TOK:CN2|Construct|||DarettiConstructToken| +|Generate|TOK:CN2|Dragon|||DragonToken2| +|Generate|TOK:CN2|Insect|||InsectToken| +|Generate|TOK:CN2|Lizard|||SubterraneanTremorsLizardToken| +|Generate|TOK:CN2|Soldier|||SoldierToken| +|Generate|TOK:CN2|Spirit|||SpiritWhiteToken| +|Generate|TOK:CN2|Zombie|||ZombieToken| |Generate|TOK:CNS|Construct|||DarettiConstructToken| |Generate|TOK:CNS|Demon|||DemonFlyingToken| |Generate|TOK:CNS|Elephant|||ElephantToken| diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java index ccfc2de697..838b900cae 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java @@ -22,7 +22,7 @@ public final class DragonToken2 extends TokenImpl { addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "CMD", "ONS", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA"); + availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "CMD", "ONS", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA", "CN2"); } public DragonToken2(final DragonToken2 token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java index f02b6c889b..3a4529f45a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java @@ -24,7 +24,7 @@ public final class InsectToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("M10", "MM2", "SOI", "ZNR", "VOW", "NCC", "PCA"); + availableImageSetCodes = Arrays.asList("M10", "MM2", "SOI", "ZNR", "VOW", "NCC", "PCA", "CN2"); } public InsectToken(final InsectToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java b/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java index fe6b5b6bc6..bb14d54923 100644 --- a/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java @@ -7,6 +7,8 @@ import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.HasteAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -22,6 +24,8 @@ public final class QueenMarchesaAssassinToken extends TokenImpl { toughness = new MageInt(1); addAbility(DeathtouchAbility.getInstance()); addAbility(HasteAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("CN2"); } public QueenMarchesaAssassinToken(final QueenMarchesaAssassinToken token) { 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 bb84993e39..11b89aaf5a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java @@ -38,12 +38,6 @@ public final class SoldierToken extends TokenImpl { public void setExpansionSetCodeForImage(String code) { super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CN2")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CN2")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); - } if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MM3")) { this.setTokenType(RandomUtil.nextInt(2) + 1); } 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 c854a90a3f..3bc8bc5f58 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"); + "MID", "VOW", "UMA", "BBD", "IMA", "CM2", "MD1", "DVD", "DDQ", "CN2"); } @Override 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 f5d8d22694..9e562721b9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -31,7 +31,7 @@ public final class ZombieToken extends TokenImpl { "M20", "C19", "C20", "THB", "M21", "CMR", "C21", "MH2", "AFR", "MIC", "VOW", "UMA", - "NCC", "MED", "BBD", "M19", "CM2", "PCA", "AVR", "DDQ"); + "NCC", "MED", "BBD", "M19", "CM2", "PCA", "AVR", "DDQ", "CN2"); } @Override