From afde23e8030fda34bed84ced73aac16b305b74ee Mon Sep 17 00:00:00 2001 From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com> Date: Sat, 25 Feb 2023 14:06:06 +0000 Subject: [PATCH] Add ONE token images --- .../dl/sources/ScryfallImageSupportTokens.java | 17 ++++++++++++++++- .../src/main/resources/card-pictures-tok.txt | 18 ++++++++++++++++++ .../mage/game/permanent/token/CatToken.java | 2 +- .../token/DoublestrikeSamuraiToken.java | 2 ++ .../mage/game/permanent/token/DroneToken.java | 2 ++ .../token/PhyrexianBeastToxicToken.java | 2 +- .../permanent/token/PhyrexianGolemToken.java | 2 +- .../token/PhyrexianHorrorGreenToken.java | 11 +++++++++-- .../token/PhyrexianHorrorRedToken.java | 9 +++++++++ .../permanent/token/PhyrexianMiteToken.java | 10 ++++++++++ .../game/permanent/token/RebelRedToken.java | 2 ++ 11 files changed, 71 insertions(+), 6 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 311c23a89d7..d145b032384 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 @@ -1851,7 +1851,7 @@ public class ScryfallImageSupportTokens { put ("DMR/Cat/2", "https://api.scryfall.com/cards/tdmr/8/en?format=image"); put ("DMR/Construct", "https://api.scryfall.com/cards/tdmr/14/en?format=image"); put ("DMR/Elemental", "https://api.scryfall.com/cards/tdmr/6/en?format=image"); - put ("DMR/ELephant", "https://api.scryfall.com/cards/tdmr/9/en?format=image"); + put ("DMR/Elephant", "https://api.scryfall.com/cards/tdmr/9/en?format=image"); put ("DMR/Goblin", "https://api.scryfall.com/cards/tdmr/7/en?format=image"); put ("DMR/Griffin", "https://api.scryfall.com/cards/tdmr/2/en?format=image"); put ("DMR/Insect", "https://api.scryfall.com/cards/tdmr/10/en?format=image"); @@ -1861,6 +1861,21 @@ public class ScryfallImageSupportTokens { put ("DMR/Squirrel", "https://api.scryfall.com/cards/tdmr/13/en?format=image"); put ("DMR/Zombie", "https://api.scryfall.com/cards/tdmr/5/en?format=image"); + // ONE + put ("ONE/Cat", "https://api.scryfall.com/cards/tone/1/en?format=image"); + put ("ONE/Drone", "https://api.scryfall.com/cards/tone/8/en?format=image"); + put ("ONE/Emblem Koth, Fire of Resistance", "https://api.scryfall.com/cards/tone/13/en?format=image"); + put ("ONE/Phyrexian Beast", "https://api.scryfall.com/cards/tone/6/en?format=image"); + put ("ONE/Phyrexian Goblin", "https://api.scryfall.com/cards/tone/3/en?format=image"); + put ("ONE/Phyrexian Golem", "https://api.scryfall.com/cards/tone/10/en?format=image"); + put ("ONE/Phyrexian Horror/1", "https://api.scryfall.com/cards/tone/7/en?format=image"); + put ("ONE/Phyrexian Horror/2", "https://api.scryfall.com/cards/tone/4/en?format=image"); + put ("ONE/Phyrexian Mite/1", "https://api.scryfall.com/cards/tone/11/en?format=image"); + put ("ONE/Phyrexian Mite/2", "https://api.scryfall.com/cards/tone/12/en?format=image"); + put ("ONE/Rebel", "https://api.scryfall.com/cards/tone/5/en?format=image"); + put ("ONE/Samurai", "https://api.scryfall.com/cards/tone/2/en?format=image"); + put ("ONE/The Hollow Sentinel", "https://api.scryfall.com/cards/tone/9/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 081ada4a1d4..33eb7c02c09 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -138,6 +138,7 @@ |Generate|EMBLEM:DMU|Ajani, Sleeper Agent||Emblem Ajani|AjaniSleeperAgentEmblem| |Generate|EMBLEM:DMU|Jaya, Fiery Negotiator||Emblem Jaya|JayaFieryNegotiatorEmblem| |Generate|EMBLEM:BRO|Saheeli, Filigree Master||Emblem Saheeli|SaheeliFiligreeMasterEmblem| +|Generate|EMBLEM:ONE|Koth, Fire of Resistance||Emblem Koth|KothFireOfResistanceEmblem| # Planes |Generate|PLANE:PCA|Plane - Academy at Tolaria West|||AcademyAtTolariaWestPlane| @@ -1976,3 +1977,20 @@ |Generate|TOK:DMR|Sheep|||SheepToken| |Generate|TOK:DMR|Squirrel|||SquirrelToken| |Generate|TOK:DMR|Zombie|||ZombieToken| + +# ONE +|Generate|TOK:ONE|Cat|||CatToken| +|Generate|TOK:ONE|Drone|||DroneToken| +|Generate|TOK:ONE|Phyrexian Beast|||PhyrexianBeastToxicToken| +|Generate|TOK:ONE|Phyrexian Goblin|||PhyrexianGoblinToken| +|Generate|TOK:ONE|Phyrexian Golem|||PhyrexianGolemToken| +|Generate|TOK:ONE|Phyrexian Horror|1||PhyrexianHorrorGreenToken| +|Generate|TOK:ONE|Phyrexian Horror|2||PhyrexianHorrorRedToken| +|Generate|TOK:ONE|Phyrexian Mite|1||PhyrexianMiteToken| +|Generate|TOK:ONE|Phyrexian Mite|2||PhyrexianMiteToken| +|Generate|TOK:ONE|Rebel|||RebelRedToken| +|Generate|TOK:ONE|Samurai|||DoublestrikeSamuraiToken| +|Generate|TOK:ONE|The Hollow Sentinel|||TheHollowSentinelToken| + + + diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken.java b/Mage/src/main/java/mage/game/permanent/token/CatToken.java index ff5c071a485..1d8ba8cf9bd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken.java @@ -19,7 +19,7 @@ public final class CatToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); - availableImageSetCodes = Arrays.asList("PMEI", "C14", "C15", "C17", "C18", "M13", "M14", "SOM", "CMR", "2XM"); + availableImageSetCodes = Arrays.asList("PMEI", "C14", "C15", "C17", "C18", "M13", "M14", "SOM", "CMR", "2XM", "ONE"); } public CatToken(final CatToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DoublestrikeSamuraiToken.java b/Mage/src/main/java/mage/game/permanent/token/DoublestrikeSamuraiToken.java index f2363671d56..422ebe5a687 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DoublestrikeSamuraiToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DoublestrikeSamuraiToken.java @@ -18,6 +18,8 @@ public class DoublestrikeSamuraiToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(DoubleStrikeAbility.getInstance()); + + setOriginalExpansionSetCode("ONE"); } private DoublestrikeSamuraiToken(final DoublestrikeSamuraiToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DroneToken.java b/Mage/src/main/java/mage/game/permanent/token/DroneToken.java index 1c7f834c6ef..9dd24769e93 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DroneToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DroneToken.java @@ -27,6 +27,8 @@ public class DroneToken extends TokenImpl { ability.addEffect(new GainLifeEffect(2).concatBy("and")); addAbility(ability); + setOriginalExpansionSetCode("ONE"); + } private DroneToken(final DroneToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToxicToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToxicToken.java index d7c1fb2414e..151b85320ce 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToxicToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianBeastToxicToken.java @@ -13,7 +13,7 @@ import java.util.Arrays; public final class PhyrexianBeastToxicToken extends TokenImpl { public PhyrexianBeastToxicToken() { - super("Phyrexian Golem Token", "3/3 green Phyrexian Beast creature token with toxic 1"); + super("Phyrexian Beast Token", "3/3 green Phyrexian Beast creature token with toxic 1"); color.setGreen(true); cardType.add(CardType.CREATURE); subtype.add(SubType.PHYREXIAN); diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java index c01f324c115..36c2e7b6544 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java @@ -20,7 +20,7 @@ public final class PhyrexianGolemToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("MM2", "NPH", "SOM", "MH1", "M20", "CMR", "MM3", "2X2"); + availableImageSetCodes = Arrays.asList("MM2", "NPH", "SOM", "MH1", "M20", "CMR", "MM3", "2X2", "ONE"); } public PhyrexianGolemToken(final PhyrexianGolemToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorGreenToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorGreenToken.java index 028b595bf0f..ef355f4d2d7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorGreenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorGreenToken.java @@ -1,8 +1,6 @@ package mage.game.permanent.token; import mage.MageInt; -import mage.abilities.keyword.HasteAbility; -import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType; import mage.constants.SubType; @@ -25,6 +23,15 @@ public final class PhyrexianHorrorGreenToken extends TokenImpl { availableImageSetCodes = Arrays.asList("ONE"); } + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ONE")) { + setTokenType(1); + } + } + public PhyrexianHorrorGreenToken(final PhyrexianHorrorGreenToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorRedToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorRedToken.java index 3cd4f5f50c6..4416c739493 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorRedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianHorrorRedToken.java @@ -28,6 +28,15 @@ public final class PhyrexianHorrorRedToken extends TokenImpl { availableImageSetCodes = Arrays.asList("ONE"); } + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ONE")) { + setTokenType(2); + } + } + public PhyrexianHorrorRedToken(final PhyrexianHorrorRedToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMiteToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMiteToken.java index b1e203bb359..86f789ea222 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMiteToken.java @@ -7,6 +7,7 @@ import mage.abilities.keyword.ToxicAbility; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; +import mage.util.RandomUtil; import java.util.Arrays; @@ -30,6 +31,15 @@ public final class PhyrexianMiteToken extends TokenImpl { availableImageSetCodes = Arrays.asList("ONE"); } + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ONE")) { + this.setTokenType(RandomUtil.nextInt(2) + 1); + } + } + public PhyrexianMiteToken(final PhyrexianMiteToken token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/RebelRedToken.java b/Mage/src/main/java/mage/game/permanent/token/RebelRedToken.java index a269bc1831e..46b38ae42cf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RebelRedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RebelRedToken.java @@ -16,6 +16,8 @@ public final class RebelRedToken extends TokenImpl { cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.REBEL); + + setOriginalExpansionSetCode("ONE"); } public RebelRedToken(final RebelRedToken token) {