From a95b988ac7421e6ca58a4318eb41017ed2af157f Mon Sep 17 00:00:00 2001 From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com> Date: Wed, 15 May 2024 03:18:53 +0100 Subject: [PATCH] Add SCD token images --- .../sources/ScryfallImageSupportTokens.java | 29 +++++++++++++++++++ Mage.Sets/src/mage/cards/r/ReignOfThePit.java | 2 -- .../SarkhanTheDragonspeakerEmblem.java | 2 +- Mage/src/main/resources/tokens-database.txt | 29 +++++++++++++++++++ 4 files changed, 59 insertions(+), 3 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 5f5cfaffdc8..c89f72473b1 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 @@ -2342,6 +2342,35 @@ public class ScryfallImageSupportTokens { put("OTP/Human Warrior", "https://api.scryfall.com/cards/totp/3/en?format=image"); put("OTP/Pest", "https://api.scryfall.com/cards/totp/4/en?format=image"); + // SCD + put("SCD/Beast", "https://api.scryfall.com/cards/tscd/19/en?format=image"); + put("SCD/Bird", "https://api.scryfall.com/cards/tscd/2/en?format=image"); + put("SCD/Cat", "https://api.scryfall.com/cards/tscd/3/en?format=image"); + put("SCD/Cat Beast", "https://api.scryfall.com/cards/tscd/4/en?format=image"); + put("SCD/Cat Bird", "https://api.scryfall.com/cards/tscd/5/en?format=image"); + put("SCD/Demon", "https://api.scryfall.com/cards/tscd/12/en?format=image"); + put("SCD/Dragon", "https://api.scryfall.com/cards/tscd/16/en?format=image"); + put("SCD/Eldrazi", "https://api.scryfall.com/cards/tscd/1/en?format=image"); + put("SCD/Elephant", "https://api.scryfall.com/cards/tscd/20/en?format=image"); + put("SCD/Elf Warrior", "https://api.scryfall.com/cards/tscd/21/en?format=image"); + put("SCD/Faerie", "https://api.scryfall.com/cards/tscd/10/en?format=image"); + put("SCD/Human Warrior", "https://api.scryfall.com/cards/tscd/6/en?format=image"); + put("SCD/Insect", "https://api.scryfall.com/cards/tscd/22/en?format=image"); + put("SCD/Karox Bladewing", "https://api.scryfall.com/cards/tscd/17/en?format=image"); + put("SCD/Emblem Nixilis", "https://api.scryfall.com/cards/tscd/26/en?format=image"); + put("SCD/Ogre", "https://api.scryfall.com/cards/tscd/18/en?format=image"); + put("SCD/Pegasus", "https://api.scryfall.com/cards/tscd/7/en?format=image"); + put("SCD/Saproling", "https://api.scryfall.com/cards/tscd/23/en?format=image"); + put("SCD/Emblem Sarkhan", "https://api.scryfall.com/cards/tscd/27/en?format=image"); + put("SCD/Soldier", "https://api.scryfall.com/cards/tscd/8/en?format=image"); + put("SCD/Spirit", "https://api.scryfall.com/cards/tscd/9/en?format=image"); + put("SCD/Thopter/1", "https://api.scryfall.com/cards/tscd/24/en?format=image"); + put("SCD/Thopter/2", "https://api.scryfall.com/cards/tscd/11/en?format=image"); + put("SCD/Treasure", "https://api.scryfall.com/cards/tscd/25/en?format=image"); + put("SCD/Zombie", "https://api.scryfall.com/cards/tscd/13/en?format=image"); + put("SCD/Zombie Army", "https://api.scryfall.com/cards/tscd/14/en?format=image"); + put("SCD/Zombie Knight", "https://api.scryfall.com/cards/tscd/15/en?format=image"); + // generate supported sets supportedSets.clear(); for (String cardName : this.keySet()) { diff --git a/Mage.Sets/src/mage/cards/r/ReignOfThePit.java b/Mage.Sets/src/mage/cards/r/ReignOfThePit.java index 11d36e849e5..943df3ae447 100644 --- a/Mage.Sets/src/mage/cards/r/ReignOfThePit.java +++ b/Mage.Sets/src/mage/cards/r/ReignOfThePit.java @@ -8,12 +8,10 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.StaticFilters; -import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.DemonFlyingToken; import mage.players.Player; -import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetSacrifice; import java.util.ArrayList; diff --git a/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java index fe21a168f5a..b54ba95c269 100644 --- a/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java @@ -16,7 +16,7 @@ public final class SarkhanTheDragonspeakerEmblem extends Emblem { public SarkhanTheDragonspeakerEmblem() { super("Emblem Sarkhan"); - this.getAbilities().add(new BeginningOfDrawTriggeredAbility(Zone.COMMAND, new DrawCardSourceControllerEffect(2), TargetController.YOU, false)); + this.getAbilities().add(new BeginningOfDrawTriggeredAbility(Zone.COMMAND, new DrawCardSourceControllerEffect(2).setText("draw two additional cards"), TargetController.YOU, false)); this.getAbilities().add(new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, new DiscardHandControllerEffect(), TargetController.YOU, null, false)); } diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt index b8575f87893..54ce870aa66 100644 --- a/Mage/src/main/resources/tokens-database.txt +++ b/Mage/src/main/resources/tokens-database.txt @@ -129,6 +129,8 @@ |Generate|EMBLEM:PH17|Emblem Inzerva|||InzervaMasterOfInsightsEmblem| |Generate|EMBLEM:LCC|Emblem Sorin|||SorinLordOfInnistradEmblem| |Generate|EMBLEM:RVR|Emblem Domri|||DomriRadeEmblem| +|Generate|EMBLEM:SCD|Emblem Nixilis|||ObNixilisReignitedEmblem| +|Generate|EMBLEM:SCD|Emblem Sarkhan|||SarkhanTheDragonspeakerEmblem| # ALL PLANES # Usage hints: @@ -2277,3 +2279,30 @@ |Generate|TOK:OTP|Human Rogue|||OutlawsMerrimentRogueToken| |Generate|TOK:OTP|Human Warrior|||OutlawsMerrimentWarriorToken| |Generate|TOK:OTP|Pest|||Pest11GainLifeToken| + +# SCD +|Generate|TOK:SCD|Beast|||BeastToken| +|Generate|TOK:SCD|Bird|||BirdToken| +|Generate|TOK:SCD|Cat|||CatToken| +|Generate|TOK:SCD|Cat Beast|||CatBeastToken| +|Generate|TOK:SCD|Cat Bird|||CatBirdToken| +|Generate|TOK:SCD|Demon|||DemonFlyingToken| +|Generate|TOK:SCD|Dragon|||DragonToken2| +|Generate|TOK:SCD|Eldrazi|||EldraziToken| +|Generate|TOK:SCD|Elephant|||ElephantToken| +|Generate|TOK:SCD|Elf Warrior|||ElfWarriorToken| +|Generate|TOK:SCD|Faerie|||FaerieToken| +|Generate|TOK:SCD|Human Warrior|||HumanWarriorToken| +|Generate|TOK:SCD|Insect|||InsectDeathToken| +|Generate|TOK:SCD|Karox Bladewing|||KaroxBladewingDragonToken| +|Generate|TOK:SCD|Ogre|||OgreToken| +|Generate|TOK:SCD|Pegasus|||PegasusToken| +|Generate|TOK:SCD|Saproling|||SaprolingToken| +|Generate|TOK:SCD|Soldier|||SoldierLifelinkToken| +|Generate|TOK:SCD|Spirit|||SpiritWhiteToken| +|Generate|TOK:SCD|Thopter|1||ThopterColorlessToken| +|Generate|TOK:SCD|Thopter|2||ThopterToken| +|Generate|TOK:SCD|Treasure|||TreasureToken| +|Generate|TOK:SCD|Zombie|||ZombieToken| +|Generate|TOK:SCD|Zombie Army|||ZombieArmyToken| +|Generate|TOK:SCD|Zombie Knight|||ZombieKnightToken|