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 568dc4bad7b..4b3fa78c326 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 @@ -1139,6 +1139,248 @@ public class ScryfallImageSupportTokens { put ("M14/Wolf", "https://api.scryfall.com/cards/tm14/11/en?format=image"); put ("M14/Zombie", "https://api.scryfall.com/cards/tm14/5/en?format=image"); + // M13 + put ("M13/Beast", "https://api.scryfall.com/cards/tm13/8/en?format=image"); + put ("M13/Cat", "https://api.scryfall.com/cards/tm13/1/en?format=image"); + put ("M13/Drake", "https://api.scryfall.com/cards/tm13/4/en?format=image"); + put ("M13/Goat", "https://api.scryfall.com/cards/tm13/2/en?format=image"); + put ("M13/Goblin", "https://api.scryfall.com/cards/tm13/6/en?format=image"); + put ("M13/Hellion", "https://api.scryfall.com/cards/tm13/7/en?format=image"); + put ("M13/Emblem Liliana of the Dark Realms", "https://api.scryfall.com/cards/tm13/11/en?format=image"); + put ("M13/Saproling", "https://api.scryfall.com/cards/tm13/9/en?format=image"); + put ("M13/Soldier", "https://api.scryfall.com/cards/tm13/3/en?format=image"); + put ("M13/Wurm", "https://api.scryfall.com/cards/tm13/10/en?format=image"); + put ("M13/Zombie", "https://api.scryfall.com/cards/tm13/5/en?format=image"); + + // M12 + put ("M12/Beast", "https://api.scryfall.com/cards/tm12/4/en?format=image"); + put ("M12/Bird", "https://api.scryfall.com/cards/tm12/1/en?format=image"); + put ("M12/Pentavite", "https://api.scryfall.com/cards/tm12/7/en?format=image"); + put ("M12/Saproling", "https://api.scryfall.com/cards/tm12/5/en?format=image"); + put ("M12/Soldier", "https://api.scryfall.com/cards/tm12/2/en?format=image"); + put ("M12/Wurm", "https://api.scryfall.com/cards/tm12/6/en?format=image"); + put ("M12/Zombie", "https://api.scryfall.com/cards/tm12/3/en?format=image"); + + // M11 + put ("M11/Avatar", "https://api.scryfall.com/cards/tm11/1/en?format=image"); + put ("M11/Beast", "https://api.scryfall.com/cards/tm11/4/en?format=image"); + put ("M11/Bird", "https://api.scryfall.com/cards/tm11/2/en?format=image"); + put ("M11/Ooze/1", "https://api.scryfall.com/cards/tm11/6/en?format=image"); + put ("M11/Ooze/2", "https://api.scryfall.com/cards/tm11/5/en?format=image"); + put ("M11/Zombie", "https://api.scryfall.com/cards/tm11/3/en?format=image"); + + // M10 + put ("M10/Avatar", "https://api.scryfall.com/cards/tm10/1/en?format=image"); + put ("M10/Beast", "https://api.scryfall.com/cards/tm10/5/en?format=image"); + put ("M10/Gargoyle", "https://api.scryfall.com/cards/tm10/8/en?format=image"); + put ("M10/Goblin", "https://api.scryfall.com/cards/tm10/4/en?format=image"); + put ("M10/Insect", "https://api.scryfall.com/cards/tm10/6/en?format=image"); + put ("M10/Soldier", "https://api.scryfall.com/cards/tm10/2/en?format=image"); + put ("M10/Wolf", "https://api.scryfall.com/cards/tm10/7/en?format=image"); + put ("M10/Zombie", "https://api.scryfall.com/cards/tm10/3/en?format=image"); + + // ARB + put ("ARB/Bird Soldier", "https://api.scryfall.com/cards/tarb/1/en?format=image"); + put ("ARB/Dragon", "https://api.scryfall.com/cards/tarb/3/en?format=image"); + put ("ARB/Lizard", "https://api.scryfall.com/cards/tarb/2/en?format=image"); + put ("ARB/Zombie Wizard", "https://api.scryfall.com/cards/tarb/4/en?format=image"); + + // DDC + put ("DDC/Demon", "https://api.scryfall.com/cards/tddc/2/en?format=image"); + put ("DDC/Spirit", "https://api.scryfall.com/cards/tddc/1/en?format=image"); + put ("DDC/Thrull", "https://api.scryfall.com/cards/tddc/3/en?format=image"); + + // CON + put ("CON/Angel", "https://api.scryfall.com/cards/tcon/1/en?format=image"); + put ("CON/Elemental", "https://api.scryfall.com/cards/tcon/2/en?format=image"); + + // ALA + put ("ALA/Beast", "https://api.scryfall.com/cards/tala/10/en?format=image"); + put ("ALA/Dragon", "https://api.scryfall.com/cards/tala/6/en?format=image"); + put ("ALA/Goblin", "https://api.scryfall.com/cards/tala/7/en?format=image"); + put ("ALA/Homunculus", "https://api.scryfall.com/cards/tala/2/en?format=image"); + put ("ALA/Ooze", "https://api.scryfall.com/cards/tala/8/en?format=image"); + put ("ALA/Saproling", "https://api.scryfall.com/cards/tala/9/en?format=image"); + put ("ALA/Skeleton", "https://api.scryfall.com/cards/tala/4/en?format=image"); + put ("ALA/Soldier", "https://api.scryfall.com/cards/tala/1/en?format=image"); + put ("ALA/Thopter", "https://api.scryfall.com/cards/tala/3/en?format=image"); + put ("ALA/Zombie", "https://api.scryfall.com/cards/tala/5/en?format=image"); + + // MOR + put ("MOR/Faerie Rogue", "https://api.scryfall.com/cards/tmor/2/en?format=image"); + put ("MOR/Giant Warrior", "https://api.scryfall.com/cards/tmor/1/en?format=image"); + put ("MOR/Treefolk Shaman", "https://api.scryfall.com/cards/tmor/3/en?format=image"); + + // DD1 + put ("DD1/Elemental", "https://api.scryfall.com/cards/tdd1/T1/en?format=image"); + put ("DD1/Elf Warrior", "https://api.scryfall.com/cards/tdd1/T2/en?format=image"); + put ("DD1/Goblin", "https://api.scryfall.com/cards/tdd1/T3/en?format=image"); + + // 10E + put ("10E/Dragon", "https://api.scryfall.com/cards/t10e/3/en?format=image"); + put ("10E/Goblin", "https://api.scryfall.com/cards/t10e/4/en?format=image"); + put ("10E/Saproling", "https://api.scryfall.com/cards/t10e/5/en?format=image"); + put ("10E/Soldier", "https://api.scryfall.com/cards/t10e/1/en?format=image"); + put ("10E/Wasp", "https://api.scryfall.com/cards/t10e/6/en?format=image"); + put ("10E/Zombie", "https://api.scryfall.com/cards/t10e/2/en?format=image"); + + // ZEN + put ("ZEN/Angel", "https://api.scryfall.com/cards/tzen/1/en?format=image"); + put ("ZEN/Beast", "https://api.scryfall.com/cards/tzen/9/en?format=image"); + put ("ZEN/Bird", "https://api.scryfall.com/cards/tzen/2/en?format=image"); + put ("ZEN/Elemental", "https://api.scryfall.com/cards/tzen/8/en?format=image"); + put ("ZEN/Illusion", "https://api.scryfall.com/cards/tzen/4/en?format=image"); + put ("ZEN/Kor Soldier", "https://api.scryfall.com/cards/tzen/3/en?format=image"); + put ("ZEN/Merfolk", "https://api.scryfall.com/cards/tzen/5/en?format=image"); + put ("ZEN/Snake", "https://api.scryfall.com/cards/tzen/10/en?format=image"); + put ("ZEN/Vampire", "https://api.scryfall.com/cards/tzen/6/en?format=image"); + put ("ZEN/Wolf", "https://api.scryfall.com/cards/tzen/11/en?format=image"); + put ("ZEN/Zombie Giant", "https://api.scryfall.com/cards/tzen/7/en?format=image"); + + // WWK + put ("WWK/Construct", "https://api.scryfall.com/cards/twwk/6/en?format=image"); + put ("WWK/Dragon", "https://api.scryfall.com/cards/twwk/2/en?format=image"); + put ("WWK/Elephant", "https://api.scryfall.com/cards/twwk/4/en?format=image"); + put ("WWK/Ogre", "https://api.scryfall.com/cards/twwk/3/en?format=image"); + put ("WWK/Plant", "https://api.scryfall.com/cards/twwk/5/en?format=image"); + put ("WWK/Soldier Ally", "https://api.scryfall.com/cards/twwk/1/en?format=image"); + + // ROE + put ("ROE/Eldrazi Spawn/1", "https://api.scryfall.com/cards/troe/1a/en?format=image"); + put ("ROE/Eldrazi Spawn/2", "https://api.scryfall.com/cards/troe/1b/en?format=image"); + put ("ROE/Eldrazi Spawn/3", "https://api.scryfall.com/cards/troe/1c/en?format=image"); + put ("ROE/Elemental", "https://api.scryfall.com/cards/troe/2/en?format=image"); + put ("ROE/Hellion", "https://api.scryfall.com/cards/troe/3/en?format=image"); + put ("ROE/Ooze", "https://api.scryfall.com/cards/troe/4/en?format=image"); + put ("ROE/Tuktuk the Returned", "https://api.scryfall.com/cards/troe/5/en?format=image"); + + // DDF + put ("DDF/Soldier", "https://api.scryfall.com/cards/tddf/1/en?format=image"); + + // DDE + put ("DDE/Hornet", "https://api.scryfall.com/cards/tdde/1/en?format=image"); + put ("DDE/Phyrexian Minion", "https://api.scryfall.com/cards/tdde/2/en?format=image"); + put ("DDE/Saproling", "https://api.scryfall.com/cards/tdde/3/en?format=image"); + + // DDD + put ("DDD/Beast/1", "https://api.scryfall.com/cards/tddd/1/en?format=image"); + put ("DDD/Beast/2", "https://api.scryfall.com/cards/tddd/2/en?format=image"); + put ("DDD/Elephant", "https://api.scryfall.com/cards/tddd/3/en?format=image"); + + // SOM + put ("SOM/Cat", "https://api.scryfall.com/cards/tsom/1/en?format=image"); + put ("SOM/Goblin", "https://api.scryfall.com/cards/tsom/3/en?format=image"); + put ("SOM/Golem", "https://api.scryfall.com/cards/tsom/6/en?format=image"); + put ("SOM/Phyrexian Insect", "https://api.scryfall.com/cards/tsom/4/en?format=image"); + put ("SOM/Myr", "https://api.scryfall.com/cards/tsom/7/en?format=image"); + put ("SOM/Soldier", "https://api.scryfall.com/cards/tsom/2/en?format=image"); + put ("SOM/Wolf", "https://api.scryfall.com/cards/tsom/5/en?format=image"); + put ("SOM/Phyrexian Wurm/1", "https://api.scryfall.com/cards/tsom/8/en?format=image"); + put ("SOM/Phyrexian Wurm/2", "https://api.scryfall.com/cards/tsom/9/en?format=image"); + + // MBS + put ("MBS/Phyrexian Germ", "https://api.scryfall.com/cards/tmbs/1/en?format=image"); + put ("MBS/Golem", "https://api.scryfall.com/cards/tmbs/3/en?format=image"); + put ("MBS/Phyrexian Horror", "https://api.scryfall.com/cards/tmbs/4/en?format=image"); + put ("MBS/Thopter", "https://api.scryfall.com/cards/tmbs/5/en?format=image"); + put ("MBS/Zombie", "https://api.scryfall.com/cards/tmbs/2/en?format=image"); + + // DDG + put ("DDG/Goblin", "https://api.scryfall.com/cards/tddg/1/en?format=image"); + + // NPH + put ("NPH/Beast", "https://api.scryfall.com/cards/tnph/1/en?format=image"); + put ("NPH/Phyrexian Goblin", "https://api.scryfall.com/cards/tnph/2/en?format=image"); + put ("NPH/Phyrexian Golem", "https://api.scryfall.com/cards/tnph/3/en?format=image"); + put ("NPH/Phyrexian Myr", "https://api.scryfall.com/cards/tnph/4/en?format=image"); + + // DDH + put ("DDH/Griffin", "https://api.scryfall.com/cards/tddh/1/en?format=image"); + put ("DDH/Saproling", "https://api.scryfall.com/cards/tddh/2/en?format=image"); + + // ISD + put ("ISD/Angel", "https://api.scryfall.com/cards/tisd/1/en?format=image"); + put ("ISD/Demon", "https://api.scryfall.com/cards/tisd/4/en?format=image"); + put ("ISD/Homunculus", "https://api.scryfall.com/cards/tisd/3/en?format=image"); + put ("ISD/Ooze", "https://api.scryfall.com/cards/tisd/10/en?format=image"); + put ("ISD/Spider", "https://api.scryfall.com/cards/tisd/11/en?format=image"); + put ("ISD/Spirit", "https://api.scryfall.com/cards/tisd/2/en?format=image"); + put ("ISD/Vampire", "https://api.scryfall.com/cards/tisd/5/en?format=image"); + put ("ISD/Wolf/1", "https://api.scryfall.com/cards/tisd/6/en?format=image"); + put ("ISD/Wolf/2", "https://api.scryfall.com/cards/tisd/12/en?format=image"); + put ("ISD/Zombie/1", "https://api.scryfall.com/cards/tisd/7/en?format=image"); + put ("ISD/Zombie/2", "https://api.scryfall.com/cards/tisd/8/en?format=image"); + put ("ISD/Zombie/3", "https://api.scryfall.com/cards/tisd/9/en?format=image"); + + // DKA + put ("DKA/Human", "https://api.scryfall.com/cards/tdka/1/en?format=image"); + put ("DKA/Emblem Sorin, Lord of Innistrad", "https://api.scryfall.com/cards/tdka/3/en?format=image"); + put ("DKA/Vampire", "https://api.scryfall.com/cards/tdka/2/en?format=image"); + + // DDI + put ("DDI/Emblem Koth of the Hammer", "https://api.scryfall.com/cards/tddi/2/en?format=image"); + put ("DDI/Emblem Venser, the Sojourner", "https://api.scryfall.com/cards/tddi/1/en?format=image"); + + // AVR + put ("AVR/Angel", "https://api.scryfall.com/cards/tavr/1/en?format=image"); + put ("AVR/Demon", "https://api.scryfall.com/cards/tavr/5/en?format=image"); + put ("AVR/Human/1", "https://api.scryfall.com/cards/tavr/7/en?format=image"); + put ("AVR/Human/2", "https://api.scryfall.com/cards/tavr/2/en?format=image"); + put ("AVR/Spirit/1", "https://api.scryfall.com/cards/tavr/4/en?format=image"); + put ("AVR/Spirit/2", "https://api.scryfall.com/cards/tavr/3/en?format=image"); + put ("AVR/Emblem Tamiyo, the Moon Sage", "https://api.scryfall.com/cards/tavr/8/en?format=image"); + put ("AVR/Zombie", "https://api.scryfall.com/cards/tavr/6/en?format=image"); + + // DDJ + put ("DDJ/Saproling", "https://api.scryfall.com/cards/tddj/1/en?format=image"); + + // RTR + put ("RTR/Assassin", "https://api.scryfall.com/cards/trtr/4/en?format=image"); + put ("RTR/Bird", "https://api.scryfall.com/cards/trtr/1/en?format=image"); + put ("RTR/Centaur", "https://api.scryfall.com/cards/trtr/7/en?format=image"); + put ("RTR/Dragon", "https://api.scryfall.com/cards/trtr/5/en?format=image"); + put ("RTR/Elemental", "https://api.scryfall.com/cards/trtr/12/en?format=image"); + put ("RTR/Goblin", "https://api.scryfall.com/cards/trtr/6/en?format=image"); + put ("RTR/Knight", "https://api.scryfall.com/cards/trtr/2/en?format=image"); + put ("RTR/Ooze", "https://api.scryfall.com/cards/trtr/8/en?format=image"); + put ("RTR/Rhino", "https://api.scryfall.com/cards/trtr/9/en?format=image"); + put ("RTR/Saproling", "https://api.scryfall.com/cards/trtr/10/en?format=image"); + put ("RTR/Soldier", "https://api.scryfall.com/cards/trtr/3/en?format=image"); + put ("RTR/Wurm", "https://api.scryfall.com/cards/trtr/11/en?format=image"); + + // GTC + put ("GTC/Angel", "https://api.scryfall.com/cards/tgtc/1/en?format=image"); + put ("GTC/Cleric", "https://api.scryfall.com/cards/tgtc/4/en?format=image"); + put ("GTC/Emblem Domri Rade", "https://api.scryfall.com/cards/tgtc/8/en?format=image"); + put ("GTC/Frog Lizard", "https://api.scryfall.com/cards/tgtc/3/en?format=image"); + put ("GTC/Horror", "https://api.scryfall.com/cards/tgtc/5/en?format=image"); + put ("GTC/Rat", "https://api.scryfall.com/cards/tgtc/2/en?format=image"); + put ("GTC/Soldier", "https://api.scryfall.com/cards/tgtc/6/en?format=image"); + put ("GTC/Spirit", "https://api.scryfall.com/cards/tgtc/7/en?format=image"); + + // DDK + put ("DDK/Spirit", "https://api.scryfall.com/cards/tddk/1/en?format=image"); + + // DGM + put ("DGM/Elemental", "https://api.scryfall.com/cards/tdgm/1/en?format=image"); + + // DDL + put ("DDL/Beast", "https://api.scryfall.com/cards/tddl/2/en?format=image"); + put ("DDL/Griffin", "https://api.scryfall.com/cards/tddl/1/en?format=image"); + + // THS + put ("THS/Bird", "https://api.scryfall.com/cards/tths/4/en?format=image"); + put ("THS/Boar", "https://api.scryfall.com/cards/tths/8/en?format=image"); + put ("THS/Cleric", "https://api.scryfall.com/cards/tths/1/en?format=image"); + put ("THS/Elemental", "https://api.scryfall.com/cards/tths/5/en?format=image"); + put ("THS/Emblem Elspeth, Sun's Champion", "https://api.scryfall.com/cards/tths/11/en?format=image"); + put ("THS/Golem", "https://api.scryfall.com/cards/tths/10/en?format=image"); + put ("THS/Harpy", "https://api.scryfall.com/cards/tths/6/en?format=image"); + put ("THS/Satyr", "https://api.scryfall.com/cards/tths/9/en?format=image"); + put ("THS/Soldier/1", "https://api.scryfall.com/cards/tths/2/en?format=image"); + put ("THS/Soldier/2", "https://api.scryfall.com/cards/tths/3/en?format=image"); + put ("THS/Soldier/3", "https://api.scryfall.com/cards/tths/7/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 9d42e513ff8..0d910063020 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -83,7 +83,7 @@ |Generate|EMBLEM!:MED|Emblem Vraska|||VraskaGolgariQueenEmblem| |Generate|EMBLEM!:BBD|Emblem Rowan Kenrith|||RowanKenrithEmblem| |Generate|EMBLEM!:BBD|Emblem Will Kenrith|||WillKenrithEmblem| -|Generate|EMBLEM:THS|Elspeth, Suns Champion||Emblem Elspeth|ElspethSunsChampionEmblem| +|Generate|EMBLEM:THS|Elspeth, Sun's Champion||Emblem Elspeth|ElspethSunsChampionEmblem| |Generate|EMBLEM:AVR|Tamiyo, the Moon Sage||Emblem Tamiyo|TamiyoTheMoonSageEmblem| |Generate|EMBLEM:BNG|Kiora, the Crashing Wave||Emblem Kiora|KioraEmblem| |Generate|EMBLEM:DDI|Koth of the Hammer||Emblem Koth|KothOfTheHammerEmblem| @@ -154,15 +154,12 @@ |Generate|PLANE:PCA|Plane - Trail of the Mage-Rings|||TrailOfTheMageRingsPlane| |Generate|TOK:ANA|Goblin|||GoblinToken| |Generate|TOK:ANA|Spirit|||SpiritWhiteToken| -|Generate|TOK:10E|Ape|||PongifyApeToken| |Generate|TOK:10E|Dragon|||DragonToken2| |Generate|TOK:10E|Goblin|||GoblinToken| -|Generate|TOK:10E|Insect|||WaspToken| |Generate|TOK:10E|Saproling|||SaprolingToken| -|Generate|TOK:10E|Skeleton|||SkeletonRegenerateToken| |Generate|TOK:10E|Soldier|||SoldierToken| +|Generate|TOK:10E|Wasp|||WaspToken| |Generate|TOK:10E|Zombie|||ZombieToken| -|Generate|TOK:2ED|Insect|||WaspToken| |Generate|TOK:3ED|Djinn|||DjinnToken| |Generate|TOK:3ED|Insect|||WaspToken| |Generate|TOK:4ED|Assembly-Worker|||AssemblyWorkerToken| @@ -231,10 +228,9 @@ |Generate|TOK:ALA|Beast|||GodSireBeastToken| |Generate|TOK:ALA|Dragon|||DragonToken| -|Generate|TOK:ALA|Goblin|||GoblinTokenWithHaste| |Generate|TOK:ALA|Goblin|||GoblinToken| |Generate|TOK:ALA|Homunculus|||HomunculusToken| -|Generate|TOK:ALA|Ooze|||MysticGenesisOozeToken| +|Generate|TOK:ALA|Ooze|||OozeToken| |Generate|TOK:ALA|Saproling|||SaprolingToken| |Generate|TOK:ALA|Skeleton|||SkeletonRegenerateToken| |Generate|TOK:ALA|Soldier|||SoldierToken| @@ -251,15 +247,10 @@ |Generate|TOK:APC|Kavu|||PenumbraKavuToken| |Generate|TOK:APC|Saproling|||SaprolingToken| |Generate|TOK:APC|Wurm|||PenumbraWurmToken| -|Generate|TOK:ARB|Bird Soldier|||BirdSoldierToke| +|Generate|TOK:ARB|Bird Soldier|||BirdSoldierToken| |Generate|TOK:ARB|Dragon|||DragonBroodmotherDragonToken| -|Generate|TOK:ARB|Goblin|||GoblinToken| |Generate|TOK:ARB|Lizard|||LizardToken| -|Generate|TOK:ARB|Saproling|||SaprolingToken| -|Generate|TOK:ARB|Soldier|||SoldierToken| -|Generate|TOK:ARB|Thopter|||ThopterToken| |Generate|TOK:ARB|Zombie Wizard|||ZombieWizardToken| -|Generate|TOK:ARB|Zombie|||ZombieToken| |Generate|TOK:ARC|Goblin|||GoblinToken| |Generate|TOK:ARC|Goblin|||RakdosGuildmageGoblinToken| |Generate|TOK:ARC|Plant|||PlantToken| @@ -271,10 +262,10 @@ |Generate|TOK:ATQ|Tetravite|||TetraviteToken| |Generate|TOK:AVR|Angel|||AngelToken| |Generate|TOK:AVR|Demon|||DemonToken| -|Generate|TOK:AVR|Human|1||HumanToken| -|Generate|TOK:AVR|Human|2||RedHumanToken| -|Generate|TOK:AVR|Spirit|1||SpiritWhiteToken| -|Generate|TOK:AVR|Spirit|2||Spirit| +|Generate|TOK:AVR|Human|1||RedHumanToken| +|Generate|TOK:AVR|Human|2||HumanToken| +|Generate|TOK:AVR|Spirit|1||SpiritBlueToken| +|Generate|TOK:AVR|Spirit|2||SpiritWhiteToken| |Generate|TOK:AVR|Zombie|||ZombieToken| |Generate|TOK:BFZ|Dragon|||DragonToken2| |Generate|TOK:BFZ|Eldrazi Scion|1||EldraziScionToken| @@ -499,9 +490,6 @@ |Generate|TOK:CNS|Zombie|||ZombieToken| |Generate|TOK:CON|Angel|||AngelToken| |Generate|TOK:CON|Elemental|||ElementalTokenWithHaste| -|Generate|TOK:CON|Saproling|||SaprolingToken| -|Generate|TOK:CON|Soldier|||SoldierToken| -|Generate|TOK:CON|Zombie|||ZombieToken| |Generate|TOK:CSP|Bird|||BirdToken| |Generate|TOK:CSP|Graveborn|||SekKuarDeathkeeperGravebornToken| |Generate|TOK:CSP|Marit Lage|||MaritLageToken| @@ -529,32 +517,21 @@ |Generate|TOK:GVL|Beast|2||BeastToken| |Generate|TOK:GVL|Elephant|||ElephantToken| |Generate|TOK:JVC|Elemental Shaman|||ElementalShamanToken| -|Generate|TOK:DDC|Demon|||ReignOfThePitToken| +|Generate|TOK:DDC|Demon|||DemonFlyingToken| |Generate|TOK:DDC|Spirit|||SpiritWhiteToken| -|Generate|TOK:DDC|Thrull|||BreedingPitBlackInsectToken| -|Generate|TOK:DDD|Ape|||PongifyApeToken| -|Generate|TOK:DDD|Bat|||BatToken| +|Generate|TOK:DDC|Thrull|||BreedingPitThrullToken| |Generate|TOK:DDD|Beast|1||BeastToken| |Generate|TOK:DDD|Beast|2||BeastToken2| |Generate|TOK:DDD|Elephant|||ElephantToken| -|Generate|TOK:DDE|Hornet|| -|Generate|TOK:DDE|Insect|||HornetToken| -|Generate|TOK:DDE|Insect|||WaspToken| -|Generate|TOK:DDE|Minion|||MinionToken| +|Generate|TOK:DDE|Hornet|||HornetToken| +|Generate|TOK:DDE|Phyrexian Minion|||MinionToken| |Generate|TOK:DDE|Saproling|||SaprolingToken| -|Generate|TOK:DDF|Assembly-Worker|||AssemblyWorkerToken| -|Generate|TOK:DDF|Pentavite|||PentaviteToken| |Generate|TOK:DDF|Soldier|||SoldierToken| -|Generate|TOK:DDG|Ape|||PongifyApeToken| |Generate|TOK:DDG|Goblin|||GoblinToken| -|Generate|TOK:DDG|Griffin|||GriffinToken| |Generate|TOK:DDH|Griffin|||GriffinToken| |Generate|TOK:DDH|Saproling|||SaprolingToken| |Generate|TOK:DDJ|Saproling|||SaprolingToken| -|Generate|TOK:DDJ|Weird|||WeirdToken| -|Generate|TOK:DDJ|Zombie|||ZombieToken| |Generate|TOK:DDK|Spirit|||SpiritWhiteToken| -|Generate|TOK:DDK|Vampire|||SorinLordOfInnistradVampireToken| |Generate|TOK:DDL|Beast|||BeastToken| |Generate|TOK:DDL|Griffin|||GriffinToken| |Generate|TOK:DDM|Assassin|||AssassinToken| @@ -572,15 +549,7 @@ |Generate|TOK:DDQ|Human|||HumanToken| |Generate|TOK:DDQ|Spirit|||SpiritWhiteToken| |Generate|TOK:DDQ|Zombie|||ZombieToken| -|Generate|TOK:DGM|Bird|||BirdToken| -|Generate|TOK:DGM|Centaur|||CentaurToken| |Generate|TOK:DGM|Elemental|||VoiceOfResurgenceToken| -|Generate|TOK:DGM|Knight|||KnightToken| -|Generate|TOK:DGM|Rhino|||RhinoToken| -|Generate|TOK:DGM|Soldier|||SoldierTokenWithHaste| -|Generate|TOK:DGM|Spirit|||TeysaEnvoyOfGhostsToken| -|Generate|TOK:DGM|Wurm|1||WurmWithTrampleToken| -|Generate|TOK:DGM|Wurm|2||Wurm55Token| |Generate|TOK:DIS|Bird|||WhiteBlueBirdToken| |Generate|TOK:DIS|Drake|||LeafdrakeRoostDrakeToken| |Generate|TOK:DIS|Elemental|||ResearchDevelopmentToken| @@ -588,10 +557,7 @@ |Generate|TOK:DIS|Saproling|||SaprolingToken| |Generate|TOK:DIS|Snake|||PatagiaViperSnakeToken| |Generate|TOK:DKA|Human|||HumanToken| -|Generate|TOK:DKA|Spirit|||SpiritWhiteToken| |Generate|TOK:DKA|Vampire|||SorinLordOfInnistradVampireToken| -|Generate|TOK:DKA|Wolf|||WolfToken| -|Generate|TOK:DKA|Zombie|||ZombieToken| |Generate|TOK:DOM|Cleric|||BelzenlokClericToken| |Generate|TOK:DOM|Construct|||KarnConstructToken| |Generate|TOK:DOM|Demon|||BelzenlokDemonToken| @@ -693,14 +659,11 @@ |Generate|TOK:GPT|Wurm|||WurmToken| |Generate|TOK:GTC|Angel|||AngelToken| |Generate|TOK:GTC|Cleric|||DeathpactAngelToken| -|Generate|TOK:GTC|Frog Lizard|||RapidHybridizationToken| +|Generate|TOK:GTC|Frog Lizard|||FrogLizardToken| |Generate|TOK:GTC|Horror|||NightwingHorrorToken| -|Generate|TOK:GTC|Knight|||KnightWatch| -|Generate|TOK:GTC|Ooze|||MysticGenesisOozeToken| |Generate|TOK:GTC|Rat|||RatToken| -|Generate|TOK:GTC|Soldier|1||SoldierToken| -|Generate|TOK:GTC|Soldier|2||SoldierTokenWithHaste| -|Generate|TOK:GTC|Spirit|||TeysaEnvoyOfGhostsToken| +|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| @@ -736,7 +699,7 @@ |Generate|TOK:ISD|Spider|||SpiderToken| |Generate|TOK:ISD|Spirit|||SpiritWhiteToken| |Generate|TOK:ISD|Vampire|||VampireToken| -|Generate|TOK:ISD|Wolf|1||WolfToken| +|Generate|TOK:ISD|Wolf|1||WolfTokenWithDeathtouch| |Generate|TOK:ISD|Wolf|2||WolfToken| |Generate|TOK:ISD|Zombie|1||ZombieToken| |Generate|TOK:ISD|Zombie|2||ZombieToken| @@ -821,8 +784,7 @@ |Generate|TOK:M13|Drake|||DrakeToken| |Generate|TOK:M13|Goat|||GoatToken| |Generate|TOK:M13|Goblin|||GoblinToken| -|Generate|TOK:M13|Hellion|1||HellionHasteToken| -|Generate|TOK:M13|Hellion|2||HellionToken| +|Generate|TOK:M13|Hellion|||HellionHasteToken| |Generate|TOK:M13|Saproling|||SaprolingToken| |Generate|TOK:M13|Soldier|||SoldierToken| |Generate|TOK:M13|Wurm|||WurmToken| @@ -850,12 +812,9 @@ |Generate|TOK:M15|Squid|||SquidToken| |Generate|TOK:M15|Treefolk Warrior|||KalonianTwingroveTreefolkWarriorToken| |Generate|TOK:M15|Zombie|||ZombieToken| -|Generate|TOK:MBS|Cat|||CatToken| -|Generate|TOK:MBS|Germ|||PhyrexianGermToken| +|Generate|TOK:MBS|Phyrexian Germ|||PhyrexianGermToken| |Generate|TOK:MBS|Golem|||TitanForgeGolemToken| -|Generate|TOK:MBS|Horror|||PhyrexianRebirthHorrorToken| -|Generate|TOK:MBS|Myr|||MyrToken| -|Generate|TOK:MBS|Soldier|||SoldierToken| +|Generate|TOK:MBS|Phyrexian Horror|||PhyrexianRebirthHorrorToken| |Generate|TOK:MBS|Thopter|||ThopterColorlessToken| |Generate|TOK:MBS|Zombie|||ZombieToken| |Generate|TOK:ME2|Caribou|||CaribouToken| @@ -940,14 +899,9 @@ |Generate|TOK:MMQ|Soldier|||SoldierToken| |Generate|TOK:MMQ|Spirit|||SpiritWhiteToken| |Generate|TOK:MMQ|Zombie|||ZombieToken| -|Generate|TOK:MOR|Elemental|||WalkerOfTheGroveToken| -|Generate|TOK:MOR|Elf Warrior|||ElfWarriorToken| |Generate|TOK:MOR|Faerie Rogue|||FaerieRogueToken| |Generate|TOK:MOR|Giant Warrior|||GiantWarriorToken| -|Generate|TOK:MOR|Goblin Rogue|||GoblinRogueToken| -|Generate|TOK:MOR|Kithkin Soldier|||KithkinSoldierToken| |Generate|TOK:MOR|Treefolk Shaman|||TreefolkShamanToken| -|Generate|TOK:MOR|Wolf|||WolfToken| |Generate|TOK:MRD|Beast|||OneDozenEyesBeastToken| |Generate|TOK:MRD|Demon|||ReignOfThePitToken| |Generate|TOK:MRD|Elemental|||ElementalTokenWithHaste| @@ -962,13 +916,9 @@ |Generate|TOK:NEM|Saproling|1||SaprolingBurstToken| |Generate|TOK:NEM|Saproling|2||SaprolingToken| |Generate|TOK:NPH|Beast|||BeastToken| -|Generate|TOK:NPH|Germ|||PhyrexianGermToken| -|Generate|TOK:NPH|Goblin|||GoblinTokenWithHaste| -|Generate|TOK:NPH|Goblin|||GoblinToken| -|Generate|TOK:NPH|Golem|||GolemToken| -|Generate|TOK:NPH|Insect|||InsectInfectToken| -|Generate|TOK:NPH|Insect|||InsectToken| -|Generate|TOK:NPH|Myr|||MyrToken| +|Generate|TOK:NPH|Phyrexian Goblin|||PhyrexianGoblinToken| +|Generate|TOK:NPH|Phyrexian Golem|||PhyrexianGolemToken| +|Generate|TOK:NPH|Phyrexian Myr|||PhyrexianMyrToken| |Generate|TOK:ODY|Bear|||BearToken| |Generate|TOK:ODY|Beast|||BeastToken2| |Generate|TOK:ODY|Elephant|||ElephantToken| @@ -1039,16 +989,13 @@ |Generate|TOK:RIX|Elemental|2||RedElementalToken| |Generate|TOK:RIX|Golem|||GoldForgeGarrisonGolemToken| |Generate|TOK:RIX|Saproling|||SaprolingToken| -|Generate|TOK:ROE|Dragon|||DragonToken2| |Generate|TOK:ROE|Eldrazi Spawn|1||EldraziSpawnToken| |Generate|TOK:ROE|Eldrazi Spawn|2||EldraziSpawnToken| |Generate|TOK:ROE|Eldrazi Spawn|3||EldraziSpawnToken| |Generate|TOK:ROE|Elemental|||DevastatingSummonsElementalToken| -|Generate|TOK:ROE|Elephant|||ElephantToken| -|Generate|TOK:ROE|Goblin Golem|||TuktukTheReturnedToken| |Generate|TOK:ROE|Hellion|||HellionToken| -|Generate|TOK:ROE|Kor Soldier|||KorSoldierToken| -|Generate|TOK:ROE|Ooze|||MysticGenesisOozeToken| +|Generate|TOK:ROE|Ooze|||OozeToken| +|Generate|TOK:ROE|Tuktuk the Returned|||TuktukTheReturnedToken| |Generate|TOK:RTR|Assassin|||AssassinToken| |Generate|TOK:RTR|Bird|||BirdToken| |Generate|TOK:RTR|Centaur|||CentaurToken| @@ -1056,7 +1003,7 @@ |Generate|TOK:RTR|Elemental|||GreenAndWhiteElementalToken| |Generate|TOK:RTR|Goblin|||GoblinToken| |Generate|TOK:RTR|Knight|||KnightToken| -|Generate|TOK:RTR|Ooze|||MysticGenesisOozeToken| +|Generate|TOK:RTR|Ooze|||OozeToken| |Generate|TOK:RTR|Rhino|||RhinoToken| |Generate|TOK:RTR|Saproling|||SaprolingToken| |Generate|TOK:RTR|Soldier|||SoldierToken| @@ -1102,12 +1049,12 @@ |Generate|TOK:SOM|Cat|||CatToken| |Generate|TOK:SOM|Goblin|||GoblinToken| |Generate|TOK:SOM|Golem|||GolemToken| -|Generate|TOK:SOM|Insect|||InsectInfectToken| +|Generate|TOK:SOM|Phyrexian Insect|||InsectInfectToken| |Generate|TOK:SOM|Myr|||MyrToken| |Generate|TOK:SOM|Soldier|||SoldierToken| |Generate|TOK:SOM|Wolf|||WolfToken| -|Generate|TOK:SOM|Wurm|1||WurmWithDeathtouchToken| -|Generate|TOK:SOM|Wurm|2||WurmWithLifelinkToken| +|Generate|TOK:SOM|Phyrexian Wurm|1||WurmWithDeathtouchToken| +|Generate|TOK:SOM|Phyrexian Wurm|2||WurmWithLifelinkToken| |Generate|TOK:SWS|Ewok|||EwokToken| |Generate|TOK:SWS|B-Wing|||RebelStarshipToken| |Generate|TOK:SWS|Hunter|||HunterToken| @@ -1195,9 +1142,7 @@ |Generate|TOK:WWK|Elephant|||ElephantToken| |Generate|TOK:WWK|Ogre|||OgreToken| |Generate|TOK:WWK|Plant|||PlantToken| -|Generate|TOK:WWK|Snake|||SnakeToken| |Generate|TOK:WWK|Soldier Ally|||JoinTheRanksSoldierToken| -|Generate|TOK:WWK|Wolf|||WolfToken| |Generate|TOK:XLN|Dinosaur|||DinosaurToken| |Generate|TOK:XLN|Illusion|||JaceCunningCastawayIllusionToken| |Generate|TOK:XLN|Merfolk|||MerfolkHexproofToken| @@ -1211,14 +1156,12 @@ |Generate|TOK:ZEN|Angel|||AngelToken| |Generate|TOK:ZEN|Beast|||BeastToken2| |Generate|TOK:ZEN|Bird|||BirdToken| -|Generate|TOK:ZEN|Elemental|1||RedElementalWithTrampleAndHaste| -|Generate|TOK:ZEN|Elemental|2||RedElementalWithTrampleAndHaste| +|Generate|TOK:ZEN|Elemental|||RedElementalWithTrampleAndHaste| |Generate|TOK:ZEN|Illusion|||IllusionToken| |Generate|TOK:ZEN|Kor Soldier|||KorSoldierToken| -|Generate|TOK:ZEN|Merfolk|| -|Generate|TOK:ZEN|Plant|||PlantToken| +|Generate|TOK:ZEN|Merfolk|||MerfolkToken| |Generate|TOK:ZEN|Snake|||SnakeToken| -|Generate|TOK:ZEN|Vampire|| +|Generate|TOK:ZEN|Vampire|||KalitasVampireToken| |Generate|TOK:ZEN|Wolf|||WolfToken| |Generate|TOK:ZEN|Zombie Giant|||QuestForTheGravelordZombieToken| |Generate|TOK:RNA|Beast|||RedGreenBeastToken| @@ -1861,4 +1804,9 @@ |Generate|TOK:PCA|Plant|||PlantToken| |Generate|TOK:PCA|Saproling|||SaprolingToken| |Generate|TOK:PCA|Spider|||PenumbraSpiderToken| -|Generate|TOK:PCA|Zombie|||ZombieToken| \ No newline at end of file +|Generate|TOK:PCA|Zombie|||ZombieToken| + +# DD1 +|Generate|TOK:DD1|Elemental|||VoiceOfTheWoodsElementalToken| +|Generate|TOK:DD1|Elf Warrior|||ElfWarriorToken| +|Generate|TOK:DD1|Goblin|||GoblinToken| \ No newline at end of file diff --git a/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java b/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java index 700f2ebbdf7..ecbccacaf82 100644 --- a/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/DomriRadeEmblem.java @@ -22,7 +22,7 @@ public final class DomriRadeEmblem extends Emblem { // "Creatures you control have double strike, trample, hexproof and haste." public DomriRadeEmblem() { - this.setName("Emblem Domri Rade"); + this.setName("Emblem Domri"); FilterPermanent filter = new FilterControlledCreaturePermanent("Creatures"); CompoundAbility compoundAbilities = new CompoundAbility( diff --git a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java index f21f8dfc508..5c74c1c6b50 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java @@ -39,7 +39,7 @@ class KothOfTheHammerThirdEffect extends ContinuousEffectImpl { public KothOfTheHammerThirdEffect() { super(Duration.EndOfGame, Outcome.AddAbility); - staticText = "You get an emblem with \"Mountains you control have '{T}: This land deals 1 damage to any target.'\""; + staticText = "Mountains you control have '{T}: This land deals 1 damage to any target.'"; } public KothOfTheHammerThirdEffect(final KothOfTheHammerThirdEffect effect) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java index 4592fc39b71..1a3d408bace 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java @@ -22,7 +22,7 @@ public final class AssemblyWorkerToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); - availableImageSetCodes = Arrays.asList("4ED", "ATQ", "DDF", "TSR"); + availableImageSetCodes = Arrays.asList("4ED", "ATQ", "TSR"); } public AssemblyWorkerToken(final AssemblyWorkerToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java b/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java index 1af0d64eedb..96aff833d03 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java @@ -8,6 +8,8 @@ import mage.constants.Duration; import mage.constants.SubLayer; import mage.constants.SubType; +import java.util.Arrays; + /** * @author spjspj */ @@ -22,6 +24,8 @@ public final class AvatarToken extends TokenImpl { ControllerLifeCount.instance, Duration.WhileOnBattlefield, SubLayer.CharacteristicDefining_7a ).setText("this creature's power and toughness are each equal to your life total"))); + + availableImageSetCodes = Arrays.asList("LRW", "M10", "M11"); } public AvatarToken(final AvatarToken token) { 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 90d678ae437..e65c109d82c 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("C17", "GVL", "DDD", "GPT", "MMA", "M19", "MID", "VOC"); + availableImageSetCodes = Arrays.asList("C17", "GVL", "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 8806ae6a178..b942879181b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java @@ -50,6 +50,9 @@ public final class BeastToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMA")) { setTokenType(1); } + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DDD")) { + setTokenType(1); + } } public BeastToken(final BeastToken token) { 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 a8f1103c6ca..687910841e9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java @@ -23,7 +23,7 @@ public final class BirdToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("BNG", "CSP", "DGM", "JUD", "MM3", "RTR", "VMA", "ZEN", + availableImageSetCodes = Arrays.asList("BNG", "CSP", "JUD", "MM3", "RTR", "VMA", "ZEN", "MH1", "C16", "C20", "M21", "ZNC", "KHC", "MH2", "IMA", "CM2"); } diff --git a/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java b/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java index 15a8f92166f..63215c20aaf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java @@ -19,7 +19,7 @@ public final class BreedingPitThrullToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("CMR"); + availableImageSetCodes = Arrays.asList("CMR", "DDC"); } public BreedingPitThrullToken(final BreedingPitThrullToken token) { 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 fb06f988a74..ff5c071a485 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", "MBS", "SOM", "CMR", "2XM"); + availableImageSetCodes = Arrays.asList("PMEI", "C14", "C15", "C17", "C18", "M13", "M14", "SOM", "CMR", "2XM"); } public CatToken(final CatToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java index a0ee1ec9bfc..82f728280f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java @@ -20,7 +20,7 @@ public final class CentaurToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("C19", "DGM", "ONS", "RTR", "RNA", "MIC"); + availableImageSetCodes = Arrays.asList("C19", "ONS", "RTR", "RNA", "MIC"); } public CentaurToken(final CentaurToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java index 4c97e0ba83c..5185271831a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java @@ -15,6 +15,8 @@ import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.target.common.TargetCardInYourGraveyard; +import java.util.Arrays; + /** * * @author spjspj @@ -44,6 +46,8 @@ public final class DeathpactAngelToken extends TokenImpl { ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); + + availableImageSetCodes = Arrays.asList("GTC", "GK2"); } public DeathpactAngelToken(final DeathpactAngelToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java b/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java index 88331489632..dfbbdf7fa62 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonFlyingToken.java @@ -26,7 +26,7 @@ public final class DemonFlyingToken extends TokenImpl { addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("C14", "C21", "NCC"); + availableImageSetCodes = Arrays.asList("C14", "C21", "NCC", "DDC"); } public DemonFlyingToken(final DemonFlyingToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java index d5eac19ebf1..ccfc2de6979 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java @@ -22,7 +22,7 @@ public final class DragonToken2 extends TokenImpl { addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "CMD", "ONS", "ROE", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA"); + availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "CMD", "ONS", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA"); } public DragonToken2(final DragonToken2 token) { 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 d054696233c..4c0a4c43b44 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java @@ -20,7 +20,7 @@ public final class ElephantToken extends TokenImpl { toughness = new MageInt(3); 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", "NCC"); + "EMA", "INV", "JUD", "MM2", "ODY", "TSP", "VMA", "WWK", "MH1", "CMR", "C21", "MIC", "NEC", "2XM", "NCC"); } public ElephantToken(final ElephantToken token) { 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 5def381270a..c7d09b9a3c2 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("C14", "C16", "EVG", "EMA", "LRW", "MOR", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU", "CMA"); + availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU", "CMA", "DD1"); } 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 80ceb52f1a4..a271cdecd4a 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", "C15", "C21"); + availableImageSetCodes = Arrays.asList("GTC", "RNA", "C15", "C21"); } public FrogLizardToken(final FrogLizardToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java index 4efe2970fb5..909b973470a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java @@ -5,6 +5,8 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; +import java.util.Arrays; + /** * * @author spjspj @@ -19,6 +21,8 @@ public final class GiantWarriorToken extends TokenImpl { subtype.add(SubType.WARRIOR); power = new MageInt(5); toughness = new MageInt(5); + + availableImageSetCodes = Arrays.asList("MOR", "MMA"); } public GiantWarriorToken(final GiantWarriorToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java index 95d9914ae9b..b92731bd612 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java @@ -30,9 +30,9 @@ public final class GoblinToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("10E", "ALA", "SOM", "M10", "NPH", "M13", "RTR", + availableImageSetCodes = Arrays.asList("10E", "ALA", "SOM", "M10", "M13", "RTR", "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", "EVG", "MM2", - "MM3", "EMA", "C16", "DOM", "ANA", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", "NEC", "M19", "CM2", "PCA"); + "MM3", "EMA", "C16", "DOM", "ANA", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", "NEC", "M19", "CM2", "PCA", "DD1"); } public GoblinToken(final GoblinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java index c34d881b31c..edd108c62dc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java @@ -19,7 +19,7 @@ public final class GolemToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("MM2", "NPH", "SOM", "MH1", "M20", "CMR", "2XM"); + availableImageSetCodes = Arrays.asList("MM2", "SOM", "MH1", "M20", "CMR", "2XM"); } public GolemToken(final GolemToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java index 6b2fe9c0c3a..3996699ab56 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java @@ -23,7 +23,7 @@ public final class GriffinToken extends TokenImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("DDG", "DDH", "DDL", "TSP", "M21", "TSR"); + availableImageSetCodes = Arrays.asList("DDH", "DDL", "TSP", "M21", "TSR"); } public GriffinToken(final GriffinToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java index a179a48eb84..85300e4cc27 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java @@ -38,5 +38,8 @@ public final class HumanToken extends TokenImpl { if (getOriginalExpansionSetCode().equals("VOW")) { this.setTokenType(2); } + if (getOriginalExpansionSetCode().equals("AVR")) { + this.setTokenType(2); + } } } diff --git a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java index da30f56feb8..430dca6853c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java @@ -4,6 +4,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 IllusionToken extends TokenImpl { subtype.add(SubType.ILLUSION); power = new MageInt(2); toughness = new MageInt(2); + + availableImageSetCodes = Arrays.asList("ZEN"); } public IllusionToken(final IllusionToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java index 034b7ec801c..ec66e8f7576 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java @@ -20,7 +20,7 @@ public final class KithkinSoldierToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - availableImageSetCodes = Arrays.asList("CMD", "EVE", "LRW", "MMA", "MOR", "SHM", "MMA", "KHC", "CMA"); + availableImageSetCodes = Arrays.asList("CMD", "EVE", "LRW", "MMA", "SHM", "MMA", "KHC", "CMA"); } public KithkinSoldierToken(final KithkinSoldierToken token) { 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 1464a9f0ad6..6b214769aaa 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("C15", "CMA", "DGM", "ORI", "RTR", "M19", "ELD", "M21", "AFC", "MIC", "DOM"); + availableImageSetCodes = Arrays.asList("C15", "CMA", "ORI", "RTR", "M19", "ELD", "M21", "AFC", "MIC", "DOM"); } public KnightToken(final KnightToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java index 7a05eb10de8..09e6098d19f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java @@ -5,6 +5,8 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; +import java.util.Arrays; + /** * * @author spjspj @@ -20,6 +22,8 @@ public final class MasterOfWavesElementalToken extends TokenImpl { this.power = new MageInt(1); this.toughness = new MageInt(0); + + availableImageSetCodes = Arrays.asList("THS", "DDT"); } public MasterOfWavesElementalToken(final MasterOfWavesElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java index 18f0acb9e76..cb92959db7c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.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 MerfolkToken extends TokenImpl { subtype.add(SubType.MERFOLK); power = new MageInt(1); toughness = new MageInt(1); + + availableImageSetCodes = Arrays.asList("ZEN"); } public MerfolkToken(final MerfolkToken token) { 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 91b839d879a..168a6798fc9 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("C14", "C16", "C18", "DST", "MBS", "MM2", "MRD", "NPH", "SOM", "MH1", "C21", "NEC", "2XM", "BBD", "DDU", "CM2"); + availableImageSetCodes = Arrays.asList("C14", "C16", "C18", "DST", "MM2", "MRD", "SOM", "MH1", "C21", "NEC", "2XM", "BBD", "DDU", "CM2"); } public MyrToken(final MyrToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java index 254083d33f0..79df1c315b2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java @@ -21,7 +21,7 @@ public final class MysticGenesisOozeToken extends TokenImpl { subtype.add(SubType.OOZE); power = new MageInt(xValue); toughness = new MageInt(xValue); - setOriginalExpansionSetCode("RTR"); + setOriginalExpansionSetCode("MM3"); } public MysticGenesisOozeToken(final MysticGenesisOozeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java index 01096f3fb8a..0095b9532b9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -23,6 +25,8 @@ public final class NightwingHorrorToken extends TokenImpl { // Flying this.addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("GTC"); } public NightwingHorrorToken(final NightwingHorrorToken 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 bc4e3a730dd..a05956db22f 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", "C16", "MBS", "MM2", "NPH", "PC2", "MH2", "NEC", "2XM", "CM2", "CMA", "PCA"); + availableImageSetCodes = Arrays.asList("C14", "C15", "C16", "MBS", "MM2", "PC2", "MH2", "NEC", "2XM", "CM2", "CMA", "PCA"); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java index f79360365ed..e32a16fbae6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianMyrToken.java @@ -4,6 +4,8 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; +import java.util.Arrays; + public final class PhyrexianMyrToken extends TokenImpl { public PhyrexianMyrToken() { @@ -14,6 +16,8 @@ public final class PhyrexianMyrToken extends TokenImpl { subtype.add(SubType.MYR); power = new MageInt(1); toughness = new MageInt(1); + + availableImageSetCodes = Arrays.asList("NPH"); } public PhyrexianMyrToken(final PhyrexianMyrToken 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 13c73c3dc7c..a418bb34962 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", "C18", "DDP", "OGW", "PC2", "WWK", "XLN", "ZEN", "ZNR", "CMR", "NEC", "2XM", "NCC", "PCA"); + availableImageSetCodes = Arrays.asList("ARC", "C18", "DDP", "OGW", "PC2", "WWK", "XLN", "ZNR", "CMR", "NEC", "2XM", "NCC", "PCA"); } public PlantToken(final PlantToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java b/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java index bdbe3fece0e..2c31446269d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java @@ -21,7 +21,7 @@ public final class PongifyApeToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("10E", "C14", "GVL", "DDD", "DDG", "PLC", "ULG", "UNH", "TSR"); + availableImageSetCodes = Arrays.asList("C14", "GVL", "PLC", "ULG", "UNH", "TSR"); } public PongifyApeToken(final PongifyApeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java b/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java index 08512f80491..8aaca8dc4b3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java @@ -23,15 +23,6 @@ public final class RedElementalWithTrampleAndHaste extends TokenImpl { addAbility(HasteAbility.getInstance()); } - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ZEN")) { - setTokenType(RandomUtil.nextInt(2) + 1); - } - } - public RedElementalWithTrampleAndHaste(final RedElementalWithTrampleAndHaste token) { super(token); } diff --git a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java index 264b43d91c7..c0e2977f3a0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java @@ -31,7 +31,7 @@ public final class RedHumanToken extends TokenImpl { super.setExpansionSetCodeForImage(code); if (getOriginalExpansionSetCode().equals("AVR")) { - this.setTokenType(2); + this.setTokenType(1); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java index f8b8e06e8a8..e2c4c1948b3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java @@ -21,7 +21,7 @@ public final class RhinoToken extends TokenImpl { toughness = new MageInt(4); addAbility(TrampleAbility.getInstance()); - availableImageSetCodes = Arrays.asList("DGM", "RTR", "MH1", "C19", "MIC"); + availableImageSetCodes = Arrays.asList("RTR", "MH1", "C19", "MIC"); } public RhinoToken(final RhinoToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java b/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java index 7f63f3382cc..d849228ac84 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkeletonRegenerateToken.java @@ -9,6 +9,8 @@ import mage.constants.ColoredManaSymbol; import mage.constants.SubType; import mage.constants.Zone; +import java.util.Arrays; + public final class SkeletonRegenerateToken extends TokenImpl { public SkeletonRegenerateToken() { @@ -19,6 +21,8 @@ public final class SkeletonRegenerateToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ColoredManaCost(ColoredManaSymbol.B))); + + availableImageSetCodes = Arrays.asList("ALA", "A25"); } public SkeletonRegenerateToken(final SkeletonRegenerateToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java index 5d869ea7cde..1ddf2f7d05e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java @@ -20,7 +20,7 @@ public final class SnakeToken extends TokenImpl { toughness = new MageInt(1); availableImageSetCodes = Arrays.asList("6ED", "C15", "C19", "CHK", "CMD", "KTK", "MM2", "MMQ", "SOK", - "VIS", "WWK", "ZEN", "C20", "MIC"); + "VIS", "ZEN", "C20", "MIC"); } public SnakeToken(final SnakeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java index dae21c55d2d..5212a115900 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java @@ -30,9 +30,6 @@ public final class SoldierTokenWithHaste extends TokenImpl { public void setExpansionSetCodeForImage(String code) { super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GTC")) { - setTokenType(2); - } if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MM3")) { setTokenType(2); } diff --git a/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java index c9fd2d762a6..2f332061d94 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.LifelinkAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -20,6 +22,8 @@ public final class SorinLordOfInnistradVampireToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); addAbility(LifelinkAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("DKA"); } public SorinLordOfInnistradVampireToken(final SorinLordOfInnistradVampireToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java index 836d21d1efe..42c8f2b3244 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -21,6 +23,16 @@ public final class SpiritBlueToken extends TokenImpl { toughness = new MageInt(1); setTokenType(2); addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("AVR"); + } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("AVR")) { + setTokenType(1); + } } public SpiritBlueToken(final SpiritBlueToken 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 b47419787ad..6c0df4f0d37 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java @@ -31,7 +31,7 @@ public final class SpiritWhiteToken extends TokenImpl { public void setExpansionSetCodeForImage(String code) { super.setExpansionSetCodeForImage(code); if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("AVR")) { - setTokenType(1); + setTokenType(2); } if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { setTokenType(2); diff --git a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java index 387e3d0f287..4780b5e1a01 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java @@ -21,7 +21,7 @@ public final class StitchersApprenticeHomunculusToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); - availableImageSetCodes = Arrays.asList("UMA"); + availableImageSetCodes = Arrays.asList("ISD", "UMA"); } public StitchersApprenticeHomunculusToken(final StitchersApprenticeHomunculusToken token) { 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 7e98535d22a..7c2214cabc6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -17,12 +19,20 @@ public final class SwanSongBirdToken extends TokenImpl { cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add(SubType.BIRD); - if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { - setTokenType(1); - } power = new MageInt(2); toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("THS", "C16"); + } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { + setTokenType(1); + } } public SwanSongBirdToken(final SwanSongBirdToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java index fe2cc6cc0f4..ed90215fd4e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java @@ -5,6 +5,8 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; +import java.util.Arrays; + /** * * @author spjspj @@ -19,6 +21,8 @@ public final class TreefolkShamanToken extends TokenImpl { subtype.add(SubType.SHAMAN); power = new MageInt(2); toughness = new MageInt(5); + + availableImageSetCodes = Arrays.asList("MOR", "MMA"); } public TreefolkShamanToken(final TreefolkShamanToken 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 3c0f5c70958..7de30186e12 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java @@ -17,13 +17,12 @@ public final class UtvaraHellkiteDragonToken extends TokenImpl { static final private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("C17")); + tokenImageSets.addAll(Arrays.asList("RTR", "C17")); } public UtvaraHellkiteDragonToken() { super("Dragon Token", "6/6 red Dragon creature token with flying"); availableImageSetCodes = tokenImageSets; - setExpansionSetCodeForImage("C17"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DRAGON); diff --git a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java b/Mage/src/main/java/mage/game/permanent/token/VampireToken.java index 936357d1756..78067d197b2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VampireToken.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 VampireToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("ISD", "KTK"); } public VampireToken(final VampireToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java index 4057c269132..989a85ad746 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java @@ -23,7 +23,7 @@ public final class VoiceOfTheWoodsElementalToken extends TokenImpl { addAbility(TrampleAbility.getInstance()); - availableImageSetCodes.addAll(Arrays.asList("EVG", "KHC")); + availableImageSetCodes.addAll(Arrays.asList("DD1", "EVG", "KHC")); } public VoiceOfTheWoodsElementalToken(final VoiceOfTheWoodsElementalToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WaspToken.java b/Mage/src/main/java/mage/game/permanent/token/WaspToken.java index e4580a6e0f5..f0f97fea142 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WaspToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WaspToken.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 WaspToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("10E"); } public WaspToken(final WaspToken token) { 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 4fb73cf10bd..30b0d3c0138 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", "C15", "C21", "UMA")); + availableImageSetCodes.addAll(Arrays.asList("GTC", "MH1", "C15", "C21", "UMA")); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java index 674f1ad81b8..82746f9c864 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java @@ -21,8 +21,8 @@ public final class WolfToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); - availableImageSetCodes = Arrays.asList("BNG", "C14", "C15", "CMA", "CMD", "CNS", "DKA", "EVE", "ISD", - "LRW", "M10", "M14", "MM2", "MOR", "SHM", "SOI", "SOM", "V10", "WWK", "ZEN", "WAR", "M20", + availableImageSetCodes = Arrays.asList("BNG", "C14", "C15", "CMA", "CMD", "CNS", "EVE", "ISD", + "LRW", "M10", "M14", "MM2", "SHM", "SOI", "SOM", "V10", "ZEN", "WAR", "M20", "THB", "AFR", "MID", "VOW", "2XM"); } @@ -31,7 +31,7 @@ public final class WolfToken extends TokenImpl { super.setExpansionSetCodeForImage(code); if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ISD")) { - this.setTokenType(RandomUtil.nextInt(2) + 1); // 2 images + this.setTokenType(2); } if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMA")) { this.setTokenType(RandomUtil.nextInt(2) + 1); // 2 images diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java index a9202f14f28..9457a47c04b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java @@ -6,6 +6,9 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.DeathtouchAbility; +import mage.util.RandomUtil; + +import java.util.Arrays; /** * @@ -22,6 +25,17 @@ public final class WolfTokenWithDeathtouch extends TokenImpl { toughness = new MageInt(1); addAbility(DeathtouchAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("ISD"); + } + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ISD")) { + this.setTokenType(1); + } } public WolfTokenWithDeathtouch(final WolfTokenWithDeathtouch token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java index 8756bf867d7..d62c2bb4f0f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Wurm55Token.java @@ -19,16 +19,7 @@ public final class Wurm55Token extends TokenImpl { power = new MageInt(5); toughness = new MageInt(5); - availableImageSetCodes = Arrays.asList("AKH", "DGM", "NCC"); - } - - @Override - public void setExpansionSetCodeForImage(String code) { - super.setExpansionSetCodeForImage(code); - - if (getOriginalExpansionSetCode().equals("DGM")) { - this.setTokenType(2); - } + availableImageSetCodes = Arrays.asList("AKH", "NCC"); } public Wurm55Token(final Wurm55Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java index 2fc00530781..ea47aa04be6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmWithTrampleToken.java @@ -21,7 +21,7 @@ public final class WurmWithTrampleToken extends TokenImpl { toughness = new MageInt(5); addAbility(TrampleAbility.getInstance()); - availableImageSetCodes = Arrays.asList("DGM", "RTR"); + availableImageSetCodes = Arrays.asList("RTR"); } public WurmWithTrampleToken(final WurmWithTrampleToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java index af90ba5d06b..aeb72ef1948 100644 --- a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.HasteAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -22,6 +24,8 @@ public final class XenagosSatyrToken extends TokenImpl { toughness = new MageInt(2); this.addAbility(HasteAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("THS"); } public XenagosSatyrToken(final XenagosSatyrToken token) { super(token); 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 ceba4121bcd..bbdc0118be2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -31,7 +31,7 @@ public final class ZombieToken extends TokenImpl { "M20", "C19", "C20", "THB", "M21", "CMR", "C21", "MH2", "AFR", "MIC", "VOW", "UMA", - "NCC", "MED", "BBD", "M19", "CM2", "PCA"); + "NCC", "MED", "BBD", "M19", "CM2", "PCA", "AVR"); } @Override