From 2ff33f2b9461db0829a81ca9396e4e8e24f07dbd Mon Sep 17 00:00:00 2001 From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com> Date: Sat, 19 Nov 2022 01:58:45 +0000 Subject: [PATCH] Add BRO token images --- .../dl/sources/ScryfallImageSupportTokens.java | 14 ++++++++++++++ .../src/main/resources/card-pictures-tok.txt | 14 ++++++++++++++ .../java/mage/game/permanent/token/BearToken.java | 2 +- .../mage/game/permanent/token/Construct2Token.java | 3 +++ .../game/permanent/token/KarnConstructToken.java | 5 ++++- .../mage/game/permanent/token/PowerstoneToken.java | 2 +- .../game/permanent/token/SoldierArtifactToken.java | 2 ++ .../game/permanent/token/SpiritTeferiToken.java | 2 ++ .../permanent/token/ThopterColorlessToken.java | 2 +- 9 files changed, 42 insertions(+), 4 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 1e416e1a24..1bc261f900 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 @@ -1817,6 +1817,20 @@ public class ScryfallImageSupportTokens { put ("40K/Tyranid Gargoyle", "https://api.scryfall.com/cards/t40k/9/en?format=image"); put ("40K/Tyranid Warrior", "https://api.scryfall.com/cards/t40k/19/en?format=image"); + // BRO + put ("BRO/Bear", "https://api.scryfall.com/cards/tbro/2/en?format=image"); + put ("BRO/Construct/1", "https://api.scryfall.com/cards/tbro/5/en?format=image"); + put ("BRO/Construct/2", "https://api.scryfall.com/cards/tbro/4/en?format=image"); + put ("BRO/Forest Dryad", "https://api.scryfall.com/cards/tbro/3/en?format=image"); + put ("BRO/Golem", "https://api.scryfall.com/cards/tbro/6/en?format=image"); + put ("BRO/Powerstone", "https://api.scryfall.com/cards/tbro/7/en?format=image"); + put ("BRO/Emblem Saheeli, Filigree Master", "https://api.scryfall.com/cards/tbro/12/en?format=image"); + put ("BRO/Soldier/1", "https://api.scryfall.com/cards/tbro/8/en?format=image"); + put ("BRO/Soldier/2", "https://api.scryfall.com/cards/tbro/9/en?format=image"); + put ("BRO/Spirit", "https://api.scryfall.com/cards/tbro/1/en?format=image"); + put ("BRO/Thopter", "https://api.scryfall.com/cards/tbro/10/en?format=image"); + put ("BRO/Zombie", "https://api.scryfall.com/cards/tbro/11/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 2b77d50713..02ff9415b3 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -137,6 +137,7 @@ |Generate|EMBLEM:2X2|Wrenn and Six||Emblem Wrenn|WrennAndSixEmblem| |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| # Planes |Generate|PLANE:PCA|Plane - Academy at Tolaria West|||AcademyAtTolariaWestPlane| @@ -1938,3 +1939,16 @@ |Generate|TOK:40K|Tyranid|2||Tyranid55Token| |Generate|TOK:40K|Tyranid Gargoyle|||TyranidGargoyleToken| |Generate|TOK:40K|Tyranid Warrior|||TyranidWarriorToken| + +# BRO +|Generate|TOK:BRO|Bear|||BearToken| +|Generate|TOK:BRO|Construct|1||KarnConstructToken| +|Generate|TOK:BRO|Construct|2||Construct2Token| +|Generate|TOK:BRO|Forest Dryad|||ForestDryadToken| +|Generate|TOK:BRO|Golem|||GolemXXToken| +|Generate|TOK:BRO|Powerstone|||PowerstoneToken| +|Generate|TOK:BRO|Soldier|1||SoldierArtifactToken| +|Generate|TOK:BRO|Soldier|2||SoldierArtifactToken| +|Generate|TOK:BRO|Spirit|||SpiritTeferiToken| +|Generate|TOK:BRO|Thopter|||ThopterColorlessToken| +|Generate|TOK:BRO|Zombie|||AshnodZombieToken| diff --git a/Mage/src/main/java/mage/game/permanent/token/BearToken.java b/Mage/src/main/java/mage/game/permanent/token/BearToken.java index 6feb1b9293..19e2c0bb3b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BearToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BearToken.java @@ -19,7 +19,7 @@ public final class BearToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); - availableImageSetCodes = Arrays.asList("C15", "JUD", "ODY", "VMA", "MH1", "ELD", "KHM", "DMC"); + availableImageSetCodes = Arrays.asList("C15", "JUD", "ODY", "VMA", "MH1", "ELD", "KHM", "DMC", "BRO"); } public BearToken(final BearToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Construct2Token.java b/Mage/src/main/java/mage/game/permanent/token/Construct2Token.java index 2df45023dd..7feedee8bf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Construct2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Construct2Token.java @@ -17,6 +17,9 @@ public class Construct2Token extends TokenImpl { subtype.add(SubType.CONSTRUCT); power = new MageInt(2); toughness = new MageInt(2); + + this.setExpansionSetCodeForImage("BRO"); + this.setTokenType(2); } private Construct2Token(final Construct2Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java index 53fd6e4213..bb30924493 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java @@ -30,7 +30,7 @@ public final class KarnConstructToken extends TokenImpl { .setText("This creature gets +1/+1 for each artifact you control") )); - availableImageSetCodes = Arrays.asList("DOM", "MH1", "C21", "MH2", "MED"); + availableImageSetCodes = Arrays.asList("DOM", "MH1", "C21", "MH2", "MED", "BRO"); } public KarnConstructToken(final KarnConstructToken token) { @@ -51,5 +51,8 @@ public final class KarnConstructToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MED")) { setTokenType(1); } + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("BRO")) { + setTokenType(1); + } } } diff --git a/Mage/src/main/java/mage/game/permanent/token/PowerstoneToken.java b/Mage/src/main/java/mage/game/permanent/token/PowerstoneToken.java index 370c16e237..366d0b2db7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PowerstoneToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PowerstoneToken.java @@ -30,7 +30,7 @@ public final class PowerstoneToken extends TokenImpl { // {T}: Add {C}. This mana can't be spent to cast a nonartifact spell. this.addAbility(new ConditionalColorlessManaAbility(1, makeBuilder())); - availableImageSetCodes = Arrays.asList("DMU"); + availableImageSetCodes = Arrays.asList("DMU", "BRO"); } public PowerstoneToken(final PowerstoneToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierArtifactToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierArtifactToken.java index c4fcd5c781..505b78b9f7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierArtifactToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierArtifactToken.java @@ -3,6 +3,7 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; +import mage.util.RandomUtil; import java.util.Arrays; @@ -20,6 +21,7 @@ public final class SoldierArtifactToken extends TokenImpl { toughness = new MageInt(1); availableImageSetCodes = Arrays.asList("BRO"); + this.setTokenType(RandomUtil.nextInt(2) + 1); } public SoldierArtifactToken(final SoldierArtifactToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritTeferiToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritTeferiToken.java index 1dd430959c..02a7e8d75f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritTeferiToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritTeferiToken.java @@ -23,6 +23,8 @@ public class SpiritTeferiToken extends TokenImpl { toughness = new MageInt(2); addAbility(VigilanceAbility.getInstance()); addAbility(new DrawCardControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); + + this.setExpansionSetCodeForImage("BRO"); } private SpiritTeferiToken(final SpiritTeferiToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java index 7d031eb4ca..2754f2475c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java @@ -24,7 +24,7 @@ public final class ThopterColorlessToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); availableImageSetCodes = Arrays.asList("C18", "KLD", "MBS", "ORI", "VMA", "M19", "ZNC", - "KHC", "C21", "MH2", "AFC", "VOC", "NEC", "2XM", "RNA", "NCC", "DDU"); + "KHC", "C21", "MH2", "AFC", "VOC", "NEC", "2XM", "RNA", "NCC", "DDU", "BRO"); } @Override