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 94a87f91fdb..0b091bd16fb 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 @@ -61,7 +61,7 @@ public class ScryfallImageSupportTokens { put("RNA/Treasure", "https://api.scryfall.com/cards/trna/12/en?format=image"); put("RNA/Zombie", "https://api.scryfall.com/cards/trna/3/en?format=image"); - //GRN + // GRN put("GRN/Angel", "https://api.scryfall.com/cards/tgrn/1/en?format=image"); put("GRN/Bird Illusion", "https://api.scryfall.com/cards/tgrn/3/en?format=image"); put("GRN/Elf Knight", "https://api.scryfall.com/cards/tgrn/6/en?format=image"); @@ -71,7 +71,7 @@ public class ScryfallImageSupportTokens { put("GRN/Soldier", "https://api.scryfall.com/cards/tgrn/2/en?format=image"); put("GRN/Emblem Vraska", "https://api.scryfall.com/cards/tgrn/8/en?format=image"); - //DOM + // DOM put("DOM/Cleric", "https://api.scryfall.com/cards/tdom/4/en?format=image"); put("DOM/Construct", "https://api.scryfall.com/cards/tdom/14/en?format=image"); put("DOM/Demon", "https://api.scryfall.com/cards/tdom/7/en?format=image"); @@ -89,7 +89,7 @@ public class ScryfallImageSupportTokens { put("DOM/Emblem Teferi", "https://api.scryfall.com/cards/tdom/16/en?format=image"); put("DOM/Zombie Knight", "https://api.scryfall.com/cards/tdom/5/en?format=image"); - //XLN + // XLN put("XLN/Dinosaur", "https://api.scryfall.com/cards/txln/5/en?format=image"); put("XLN/Illusion", "https://api.scryfall.com/cards/txln/2/en?format=image"); put("XLN/Merfolk", "https://api.scryfall.com/cards/txln/3/en?format=image"); @@ -101,12 +101,12 @@ public class ScryfallImageSupportTokens { put("XLN/Treasure/4", "https://api.scryfall.com/cards/txln/10/en?format=image"); put("XLN/Vampire", "https://api.scryfall.com/cards/txln/1/en?format=image"); - //HOU + // HOU put("HOU/Horse", "https://api.scryfall.com/cards/thou/10/en?format=image"); put("HOU/Insect", "https://api.scryfall.com/cards/thou/12/en?format=image"); put("HOU/Snake", "https://api.scryfall.com/cards/thou/11/en?format=image"); - //AKH - tokens + // AKH - tokens put("AKH/Beast", "https://api.scryfall.com/cards/takh/21/en?format=image"); put("AKH/Cat", "https://api.scryfall.com/cards/takh/16/en?format=image"); put("AKH/Drake", "https://api.scryfall.com/cards/takh/18/en?format=image"); @@ -117,7 +117,7 @@ public class ScryfallImageSupportTokens { put("AKH/Warrior", "https://api.scryfall.com/cards/takh/17/en?format=image"); put("AKH/Wurm", "https://api.scryfall.com/cards/takh/24/en?format=image"); put("AKH/Zombie", "https://api.scryfall.com/cards/takh/20/en?format=image"); - //AKH - embalm ability (token from card) + // AKH - embalm ability (token from card) put("AKH/Angel of Sanctions", "https://api.scryfall.com/cards/takh/1/en?format=image"); put("AKH/Anointer Priest", "https://api.scryfall.com/cards/takh/2/en?format=image"); put("AKH/Aven Initiate", "https://api.scryfall.com/cards/takh/3/en?format=image"); @@ -134,13 +134,13 @@ public class ScryfallImageSupportTokens { put("AKH/Unwavering Initiate", "https://api.scryfall.com/cards/takh/14/en?format=image"); put("AKH/Vizier of Many Faces", "https://api.scryfall.com/cards/takh/15/en?format=image"); - //AER + // AER put("AER/Etherium Cell", "https://api.scryfall.com/cards/taer/3/en?format=image"); put("AER/Gremlin", "https://api.scryfall.com/cards/taer/1/en?format=image"); put("AER/Ragavan", "https://api.scryfall.com/cards/taer/2/en?format=image"); put("AER/Emblem Tezzeret", "https://api.scryfall.com/cards/taer/4/en?format=image"); - //KLD + // KLD put("KLD/Beast", "https://api.scryfall.com/cards/tkld/1/en?format=image"); put("KLD/Emblem Chandra", "https://api.scryfall.com/cards/tkld/10/en?format=image"); put("KLD/Construct/1", "https://api.scryfall.com/cards/tkld/2/en?format=image"); @@ -154,7 +154,7 @@ public class ScryfallImageSupportTokens { put("KLD/Thopter/2", "https://api.scryfall.com/cards/tkld/8/en?format=image"); put("KLD/Thopter/3", "https://api.scryfall.com/cards/tkld/9/en?format=image"); - //EMN + // EMN put("EMN/Eldrazi Horror", "https://api.scryfall.com/cards/temn/1/en?format=image"); put("EMN/Human", "https://api.scryfall.com/cards/temn/7/en?format=image"); put("EMN/Human Wizard", "https://api.scryfall.com/cards/temn/2/en?format=image"); @@ -166,7 +166,7 @@ public class ScryfallImageSupportTokens { put("EMN/Zombie/3", "https://api.scryfall.com/cards/temn/5/en?format=image"); put("EMN/Zombie/4", "https://api.scryfall.com/cards/temn/6/en?format=image"); - //SOI + // SOI put("SOI/Angel", "https://api.scryfall.com/cards/tsoi/1/en?format=image"); put("SOI/Emblem Arlinn", "https://api.scryfall.com/cards/tsoi/18/en?format=image"); put("SOI/Clue/1", "https://api.scryfall.com/cards/tsoi/11/en?format=image"); @@ -186,7 +186,7 @@ public class ScryfallImageSupportTokens { put("SOI/Wolf", "https://api.scryfall.com/cards/tsoi/9/en?format=image"); put("SOI/Zombie", "https://api.scryfall.com/cards/tsoi/5/en?format=image"); - //OGW + // OGW put("OGW/Angel", "https://api.scryfall.com/cards/togw/7/en?format=image"); put("OGW/Eldrazi Scion/1", "https://api.scryfall.com/cards/togw/1/en?format=image"); put("OGW/Eldrazi Scion/2", "https://api.scryfall.com/cards/togw/2/en?format=image"); @@ -199,7 +199,7 @@ public class ScryfallImageSupportTokens { put("OGW/Plant", "https://api.scryfall.com/cards/togw/11/en?format=image"); put("OGW/Zombie", "https://api.scryfall.com/cards/togw/8/en?format=image"); - //BFZ + // BFZ put("BFZ/Dragon", "https://api.scryfall.com/cards/tbfz/8/en?format=image"); put("BFZ/Eldrazi", "https://api.scryfall.com/cards/tbfz/1/en?format=image"); put("BFZ/Eldrazi Scion/1", "https://api.scryfall.com/cards/tbfz/2/en?format=image"); @@ -319,7 +319,7 @@ public class ScryfallImageSupportTokens { put("C18/Worm", "https://api.scryfall.com/cards/tc18/18/en?format=image"); put("C18/Zombie", "https://api.scryfall.com/cards/tc18/9/en?format=image"); - //C19 + // C19 put("C19/Assassin", "https://api.scryfall.com/cards/tc19/9/en?format=image"); put("C19/Beast/1", "https://api.scryfall.com/cards/tc19/13/en?format=image"); put("C19/Beast/2", "https://api.scryfall.com/cards/tc19/14/en?format=image"); @@ -2167,7 +2167,7 @@ public class ScryfallImageSupportTokens { put("WOC/Spirit", "https://api.scryfall.com/cards/twoc/17/en?format=image"); put("WOC/Virtuous", "https://api.scryfall.com/cards/twoc/3/en?format=image"); - //WHO + // WHO put("WHO/Alien Insect", "https://api.scryfall.com/cards/twho/19/en?format=image"); // 8ED @@ -2491,6 +2491,9 @@ public class ScryfallImageSupportTokens { put("FDN/Emblem Vivien", "https://api.scryfall.com/cards/tfdn/25/en?format=image"); put("FDN/Zombie", "https://api.scryfall.com/cards/tfdn/15/en?format=image"); + // H17 + put("H17/Dragon", "https://api.scryfall.com/cards/h17/4/en?format=image"); + // generate supported sets supportedSets.clear(); for (String cardName : this.keySet()) { diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt index 5084ff814d8..643a4eefd12 100644 --- a/Mage/src/main/resources/tokens-database.txt +++ b/Mage/src/main/resources/tokens-database.txt @@ -231,11 +231,7 @@ |Generate|TOK:ARB|Bird Soldier|||BirdSoldierToken| |Generate|TOK:ARB|Dragon|||DragonBroodmotherDragonToken| |Generate|TOK:ARB|Lizard|||LizardToken| -|Generate|TOK:ARB|Zombie Wizard|||ZombieWizardToken| -|Generate|TOK:ARN|Bird|||RukhEggBirdToken| |Generate|TOK:ARN|Djinn|||DjinnToken| -|Generate|TOK:ATQ|Assembly-Worker|||AssemblyWorkerToken| -|Generate|TOK:ATQ|Tetravite|||TetraviteToken| |Generate|TOK:AVR|Angel|||AngelToken| |Generate|TOK:AVR|Demon|||DemonToken| |Generate|TOK:AVR|Human|1||RedHumanToken| @@ -401,12 +397,6 @@ |Generate|TOK:C19|Wurm|||WurmToken| |Generate|TOK:C19|Zombie|1||ZombieToken| |Generate|TOK:C19|Zombie|2||ZombieToken| -|Generate|TOK:CHK|Dragon Spirit|||TatsumaDragonToken| -|Generate|TOK:CHK|Elemental|||SeedGuardianToken| -|Generate|TOK:CHK|Illusion|||MelokuTheCloudedMirrorToken| -|Generate|TOK:CHK|Rat|||RatToken| -|Generate|TOK:CHK|Snake|||SnakeToken| -|Generate|TOK:CHR|Snake|||SerpentGeneratorSnakeToken| |Generate|TOK:CMA|Beast|1||BeastToken| |Generate|TOK:CMA|Beast|2||BeastToken2| |Generate|TOK:CMA|Dragon|||DragonToken2| @@ -445,7 +435,6 @@ |Generate|TOK:CNS|Zombie|||ZombieToken| |Generate|TOK:CON|Angel|||AngelToken| |Generate|TOK:CON|Elemental|||ElementalTokenWithHaste| -|Generate|TOK:DD2|Elemental Shaman|||ElementalShamanToken| |Generate|TOK:DVD|Demon|||DemonFlyingToken| |Generate|TOK:DVD|Spirit|||SpiritWhiteToken| |Generate|TOK:DVD|Thrull|||BreedingPitThrullToken| @@ -453,7 +442,6 @@ |Generate|TOK:GVL|Beast|1||BeastToken| |Generate|TOK:GVL|Beast|2||BeastToken2| |Generate|TOK:GVL|Elephant|||ElephantToken| -|Generate|TOK:JVC|Elemental Shaman|||ElementalShamanToken| |Generate|TOK:DDC|Demon|||DemonFlyingToken| |Generate|TOK:DDC|Spirit|||SpiritWhiteToken| |Generate|TOK:DDC|Thrull|||BreedingPitThrullToken| @@ -501,14 +489,6 @@ |Generate|TOK:DOM|Saproling|3||SaprolingToken| |Generate|TOK:DOM|Soldier|||SoldierToken| |Generate|TOK:DOM|Zombie Knight|||ZombieKnightToken| -|Generate|TOK:DRB|Saproling|||SaprolingToken| -|Generate|TOK:DST|Beast|||BeastToken| -|Generate|TOK:DST|Elemental|1||WandOfTheElementsFirstToken| -|Generate|TOK:DST|Elemental|2||WandOfTheElementsSecondToken| -|Generate|TOK:DST|Wirefly|||WireflyToken| -|Generate|TOK:DST|Insect|||InsectToken| -|Generate|TOK:DST|Myr|||MyrToken| -|Generate|TOK:DST|Spawn|||SpawningPitToken| |Generate|TOK:DTK|Djinn Monk|||DjinnMonkToken| |Generate|TOK:DTK|Dragon|||DragonToken| |Generate|TOK:DTK|Goblin|||GoblinToken| @@ -570,9 +550,6 @@ |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| -|Generate|TOK:HML|Skeleton|||SkeletonRegenerateToken| |Generate|TOK:HOU|Horse|||CrestedSunmareToken| |Generate|TOK:HOU|Insect|||TheLocustGodInsectToken| |Generate|TOK:HOU|Snake|||RhonassLastStandToken| @@ -587,7 +564,6 @@ #|Generate|TOK:HOU|Sinuous Striker|||| #|Generate|TOK:HOU|Steadfast Sentinel|||| #|Generate|TOK:HOU|Sunscourge Champion|||| -|Generate|TOK:ICE|Caribou|||CaribouToken| |Generate|TOK:ISD|Angel|||AngelToken| |Generate|TOK:ISD|Demon|||DemonToken| |Generate|TOK:ISD|Homunculus|||StitchersApprenticeHomunculusToken| @@ -606,12 +582,6 @@ |Generate|TOK:JOU|Sphinx|||HourOfNeedSphinxToken| |Generate|TOK:JOU|Spider|||RenownedWeaverSpiderToken| |Generate|TOK:JOU|Zombie|||RitualOfTheReturnedZombieToken| -|Generate|TOK:JUD|Bear|||BearToken| -|Generate|TOK:JUD|Bird|||BirdToken| -|Generate|TOK:JUD|Elemental Cat|||ElementalCatToken| -|Generate|TOK:JUD|Elephant|||ElephantToken| -|Generate|TOK:JUD|Spirit|||SpiritWhiteToken| -|Generate|TOK:JUD|Wurm|||WurmToken| |Generate|TOK:KLD|Beast|||ArchitectOfTheUntamedBeastToken| |Generate|TOK:KLD|Construct|1||OviyaPashiriSageLifecrafterToken| |Generate|TOK:KLD|Construct|2||MetallurgicSummoningsConstructToken| @@ -631,9 +601,6 @@ |Generate|TOK:KTK|Warrior|1||WarriorToken| |Generate|TOK:KTK|Warrior|2||WarriorToken| |Generate|TOK:KTK|Zombie|||ZombieToken| -|Generate|TOK:LEG|Demon|||MinorDemonToken| -|Generate|TOK:LEG|Sand Warrior|||HazezonTamarSandWarriorToken| -|Generate|TOK:LEG|Snake|||SerpentGeneratorSnakeToken| # LGN don't have tokens, from wiki: A Sliver token for Brood Sliver and a Goblin token for Warbreak Trumpeter were featured as a Magic Player Reward. |Generate|TOK:LRW|Avatar|||AvatarToken| |Generate|TOK:LRW|Beast|||BeastToken| @@ -765,15 +732,6 @@ |Generate|TOK:MOR|Faerie Rogue|||FaerieRogueToken| |Generate|TOK:MOR|Giant Warrior|||GiantWarriorToken| |Generate|TOK:MOR|Treefolk Shaman|||TreefolkShamanToken| -|Generate|TOK:MRD|Beast|||OneDozenEyesBeastToken| -|Generate|TOK:MRD|Demon|||ReignOfThePitToken| -|Generate|TOK:MRD|Elemental|||ElementalTokenWithHaste| -|Generate|TOK:MRD|Insect|||InsectToken| -|Generate|TOK:MRD|Myr|||MyrToken| -|Generate|TOK:MRD|Pentavite|||PentaviteToken| -|Generate|TOK:MRD|Pest|||PestToken| -|Generate|TOK:MRD|Soldier|||SoldierToken| -|Generate|TOK:MRD|Spirit|||SpiritWhiteToken| |Generate|TOK:NPH|Beast|||BeastToken| |Generate|TOK:NPH|Phyrexian Goblin|||PhyrexianGoblinHasteToken| |Generate|TOK:NPH|Phyrexian Golem|||PhyrexianGolemToken| @@ -886,16 +844,8 @@ |Generate|TOK:THS|Soldier|1||SoldierToken| |Generate|TOK:THS|Soldier|2||SoldierToken| |Generate|TOK:THS|Soldier|3||AkroanSoldierToken| -|Generate|TOK:TOR|Squirrel|||SquirrelToken| |Generate|TOK:UST|Dragon|||DragonTokenGold| |Generate|TOK:UST|Storm Crow|||StormCrowToken| -|Generate|TOK:V10|Wolf|||WolfToken| -|Generate|TOK:V11|Faerie Rogue|||OonaQueenFaerieToken| -|Generate|TOK:VIS|Butterfly|||ButterflyToken| -|Generate|TOK:VIS|Insect|||InsectToken| -|Generate|TOK:VIS|Prism|||PrismToken| -|Generate|TOK:VIS|Snake|||SnakeToken| -|Generate|TOK:WTH|Squirrel|||SquirrelToken| |Generate|TOK:WWK|Construct|||StoneTrapIdolToken| |Generate|TOK:WWK|Dragon|||DragonToken2| |Generate|TOK:WWK|Elephant|||ElephantToken| @@ -1092,11 +1042,6 @@ |Generate|TOK:M21|Weird|||WeirdToken2| |Generate|TOK:M21|Zombie|||ZombieToken| -# JMP -# Jumpstart uses tokens and emblems from M21 set, -# TODO: check scryfall for JMP tokens after set's release -|Generate|TOK:JMP|Unicorn|||UnicornToken| - # ZNR |Generate|TOK:ZNR|Angel Warrior|||AngelWarriorToken| |Generate|TOK:ZNR|Cat|||CatToken3|