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 092a0f7ce9..75b2c22ae5 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 @@ -281,27 +281,31 @@ public class ScryfallImageSupportTokens { put("M20/Zombie", "https://api.scryfall.com/cards/tm20/6/en?format=image"); // C18 - put("C18/Angel", "https://api.scryfall.com/cards/tc18/3/en?format=image"); - put("C18/Cat Warrior", "https://api.scryfall.com/cards/tc18/15/en?format=image"); - put("C18/Cat", "https://api.scryfall.com/cards/tc18/5/en?format=image"); - put("C18/Clue", "https://api.scryfall.com/cards/tc18/19/en?format=image"); - put("C18/Construct/1", "https://api.scryfall.com/cards/tc18/20/en?format=image"); - put("C18/Construct/2", "https://api.scryfall.com/cards/tc18/21/en?format=image"); - put("C18/Dragon Egg", "https://api.scryfall.com/cards/tc18/10/en?format=image"); - put("C18/Dragon", "https://api.scryfall.com/cards/tc18/11/en?format=image"); - put("C18/Elemental", "https://api.scryfall.com/cards/tc18/16/en?format=image"); - put("C18/Horror", "https://api.scryfall.com/cards/tc18/22/en?format=image"); - put("C18/Manifest", "https://api.scryfall.com/cards/tc18/1/en?format=image"); - put("C18/Mask", "https://api.scryfall.com/cards/tc18/4/en?format=image"); - put("C18/Myr", "https://api.scryfall.com/cards/tc18/7/en?format=image"); - put("C18/Plant", "https://api.scryfall.com/cards/tc18/17/en?format=image"); - put("C18/Servo", "https://api.scryfall.com/cards/tc18/24/en?format=image"); - put("C18/Survivor", "https://api.scryfall.com/cards/tc18/12/en?format=image"); - put("C18/Thopter/1", "https://api.scryfall.com/cards/tc18/25/en?format=image"); - put("C18/Thopter/2", "https://api.scryfall.com/cards/tc18/26/en?format=image"); - put("C18/Thopter/3", "https://api.scryfall.com/cards/tc18/8/en?format=image"); - 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"); + put ("C18/Angel", "https://api.scryfall.com/cards/tc18/3/en?format=image"); + put ("C18/Beast/1", "https://api.scryfall.com/cards/tc18/13/en?format=image"); + put ("C18/Beast/2", "https://api.scryfall.com/cards/tc18/14/en?format=image"); + put ("C18/Cat", "https://api.scryfall.com/cards/tc18/5/en?format=image"); + put ("C18/Cat Warrior", "https://api.scryfall.com/cards/tc18/15/en?format=image"); + put ("C18/Clue", "https://api.scryfall.com/cards/tc18/19/en?format=image"); + put ("C18/Construct/1", "https://api.scryfall.com/cards/tc18/20/en?format=image"); + put ("C18/Construct/2", "https://api.scryfall.com/cards/tc18/21/en?format=image"); + put ("C18/Dragon", "https://api.scryfall.com/cards/tc18/11/en?format=image"); + put ("C18/Dragon Egg", "https://api.scryfall.com/cards/tc18/10/en?format=image"); + put ("C18/Elemental", "https://api.scryfall.com/cards/tc18/16/en?format=image"); + put ("C18/Phyrexian Horror", "https://api.scryfall.com/cards/tc18/22/en?format=image"); + put ("C18/Mask", "https://api.scryfall.com/cards/tc18/4/en?format=image"); + put ("C18/Myr", "https://api.scryfall.com/cards/tc18/23/en?format=image"); + put ("C18/Phyrexian Myr", "https://api.scryfall.com/cards/tc18/7/en?format=image"); + put ("C18/Plant", "https://api.scryfall.com/cards/tc18/17/en?format=image"); + put ("C18/Servo", "https://api.scryfall.com/cards/tc18/24/en?format=image"); + put ("C18/Shapeshifter", "https://api.scryfall.com/cards/tc18/2/en?format=image"); + put ("C18/Soldier", "https://api.scryfall.com/cards/tc18/6/en?format=image"); + put ("C18/Survivor", "https://api.scryfall.com/cards/tc18/12/en?format=image"); + put ("C18/Thopter/1", "https://api.scryfall.com/cards/tc18/25/en?format=image"); + put ("C18/Thopter/2", "https://api.scryfall.com/cards/tc18/26/en?format=image"); + put ("C18/Thopter/3", "https://api.scryfall.com/cards/tc18/8/en?format=image"); + 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 put("C19/Assassin", "https://api.scryfall.com/cards/tc19/9/en?format=image"); @@ -315,7 +319,7 @@ public class ScryfallImageSupportTokens { put("C19/Egg", "https://api.scryfall.com/cards/tc19/16/en?format=image"); put("C19/Eldrazi", "https://api.scryfall.com/cards/tc19/26/en?format=image"); put("C19/Gargoyle", "https://api.scryfall.com/cards/tc19/22/en?format=image"); - put("C19/Horror", "https://api.scryfall.com/cards/tc19/23/en?format=image"); + put("C19/Phyrexian Horror", "https://api.scryfall.com/cards/tc19/23/en?format=image"); put("C19/Human", "https://api.scryfall.com/cards/tc19/3/en?format=image"); put("C19/Emblem Ob Nixilis Reignited", "https://api.scryfall.com/cards/tc19/29/en?format=image"); put("C19/Pegasus", "https://api.scryfall.com/cards/tc19/4/en?format=image"); @@ -327,8 +331,8 @@ public class ScryfallImageSupportTokens { put("C19/Spirit", "https://api.scryfall.com/cards/tc19/5/en?format=image"); put("C19/Treasure", "https://api.scryfall.com/cards/tc19/25/en?format=image"); put("C19/Wurm", "https://api.scryfall.com/cards/tc19/21/en?format=image"); - put("C19/Zombie/1", "https://api.scryfall.com/cards/tc19/11/en?format=image"); - put("C19/Zombie/2", "https://api.scryfall.com/cards/tc19/10/en?format=image"); + put("C19/Zombie/1", "https://api.scryfall.com/cards/tc19/10/en?format=image"); + put("C19/Zombie/2", "https://api.scryfall.com/cards/tc19/11/en?format=image"); // ELD put("ELD/Bear", "https://api.scryfall.com/cards/teld/8/en?format=image"); @@ -866,6 +870,106 @@ public class ScryfallImageSupportTokens { put ("SNC/Treasure/5", "https://api.scryfall.com/cards/tsnc/17/en?format=image"); put ("SNC/Wizard", "https://api.scryfall.com/cards/tsnc/5/en?format=image"); + // C14 + put ("C14/Angel", "https://api.scryfall.com/cards/tc14/1/en?format=image"); + put ("C14/Ape", "https://api.scryfall.com/cards/tc14/18/en?format=image"); + put ("C14/Beast/1", "https://api.scryfall.com/cards/tc14/19/en?format=image"); + put ("C14/Beast/2", "https://api.scryfall.com/cards/tc14/20/en?format=image"); + put ("C14/Cat", "https://api.scryfall.com/cards/tc14/2/en?format=image"); + put ("C14/Emblem Daretti", "https://api.scryfall.com/cards/tc14/36/en?format=image"); + put ("C14/Demon/1", "https://api.scryfall.com/cards/tc14/13/en?format=image"); + put ("C14/Demon/2", "https://api.scryfall.com/cards/tc14/12/en?format=image"); + put ("C14/Elemental", "https://api.scryfall.com/cards/tc14/21/en?format=image"); + put ("C14/Elephant", "https://api.scryfall.com/cards/tc14/22/en?format=image"); + put ("C14/Elf Druid", "https://api.scryfall.com/cards/tc14/23/en?format=image"); + put ("C14/Elf Warrior", "https://api.scryfall.com/cards/tc14/24/en?format=image"); + put ("C14/Fish", "https://api.scryfall.com/cards/tc14/8/en?format=image"); + put ("C14/Gargoyle", "https://api.scryfall.com/cards/tc14/27/en?format=image"); + put ("C14/Phyrexian Germ", "https://api.scryfall.com/cards/tc14/14/en?format=image"); + put ("C14/Goat", "https://api.scryfall.com/cards/tc14/3/en?format=image"); + put ("C14/Goblin", "https://api.scryfall.com/cards/tc14/17/en?format=image"); + put ("C14/Horror", "https://api.scryfall.com/cards/tc14/15/en?format=image"); + put ("C14/Kor Soldier", "https://api.scryfall.com/cards/tc14/4/en?format=image"); + put ("C14/Kraken", "https://api.scryfall.com/cards/tc14/9/en?format=image"); + put ("C14/Myr", "https://api.scryfall.com/cards/tc14/28/en?format=image"); + put ("C14/Emblem Nixilis", "https://api.scryfall.com/cards/tc14/35/en?format=image"); + put ("C14/Pegasus", "https://api.scryfall.com/cards/tc14/5/en?format=image"); + put ("C14/Pentavite", "https://api.scryfall.com/cards/tc14/29/en?format=image"); + put ("C14/Soldier", "https://api.scryfall.com/cards/tc14/6/en?format=image"); + put ("C14/Spirit", "https://api.scryfall.com/cards/tc14/7/en?format=image"); + put ("C14/Stoneforged Blade", "https://api.scryfall.com/cards/tc14/30/en?format=image"); + put ("C14/Emblem Teferi", "https://api.scryfall.com/cards/tc14/34/en?format=image"); + put ("C14/Treefolk", "https://api.scryfall.com/cards/tc14/25/en?format=image"); + put ("C14/Tuktuk the Returned", "https://api.scryfall.com/cards/tc14/31/en?format=image"); + put ("C14/Whale", "https://api.scryfall.com/cards/tc14/10/en?format=image"); + put ("C14/Wolf", "https://api.scryfall.com/cards/tc14/26/en?format=image"); + put ("C14/Phyrexian Wurm/1", "https://api.scryfall.com/cards/tc14/32/en?format=image"); + put ("C14/Phyrexian Wurm/2", "https://api.scryfall.com/cards/tc14/33/en?format=image"); + put ("C14/Zombie/1", "https://api.scryfall.com/cards/tc14/16/en?format=image"); + put ("C14/Zombie/2", "https://api.scryfall.com/cards/tc14/11/en?format=image"); + + // C15 + put ("C15/Angel", "https://api.scryfall.com/cards/tc15/2/en?format=image"); + put ("C15/Bear", "https://api.scryfall.com/cards/tc15/12/en?format=image"); + put ("C15/Beast", "https://api.scryfall.com/cards/tc15/13/en?format=image"); + put ("C15/Cat", "https://api.scryfall.com/cards/tc15/3/en?format=image"); + put ("C15/Dragon", "https://api.scryfall.com/cards/tc15/9/en?format=image"); + put ("C15/Drake", "https://api.scryfall.com/cards/tc15/6/en?format=image"); + put ("C15/Elemental", "https://api.scryfall.com/cards/tc15/20/en?format=image"); + put ("C15/Elemental Shaman", "https://api.scryfall.com/cards/tc15/10/en?format=image"); + put ("C15/Elephant", "https://api.scryfall.com/cards/tc15/14/en?format=image"); + put ("C15/Frog Lizard", "https://api.scryfall.com/cards/tc15/15/en?format=image"); + put ("C15/Phyrexian Germ", "https://api.scryfall.com/cards/tc15/7/en?format=image"); + put ("C15/Gold", "https://api.scryfall.com/cards/tc15/24/en?format=image"); + put ("C15/Knight/1", "https://api.scryfall.com/cards/tc15/4/en?format=image"); + put ("C15/Knight/2", "https://api.scryfall.com/cards/tc15/5/en?format=image"); + put ("C15/Lightning Rager", "https://api.scryfall.com/cards/tc15/11/en?format=image"); + put ("C15/Saproling", "https://api.scryfall.com/cards/tc15/16/en?format=image"); + put ("C15/Shapeshifter", "https://api.scryfall.com/cards/tc15/1/en?format=image"); + put ("C15/Snake/1", "https://api.scryfall.com/cards/tc15/17/en?format=image"); + put ("C15/Snake/2", "https://api.scryfall.com/cards/tc15/21/en?format=image"); + put ("C15/Spider", "https://api.scryfall.com/cards/tc15/18/en?format=image"); + put ("C15/Spirit/1", "https://api.scryfall.com/cards/tc15/23/en?format=image"); + put ("C15/Spirit/2", "https://api.scryfall.com/cards/tc15/22/en?format=image"); + put ("C15/Wolf", "https://api.scryfall.com/cards/tc15/19/en?format=image"); + put ("C15/Zombie", "https://api.scryfall.com/cards/tc15/8/en?format=image"); + + // C16 + put ("C16/Beast", "https://api.scryfall.com/cards/tc16/14/en?format=image"); + put ("C16/Bird/1", "https://api.scryfall.com/cards/tc16/7/en?format=image"); + put ("C16/Bird/2", "https://api.scryfall.com/cards/tc16/2/en?format=image"); + put ("C16/Emblem Daretti", "https://api.scryfall.com/cards/tc16/21/en?format=image"); + put ("C16/Elemental", "https://api.scryfall.com/cards/tc16/3/en?format=image"); + put ("C16/Elf Warrior", "https://api.scryfall.com/cards/tc16/15/en?format=image"); + put ("C16/Phyrexian Germ", "https://api.scryfall.com/cards/tc16/10/en?format=image"); + put ("C16/Goat", "https://api.scryfall.com/cards/tc16/4/en?format=image"); + put ("C16/Goblin", "https://api.scryfall.com/cards/tc16/12/en?format=image"); + put ("C16/Phyrexian Horror", "https://api.scryfall.com/cards/tc16/19/en?format=image"); + put ("C16/Myr", "https://api.scryfall.com/cards/tc16/20/en?format=image"); + put ("C16/Ogre", "https://api.scryfall.com/cards/tc16/13/en?format=image"); + put ("C16/Saproling/1", "https://api.scryfall.com/cards/tc16/16/en?format=image"); + put ("C16/Saproling/2", "https://api.scryfall.com/cards/tc16/17/en?format=image"); + put ("C16/Soldier", "https://api.scryfall.com/cards/tc16/5/en?format=image"); + put ("C16/Spirit/1", "https://api.scryfall.com/cards/tc16/1/en?format=image"); + put ("C16/Spirit/2", "https://api.scryfall.com/cards/tc16/6/en?format=image"); + put ("C16/Squid", "https://api.scryfall.com/cards/tc16/8/en?format=image"); + put ("C16/Thopter", "https://api.scryfall.com/cards/tc16/9/en?format=image"); + put ("C16/Worm", "https://api.scryfall.com/cards/tc16/18/en?format=image"); + put ("C16/Zombie", "https://api.scryfall.com/cards/tc16/11/en?format=image"); + + // C17 + put ("C17/Bat", "https://api.scryfall.com/cards/tc17/2/en?format=image"); + put ("C17/Cat", "https://api.scryfall.com/cards/tc17/1/en?format=image"); + put ("C17/Cat Dragon", "https://api.scryfall.com/cards/tc17/9/en?format=image"); + put ("C17/Cat Warrior", "https://api.scryfall.com/cards/tc17/8/en?format=image"); + put ("C17/Dragon/1", "https://api.scryfall.com/cards/tc17/6/en?format=image"); + put ("C17/Dragon/2", "https://api.scryfall.com/cards/tc17/7/en?format=image"); + put ("C17/Eldrazi Spawn", "https://api.scryfall.com/cards/tc17/11/en?format=image"); + put ("C17/Gold", "https://api.scryfall.com/cards/tc17/10/en?format=image"); + put ("C17/Rat", "https://api.scryfall.com/cards/tc17/3/en?format=image"); + put ("C17/Vampire", "https://api.scryfall.com/cards/tc17/4/en?format=image"); + put ("C17/Zombie", "https://api.scryfall.com/cards/tc17/5/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 beb5e9cf86..514b3db1ad 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -48,7 +48,6 @@ |Generate|EMBLEM!:BFZ|Emblem Nixilis|||ObNixilisReignitedEmblem| |Generate|EMBLEM!:AKH|Emblem Gideon|||GideonOfTheTrialsEmblem| |Generate|EMBLEM!:C14|Emblem Daretti|||DarettiScrapSavantEmblem| -|Generate|EMBLEM!:C14|Emblem Daretti||Emblem Daretti|DarettiScrapSavantEmblem| |Generate|EMBLEM!:C14|Emblem Nixilis|||ObNixilisOfTheBlackOathEmblem| |Generate|EMBLEM!:C14|Emblem Teferi|||TeferiTemporalArchmageEmblem| |Generate|EMBLEM!:C16|Emblem Daretti|||DarettiScrapSavantEmblem| @@ -289,30 +288,6 @@ |Generate|TOK:BOK|Snake|||SnakeToken| |Generate|TOK:BOK|Spirit|1||AnotherSpiritToken| |Generate|TOK:BOK|Spirit|2||SpiritToken| -|Generate|TOK:C13|Assembly-Worker|||AssembleWorkerToken| -|Generate|TOK:C13|Beast|1||BeastToken2| -|Generate|TOK:C13|Beast|2||CarnivoreToken| -|Generate|TOK:C13|Beast|3||OneDozenEyesBeastToken| -|Generate|TOK:C13|Beast|4||SpawningGroundsBeastToken| -|Generate|TOK:C13|Drake|||LeafdrakeRoostDrakeToken| -|Generate|TOK:C13|Elemental|1||SeedGuardianToken| -|Generate|TOK:C13|Elemental|2||WalkerOfTheGroveToken| -|Generate|TOK:C13|Elemental|3||RedElementalToken| -|Generate|TOK:C13|Elephant|||ElephantToken| -|Generate|TOK:C13|Elf Warrior|||ElfWarriorToken| -|Generate|TOK:C13|Goat|||GoatToken| -|Generate|TOK:C13|Graveborn|||SekKuarDeathkeeperGravebornToken| -|Generate|TOK:C13|Insect|||InsectToken| -|Generate|TOK:C13|Knight|||KnightToken| -|Generate|TOK:C13|Kobold|||ProsshKoboldToken| -|Generate|TOK:C13|Myr|||MyrToken| -|Generate|TOK:C13|Plant|||PlantToken| -|Generate|TOK:C13|Saproling|||SaprolingToken| -|Generate|TOK:C13|Snake|||OphiomancerSnakeToken| -|Generate|TOK:C13|Spirit|||SpiritWhiteToken| -|Generate|TOK:C13|Thopter|||ThopterToken| -|Generate|TOK:C13|Thrull|||ThrullToken| -|Generate|TOK:C13|Zombie|||ZombieToken| |Generate|TOK:C14|Angel|||AngelToken| |Generate|TOK:C14|Ape|||PongifyApeToken| |Generate|TOK:C14|Beast|1||BeastToken| @@ -324,12 +299,10 @@ |Generate|TOK:C14|Elephant|||ElephantToken| |Generate|TOK:C14|Elf Druid|||ElfDruidToken| |Generate|TOK:C14|Elf Warrior|||ElfWarriorToken| -|Generate|TOK:C14|Equipment|||NahiriTheLithomancerEquipmentToken| |Generate|TOK:C14|Fish|||ReefWormFishToken| |Generate|TOK:C14|Gargoyle|||GargoyleToken| -|Generate|TOK:C14|Germ|||PhyrexianGermToken| +|Generate|TOK:C14|Phyrexian Germ|||PhyrexianGermToken| |Generate|TOK:C14|Goat|||GoatToken| -|Generate|TOK:C14|Goblin Golem|||TuktukTheReturnedToken| |Generate|TOK:C14|Goblin|||GoblinToken| |Generate|TOK:C14|Horror|||SpoilsOfBloodHorrorToken| |Generate|TOK:C14|Kor Soldier|||KorSoldierToken| @@ -339,12 +312,13 @@ |Generate|TOK:C14|Pentavite|||PentaviteToken| |Generate|TOK:C14|Soldier|||SoldierToken| |Generate|TOK:C14|Spirit|||SpiritWhiteToken| -|Generate|TOK:C14|Stoneforged Blade|| +|Generate|TOK:C14|Stoneforged Blade|||NahiriTheLithomancerEquipmentToken| |Generate|TOK:C14|Treefolk|||SylvanOfferingTreefolkToken| +|Generate|TOK:C14|Tuktuk the Returned|||TuktukTheReturnedToken| |Generate|TOK:C14|Whale|||ReefWormWhaleToken| |Generate|TOK:C14|Wolf|||WolfToken| -|Generate|TOK:C14|Wurm|1||WurmWithDeathtouchToken| -|Generate|TOK:C14|Wurm|2||WurmWithLifelinkToken| +|Generate|TOK:C14|Phyrexian Wurm|1||WurmWithDeathtouchToken| +|Generate|TOK:C14|Phyrexian Wurm|2||WurmWithLifelinkToken| |Generate|TOK:C14|Zombie|1||ZombieToken| |Generate|TOK:C14|Zombie|2||StitcherGeralfZombieToken| |Generate|TOK:C15|Angel|||AngelToken| @@ -353,58 +327,58 @@ |Generate|TOK:C15|Cat|||CatToken| |Generate|TOK:C15|Dragon|||DragonToken2| |Generate|TOK:C15|Drake|||DrakeToken| +|Generate|TOK:C15|Elemental|||CallTheSkyBreakerElementalToken| |Generate|TOK:C15|Elemental Shaman|||ElementalShamanToken| -|Generate|TOK:C15|Elemental|1||CallTheSkyBreakerElementalToken| -|Generate|TOK:C15|Elemental|2||LightningRagerToken| |Generate|TOK:C15|Elephant|||ElephantToken| -|Generate|TOK:C15|Frog Lizard|||RapidHybridizationToken| -|Generate|TOK:C15|Germ|||PhyrexianGermToken| -|Generate|TOK:C15|Gold|| -|Generate|TOK:C15|Knight|1||KnightToken| -|Generate|TOK:C15|Knight|2||HuntedDragonKnightToken| -|Generate|TOK:C15|Lightning Ranger|| +|Generate|TOK:C15|Frog Lizard|||FrogLizardToken| +|Generate|TOK:C15|Phyrexian Germ|||PhyrexianGermToken| +|Generate|TOK:C15|Gold|||GoldToken| +|Generate|TOK:C15|Knight|1||HuntedDragonKnightToken| +|Generate|TOK:C15|Knight|2||KnightToken| +|Generate|TOK:C15|Lightning Rager|||LightningRagerToken| |Generate|TOK:C15|Saproling|||SaprolingToken| |Generate|TOK:C15|Shapeshifter|||CribSwapShapeshifterWhiteToken| |Generate|TOK:C15|Snake|1||SnakeToken| |Generate|TOK:C15|Snake|2||PatagiaViperSnakeToken| |Generate|TOK:C15|Spider|||SpiderToken| |Generate|TOK:C15|Spirit|1||DaxosSpiritToken| -|Generate|TOK:C15|Spirit|2||TeysaEnvoyOfGhostsToken| +|Generate|TOK:C15|Spirit|2||WhiteBlackSpiritToken| |Generate|TOK:C15|Wolf|||WolfToken| |Generate|TOK:C15|Zombie|||ZombieToken| -|Generate|TOK:C16|Beast|| -|Generate|TOK:C16|Bird|1| -|Generate|TOK:C16|Bird|2| +|Generate|TOK:C16|Beast|||BeastToken| +|Generate|TOK:C16|Bird|1||SwanSongBirdToken| +|Generate|TOK:C16|Bird|2||BirdToken| |Generate|TOK:C16|Elemental|||WhiteElementalToken| -|Generate|TOK:C16|Elf Warrior|| -|Generate|TOK:C16|Germ|| -|Generate|TOK:C16|Goat|| +|Generate|TOK:C16|Elf Warrior|||ElfWarriorToken| +|Generate|TOK:C16|Phyrexian Germ|||PhyrexianGermToken| +|Generate|TOK:C16|Goat|||GoatToken| |Generate|TOK:C16|Goblin|||SpyMasterGoblinToken| -|Generate|TOK:C16|Horror|| -|Generate|TOK:C16|Myr|| -|Generate|TOK:C16|Ogre|| -|Generate|TOK:C16|Saproling|1| -|Generate|TOK:C16|Saproling|2| -|Generate|TOK:C16|Soldier|| -|Generate|TOK:C16|Spirit|1| -|Generate|TOK:C16|Spirit|2| -|Generate|TOK:C16|Squid|| -|Generate|TOK:C16|Thopter|| -|Generate|TOK:C16|Worm|| -|Generate|TOK:C16|Zombie|| -|Generate|TOK:C17|Bat|| +|Generate|TOK:C16|Phyrexian Horror|||PhyrexianRebirthHorrorToken| +|Generate|TOK:C16|Myr|||MyrToken| +|Generate|TOK:C16|Ogre|||OgreToken| +|Generate|TOK:C16|Saproling|1||SaprolingToken| +|Generate|TOK:C16|Saproling|2||SaprolingToken| +|Generate|TOK:C16|Soldier|||SoldierToken| +|Generate|TOK:C16|Spirit|1||SpiritToken| +|Generate|TOK:C16|Spirit|2||SpiritWhiteToken| +|Generate|TOK:C16|Squid|||ChasmSkulkerSquidToken| +|Generate|TOK:C16|Thopter|||ThopterToken| +|Generate|TOK:C16|Worm|||WormHarvestToken| +|Generate|TOK:C16|Zombie|||ZombieToken| +|Generate|TOK:C17|Bat|||BatToken| |Generate|TOK:C17|Cat|||CatToken| |Generate|TOK:C17|Cat Dragon|||WasitoraCatDragonToken| -|Generate|TOK:C17|Cat Warrior|| +|Generate|TOK:C17|Cat Warrior|||CatWarriorToken| |Generate|TOK:C17|Dragon|1||DragonToken| |Generate|TOK:C17|Dragon|2||UtvaraHellkiteDragonToken| -|Generate|TOK:C17|Eldrazi Spawn|| -|Generate|TOK:C17|Gold|| +|Generate|TOK:C17|Eldrazi Spawn|||EldraziSpawnToken| +|Generate|TOK:C17|Gold|||GoldToken| |Generate|TOK:C17|Rat|||DeathtouchRatToken| |Generate|TOK:C17|Vampire|||EdgarMarkovToken| -|Generate|TOK:C17|Zombie|| -|Generate|TOK:C18|Myr|||BrudicladTelchorMyrToken| +|Generate|TOK:C17|Zombie|||ZombieToken| |Generate|TOK:C18|Angel|||AngelToken| +|Generate|TOK:C18|Beast|1||BeastToken2| +|Generate|TOK:C18|Beast|2||SpawningGroundsBeastToken| |Generate|TOK:C18|Cat|||CatToken| |Generate|TOK:C18|Cat Warrior|||CatWarriorToken| |Generate|TOK:C18|Clue|||ClueArtifactToken| @@ -413,14 +387,18 @@ |Generate|TOK:C18|Dragon|||DragonEggDragonToken| |Generate|TOK:C18|Dragon Egg|||NestingDragonToken| |Generate|TOK:C18|Elemental|||DokaiWeaverofLifeToken| -|Generate|TOK:C18|Horror|||PhyrexianRebirthHorrorToken| |Generate|TOK:C18|Mask|||MaskToken| +|Generate|TOK:C18|Myr|||MyrToken| +|Generate|TOK:C18|Phyrexian Horror|||PhyrexianRebirthHorrorToken| +|Generate|TOK:C18|Phyrexian Myr|||BrudicladTelchorMyrToken| |Generate|TOK:C18|Plant|||PlantToken| |Generate|TOK:C18|Servo|||ServoToken| +|Generate|TOK:C18|Shapeshifter|||CribSwapShapeshifterWhiteToken| +|Generate|TOK:C18|Soldier|||SoldierToken| |Generate|TOK:C18|Survivor|||SurvivorToken| |Generate|TOK:C18|Thopter|1||ThopterColorlessToken| |Generate|TOK:C18|Thopter|2||ThopterColorlessToken| -|Generate|TOK:C18|Thopter|3||ThopterColorlessToken| +|Generate|TOK:C18|Thopter|3||ThopterToken| |Generate|TOK:C18|Worm|||WormHarvestToken| |Generate|TOK:C18|Zombie|||ZombieToken| |Generate|TOK:C19|Assassin|||AssassinToken| @@ -434,7 +412,7 @@ |Generate|TOK:C19|Egg|||AtlaPalaniToken| |Generate|TOK:C19|Eldrazi|||EldraziToken| |Generate|TOK:C19|Gargoyle|||GargoyleToken| -|Generate|TOK:C19|Horror|||PhyrexianRebirthHorrorToken| +|Generate|TOK:C19|Phyrexian Horror|||PhyrexianRebirthHorrorToken| |Generate|TOK:C19|Human|||HumanToken| |Generate|TOK:C19|Pegasus|||PegasusToken| |Generate|TOK:C19|Plant|||GrismoldPlantToken| @@ -442,7 +420,7 @@ |Generate|TOK:C19|Saproling|||SaprolingToken| |Generate|TOK:C19|Sculpture|||DoomedArtisanToken| |Generate|TOK:C19|Snake|||SnakeToken| -|Generate|TOK:C19|Spirit|||SpiritToken| +|Generate|TOK:C19|Spirit|||SpiritWhiteToken| |Generate|TOK:C19|Treasure|||TreasureToken| |Generate|TOK:C19|Wurm|||WurmToken| |Generate|TOK:C19|Zombie|1||ZombieToken| @@ -460,7 +438,6 @@ |Generate|TOK:CMA|Drake|||LeafdrakeRoostDrakeToken| |Generate|TOK:CMA|Elemental|||TitaniaProtectorOfArgothElementalToken| |Generate|TOK:CMA|Elephant|||ElephantToken| -|Generate|TOK:C14|Elf Druid|||ElfDruidToken| |Generate|TOK:CMA|Elf Warrior|| |Generate|TOK:CMA|Gargoyle|||GargoyleToken| |Generate|TOK:CMA|Kithkin Soldier|||KithkinSoldierToken| @@ -996,9 +973,6 @@ |Generate|TOK:OGW|Eldrazi Scion|6||EldraziScionToken| |Generate|TOK:OGW|Elemental|1||SeedGuardianToken| |Generate|TOK:OGW|Elemental|2||ElementalTokenWithHaste| -|Generate|TOK:OGW|Knight Ally|||KnightAllyToken| -|Generate|TOK:OGW|Kor Ally|||KorAllyToken| -|Generate|TOK:OGW|Octopus|||OctopusToken| |Generate|TOK:OGW|Plant|||PlantToken| |Generate|TOK:OGW|Zombie|||ZombieToken| |Generate|TOK:ONS|Bear|||BearToken| diff --git a/Mage/src/main/java/mage/game/permanent/token/BatToken.java b/Mage/src/main/java/mage/game/permanent/token/BatToken.java index db3e8d78e4..90d678ae43 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BatToken.java @@ -18,7 +18,7 @@ public final class BatToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("GVL", "DDD", "GPT", "MMA", "M19", "MID", "VOC"); + availableImageSetCodes = Arrays.asList("C17", "GVL", "DDD", "GPT", "MMA", "M19", "MID", "VOC"); } public BatToken(final BatToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java index 80b799e088..20d3265909 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java @@ -38,6 +38,9 @@ public final class BeastToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GVL")) { this.setTokenType(2); } + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) { + this.setTokenType(1); + } if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DD3C")) { setTokenType(RandomUtil.nextInt(2) + 1); diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java index ff4154f25e..bec70c2128 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java @@ -19,7 +19,7 @@ public final class BeastToken2 extends TokenImpl { power = new MageInt(4); toughness = new MageInt(4); - availableImageSetCodes = Arrays.asList("C13", "C14", "C15", "C19", "CMA", "CMD", "GVL", "DDD", + availableImageSetCodes = Arrays.asList("C14", "C15", "C18", "C19", "CMA", "CMD", "GVL", "DDD", "E01", "ODY", "SCG", "ZEN", "C20", "ZNC", "CMR", "C21", "MH2", "MID"); } @@ -40,6 +40,10 @@ public final class BeastToken2 extends TokenImpl { this.setTokenType(2); } + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C18")) { + this.setTokenType(1); + } + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) { this.setTokenType(2); } diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java index 268fa489c2..b6df205bf4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java @@ -24,7 +24,7 @@ public final class BirdToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); availableImageSetCodes = Arrays.asList("BNG", "CSP", "DGM", "JUD", "MM3", "RTR", "VMA", "ZEN", - "MH1", "C20", "M21", "ZNC", "KHC", "MH2"); + "MH1", "C16", "C20", "M21", "ZNC", "KHC", "MH2"); } public BirdToken(final BirdToken token) { @@ -41,7 +41,7 @@ public final class BirdToken extends TokenImpl { super.setExpansionSetCodeForImage(code); if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { - setTokenType(RandomUtil.nextInt(2) + 1); + setTokenType(2); } } } diff --git a/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java b/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java index 71c247cae0..af9681849f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java @@ -19,7 +19,7 @@ public final class CarnivoreToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("C13", "EMA", "TMP"); + availableImageSetCodes = Arrays.asList("EMA", "TMP"); } public CarnivoreToken(final CarnivoreToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java index 325392f0bd..10320472a2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java @@ -17,7 +17,7 @@ public final class CatWarriorToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("PLC", "C17")); + tokenImageSets.addAll(Arrays.asList("PLC", "C17", "C18")); } public CatWarriorToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java b/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java index 62c4634621..0a669a4a56 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Construct4Token.java @@ -29,4 +29,13 @@ public final class Construct4Token extends TokenImpl { public Construct4Token copy() { return new Construct4Token(this); } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C18")) { + this.setTokenType(1); + } + } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java index 9720819640..ea7fdb5c26 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java @@ -45,6 +45,15 @@ public final class DaxosSpiritToken extends TokenImpl { public DaxosSpiritToken copy() { return new DaxosSpiritToken(this); } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode().equals("C15")) { + this.setTokenType(1); + } + } } class DaxosSpiritSetPTEffect extends ContinuousEffectImpl { diff --git a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java index 137cdb1ded..21f0f0afcb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java @@ -32,4 +32,13 @@ public final class DemonToken extends TokenImpl { public DemonToken copy() { return new DemonToken(this); } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C14")) { + setTokenType(1); + } + } } diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java index 8fe6c311a9..591e566dff 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java @@ -47,4 +47,13 @@ public final class DragonToken extends TokenImpl { public DragonToken copy() { return new DragonToken(this); } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C17")) { + setTokenType(1); + } + } } diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java index 66c351a7e7..622ce85c59 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java @@ -26,7 +26,7 @@ public final class EldraziSpawnToken extends TokenImpl { toughness = new MageInt(1); addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new SacrificeSourceCost())); - availableImageSetCodes = Arrays.asList("CMD", "DDP", "MM2", "PC2", "ROE", "MIC", "2XM"); + availableImageSetCodes = Arrays.asList("C17", "CMD", "DDP", "MM2", "PC2", "ROE", "MIC", "2XM"); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java index d621cc6179..6af3e632db 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java @@ -19,7 +19,7 @@ public final class ElephantToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("C13", "C14", "C15", "CMA", "CMD", "CNS", "GVL", "DDD", + availableImageSetCodes = Arrays.asList("C14", "C15", "CMA", "CMD", "CNS", "GVL", "DDD", "EMA", "INV", "JUD", "MM2", "ODY", "ROE", "TSP", "VMA", "WWK", "MH1", "CMR", "C21", "MIC", "NEC", "2XM"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java index 5bb78727bb..06e5ea63ac 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java @@ -20,7 +20,7 @@ public final class ElfWarriorToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("C13", "C14", "EVG", "EMA", "LRW", "MOR", "ORI", "SHM", "M19", "CMR", "KHM"); + availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "MOR", "ORI", "SHM", "M19", "CMR", "KHM"); } public ElfWarriorToken(final ElfWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java b/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java index e6d01b46c2..80ceb52f1a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FrogLizardToken.java @@ -20,7 +20,7 @@ public final class FrogLizardToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("RNA", "C21"); + availableImageSetCodes = Arrays.asList("RNA", "C15", "C21"); } public FrogLizardToken(final FrogLizardToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java index ae726a221a..76969cfd39 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -20,6 +22,8 @@ public final class GargoyleToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(4); addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes.addAll(Arrays.asList("M10", "C14", "CMA", "C19")); } public GargoyleToken(final GargoyleToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java index 6cb4d5af8f..8c6af9b7a2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java @@ -16,7 +16,7 @@ public final class GoatToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("EVE", "M13", "M14", "C14", "ELD", "THB")); + tokenImageSets.addAll(Arrays.asList("EVE", "M13", "M14", "C14", "C16", "ELD", "THB")); } public GoatToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java index 19efc14390..916ed53d1e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java @@ -18,7 +18,7 @@ public final class GoldToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("BNG", "C17", "THB")); + tokenImageSets.addAll(Arrays.asList("BNG", "C15", "C17", "THB")); } public GoldToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java index 8f4e424fe2..946b4e6bae 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java @@ -37,7 +37,7 @@ public final class HuntedDragonKnightToken extends TokenImpl { super.setExpansionSetCodeForImage(code); if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C15")) { - setTokenType(2); + setTokenType(1); } } } diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java index 60a23c2b84..1464a9f0ad 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java @@ -23,7 +23,7 @@ public final class KnightToken extends TokenImpl { toughness = new MageInt(2); this.addAbility(VigilanceAbility.getInstance()); - availableImageSetCodes = Arrays.asList("C13", "C15", "CMA", "DGM", "ORI", "RTR", "M19", "ELD", "M21", "AFC", "MIC", "DOM"); + availableImageSetCodes = Arrays.asList("C15", "CMA", "DGM", "ORI", "RTR", "M19", "ELD", "M21", "AFC", "MIC", "DOM"); } public KnightToken(final KnightToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java b/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java index 6875b53163..a31888bad9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java @@ -17,7 +17,7 @@ public final class KorAllyToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("BFZ", "OGW", "ZNC"); + availableImageSetCodes = Arrays.asList("BFZ", "ZNC"); } public KorAllyToken(final KorAllyToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java index 6d6b5efd77..219ffc9ffa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java @@ -18,7 +18,7 @@ public final class LeafdrakeRoostDrakeToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("C13", "CMA")); + tokenImageSets.addAll(Arrays.asList("CMA")); } public LeafdrakeRoostDrakeToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java b/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java index de9357fff6..be7110e072 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java @@ -29,7 +29,7 @@ public final class LightningRagerToken extends TokenImpl { this.addAbility(HasteAbility.getInstance()); this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.NEXT, false)); - availableImageSetCodes = Arrays.asList("C15"); + availableImageSetCodes = Arrays.asList("C15", "CM2", "NCC"); } public LightningRagerToken(final LightningRagerToken token) { @@ -39,14 +39,4 @@ public final class LightningRagerToken extends TokenImpl { public LightningRagerToken copy() { return new LightningRagerToken(this); } - - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C15")) { - this.setTokenType(2); - } - } } diff --git a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java index 212b6937aa..21830c6189 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java @@ -16,7 +16,7 @@ public final class MyrToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("C13", "C14", "DST", "MBS", "MM2", "MRD", "NPH", "SOM", "MH1", "C21", "NEC", "2XM"); + availableImageSetCodes = Arrays.asList("C14", "C16", "C18", "DST", "MBS", "MM2", "MRD", "NPH", "SOM", "MH1", "C21", "NEC", "2XM"); } public MyrToken(final MyrToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/OgreToken.java b/Mage/src/main/java/mage/game/permanent/token/OgreToken.java index 79045d07ba..0809f007b5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OgreToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OgreToken.java @@ -5,6 +5,8 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; +import java.util.Arrays; + /** * * @author spjspj @@ -18,6 +20,8 @@ public final class OgreToken extends TokenImpl { subtype.add(SubType.OGRE); power = new MageInt(3); toughness = new MageInt(3); + + availableImageSetCodes = Arrays.asList("WWK", "C16", "NCC"); } public OgreToken(final OgreToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java index 8effbf8882..602d2ad1e6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java @@ -19,7 +19,7 @@ public final class OneDozenEyesBeastToken extends TokenImpl { power = new MageInt(5); toughness = new MageInt(5); - availableImageSetCodes = Arrays.asList("C13", "MRD"); + availableImageSetCodes = Arrays.asList("MRD"); } public OneDozenEyesBeastToken(final OneDozenEyesBeastToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java b/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java index efed3decd0..b749f2a7e4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -20,6 +22,8 @@ public final class PentaviteToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes.addAll(Arrays.asList("M12", "C14", "CM2")); } public PentaviteToken(final PentaviteToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java index 457570875c..f5bfe32415 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGermToken.java @@ -20,7 +20,7 @@ public final class PhyrexianGermToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(0); - availableImageSetCodes = Arrays.asList("C14", "C15", "MBS", "MM2", "NPH", "PC2", "MH2", "NEC", "2XM"); + availableImageSetCodes = Arrays.asList("C14", "C15", "C16", "MBS", "MM2", "NPH", "PC2", "MH2", "NEC", "2XM"); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java index 0f99af9b2c..873ae1e102 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java @@ -24,7 +24,7 @@ public final class PhyrexianRebirthHorrorToken extends TokenImpl { this.power = new MageInt(power); this.toughness = new MageInt(toughness); - availableImageSetCodes = Arrays.asList("C18", "C19", "MBS", "CMR"); + availableImageSetCodes = Arrays.asList("C16", "C18", "C19", "MBS", "CMR"); } public PhyrexianRebirthHorrorToken(final PhyrexianRebirthHorrorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java index 93ff1c57da..dd706fa3d8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java @@ -16,7 +16,7 @@ public final class PlantToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("ARC", "C13", "C18", "DDP", "OGW", "PC2", "WWK", "XLN", "ZEN", "ZNR", "CMR", "NEC", "2XM"); + availableImageSetCodes = Arrays.asList("ARC", "C18", "DDP", "OGW", "PC2", "WWK", "XLN", "ZEN", "ZNR", "CMR", "NEC", "2XM"); } public PlantToken(final PlantToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java index 99035ae26b..91421d3de0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java @@ -20,7 +20,7 @@ public final class RedElementalToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("C13", "EMA", "M14", "SHM", "MH1", "M20", "RIX", "UMA", "NEC"); + availableImageSetCodes = Arrays.asList("EMA", "M14", "SHM", "MH1", "M20", "RIX", "UMA", "NEC"); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java b/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java index c6fb4dbdf3..5206127d36 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java @@ -5,6 +5,9 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.util.RandomUtil; + +import java.util.Arrays; /** * @@ -20,6 +23,8 @@ public final class RocEggToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("M11", "M12", "C19"); } public RocEggToken(final RocEggToken token) { @@ -29,4 +34,13 @@ public final class RocEggToken extends TokenImpl { public RocEggToken copy() { return new RocEggToken(this); } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) { + this.setTokenType(1); + } + } } diff --git a/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java b/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java index 6b53ecaaec..37d0477077 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java @@ -23,7 +23,7 @@ public final class SeedGuardianToken extends TokenImpl { power = new MageInt(xValue); toughness = new MageInt(xValue); - availableImageSetCodes = Arrays.asList("C13", "CHK", "OGW"); + availableImageSetCodes = Arrays.asList("CHK", "OGW"); } public SeedGuardianToken(final SeedGuardianToken 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 80ac240481..a150e60d1e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java @@ -21,7 +21,7 @@ public final class SoldierToken extends TokenImpl { toughness = new MageInt(1); availableImageSetCodes = Arrays.asList("10E", "M15", "C14", "ORI", "ALA", "DDF", "THS", "M12", "M13", - "MM2", "MMA", "RTR", "SOM", "DDO", "M10", "ORI", "EMN", "EMA", "CN2", "C16", "MM3", "E01", + "MM2", "MMA", "RTR", "SOM", "DDO", "M10", "ORI", "EMN", "EMA", "CN2", "C16", "C18", "MM3", "E01", "DOM", "MH1", "M20", "C20", "M21", "CMR", "KHC", "TSR", "2XM"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java index 92c26afcb2..5804debe41 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java @@ -22,7 +22,7 @@ public final class SpawningGroundsBeastToken extends TokenImpl { this.addAbility(TrampleAbility.getInstance()); - availableImageSetCodes = Arrays.asList("C13", ""); + availableImageSetCodes = Arrays.asList("C18"); } public SpawningGroundsBeastToken(final SpawningGroundsBeastToken token) { @@ -37,8 +37,8 @@ public final class SpawningGroundsBeastToken extends TokenImpl { public void setExpansionSetCodeForImage(String code) { super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C13")) { - this.setTokenType(4); + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C18")) { + this.setTokenType(2); } } } diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java index 7878427dd4..266d3af68d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java @@ -18,7 +18,7 @@ public final class SpiritToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("C19", "CHK", "EMA", "EXP", "NEO", "SOK", "V12", "VOC"); + availableImageSetCodes = Arrays.asList("C16", "CHK", "EMA", "EXP", "NEO", "SOK", "V12", "VOC"); } @Override @@ -36,6 +36,10 @@ public final class SpiritToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NEO")) { setTokenType(1); } + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { + setTokenType(1); + } } public SpiritToken(final SpiritToken token) { 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 271419f23f..702d3c0e3f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java @@ -23,7 +23,7 @@ public final class SpiritWhiteToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); 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", "C20", "CMR", "KHM", + "SOI", "EMA", "C16", "MM3", "CMA", "E01", "ANA", "GPT", "RAV", "EMN", "RNA", "M20", "C19", "C20", "CMR", "KHM", "MID", "VOW", "UMA"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java b/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java index 328bae3f3e..1ecfd8ced1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.TrampleAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -20,6 +22,8 @@ public final class StoneTrapIdolToken extends TokenImpl { power = new MageInt(6); toughness = new MageInt(12); addAbility(TrampleAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("WWK", "C18"); } public StoneTrapIdolToken(final StoneTrapIdolToken token) { @@ -29,4 +33,13 @@ public final class StoneTrapIdolToken extends TokenImpl { public StoneTrapIdolToken copy() { return new StoneTrapIdolToken(this); } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C18")) { + this.setTokenType(2); + } + } } diff --git a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java index 4292f212bc..7e98535d22 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java @@ -18,7 +18,7 @@ public final class SwanSongBirdToken extends TokenImpl { color.setBlue(true); subtype.add(SubType.BIRD); if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { - setTokenType(2); + setTokenType(1); } power = new MageInt(2); toughness = new MageInt(2); 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 e0cdaad9d7..9b74c0e618 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java @@ -32,7 +32,7 @@ public final class ThopterColorlessToken extends TokenImpl { super.setExpansionSetCodeForImage(code); if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C18")) { - this.setTokenType(RandomUtil.nextInt(3) + 1); + this.setTokenType(RandomUtil.nextInt(2) + 1); } if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("KLD")) { this.setTokenType(RandomUtil.nextInt(3) + 1); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java index 11b0a32847..d7146e254f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java @@ -34,6 +34,10 @@ public final class ThopterToken extends TokenImpl { if (getOriginalExpansionSetCode().equals("2XM")) { this.setTokenType(2); } + + if (getOriginalExpansionSetCode().equals("C18")) { + this.setTokenType(3); + } } public ThopterToken(final ThopterToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java index 323e40c4e2..3c0f5c7095 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java @@ -38,5 +38,14 @@ public final class UtvaraHellkiteDragonToken extends TokenImpl { public UtvaraHellkiteDragonToken copy() { return new UtvaraHellkiteDragonToken(this); } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C17")) { + setTokenType(2); + } + } } diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java index f646e03d45..4fb73cf10b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java @@ -22,7 +22,7 @@ public final class WhiteBlackSpiritToken extends TokenImpl { toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); - availableImageSetCodes.addAll(Arrays.asList("MH1", "C21", "UMA")); + availableImageSetCodes.addAll(Arrays.asList("MH1", "C15", "C21", "UMA")); } @Override @@ -32,6 +32,9 @@ public final class WhiteBlackSpiritToken extends TokenImpl { if (getOriginalExpansionSetCode().equals("UMA")) { this.setTokenType(2); } + if (getOriginalExpansionSetCode().equals("C15")) { + this.setTokenType(2); + } } public WhiteBlackSpiritToken(final WhiteBlackSpiritToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java b/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java index 2a6de56a91..723790a0dc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -20,6 +22,8 @@ public final class WingmateRocToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(4); addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("KTK", "C19"); } public WingmateRocToken(final WingmateRocToken token) { @@ -29,4 +33,13 @@ public final class WingmateRocToken extends TokenImpl { public WingmateRocToken copy() { return new WingmateRocToken(this); } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) { + this.setTokenType(2); + } + } } 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 dc8be13742..02b324231f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -20,7 +20,7 @@ public final class ZombieToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); - availableImageSetCodes = Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", + availableImageSetCodes = Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "C18", "MBS", "ALA", "ISD", "C14", "C15", "C16", "C17", "CNS", "MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA", "MM3", "AKH", "CMA", "E01", @@ -36,7 +36,7 @@ public final class ZombieToken extends TokenImpl { this.setTokenType(RandomUtil.nextInt(3) + 1); } if (getOriginalExpansionSetCode().equals("C14")) { - this.setTokenType(2); + this.setTokenType(1); } if (getOriginalExpansionSetCode().equals("EMN")) { this.setTokenType(RandomUtil.nextInt(4) + 1);