From 9630320ba948b967e63fee800f403bdb56ef8687 Mon Sep 17 00:00:00 2001 From: fireshoes Date: Mon, 18 Jul 2016 15:49:43 -0500 Subject: [PATCH] Changed set codes in image sources and Mage Sets to match recent changes. Changed Portal Second Age set code back to PO2. Updated tokens with recent sets to product correct images. Fixed that there was no basic land slot in EMN packs. --- .../dl/sources/MagicCardsImageSource.java | 170 +++++++++--------- .../dl/sources/WizardCardsImageSource.java | 52 +++--- .../src/main/resources/card-pictures-tok.txt | 18 +- .../src/main/resources/image.url.properties | 4 +- .../mage/sets/AnthologyDivineVsDemonic.java | 2 +- .../mage/sets/AnthologyElvesVsGoblins.java | 2 +- .../mage/sets/AnthologyGarrukVsLiliana.java | 2 +- .../src/mage/sets/AnthologyJaceVsChandra.java | 2 +- Mage.Sets/src/mage/sets/EldritchMoon.java | 4 +- Mage.Sets/src/mage/sets/FTVDragons.java | 2 +- Mage.Sets/src/mage/sets/FTVExiled.java | 2 +- Mage.Sets/src/mage/sets/FTVLegends.java | 2 +- Mage.Sets/src/mage/sets/FTVRelics.java | 2 +- Mage.Sets/src/mage/sets/Nemesis.java | 3 +- Mage.Sets/src/mage/sets/PDSSlivers.java | 2 +- .../sets/commander2015/DaxosTheReturned.java | 1 + .../sets/dissension/ResearchDevelopment.java | 4 +- .../mage/sets/jacevschandra/Hostility.java | 4 +- .../src/mage/sets/lorwyn/HearthcageGiant.java | 13 +- .../sets/lorwyn/RebellionOfTheFlamekin.java | 10 +- .../portalsecondage/AbyssalNightstalker.java | 2 +- .../sets/portalsecondage/AirElemental.java | 2 +- .../sets/portalsecondage/AlabornCavalier.java | 2 +- .../portalsecondage/AlabornGrenadier.java | 2 +- .../portalsecondage/AlabornMusketeer.java | 2 +- .../sets/portalsecondage/AlabornTrooper.java | 2 +- .../sets/portalsecondage/AlabornVeteran.java | 2 +- .../sets/portalsecondage/AlluringScent.java | 2 +- .../sets/portalsecondage/AncientCraving.java | 2 +- .../sets/portalsecondage/AngelOfFury.java | 2 +- .../sets/portalsecondage/AngelOfMercy.java | 2 +- .../sets/portalsecondage/AngelicBlessing.java | 2 +- .../sets/portalsecondage/AngelicWall.java | 2 +- .../portalsecondage/ApprenticeSorcerer.java | 2 +- .../mage/sets/portalsecondage/Archangel.java | 2 +- .../mage/sets/portalsecondage/Armageddon.java | 2 +- .../sets/portalsecondage/ArmoredGalleon.java | 2 +- .../sets/portalsecondage/ArmoredGriffin.java | 2 +- .../sets/portalsecondage/BarbtoothWurm.java | 2 +- .../mage/sets/portalsecondage/Bargain.java | 2 +- .../mage/sets/portalsecondage/BearCub.java | 2 +- .../mage/sets/portalsecondage/BeeSting.java | 2 +- .../src/mage/sets/portalsecondage/Blaze.java | 2 +- .../portalsecondage/BloodcurdlingScream.java | 2 +- .../sets/portalsecondage/BreathOfLife.java | 2 +- .../sets/portalsecondage/BrimstoneDragon.java | 2 +- .../portalsecondage/BrutalNightstalker.java | 2 +- .../sets/portalsecondage/ChorusOfWoe.java | 2 +- .../sets/portalsecondage/CoastalWizard.java | 2 +- .../mage/sets/portalsecondage/Coercion.java | 2 +- .../mage/sets/portalsecondage/CruelEdict.java | 2 +- .../mage/sets/portalsecondage/DakmorBat.java | 2 +- .../sets/portalsecondage/DakmorPlague.java | 2 +- .../sets/portalsecondage/DakmorScorpion.java | 2 +- .../sets/portalsecondage/DakmorSorceress.java | 2 +- .../sets/portalsecondage/DarkOffering.java | 2 +- .../sets/portalsecondage/DeathcoilWurm.java | 2 +- .../src/mage/sets/portalsecondage/DejaVu.java | 2 +- .../portalsecondage/DenizenOfTheDeep.java | 2 +- .../mage/sets/portalsecondage/Earthquake.java | 2 +- .../mage/sets/portalsecondage/Exhaustion.java | 2 +- .../mage/sets/portalsecondage/Extinguish.java | 2 +- .../src/mage/sets/portalsecondage/EyeSpy.java | 2 +- .../sets/portalsecondage/FalseSummoning.java | 2 +- .../portalsecondage/FestivalOfTrokin.java | 2 +- .../mage/sets/portalsecondage/Forest1.java | 2 +- .../mage/sets/portalsecondage/Forest2.java | 2 +- .../mage/sets/portalsecondage/Forest3.java | 2 +- .../mage/sets/portalsecondage/FoulSpirit.java | 2 +- .../sets/portalsecondage/GoblinCavaliers.java | 2 +- .../portalsecondage/GoblinFirestarter.java | 2 +- .../sets/portalsecondage/GoblinGeneral.java | 2 +- .../sets/portalsecondage/GoblinGlider.java | 2 +- .../mage/sets/portalsecondage/GoblinLore.java | 2 +- .../sets/portalsecondage/GoblinMatron.java | 2 +- .../portalsecondage/GoblinMountaineer.java | 2 +- .../sets/portalsecondage/GoblinPiker.java | 2 +- .../sets/portalsecondage/GoblinRaider.java | 2 +- .../sets/portalsecondage/GoblinWarStrike.java | 2 +- .../mage/sets/portalsecondage/GoldenBear.java | 2 +- .../sets/portalsecondage/HandOfDeath.java | 2 +- .../sets/portalsecondage/HarmonyOfNature.java | 2 +- .../sets/portalsecondage/HiddenHorror.java | 2 +- .../mage/sets/portalsecondage/Hurricane.java | 2 +- .../mage/sets/portalsecondage/IronhoofOx.java | 2 +- .../mage/sets/portalsecondage/Island1.java | 2 +- .../mage/sets/portalsecondage/Island2.java | 2 +- .../mage/sets/portalsecondage/Island3.java | 2 +- .../sets/portalsecondage/JaggedLightning.java | 2 +- .../sets/portalsecondage/KissOfDeath.java | 2 +- .../mage/sets/portalsecondage/LavaAxe.java | 2 +- .../mage/sets/portalsecondage/LoneWolf.java | 2 +- .../portalsecondage/LurkingNightstalker.java | 2 +- .../src/mage/sets/portalsecondage/Lynx.java | 2 +- .../mage/sets/portalsecondage/MagmaGiant.java | 2 +- .../mage/sets/portalsecondage/MindRot.java | 2 +- .../sets/portalsecondage/MoaningSpirit.java | 2 +- .../sets/portalsecondage/MonstrousGrowth.java | 2 +- .../mage/sets/portalsecondage/Mountain1.java | 2 +- .../mage/sets/portalsecondage/Mountain2.java | 2 +- .../mage/sets/portalsecondage/Mountain3.java | 2 +- .../mage/sets/portalsecondage/MuckRats.java | 2 +- .../sets/portalsecondage/MysticDenial.java | 2 +- .../sets/portalsecondage/NaturalSpring.java | 2 +- .../sets/portalsecondage/NaturesLore.java | 2 +- .../portalsecondage/NightstalkerEngine.java | 2 +- .../sets/portalsecondage/NorwoodArchers.java | 2 +- .../portalsecondage/NorwoodPriestess.java | 2 +- .../sets/portalsecondage/NorwoodRanger.java | 2 +- .../sets/portalsecondage/NorwoodRiders.java | 2 +- .../sets/portalsecondage/NorwoodWarrior.java | 2 +- .../sets/portalsecondage/ObsidianGiant.java | 2 +- .../sets/portalsecondage/OgreArsonist.java | 2 +- .../sets/portalsecondage/OgreBerserker.java | 2 +- .../sets/portalsecondage/OgreTaskmaster.java | 2 +- .../sets/portalsecondage/OgreWarrior.java | 2 +- .../mage/sets/portalsecondage/Plains1.java | 2 +- .../mage/sets/portalsecondage/Plains2.java | 2 +- .../mage/sets/portalsecondage/Plains3.java | 2 +- .../mage/sets/portalsecondage/PlatedWurm.java | 2 +- .../PredatoryNightstalker.java | 2 +- .../portalsecondage/ProwlingNightstalker.java | 2 +- .../sets/portalsecondage/RagingGoblin.java | 2 +- .../portalsecondage/RaidingNightstalker.java | 2 +- .../sets/portalsecondage/RainOfDaggers.java | 2 +- .../mage/sets/portalsecondage/RaiseDead.java | 2 +- .../sets/portalsecondage/RavenousRats.java | 2 +- .../sets/portalsecondage/RazorclawBear.java | 2 +- .../sets/portalsecondage/RighteousCharge.java | 2 +- .../sets/portalsecondage/RighteousFury.java | 2 +- .../mage/sets/portalsecondage/RiverBear.java | 2 +- .../mage/sets/portalsecondage/Salvage.java | 2 +- .../sets/portalsecondage/ScreechingDrake.java | 2 +- .../mage/sets/portalsecondage/SeaDrake.java | 2 +- .../sets/portalsecondage/SleightOfHand.java | 2 +- .../sets/portalsecondage/SpittingEarth.java | 2 +- .../sets/portalsecondage/SteamCatapult.java | 2 +- .../sets/portalsecondage/SteamFrigate.java | 2 +- .../mage/sets/portalsecondage/StoneRain.java | 2 +- .../src/mage/sets/portalsecondage/Swamp1.java | 2 +- .../src/mage/sets/portalsecondage/Swamp2.java | 2 +- .../src/mage/sets/portalsecondage/Swamp3.java | 2 +- .../sets/portalsecondage/SwarmOfRats.java | 2 +- .../sets/portalsecondage/SylvanBasilisk.java | 2 +- .../mage/sets/portalsecondage/SylvanYeti.java | 2 +- .../sets/portalsecondage/TalasAirShip.java | 2 +- .../sets/portalsecondage/TalasExplorer.java | 2 +- .../sets/portalsecondage/TalasMerchant.java | 2 +- .../sets/portalsecondage/TalasResearcher.java | 2 +- .../mage/sets/portalsecondage/TalasScout.java | 2 +- .../sets/portalsecondage/TalasWarrior.java | 2 +- .../sets/portalsecondage/TempleAcolyte.java | 2 +- .../sets/portalsecondage/TempleElder.java | 2 +- .../portalsecondage/TemporalManipulation.java | 2 +- .../sets/portalsecondage/TheftOfDreams.java | 2 +- .../mage/sets/portalsecondage/TidalSurge.java | 2 +- .../mage/sets/portalsecondage/TimeEbb.java | 2 +- .../portalsecondage/TouchOfBrilliance.java | 2 +- .../mage/sets/portalsecondage/TownSentry.java | 2 +- .../mage/sets/portalsecondage/TreeMonkey.java | 2 +- .../src/mage/sets/portalsecondage/Tremor.java | 2 +- .../sets/portalsecondage/TrokinHighGuard.java | 2 +- .../src/mage/sets/portalsecondage/Undo.java | 2 +- .../sets/portalsecondage/UntamedWilds.java | 2 +- .../sets/portalsecondage/VampiricSpirit.java | 2 +- .../mage/sets/portalsecondage/Vengeance.java | 2 +- .../sets/portalsecondage/VolcanicHammer.java | 2 +- .../portalsecondage/VolunteerMilitia.java | 2 +- .../sets/portalsecondage/WildGriffin.java | 2 +- .../src/mage/sets/portalsecondage/WildOx.java | 2 +- .../mage/sets/portalsecondage/Wildfire.java | 2 +- .../mage/sets/portalsecondage/WindSail.java | 2 +- .../mage/game/permanent/token/AngelToken.java | 2 +- .../mage/game/permanent/token/BeastToken.java | 18 +- .../game/permanent/token/BeastToken2.java | 21 ++- .../mage/game/permanent/token/CatToken.java | 21 ++- .../mage/game/permanent/token/DemonToken.java | 4 +- .../game/permanent/token/DragonToken.java | 21 ++- .../game/permanent/token/DragonToken2.java | 21 ++- .../permanent/token/ElementalShamanToken.java | 15 +- .../game/permanent/token/ElementalToken.java | 23 ++- .../game/permanent/token/ElephantToken.java | 24 ++- .../mage/game/permanent/token/GoatToken.java | 21 ++- .../game/permanent/token/GoblinToken.java | 25 ++- .../game/permanent/token/KnightToken.java | 7 +- .../game/permanent/token/SaprolingToken.java | 16 +- .../mage/game/permanent/token/SnakeToken.java | 26 +-- .../game/permanent/token/SoldierToken.java | 2 +- .../game/permanent/token/SpiderToken.java | 12 +- .../game/permanent/token/SpiritToken.java | 47 ++++- .../permanent/token/SpiritWhiteToken.java | 4 +- .../mage/game/permanent/token/WolfToken.java | 8 +- .../game/permanent/token/ZombieToken.java | 6 +- 193 files changed, 583 insertions(+), 366 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java index e2ae790ee6e..9449fc22504 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java @@ -16,100 +16,33 @@ public class MagicCardsImageSource implements CardImageSource { private static final Map setNameTokenReplacement = new HashMap() { { - put("C16", "commander-2016"); + put("10E", "tenth-edition"); put("AER", "aether-revolt"); - put("KLD", "kaladesh"); - put("CN2", "conspiracy-take-the-crown"); - put("W16", "welcome-deck-2016"); - put("EMA", "eternal-masters"); - put("EMN", "eldritch-moon"); - put("SOI", "shadows-over-innistrad"); - put("OGW", "oath-of-the-gatewatch"); - put("CMA", "commanders-arsenal"); - put("ARENA", "arena-league"); - put("CP", "champs"); - put("UGIN", "ugins-fate"); + put("ALA", "shards-of-alara"); put("APAC", "asia-pacific-land-program"); - put("EURO", "european-land-program"); - put("SUS", "super-series"); - put("C15", "commander-2015"); - put("ORG", "oath-of-the-gatewatch"); - put("EXP", "zendikar-expeditions"); + put("ARB", "alara-reborn"); + put("ARC", "archenemy"); + put("ARENA", "arena-league"); + put("AVR", "avacyn-restored"); put("BFZ", "battle-for-zendikar"); - put("FVL", "from-the-vault-legends"); - put("FVD", "from-the-vault-dragons"); - put("FVE", "from-the-vault-exiled"); - put("FVR", "from-the-vault-relics"); - put("V12", "from-the-vault-realms"); - put("V13", "from-the-vault-twenty"); - put("V14", "from-the-vault-annihilation"); - put("V15", "from-the-vault-angels"); - put("V16", "from-the-vault-lore"); - put("CLASH", "clash-pack"); - put("TPR", "tempest-remastered"); - put("ORI", "magic-origins"); - put("MM2", "modern-masters-2015"); - put("PTC", "prerelease-events"); - put("DTK", "dragons-of-tarkir"); - put("GRC", "wpngateway"); - put("MBP", "media-inserts"); - put("MLP", "launch-party"); - put("WMCQ", "world-magic-cup-qualifier"); - put("GPX", "grand-prix"); - put("JR", "judge-gift-program"); - put("MGDC", "magic-game-day-cards"); - put("FNMP", "friday-night-magic"); - put("FRF", "fate-reforged"); - put("C14", "commander-2014"); - put("KTK", "khans-of-tarkir"); - put("VMA", "vintage-masters"); - put("CNS", "conspiracy"); - put("JOU", "journey-into-nyx"); put("BNG", "born-of-the-gods"); put("C13", "commander-2013-edition"); - put("THS", "theros"); - put("MMA", "modern-masters"); - put("DGM", "dragons-maze"); - put("GTC", "gatecrash"); - put("RTR", "return-to-ravnica"); - put("AVR", "avacyn-restored"); - put("DKA", "dark-ascension"); - put("ISD", "innistrad"); - put("NPH", "new-phyrexia"); - put("MBS", "mirrodin-besieged"); - put("SOM", "scars-of-mirrodin"); - put("ROE", "rise-of-the-eldrazi"); - put("WWK", "worldwake"); - put("ZEN", "zendikar"); - put("HOP", "planechase"); + put("C14", "commander-2014"); + put("C15", "commander-2015"); + put("C16", "commander-2016"); + put("CLASH", "clash-pack"); + put("CMA", "commanders-arsenal"); put("CMD", "commander"); - put("ARC", "archenemy"); - put("PC2", "planechase-2012-edition"); - put("ARB", "alara-reborn"); + put("CN2", "conspiracy-take-the-crown"); + put("CNS", "conspiracy"); put("CON", "conflux"); - put("ALA", "shards-of-alara"); - put("EVE", "eventide"); - put("SHM", "shadowmoor"); - put("MOR", "morningtide"); - put("LRW", "lorwyn"); - put("10E", "tenth-edition"); + put("CP", "champs"); put("CSP", "coldsnap"); - put("MPRP", "magic-player-rewards"); - put("POR", "portal"); - put("PO2", "portal-second-age"); - put("PTK", "portal-three-kingdoms"); - put("M15", "magic-2015"); - put("M14", "magic-2014"); - put("M13", "magic-2013"); - put("M12", "magic-2012"); - put("M11", "magic-2011"); - put("M10", "magic-2010"); - put("EVG", "duel-decks-elves-vs-goblins"); put("DD2", "duel-decks-jace-vs-chandra"); - put("DD3A", "duel-decks-anthology-divine-vs-demonic"); - put("DD3B", "duel-decks-anthology-elves-vs-goblins"); - put("DD3C", "duel-decks-anthology-garruk-vs-liliana"); - put("DD3D", "duel-decks-anthology-jace-vs-chandra"); + put("DD3DVD", "duel-decks-anthology-divine-vs-demonic"); + put("DD3EVG", "duel-decks-anthology-elves-vs-goblins"); + put("DD3GVL", "duel-decks-anthology-garruk-vs-liliana"); + put("DD3JVC", "duel-decks-anthology-jace-vs-chandra"); put("DDC", "duel-decks-divine-vs-demonic"); put("DDD", "duel-decks-garruk-vs-liliana"); put("DDE", "duel-decks-phyrexia-vs-the-coalition"); @@ -126,6 +59,73 @@ public class MagicCardsImageSource implements CardImageSource { put("DDP", "duel-decks-zendikar-vs-eldrazi"); put("DDQ", "duel-decks-blessed-vs-cursed"); put("DDR", "duel-decks-nissa-vs-ob-nixilis"); + put("DGM", "dragons-maze"); + put("DKA", "dark-ascension"); + put("DRB", "from-the-vault-dragons"); + put("DTK", "dragons-of-tarkir"); + put("EMA", "eternal-masters"); + put("EMN", "eldritch-moon"); + put("EURO", "european-land-program"); + put("EVE", "eventide"); + put("EVG", "duel-decks-elves-vs-goblins"); + put("EXP", "zendikar-expeditions"); + put("FNMP", "friday-night-magic"); + put("FRF", "fate-reforged"); + put("GPX", "grand-prix"); + put("GRC", "wpngateway"); + put("GTC", "gatecrash"); + put("HOP", "planechase"); + put("ISD", "innistrad"); + put("JOU", "journey-into-nyx"); + put("JR", "judge-gift-program"); + put("KLD", "kaladesh"); + put("KTK", "khans-of-tarkir"); + put("LRW", "lorwyn"); + put("M10", "magic-2010"); + put("M11", "magic-2011"); + put("M12", "magic-2012"); + put("M13", "magic-2013"); + put("M14", "magic-2014"); + put("M15", "magic-2015"); + put("MBP", "media-inserts"); + put("MBS", "mirrodin-besieged"); + put("MGDC", "magic-game-day-cards"); + put("MLP", "launch-party"); + put("MM2", "modern-masters-2015"); + put("MMA", "modern-masters"); + put("MOR", "morningtide"); + put("MPRP", "magic-player-rewards"); + put("NPH", "new-phyrexia"); + put("OGW", "oath-of-the-gatewatch"); + put("ORG", "oath-of-the-gatewatch"); + put("ORI", "magic-origins"); + put("PC2", "planechase-2012-edition"); + put("PO2", "portal-second-age"); + put("POR", "portal"); + put("PTC", "prerelease-events"); + put("PTK", "portal-three-kingdoms"); + put("ROE", "rise-of-the-eldrazi"); + put("RTR", "return-to-ravnica"); + put("SHM", "shadowmoor"); + put("SOI", "shadows-over-innistrad"); + put("SOM", "scars-of-mirrodin"); + put("SUS", "super-series"); + put("THS", "theros"); + put("TPR", "tempest-remastered"); + put("UGIN", "ugins-fate"); + put("V09", "from-the-vault-exiled"); + put("V10", "from-the-vault-relics"); + put("V11", "from-the-vault-legends"); + put("V12", "from-the-vault-realms"); + put("V13", "from-the-vault-twenty"); + put("V14", "from-the-vault-annihilation"); + put("V15", "from-the-vault-angels"); + put("V16", "from-the-vault-lore"); + put("VMA", "vintage-masters"); + put("W16", "welcome-deck-2016"); + put("WMCQ", "world-magic-cup-qualifier"); + put("WWK", "worldwake"); + put("ZEN", "zendikar"); } private static final long serialVersionUID = 1L; }; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java index 6dc68065f2a..fc837786ee2 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java @@ -115,10 +115,10 @@ public class WizardCardsImageSource implements CardImageSource { setsAliases.put("CON", "Conflux"); setsAliases.put("CSP", "Coldsnap"); setsAliases.put("DD2", "Duel Decks: Jace vs. Chandra"); - setsAliases.put("DD3A", "Duel Decks Anthology, Divine vs. Demonic"); - setsAliases.put("DD3B", "Duel Decks Anthology, Elves vs. Goblins"); - setsAliases.put("DD3C", "Duel Decks Anthology, Garruk vs. Liliana"); - setsAliases.put("DD3D", "Duel Decks Anthology, Jace vs. Chandra"); + setsAliases.put("DD3DVD", "Duel Decks Anthology, Divine vs. Demonic"); + setsAliases.put("DD3EVG", "Duel Decks Anthology, Elves vs. Goblins"); + setsAliases.put("DD3GVL", "Duel Decks Anthology, Garruk vs. Liliana"); + setsAliases.put("DD3JVC", "Duel Decks Anthology, Jace vs. Chandra"); setsAliases.put("DDC", "Duel Decks: Divine vs. Demonic"); setsAliases.put("DDD", "Duel Decks: Garruk vs. Liliana"); setsAliases.put("DDE", "Duel Decks: Phyrexia vs. the Coalition"); @@ -139,6 +139,7 @@ public class WizardCardsImageSource implements CardImageSource { setsAliases.put("DIS", "Dissension"); setsAliases.put("DKA", "Dark Ascension"); setsAliases.put("DKM", "Deckmasters"); + setsAliases.put("DRB", "From the Vault: Dragons"); setsAliases.put("DRK", "The Dark"); setsAliases.put("DST", "Darksteel"); setsAliases.put("DTK", "Dragons of Tarkir"); @@ -151,14 +152,11 @@ public class WizardCardsImageSource implements CardImageSource { setsAliases.put("FNMP", "Friday Night Magic"); setsAliases.put("FRF", "Fate Reforged"); setsAliases.put("FUT", "Future Sight"); - setsAliases.put("FVD", "From the Vault: Dragons"); - setsAliases.put("FVE", "From the Vault: Exiled"); - setsAliases.put("FVL", "From the Vault: Legends"); - setsAliases.put("FVR", "From the Vault: Relics"); setsAliases.put("GPT", "Guildpact"); setsAliases.put("GPX", "Grand Prix"); setsAliases.put("GRC", "WPN Gateway"); setsAliases.put("GTC", "Gatecrash"); + setsAliases.put("H09", "Premium Deck Series: Slivers"); setsAliases.put("HML", "Homelands"); setsAliases.put("HOP", "Planechase"); setsAliases.put("ICE", "Ice Age"); @@ -195,7 +193,7 @@ public class WizardCardsImageSource implements CardImageSource { setsAliases.put("MOR", "Morningtide"); setsAliases.put("MPRP", "Magic Player Rewards"); setsAliases.put("MRD", "Mirrodin"); - setsAliases.put("NMS", "Nemesis"); + setsAliases.put("NEM", "Nemesis"); setsAliases.put("NPH", "New Phyrexia"); setsAliases.put("OGW", "Oath of the Gatewatch"); setsAliases.put("ODY", "Odyssey"); @@ -204,7 +202,6 @@ public class WizardCardsImageSource implements CardImageSource { setsAliases.put("PC2", "Planechase 2012 Edition"); setsAliases.put("PCY", "Prophecy"); setsAliases.put("PD2", "Premium Deck Series: Fire and Lightning"); - setsAliases.put("PDS", "Premium Deck Series: Slivers"); setsAliases.put("PLC", "Planar Chaos"); setsAliases.put("PLS", "Planeshift"); setsAliases.put("PO2", "Portal Second Age"); @@ -233,6 +230,9 @@ public class WizardCardsImageSource implements CardImageSource { setsAliases.put("ULG", "Urza's Legacy"); setsAliases.put("UNH", "Unhinged"); setsAliases.put("USG", "Urza's Saga"); + setsAliases.put("V09", "From the Vault: Exiled"); + setsAliases.put("V10", "From the Vault: Relics"); + setsAliases.put("V11", "From the Vault: Legends"); setsAliases.put("V12", "From the Vault: Realms"); setsAliases.put("V13", "From the Vault: Twenty"); setsAliases.put("V14", "From the Vault: Annihilation (2014)"); @@ -250,7 +250,7 @@ public class WizardCardsImageSource implements CardImageSource { setsAliases.put("WTH", "Weatherlight"); setsAliases.put("WWK", "Worldwake"); setsAliases.put("ZEN", "Zendikar"); - + languageAliases = new HashMap<>(); languageAliases.put("es", "Spanish"); languageAliases.put("jp", "Japanese"); @@ -298,16 +298,16 @@ public class WizardCardsImageSource implements CardImageSource { } catch (IOException ex) { System.out.println("Exception when parsing the wizards page: " + ex.getMessage()); } - + executor.shutdown(); - + while (!executor.isTerminated()) { try { Thread.sleep(1000); } catch (InterruptedException ie) { } } - + return setLinks; } @@ -323,9 +323,9 @@ public class WizardCardsImageSource implements CardImageSource { URL url = new URL(urlString); Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyServer, proxyPort)); HttpURLConnection uc = (HttpURLConnection)url.openConnection(proxy); - + uc.connect(); - + String line; StringBuffer tmp = new StringBuffer(); BufferedReader in = new BufferedReader(new InputStreamReader(uc.getInputStream())); @@ -336,7 +336,7 @@ public class WizardCardsImageSource implements CardImageSource { } return doc; } - + private Map getLandVariations(Integer multiverseId, String cardName) throws IOException, NumberFormatException { String urlLandDocument = "http://gatherer.wizards.com/Pages/Card/Details.aspx?multiverseid=" + multiverseId; Document landDoc = getDocument(urlLandDocument); @@ -352,7 +352,7 @@ public class WizardCardsImageSource implements CardImageSource { } else { links.put(cardName.toLowerCase(), generateLink(multiverseId)); } - + return links; } @@ -364,7 +364,7 @@ public class WizardCardsImageSource implements CardImageSource { if (preferedLanguage.equals("en")) { return multiverseId; } - + String languageName = languageAliases.get(preferedLanguage); HashMap localizedLanguageIds = getlocalizedMultiverseIds(multiverseId); if (localizedLanguageIds.containsKey(languageName)) { @@ -373,7 +373,7 @@ public class WizardCardsImageSource implements CardImageSource { return multiverseId; } } - + private HashMap getlocalizedMultiverseIds(Integer englishMultiverseId) throws IOException { String cardLanguagesUrl = "http://gatherer.wizards.com/Pages/Card/Languages.aspx?multiverseid=" + englishMultiverseId; Document cardLanguagesDoc = getDocument(cardLanguagesUrl); @@ -401,7 +401,7 @@ public class WizardCardsImageSource implements CardImageSource { } return name.replace("\u2014", "-").replace("\u2019", "'") .replace("\u00C6", "AE").replace("\u00E6", "ae") - .replace("\u00C3\u2020", "AE") + .replace("\u00C3\u2020", "AE") .replace("\u00C1", "A").replace("\u00E1", "a") .replace("\u00C2", "A").replace("\u00E2", "a") .replace("\u00D6", "O").replace("\u00F6", "o") @@ -456,21 +456,21 @@ public class WizardCardsImageSource implements CardImageSource { public Float getAverageSize() { return 60.0f; } - + private final class GetImageLinkTask implements Runnable { private final Integer multiverseId; private final String cardName; private final String preferedLanguage; private final ConcurrentHashMap setLinks; - + public GetImageLinkTask(Integer multiverseId, String cardName, String preferedLanguage, ConcurrentHashMap setLinks) { this.multiverseId = multiverseId; this.cardName = cardName; this.preferedLanguage = preferedLanguage; this.setLinks = setLinks; } - + @Override public void run() { try { @@ -484,7 +484,7 @@ public class WizardCardsImageSource implements CardImageSource { System.out.println("Exception when parsing the wizards page: " + ex.getMessage()); } } - + } - + } diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index e7eca6acb0a..c4070acff32 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -1,8 +1,24 @@ +|Generate|TOK:EMA|Carnivore|| +|Generate|TOK:EMA|Dragon|| +|Generate|TOK:EMA|Elemental|1| +|Generate|TOK:EMA|Elemental|2| +|Generate|TOK:EMA|Elephant|| +|Generate|TOK:EMA|Elf Warrior|| +|Generate|TOK:EMA|Goblin|| +|Generate|TOK:EMA|Goblin Soldier|| +|Generate|TOK:EMA|Serf|| +|Generate|TOK:EMA|Soldier|| +|Generate|TOK:EMA|Spirit|1| +|Generate|TOK:EMA|Spirit|2| +|Generate|TOK:EMA|Wall|| +|Generate|TOK:EMA|Wurm|| +|Generate|TOK:EMA|Zombie|| +|Generate|EMBLEM!:EMA|Emblem Dack Fayden|| + |Generate|TOK:EMN|Eldrazi Horror|| |Generate|TOK:EMN|Human|| |Generate|TOK:EMN|Human Wizard|| |Generate|TOK:EMN|Spider|| -|Generate|TOK:EMN|Spirit|| |Generate|TOK:EMN|Zombie|1| |Generate|TOK:EMN|Zombie|2| |Generate|TOK:EMN|Zombie|3| diff --git a/Mage.Client/src/main/resources/image.url.properties b/Mage.Client/src/main/resources/image.url.properties index 04519c58167..c7aae5d95d9 100644 --- a/Mage.Client/src/main/resources/image.url.properties +++ b/Mage.Client/src/main/resources/image.url.properties @@ -16,7 +16,7 @@ mir=mr tst=ts usg=us apc=ap -nms=ne +nem=ne dis=di vis=vi 9ed=9e @@ -66,4 +66,4 @@ dde=pvc # Remove setname as soon as the images can be downloaded ignore.urls=TOK,AER,PCA,C16,V16,KLD,DDR,CN2 # sets ordered by release time (newest goes first) -token.lookup.order=AER,PCA,C16,V16,KLD,DDR,CN2,EMN,EMA,SOI,DDQ,CP,CMA,ARENA,SUS,APAC,EURO,UGIN,C15,OGW,EXP,DDP,BFZ,FVD,FVE,FVL,FVR,V12,V13,V14,V15,TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC \ No newline at end of file +token.lookup.order=DD3DVD,DD3EVG,DD3GVL,DD3JVC,H09,AER,PCA,C16,V16,KLD,DDR,CN2,EMN,EMA,SOI,DDQ,CP,CMA,ARENA,SUS,APAC,EURO,UGIN,C15,OGW,EXP,DDP,BFZ,DRB,V09,V10,V11,V12,V13,V14,V15,TPR,MPRP,DD3,DDO,ORI,MM2,PTC,DTK,FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK,GRC \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java b/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java index 3e5bd72f44e..dbe35322360 100644 --- a/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java +++ b/Mage.Sets/src/mage/sets/AnthologyDivineVsDemonic.java @@ -43,7 +43,7 @@ public class AnthologyDivineVsDemonic extends ExpansionSet { } private AnthologyDivineVsDemonic() { - super("Duel Decks: Anthology, Divine vs. Demonic", "DD3A", "mage.sets.anthologydivinevsdemonic", new GregorianCalendar(2014, 12, 5).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Anthology, Divine vs. Demonic", "DD3DVD", "mage.sets.anthologydivinevsdemonic", new GregorianCalendar(2014, 12, 5).getTime(), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java b/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java index c1fee607182..70f5144038f 100644 --- a/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java +++ b/Mage.Sets/src/mage/sets/AnthologyElvesVsGoblins.java @@ -43,7 +43,7 @@ public class AnthologyElvesVsGoblins extends ExpansionSet { } private AnthologyElvesVsGoblins() { - super("Duel Decks: Anthology, Elves vs. Goblins", "DD3B", "mage.sets.anthologyelvesvsgoblins", new GregorianCalendar(2014, 12, 5).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Anthology, Elves vs. Goblins", "DD3EVG", "mage.sets.anthologyelvesvsgoblins", new GregorianCalendar(2014, 12, 5).getTime(), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java b/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java index b2e57d8d26f..51cf19caa3a 100644 --- a/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java +++ b/Mage.Sets/src/mage/sets/AnthologyGarrukVsLiliana.java @@ -43,7 +43,7 @@ public class AnthologyGarrukVsLiliana extends ExpansionSet { } private AnthologyGarrukVsLiliana() { - super("Duel Decks: Anthology, Garruk vs. Liliana", "DD3C", "mage.sets.anthologygarrukvsliliana", new GregorianCalendar(2014, 12, 5).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Anthology, Garruk vs. Liliana", "DD3GVL", "mage.sets.anthologygarrukvsliliana", new GregorianCalendar(2014, 12, 5).getTime(), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java b/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java index 19ef4402bb3..af8c782bce2 100644 --- a/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java +++ b/Mage.Sets/src/mage/sets/AnthologyJaceVsChandra.java @@ -43,7 +43,7 @@ public class AnthologyJaceVsChandra extends ExpansionSet { } private AnthologyJaceVsChandra() { - super("Duel Decks: Anthology, Jace vs. Chandra", "DD3D", "mage.sets.anthologyjacevschandra", new GregorianCalendar(2014, 12, 5).getTime(), SetType.SUPPLEMENTAL); + super("Duel Decks: Anthology, Jace vs. Chandra", "DD3JVC", "mage.sets.anthologyjacevschandra", new GregorianCalendar(2014, 12, 5).getTime(), SetType.SUPPLEMENTAL); this.blockName = "Duel Decks: Anthology"; this.hasBasicLands = false; } diff --git a/Mage.Sets/src/mage/sets/EldritchMoon.java b/Mage.Sets/src/mage/sets/EldritchMoon.java index 73c89460c45..43e1b95b1c4 100644 --- a/Mage.Sets/src/mage/sets/EldritchMoon.java +++ b/Mage.Sets/src/mage/sets/EldritchMoon.java @@ -47,8 +47,8 @@ public class EldritchMoon extends ExpansionSet { super("Eldritch Moon", "EMN", "mage.sets.eldritchmoon", new GregorianCalendar(2016, 7, 26).getTime(), SetType.EXPANSION); this.blockName = "Shadows over Innistrad"; this.hasBoosters = true; - this.numBoosterLands = 0; - this.numBoosterCommon = 10; + this.numBoosterLands = 1; + this.numBoosterCommon = 9; this.numBoosterUncommon = 3; this.numBoosterRare = 1; this.ratioBoosterMythic = 8; diff --git a/Mage.Sets/src/mage/sets/FTVDragons.java b/Mage.Sets/src/mage/sets/FTVDragons.java index f4b1aaf6823..48dd1498fa7 100644 --- a/Mage.Sets/src/mage/sets/FTVDragons.java +++ b/Mage.Sets/src/mage/sets/FTVDragons.java @@ -44,7 +44,7 @@ public class FTVDragons extends ExpansionSet { } private FTVDragons() { - super("From the Vault: Dragons", "FVD", "mage.sets.ftvdragons", new GregorianCalendar(2008, 8, 29).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Dragons", "DRB", "mage.sets.ftvdragons", new GregorianCalendar(2008, 8, 29).getTime(), SetType.SUPPLEMENTAL); this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/FTVExiled.java b/Mage.Sets/src/mage/sets/FTVExiled.java index 306ec002b62..8d1a446094e 100644 --- a/Mage.Sets/src/mage/sets/FTVExiled.java +++ b/Mage.Sets/src/mage/sets/FTVExiled.java @@ -44,7 +44,7 @@ public class FTVExiled extends ExpansionSet { } private FTVExiled() { - super("From the Vault: Exiled", "FVE", "mage.sets.ftvexiled", new GregorianCalendar(2009, 8, 28).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Exiled", "V09", "mage.sets.ftvexiled", new GregorianCalendar(2009, 8, 28).getTime(), SetType.SUPPLEMENTAL); this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/FTVLegends.java b/Mage.Sets/src/mage/sets/FTVLegends.java index 1d96db33225..8ec3570baf9 100644 --- a/Mage.Sets/src/mage/sets/FTVLegends.java +++ b/Mage.Sets/src/mage/sets/FTVLegends.java @@ -44,7 +44,7 @@ public class FTVLegends extends ExpansionSet { } private FTVLegends() { - super("From the Vault: Legends", "FVL", "mage.sets.ftvlegends", new GregorianCalendar(2011, 8, 26).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Legends", "V11", "mage.sets.ftvlegends", new GregorianCalendar(2011, 8, 26).getTime(), SetType.SUPPLEMENTAL); this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/FTVRelics.java b/Mage.Sets/src/mage/sets/FTVRelics.java index 1fbf07e669a..43421ec46b8 100644 --- a/Mage.Sets/src/mage/sets/FTVRelics.java +++ b/Mage.Sets/src/mage/sets/FTVRelics.java @@ -44,7 +44,7 @@ public class FTVRelics extends ExpansionSet { } private FTVRelics() { - super("From the Vault: Relics", "FVR", "mage.sets.ftvrelics", new GregorianCalendar(2010, 8, 27).getTime(), SetType.SUPPLEMENTAL); + super("From the Vault: Relics", "V10", "mage.sets.ftvrelics", new GregorianCalendar(2010, 8, 27).getTime(), SetType.SUPPLEMENTAL); this.hasBasicLands = false; } } diff --git a/Mage.Sets/src/mage/sets/Nemesis.java b/Mage.Sets/src/mage/sets/Nemesis.java index a46e1df9574..b65998ac034 100644 --- a/Mage.Sets/src/mage/sets/Nemesis.java +++ b/Mage.Sets/src/mage/sets/Nemesis.java @@ -28,7 +28,6 @@ package mage.sets; import java.util.GregorianCalendar; - import mage.cards.ExpansionSet; import mage.constants.SetType; @@ -45,7 +44,7 @@ public class Nemesis extends ExpansionSet { } private Nemesis() { - super("Nemesis", "NMS", "mage.sets.nemesis", new GregorianCalendar(2000, 1, 5).getTime(), SetType.EXPANSION); + super("Nemesis", "NEM", "mage.sets.nemesis", new GregorianCalendar(2000, 1, 5).getTime(), SetType.EXPANSION); this.blockName = "Masques"; this.parentSet = MercadianMasques.getInstance(); this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/PDSSlivers.java b/Mage.Sets/src/mage/sets/PDSSlivers.java index 175e81fd806..1d94ae2c130 100644 --- a/Mage.Sets/src/mage/sets/PDSSlivers.java +++ b/Mage.Sets/src/mage/sets/PDSSlivers.java @@ -44,7 +44,7 @@ public class PDSSlivers extends ExpansionSet { } private PDSSlivers() { - super("Premium Deck Series: Slivers", "PDS", "mage.sets.pdsslivers", new GregorianCalendar(2009, 11, 1).getTime(), SetType.SUPPLEMENTAL); + super("Premium Deck Series: Slivers", "H09", "mage.sets.pdsslivers", new GregorianCalendar(2009, 11, 1).getTime(), SetType.SUPPLEMENTAL); this.hasBasicLands = false; } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/commander2015/DaxosTheReturned.java b/Mage.Sets/src/mage/sets/commander2015/DaxosTheReturned.java index 81a6d12aaf7..5e8ffaaaa06 100644 --- a/Mage.Sets/src/mage/sets/commander2015/DaxosTheReturned.java +++ b/Mage.Sets/src/mage/sets/commander2015/DaxosTheReturned.java @@ -102,6 +102,7 @@ class DaxosSpiritToken extends Token { DaxosSpiritToken() { super("Spirit", "white and black Spirit enchantment creature token with \"This creature's power and toughness are each equal to the number of experience counters you have.\""); this.setOriginalExpansionSetCode("C15"); + setTokenType(2); cardType.add(CardType.ENCHANTMENT); cardType.add(CardType.CREATURE); color.setWhite(true); diff --git a/Mage.Sets/src/mage/sets/dissension/ResearchDevelopment.java b/Mage.Sets/src/mage/sets/dissension/ResearchDevelopment.java index d18336fdd9a..b751ecbcd4c 100644 --- a/Mage.Sets/src/mage/sets/dissension/ResearchDevelopment.java +++ b/Mage.Sets/src/mage/sets/dissension/ResearchDevelopment.java @@ -170,7 +170,7 @@ class DevelopmentEffect extends OneShotEffect { boolean putToken = true; for (UUID opponentUuid : opponents) { Player opponent = game.getPlayer(opponentUuid); - if (opponent != null && opponent.chooseUse(Outcome.Detriment, + if (opponent != null && opponent.chooseUse(Outcome.Detriment, "Allow " + player.getLogName() + " to draw a card instead? (" + Integer.toString(i+1) + ")", source, game)) { game.informPlayers(opponent.getLogName() + " had chosen to let " + player.getLogName() + " draw a card."); player.drawCards(1, game); @@ -179,7 +179,7 @@ class DevelopmentEffect extends OneShotEffect { } } if (putToken) { - new CreateTokenEffect(new ElementalToken()).apply(game, source); + new CreateTokenEffect(new ElementalToken("DIS", 1)).apply(game, source); } } diff --git a/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java b/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java index 0d94660ce2c..2fd96e21705 100644 --- a/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java +++ b/Mage.Sets/src/mage/sets/jacevschandra/Hostility.java @@ -41,10 +41,10 @@ import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; -import mage.game.permanent.token.ElementalShamanToken; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; +import mage.game.permanent.token.ElementalShamanToken; import mage.game.stack.Spell; /** @@ -133,7 +133,7 @@ class HostilityEffect extends PreventionEffectImpl { class HostilityElementalToken extends ElementalShamanToken { public HostilityElementalToken() { - super(); + super("DD2", 1); description = description + " with haste"; addAbility(HasteAbility.getInstance()); } diff --git a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java index 5e64f9bdccb..be48511fd0e 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java +++ b/Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java @@ -27,8 +27,7 @@ */ package mage.sets.lorwyn; -import mage.constants.CardType; -import mage.constants.Rarity; +import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -37,7 +36,9 @@ import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Rarity; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -46,8 +47,6 @@ import mage.game.permanent.token.ElementalShamanToken; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; -import java.util.UUID; - /** * * @author Loki @@ -70,10 +69,10 @@ public class HearthcageGiant extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); - + //When Hearthcage Giant enters the battlefield, put two 3/1 red Elemental Shaman creature tokens onto the battlefield. - this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ElementalShamanToken(), 2), false)); - + this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new ElementalShamanToken("LRW", 2)), false)); + //Sacrifice an Elemental: Target Giant creature gets +3/+1 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 1, Duration.EndOfTurn), new SacrificeTargetCost(new TargetControlledPermanent(filterElemental))); ability.addTarget(new TargetCreaturePermanent(filterGiant)); diff --git a/Mage.Sets/src/mage/sets/lorwyn/RebellionOfTheFlamekin.java b/Mage.Sets/src/mage/sets/lorwyn/RebellionOfTheFlamekin.java index 2849678b339..d14c92070db 100644 --- a/Mage.Sets/src/mage/sets/lorwyn/RebellionOfTheFlamekin.java +++ b/Mage.Sets/src/mage/sets/lorwyn/RebellionOfTheFlamekin.java @@ -29,9 +29,6 @@ package mage.sets.lorwyn; import java.util.UUID; import mage.abilities.Ability; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Rarity; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffect; @@ -41,13 +38,16 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.HasteAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.Rarity; import mage.constants.Zone; import mage.game.Game; -import mage.game.permanent.token.ElementalShamanToken; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import mage.game.permanent.token.ElementalShamanToken; import mage.players.Player; import mage.target.targetpointer.FixedTarget; @@ -136,7 +136,7 @@ class RebellionOfTheFlamekinEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { - CreateTokenEffect createTokenEffect = new CreateTokenEffect(new ElementalShamanToken(), 1); + CreateTokenEffect createTokenEffect = new CreateTokenEffect(new ElementalShamanToken("LRW", 1)); DoIfCostPaid doIfCostPaid = new DoIfCostPaid(createTokenEffect, new ManaCostsImpl("{1}")); doIfCostPaid.apply(game, source); Permanent token = game.getPermanent(createTokenEffect.getLastAddedTokenId()); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AbyssalNightstalker.java b/Mage.Sets/src/mage/sets/portalsecondage/AbyssalNightstalker.java index 072817fa8b5..9514f3b27e3 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AbyssalNightstalker.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AbyssalNightstalker.java @@ -44,7 +44,7 @@ public class AbyssalNightstalker extends CardImpl { public AbyssalNightstalker(UUID ownerId) { super(ownerId, 1, "Abyssal Nightstalker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Nightstalker"); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AirElemental.java b/Mage.Sets/src/mage/sets/portalsecondage/AirElemental.java index b4ff2fcb8cc..543ab77e030 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AirElemental.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AirElemental.java @@ -38,7 +38,7 @@ public class AirElemental extends mage.sets.magic2010.AirElemental { public AirElemental(UUID ownerId) { super(ownerId); this.cardNumber = 31; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public AirElemental(final AirElemental card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlabornCavalier.java b/Mage.Sets/src/mage/sets/portalsecondage/AlabornCavalier.java index 6f65c78c614..7b0c0e59b21 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AlabornCavalier.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AlabornCavalier.java @@ -45,7 +45,7 @@ public class AlabornCavalier extends CardImpl { public AlabornCavalier(UUID ownerId) { super(ownerId, 121, "Alaborn Cavalier", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Knight"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlabornGrenadier.java b/Mage.Sets/src/mage/sets/portalsecondage/AlabornGrenadier.java index 08eb7f4a0de..dc8dd76c527 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AlabornGrenadier.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AlabornGrenadier.java @@ -42,7 +42,7 @@ public class AlabornGrenadier extends CardImpl { public AlabornGrenadier(UUID ownerId) { super(ownerId, 122, "Alaborn Grenadier", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{W}{W}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlabornMusketeer.java b/Mage.Sets/src/mage/sets/portalsecondage/AlabornMusketeer.java index b017478c506..dc7b111dcf3 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AlabornMusketeer.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AlabornMusketeer.java @@ -42,7 +42,7 @@ public class AlabornMusketeer extends CardImpl { public AlabornMusketeer(UUID ownerId) { super(ownerId, 123, "Alaborn Musketeer", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{W}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlabornTrooper.java b/Mage.Sets/src/mage/sets/portalsecondage/AlabornTrooper.java index 42832ae4aa5..6a2d8c98a7d 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AlabornTrooper.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AlabornTrooper.java @@ -41,7 +41,7 @@ public class AlabornTrooper extends CardImpl { public AlabornTrooper(UUID ownerId) { super(ownerId, 124, "Alaborn Trooper", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Soldier"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlabornVeteran.java b/Mage.Sets/src/mage/sets/portalsecondage/AlabornVeteran.java index 0185157c5b7..4b19d3ce3cb 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AlabornVeteran.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AlabornVeteran.java @@ -49,7 +49,7 @@ public class AlabornVeteran extends CardImpl { public AlabornVeteran(UUID ownerId) { super(ownerId, 125, "Alaborn Veteran", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{W}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Knight"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java b/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java index 4973f21a940..22d9aa4eb09 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java @@ -38,7 +38,7 @@ public class AlluringScent extends mage.sets.portal.AlluringScent { public AlluringScent(UUID ownerId) { super(ownerId); this.cardNumber = 61; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public AlluringScent(final AlluringScent card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java b/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java index 071ffbb7764..4dc2cbf056c 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java @@ -38,7 +38,7 @@ public class AncientCraving extends mage.sets.starter1999.AncientCraving { public AncientCraving(UUID ownerId) { super(ownerId); this.cardNumber = 2; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public AncientCraving(final AncientCraving card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AngelOfFury.java b/Mage.Sets/src/mage/sets/portalsecondage/AngelOfFury.java index 09e277f1ccd..4b439141963 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AngelOfFury.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AngelOfFury.java @@ -44,7 +44,7 @@ public class AngelOfFury extends CardImpl { public AngelOfFury(UUID ownerId) { super(ownerId, 127, "Angel of Fury", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{W}{W}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Angel"); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AngelOfMercy.java b/Mage.Sets/src/mage/sets/portalsecondage/AngelOfMercy.java index b98bcfcbef2..7b38fa86eec 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AngelOfMercy.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AngelOfMercy.java @@ -38,7 +38,7 @@ public class AngelOfMercy extends mage.sets.tenthedition.AngelOfMercy { public AngelOfMercy(UUID ownerId) { super(ownerId); this.cardNumber = 128; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public AngelOfMercy(final AngelOfMercy card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AngelicBlessing.java b/Mage.Sets/src/mage/sets/portalsecondage/AngelicBlessing.java index 18cb37342a8..806180abbf4 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AngelicBlessing.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AngelicBlessing.java @@ -38,7 +38,7 @@ public class AngelicBlessing extends mage.sets.tenthedition.AngelicBlessing { public AngelicBlessing(UUID ownerId) { super(ownerId); this.cardNumber = 129; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public AngelicBlessing(final AngelicBlessing card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AngelicWall.java b/Mage.Sets/src/mage/sets/portalsecondage/AngelicWall.java index 73ee7bbb366..204ae636e38 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AngelicWall.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AngelicWall.java @@ -38,7 +38,7 @@ public class AngelicWall extends mage.sets.tenthedition.AngelicWall { public AngelicWall(UUID ownerId) { super(ownerId); this.cardNumber = 130; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public AngelicWall(final AngelicWall card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/ApprenticeSorcerer.java b/Mage.Sets/src/mage/sets/portalsecondage/ApprenticeSorcerer.java index da0b5ef6b0e..68d18b6e330 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/ApprenticeSorcerer.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/ApprenticeSorcerer.java @@ -48,7 +48,7 @@ public class ApprenticeSorcerer extends CardImpl { public ApprenticeSorcerer(UUID ownerId) { super(ownerId, 32, "Apprentice Sorcerer", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Archangel.java b/Mage.Sets/src/mage/sets/portalsecondage/Archangel.java index 826cf9ceb4b..88897c71202 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Archangel.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Archangel.java @@ -39,7 +39,7 @@ public class Archangel extends mage.sets.avacynrestored.Archangel { public Archangel(UUID ownerId) { super(ownerId); this.cardNumber = 131; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.RARE; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Armageddon.java b/Mage.Sets/src/mage/sets/portalsecondage/Armageddon.java index 3379534a587..d951ff80150 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Armageddon.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Armageddon.java @@ -38,7 +38,7 @@ public class Armageddon extends mage.sets.fifthedition.Armageddon { public Armageddon(UUID ownerId) { super(ownerId); this.cardNumber = 132; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Armageddon(final Armageddon card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGalleon.java b/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGalleon.java index fc3a2dda87b..24580763ab4 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGalleon.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGalleon.java @@ -45,7 +45,7 @@ public class ArmoredGalleon extends CardImpl { public ArmoredGalleon(UUID ownerId) { super(ownerId, 33, "Armored Galleon", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Pirate"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGriffin.java b/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGriffin.java index f9f4b9b7ec5..a58b1792136 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGriffin.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/ArmoredGriffin.java @@ -38,7 +38,7 @@ public class ArmoredGriffin extends mage.sets.planechase2012.ArmoredGriffin { public ArmoredGriffin(UUID ownerId) { super(ownerId); this.cardNumber = 133; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public ArmoredGriffin(final ArmoredGriffin card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BarbtoothWurm.java b/Mage.Sets/src/mage/sets/portalsecondage/BarbtoothWurm.java index 4b5f24fc4ab..3a2daf5464a 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/BarbtoothWurm.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/BarbtoothWurm.java @@ -41,7 +41,7 @@ public class BarbtoothWurm extends CardImpl { public BarbtoothWurm(UUID ownerId) { super(ownerId, 62, "Barbtooth Wurm", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Wurm"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Bargain.java b/Mage.Sets/src/mage/sets/portalsecondage/Bargain.java index 4f6c2df74f0..cf8babeb749 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Bargain.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Bargain.java @@ -38,7 +38,7 @@ public class Bargain extends mage.sets.starter1999.Bargain { public Bargain(UUID ownerId) { super(ownerId); this.cardNumber = 134; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Bargain(final Bargain card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BearCub.java b/Mage.Sets/src/mage/sets/portalsecondage/BearCub.java index 325a3d93d9f..1a7628af4d9 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/BearCub.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/BearCub.java @@ -41,7 +41,7 @@ public class BearCub extends CardImpl { public BearCub(UUID ownerId) { super(ownerId, 63, "Bear Cub", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Bear"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java b/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java index 463759f6930..2a92ef4411e 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java @@ -38,7 +38,7 @@ public class BeeSting extends mage.sets.portal.BeeSting { public BeeSting(UUID ownerId) { super(ownerId); this.cardNumber = 64; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public BeeSting(final BeeSting card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Blaze.java b/Mage.Sets/src/mage/sets/portalsecondage/Blaze.java index a9f6998617e..88c15726551 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Blaze.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Blaze.java @@ -38,7 +38,7 @@ public class Blaze extends mage.sets.planechase.Blaze { public Blaze(UUID ownerId) { super(ownerId); this.cardNumber = 91; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Blaze(final Blaze card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BloodcurdlingScream.java b/Mage.Sets/src/mage/sets/portalsecondage/BloodcurdlingScream.java index bcd7828769f..6bd616fc6a8 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/BloodcurdlingScream.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/BloodcurdlingScream.java @@ -45,7 +45,7 @@ public class BloodcurdlingScream extends CardImpl { public BloodcurdlingScream(UUID ownerId) { super(ownerId, 3, "Bloodcurdling Scream", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{X}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // Target creature gets +X/+0 until end of turn. this.getSpellAbility().addEffect(new BoostTargetEffect(new ExileFromHandCostCardConvertedMana(), new StaticValue(0), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BreathOfLife.java b/Mage.Sets/src/mage/sets/portalsecondage/BreathOfLife.java index 4c02d2943b8..91908658e04 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/BreathOfLife.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/BreathOfLife.java @@ -39,7 +39,7 @@ public class BreathOfLife extends mage.sets.starter2000.BreathOfLife { public BreathOfLife(UUID ownerId) { super(ownerId); this.cardNumber = 135; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.COMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BrimstoneDragon.java b/Mage.Sets/src/mage/sets/portalsecondage/BrimstoneDragon.java index 9a3bd922c7d..3841bb6bd4e 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/BrimstoneDragon.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/BrimstoneDragon.java @@ -43,7 +43,7 @@ public class BrimstoneDragon extends CardImpl { public BrimstoneDragon(UUID ownerId) { super(ownerId, 92, "Brimstone Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{6}{R}{R}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Dragon"); this.power = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BrutalNightstalker.java b/Mage.Sets/src/mage/sets/portalsecondage/BrutalNightstalker.java index dbfbe136960..12005ef05d6 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/BrutalNightstalker.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/BrutalNightstalker.java @@ -45,7 +45,7 @@ public class BrutalNightstalker extends CardImpl { public BrutalNightstalker(UUID ownerId) { super(ownerId, 4, "Brutal Nightstalker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Nightstalker"); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/ChorusOfWoe.java b/Mage.Sets/src/mage/sets/portalsecondage/ChorusOfWoe.java index 9d59da009ee..824c025308b 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/ChorusOfWoe.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/ChorusOfWoe.java @@ -42,7 +42,7 @@ public class ChorusOfWoe extends CardImpl { public ChorusOfWoe(UUID ownerId) { super(ownerId, 5, "Chorus of Woe", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // Creatures you control get +1/+0 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(1, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/CoastalWizard.java b/Mage.Sets/src/mage/sets/portalsecondage/CoastalWizard.java index 247f1aaffbf..29a0ee91a8c 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/CoastalWizard.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/CoastalWizard.java @@ -57,7 +57,7 @@ public class CoastalWizard extends CardImpl { public CoastalWizard(UUID ownerId) { super(ownerId, 34, "Coastal Wizard", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Wizard"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Coercion.java b/Mage.Sets/src/mage/sets/portalsecondage/Coercion.java index 838700beea6..8cd7980d85c 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Coercion.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Coercion.java @@ -39,7 +39,7 @@ public class Coercion extends mage.sets.visions.Coercion { public Coercion(UUID ownerId) { super(ownerId); this.cardNumber = 6; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.UNCOMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/CruelEdict.java b/Mage.Sets/src/mage/sets/portalsecondage/CruelEdict.java index 0a6930f52f9..f87d91f60ec 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/CruelEdict.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/CruelEdict.java @@ -39,7 +39,7 @@ public class CruelEdict extends mage.sets.tenthedition.CruelEdict { public CruelEdict(UUID ownerId) { super(ownerId); this.cardNumber = 7; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.COMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DakmorBat.java b/Mage.Sets/src/mage/sets/portalsecondage/DakmorBat.java index c2dd22cc421..8e9bddca066 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/DakmorBat.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/DakmorBat.java @@ -42,7 +42,7 @@ public class DakmorBat extends CardImpl { public DakmorBat(UUID ownerId) { super(ownerId, 8, "Dakmor Bat", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Bat"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DakmorPlague.java b/Mage.Sets/src/mage/sets/portalsecondage/DakmorPlague.java index 9e4bd0a8869..aba3368403b 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/DakmorPlague.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/DakmorPlague.java @@ -38,7 +38,7 @@ public class DakmorPlague extends mage.sets.starter1999.DakmorPlague { public DakmorPlague(UUID ownerId) { super(ownerId); this.cardNumber = 9; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public DakmorPlague(final DakmorPlague card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DakmorScorpion.java b/Mage.Sets/src/mage/sets/portalsecondage/DakmorScorpion.java index 84422fefbf4..aa4d911f027 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/DakmorScorpion.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/DakmorScorpion.java @@ -41,7 +41,7 @@ public class DakmorScorpion extends CardImpl { public DakmorScorpion(UUID ownerId) { super(ownerId, 10, "Dakmor Scorpion", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Scorpion"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DakmorSorceress.java b/Mage.Sets/src/mage/sets/portalsecondage/DakmorSorceress.java index 8e3f9b570cb..edcdf218fb7 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/DakmorSorceress.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/DakmorSorceress.java @@ -38,7 +38,7 @@ public class DakmorSorceress extends mage.sets.starter1999.DakmorSorceress { public DakmorSorceress(UUID ownerId) { super(ownerId); this.cardNumber = 11; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public DakmorSorceress(final DakmorSorceress card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DarkOffering.java b/Mage.Sets/src/mage/sets/portalsecondage/DarkOffering.java index 6ae20aebd47..a7356ac7622 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/DarkOffering.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/DarkOffering.java @@ -53,7 +53,7 @@ public class DarkOffering extends CardImpl { public DarkOffering(UUID ownerId) { super(ownerId, 12, "Dark Offering", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // Destroy target nonblack creature. You gain 3 life. this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DeathcoilWurm.java b/Mage.Sets/src/mage/sets/portalsecondage/DeathcoilWurm.java index 32f4eca4bdf..88383036963 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/DeathcoilWurm.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/DeathcoilWurm.java @@ -42,7 +42,7 @@ public class DeathcoilWurm extends CardImpl { public DeathcoilWurm(UUID ownerId) { super(ownerId, 65, "Deathcoil Wurm", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{6}{G}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Wurm"); this.power = new MageInt(7); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DejaVu.java b/Mage.Sets/src/mage/sets/portalsecondage/DejaVu.java index f4fbd6f9a11..86e3c48c098 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/DejaVu.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/DejaVu.java @@ -38,7 +38,7 @@ public class DejaVu extends mage.sets.portal.DejaVu { public DejaVu(UUID ownerId) { super(ownerId); this.cardNumber = 35; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public DejaVu(final DejaVu card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/DenizenOfTheDeep.java b/Mage.Sets/src/mage/sets/portalsecondage/DenizenOfTheDeep.java index 3c68d7a9fee..4666b3ec97b 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/DenizenOfTheDeep.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/DenizenOfTheDeep.java @@ -38,7 +38,7 @@ public class DenizenOfTheDeep extends mage.sets.tenthedition.DenizenOfTheDeep { public DenizenOfTheDeep(UUID ownerId) { super(ownerId); this.cardNumber = 36; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public DenizenOfTheDeep(final DenizenOfTheDeep card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Earthquake.java b/Mage.Sets/src/mage/sets/portalsecondage/Earthquake.java index ffe309a0449..312b264e4e0 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Earthquake.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Earthquake.java @@ -38,7 +38,7 @@ public class Earthquake extends mage.sets.magic2010.Earthquake { public Earthquake(UUID ownerId) { super(ownerId); this.cardNumber = 94; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Earthquake(final Earthquake card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Exhaustion.java b/Mage.Sets/src/mage/sets/portalsecondage/Exhaustion.java index 3ce741b6fff..18ae4e73210 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Exhaustion.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Exhaustion.java @@ -38,7 +38,7 @@ public class Exhaustion extends mage.sets.portalthreekingdoms.Exhaustion { public Exhaustion(UUID ownerId) { super(ownerId); this.cardNumber = 37; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Exhaustion(final Exhaustion card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Extinguish.java b/Mage.Sets/src/mage/sets/portalsecondage/Extinguish.java index 0f38b023028..4ce95004029 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Extinguish.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Extinguish.java @@ -50,7 +50,7 @@ public class Extinguish extends CardImpl { public Extinguish(UUID ownerId) { super(ownerId, 38, "Extinguish", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // Counter target sorcery spell. this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/EyeSpy.java b/Mage.Sets/src/mage/sets/portalsecondage/EyeSpy.java index adffe6c6ab1..3be390b8a56 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/EyeSpy.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/EyeSpy.java @@ -38,7 +38,7 @@ public class EyeSpy extends mage.sets.starter1999.EyeSpy { public EyeSpy(UUID ownerId) { super(ownerId); this.cardNumber = 39; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public EyeSpy(final EyeSpy card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/FalseSummoning.java b/Mage.Sets/src/mage/sets/portalsecondage/FalseSummoning.java index 21fd728a5ff..8e52b122a37 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/FalseSummoning.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/FalseSummoning.java @@ -43,7 +43,7 @@ public class FalseSummoning extends CardImpl { public FalseSummoning(UUID ownerId) { super(ownerId, 40, "False Summoning", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // Counter target creature spell. this.getSpellAbility().addTarget(new TargetSpell(new FilterCreatureSpell())); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/FestivalOfTrokin.java b/Mage.Sets/src/mage/sets/portalsecondage/FestivalOfTrokin.java index 175ca18fd68..b7fa292bb09 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/FestivalOfTrokin.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/FestivalOfTrokin.java @@ -44,7 +44,7 @@ public class FestivalOfTrokin extends CardImpl { public FestivalOfTrokin(UUID ownerId) { super(ownerId, 136, "Festival of Trokin", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{W}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // You gain 2 life for each creature you control. DynamicValue amount = new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent(), 2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Forest1.java b/Mage.Sets/src/mage/sets/portalsecondage/Forest1.java index 8a17e09b6fa..2ad9aedb850 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Forest1.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Forest1.java @@ -39,7 +39,7 @@ public class Forest1 extends mage.cards.basiclands.Forest { public Forest1(UUID ownerId) { super(ownerId, 151); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Forest1(final Forest1 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Forest2.java b/Mage.Sets/src/mage/sets/portalsecondage/Forest2.java index ad656ac2f78..5dc36b9a306 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Forest2.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Forest2.java @@ -39,7 +39,7 @@ public class Forest2 extends mage.cards.basiclands.Forest { public Forest2(UUID ownerId) { super(ownerId, 152); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Forest2(final Forest2 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Forest3.java b/Mage.Sets/src/mage/sets/portalsecondage/Forest3.java index fcc21ee99c1..d9e3ef6356e 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Forest3.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Forest3.java @@ -39,7 +39,7 @@ public class Forest3 extends mage.cards.basiclands.Forest { public Forest3(UUID ownerId) { super(ownerId, 153); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Forest3(final Forest3 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/FoulSpirit.java b/Mage.Sets/src/mage/sets/portalsecondage/FoulSpirit.java index 233fd06978a..4162ab26c12 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/FoulSpirit.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/FoulSpirit.java @@ -39,7 +39,7 @@ public class FoulSpirit extends mage.sets.masterseditioniv.FoulSpirit { public FoulSpirit(UUID ownerId) { super(ownerId); this.cardNumber = 13; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.UNCOMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinCavaliers.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinCavaliers.java index 5bc00ee8eaa..f5e4de81cf3 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinCavaliers.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinCavaliers.java @@ -41,7 +41,7 @@ public class GoblinCavaliers extends CardImpl { public GoblinCavaliers(UUID ownerId) { super(ownerId, 95, "Goblin Cavaliers", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Goblin"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinFirestarter.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinFirestarter.java index a4fb19cb2ad..1b4f1d3f08d 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinFirestarter.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinFirestarter.java @@ -48,7 +48,7 @@ public class GoblinFirestarter extends CardImpl { public GoblinFirestarter(UUID ownerId) { super(ownerId, 96, "Goblin Firestarter", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{R}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Goblin"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinGeneral.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinGeneral.java index fdf3164a35e..200fad95142 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinGeneral.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinGeneral.java @@ -39,7 +39,7 @@ public class GoblinGeneral extends mage.sets.vintagemasters.GoblinGeneral { public GoblinGeneral(UUID ownerId) { super(ownerId); this.cardNumber = 97; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.RARE; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinGlider.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinGlider.java index c70d9230b39..d2428a8fd6d 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinGlider.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinGlider.java @@ -39,7 +39,7 @@ public class GoblinGlider extends mage.sets.seventhedition.GoblinGlider { public GoblinGlider(UUID ownerId) { super(ownerId); this.cardNumber = 98; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.COMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinLore.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinLore.java index 6b639426bda..ed9741ff9af 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinLore.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinLore.java @@ -38,7 +38,7 @@ public class GoblinLore extends mage.sets.tenthedition.GoblinLore { public GoblinLore(UUID ownerId) { super(ownerId); this.cardNumber = 99; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public GoblinLore(final GoblinLore card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinMatron.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinMatron.java index a2d742f2a5e..e0c261d639f 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinMatron.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinMatron.java @@ -39,7 +39,7 @@ public class GoblinMatron extends mage.sets.urzassaga.GoblinMatron { public GoblinMatron(UUID ownerId) { super(ownerId); this.cardNumber = 100; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.UNCOMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinMountaineer.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinMountaineer.java index 07d5d7d6bf2..e9ae08d2a3b 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinMountaineer.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinMountaineer.java @@ -38,7 +38,7 @@ public class GoblinMountaineer extends mage.sets.shardsofalara.GoblinMountaineer public GoblinMountaineer(UUID ownerId) { super(ownerId); this.cardNumber = 101; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public GoblinMountaineer(final GoblinMountaineer card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinPiker.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinPiker.java index 2dbd731d407..2f28a59a746 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinPiker.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinPiker.java @@ -38,7 +38,7 @@ public class GoblinPiker extends mage.sets.tenthedition.GoblinPiker { public GoblinPiker(UUID ownerId) { super(ownerId); this.cardNumber = 102; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public GoblinPiker(final GoblinPiker card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinRaider.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinRaider.java index 750a50ec27b..b0ac117c911 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinRaider.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinRaider.java @@ -38,7 +38,7 @@ public class GoblinRaider extends mage.sets.urzassaga.GoblinRaider { public GoblinRaider(UUID ownerId) { super(ownerId); this.cardNumber = 103; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public GoblinRaider(final GoblinRaider card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoblinWarStrike.java b/Mage.Sets/src/mage/sets/portalsecondage/GoblinWarStrike.java index 90dde91714b..5fb63b74249 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoblinWarStrike.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoblinWarStrike.java @@ -38,7 +38,7 @@ public class GoblinWarStrike extends mage.sets.scourge.GoblinWarStrike { public GoblinWarStrike(UUID ownerId) { super(ownerId); this.cardNumber = 105; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public GoblinWarStrike(final GoblinWarStrike card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/GoldenBear.java b/Mage.Sets/src/mage/sets/portalsecondage/GoldenBear.java index c15f5b5571d..8b08bde0340 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/GoldenBear.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/GoldenBear.java @@ -41,7 +41,7 @@ public class GoldenBear extends CardImpl { public GoldenBear(UUID ownerId) { super(ownerId, 67, "Golden Bear", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Bear"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/HandOfDeath.java b/Mage.Sets/src/mage/sets/portalsecondage/HandOfDeath.java index f9c764183c9..eb5d26d586d 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/HandOfDeath.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/HandOfDeath.java @@ -38,7 +38,7 @@ public class HandOfDeath extends mage.sets.starter2000.HandOfDeath { public HandOfDeath(UUID ownerId) { super(ownerId); this.cardNumber = 14; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public HandOfDeath(final HandOfDeath card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/HarmonyOfNature.java b/Mage.Sets/src/mage/sets/portalsecondage/HarmonyOfNature.java index 132e6115ab7..266f44fdfd6 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/HarmonyOfNature.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/HarmonyOfNature.java @@ -54,7 +54,7 @@ public class HarmonyOfNature extends CardImpl { public HarmonyOfNature(UUID ownerId) { super(ownerId, 68, "Harmony of Nature", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // Tap any number of untapped creatures you control. You gain 4 life for each creature tapped this way. this.getSpellAbility().addEffect(new HarmonyOfNatureEffect()); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/HiddenHorror.java b/Mage.Sets/src/mage/sets/portalsecondage/HiddenHorror.java index 7f1810ebbc2..76686361212 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/HiddenHorror.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/HiddenHorror.java @@ -39,7 +39,7 @@ public class HiddenHorror extends mage.sets.tenthedition.HiddenHorror { public HiddenHorror(UUID ownerId) { super(ownerId); this.cardNumber = 15; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.RARE; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Hurricane.java b/Mage.Sets/src/mage/sets/portalsecondage/Hurricane.java index e87ea6de080..c6d536c1829 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Hurricane.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Hurricane.java @@ -39,7 +39,7 @@ public class Hurricane extends mage.sets.limitedalpha.Hurricane { public Hurricane(UUID ownerId) { super(ownerId); this.cardNumber = 69; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.RARE; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java b/Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java index 03a047bcef1..d03926604c3 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java @@ -44,7 +44,7 @@ public class IronhoofOx extends CardImpl { public IronhoofOx(UUID ownerId) { super(ownerId, 70, "Ironhoof Ox", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Ox"); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Island1.java b/Mage.Sets/src/mage/sets/portalsecondage/Island1.java index f1751036aa5..bb303af7da2 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Island1.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Island1.java @@ -39,7 +39,7 @@ public class Island1 extends mage.cards.basiclands.Island { public Island1(UUID ownerId) { super(ownerId, 154); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Island1(final Island1 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Island2.java b/Mage.Sets/src/mage/sets/portalsecondage/Island2.java index 10be34bf6aa..0cc1c83d7ce 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Island2.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Island2.java @@ -39,7 +39,7 @@ public class Island2 extends mage.cards.basiclands.Island { public Island2(UUID ownerId) { super(ownerId, 155); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Island2(final Island2 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Island3.java b/Mage.Sets/src/mage/sets/portalsecondage/Island3.java index c00835c1b1e..cd00be35e93 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Island3.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Island3.java @@ -39,7 +39,7 @@ public class Island3 extends mage.cards.basiclands.Island { public Island3(UUID ownerId) { super(ownerId, 156); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Island3(final Island3 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/JaggedLightning.java b/Mage.Sets/src/mage/sets/portalsecondage/JaggedLightning.java index a4d682a89e8..fdb45983ac8 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/JaggedLightning.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/JaggedLightning.java @@ -38,7 +38,7 @@ public class JaggedLightning extends mage.sets.urzassaga.JaggedLightning { public JaggedLightning(UUID ownerId) { super(ownerId); this.cardNumber = 106; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public JaggedLightning(final JaggedLightning card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/KissOfDeath.java b/Mage.Sets/src/mage/sets/portalsecondage/KissOfDeath.java index 9c56038ddc4..5c81565b501 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/KissOfDeath.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/KissOfDeath.java @@ -43,7 +43,7 @@ public class KissOfDeath extends CardImpl { public KissOfDeath(UUID ownerId) { super(ownerId, 16, "Kiss of Death", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // Kiss of Death deals 4 damage to target opponent. You gain 4 life. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/LavaAxe.java b/Mage.Sets/src/mage/sets/portalsecondage/LavaAxe.java index 0c7244efb84..27a66c45dad 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/LavaAxe.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/LavaAxe.java @@ -38,7 +38,7 @@ public class LavaAxe extends mage.sets.tenthedition.LavaAxe { public LavaAxe(UUID ownerId) { super(ownerId); this.cardNumber = 107; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public LavaAxe(final LavaAxe card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/LoneWolf.java b/Mage.Sets/src/mage/sets/portalsecondage/LoneWolf.java index 1c2d58ef148..c6fd28e7f02 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/LoneWolf.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/LoneWolf.java @@ -38,7 +38,7 @@ public class LoneWolf extends mage.sets.urzaslegacy.LoneWolf { public LoneWolf(UUID ownerId) { super(ownerId); this.cardNumber = 71; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public LoneWolf(final LoneWolf card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/LurkingNightstalker.java b/Mage.Sets/src/mage/sets/portalsecondage/LurkingNightstalker.java index 6d0123c83c1..af7f086e512 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/LurkingNightstalker.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/LurkingNightstalker.java @@ -44,7 +44,7 @@ public class LurkingNightstalker extends CardImpl { public LurkingNightstalker(UUID ownerId) { super(ownerId, 17, "Lurking Nightstalker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Nightstalker"); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Lynx.java b/Mage.Sets/src/mage/sets/portalsecondage/Lynx.java index b373dcd0071..f2f2700725c 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Lynx.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Lynx.java @@ -42,7 +42,7 @@ public class Lynx extends CardImpl { public Lynx(UUID ownerId) { super(ownerId, 72, "Lynx", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Cat"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MagmaGiant.java b/Mage.Sets/src/mage/sets/portalsecondage/MagmaGiant.java index b7d85f643d4..94864b219d8 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/MagmaGiant.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/MagmaGiant.java @@ -43,7 +43,7 @@ public class MagmaGiant extends CardImpl { public MagmaGiant(UUID ownerId) { super(ownerId, 108, "Magma Giant", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{R}{R}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Giant"); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MindRot.java b/Mage.Sets/src/mage/sets/portalsecondage/MindRot.java index 7231d142702..d74639cdf7c 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/MindRot.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/MindRot.java @@ -38,7 +38,7 @@ public class MindRot extends mage.sets.tenthedition.MindRot { public MindRot(UUID ownerId) { super(ownerId); this.cardNumber = 18; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public MindRot(final MindRot card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MoaningSpirit.java b/Mage.Sets/src/mage/sets/portalsecondage/MoaningSpirit.java index d46c511475e..20c0bfdd5ee 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/MoaningSpirit.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/MoaningSpirit.java @@ -42,7 +42,7 @@ public class MoaningSpirit extends CardImpl { public MoaningSpirit(UUID ownerId) { super(ownerId, 19, "Moaning Spirit", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Spirit"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MonstrousGrowth.java b/Mage.Sets/src/mage/sets/portalsecondage/MonstrousGrowth.java index 532ce3354c8..4ab606b7c4e 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/MonstrousGrowth.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/MonstrousGrowth.java @@ -38,7 +38,7 @@ public class MonstrousGrowth extends mage.sets.seventhedition.MonstrousGrowth { public MonstrousGrowth(UUID ownerId) { super(ownerId); this.cardNumber = 73; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public MonstrousGrowth(final MonstrousGrowth card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Mountain1.java b/Mage.Sets/src/mage/sets/portalsecondage/Mountain1.java index dec4118216c..0688f9fb543 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Mountain1.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Mountain1.java @@ -39,7 +39,7 @@ public class Mountain1 extends mage.cards.basiclands.Mountain { public Mountain1(UUID ownerId) { super(ownerId, 157); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Mountain1(final Mountain1 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Mountain2.java b/Mage.Sets/src/mage/sets/portalsecondage/Mountain2.java index 8fbf7c763d2..b68853b0458 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Mountain2.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Mountain2.java @@ -39,7 +39,7 @@ public class Mountain2 extends mage.cards.basiclands.Mountain { public Mountain2(UUID ownerId) { super(ownerId, 158); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Mountain2(final Mountain2 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Mountain3.java b/Mage.Sets/src/mage/sets/portalsecondage/Mountain3.java index e14e3d0c4ca..3275f2b00d5 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Mountain3.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Mountain3.java @@ -39,7 +39,7 @@ public class Mountain3 extends mage.cards.basiclands.Mountain { public Mountain3(UUID ownerId) { super(ownerId, 159); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Mountain3(final Mountain3 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MuckRats.java b/Mage.Sets/src/mage/sets/portalsecondage/MuckRats.java index 913cdb1ee37..933dbfdb575 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/MuckRats.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/MuckRats.java @@ -41,7 +41,7 @@ public class MuckRats extends CardImpl { public MuckRats(UUID ownerId) { super(ownerId, 20, "Muck Rats", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Rat"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/MysticDenial.java b/Mage.Sets/src/mage/sets/portalsecondage/MysticDenial.java index b79cf71f32a..cc7e0d35103 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/MysticDenial.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/MysticDenial.java @@ -38,7 +38,7 @@ public class MysticDenial extends mage.sets.portal.MysticDenial { public MysticDenial(UUID ownerId) { super(ownerId); this.cardNumber = 41; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public MysticDenial(final MysticDenial card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NaturalSpring.java b/Mage.Sets/src/mage/sets/portalsecondage/NaturalSpring.java index 41b89619ada..18b6358ee60 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/NaturalSpring.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/NaturalSpring.java @@ -38,7 +38,7 @@ public class NaturalSpring extends mage.sets.tempest.NaturalSpring { public NaturalSpring(UUID ownerId) { super(ownerId); this.cardNumber = 74; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public NaturalSpring(final NaturalSpring card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NaturesLore.java b/Mage.Sets/src/mage/sets/portalsecondage/NaturesLore.java index e5e64d38025..faed5e41b2f 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/NaturesLore.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/NaturesLore.java @@ -39,7 +39,7 @@ public class NaturesLore extends mage.sets.iceage.NaturesLore { public NaturesLore(UUID ownerId) { super(ownerId); this.cardNumber = 75; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.COMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NightstalkerEngine.java b/Mage.Sets/src/mage/sets/portalsecondage/NightstalkerEngine.java index 8f011dd5dc8..b77855bfe16 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/NightstalkerEngine.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/NightstalkerEngine.java @@ -47,7 +47,7 @@ public class NightstalkerEngine extends CardImpl { public NightstalkerEngine(UUID ownerId) { super(ownerId, 21, "Nightstalker Engine", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Nightstalker"); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodArchers.java b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodArchers.java index bc3b3425857..a62b8872bf6 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodArchers.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodArchers.java @@ -42,7 +42,7 @@ public class NorwoodArchers extends CardImpl { public NorwoodArchers(UUID ownerId) { super(ownerId, 76, "Norwood Archers", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Elf"); this.subtype.add("Archer"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodPriestess.java b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodPriestess.java index d99323b9ee7..f9b36063fc2 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodPriestess.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodPriestess.java @@ -38,7 +38,7 @@ public class NorwoodPriestess extends mage.sets.vintagemasters.NorwoodPriestess public NorwoodPriestess(UUID ownerId) { super(ownerId); this.cardNumber = 77; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public NorwoodPriestess(final NorwoodPriestess card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRanger.java b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRanger.java index 21f6e775f10..663fd513bfc 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRanger.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRanger.java @@ -38,7 +38,7 @@ public class NorwoodRanger extends mage.sets.ninthedition.NorwoodRanger { public NorwoodRanger(UUID ownerId) { super(ownerId); this.cardNumber = 78; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public NorwoodRanger(final NorwoodRanger card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRiders.java b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRiders.java index bd1aff6e25e..0fdf6682c23 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRiders.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodRiders.java @@ -44,7 +44,7 @@ public class NorwoodRiders extends CardImpl { public NorwoodRiders(UUID ownerId) { super(ownerId, 79, "Norwood Riders", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Elf"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodWarrior.java b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodWarrior.java index b8cfd9a0422..ffa7cd3113e 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/NorwoodWarrior.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/NorwoodWarrior.java @@ -45,7 +45,7 @@ public class NorwoodWarrior extends CardImpl { public NorwoodWarrior(UUID ownerId) { super(ownerId, 80, "Norwood Warrior", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Elf"); this.subtype.add("Warrior"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/ObsidianGiant.java b/Mage.Sets/src/mage/sets/portalsecondage/ObsidianGiant.java index 6d9846d980f..611aa9b327f 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/ObsidianGiant.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/ObsidianGiant.java @@ -41,7 +41,7 @@ public class ObsidianGiant extends CardImpl { public ObsidianGiant(UUID ownerId) { super(ownerId, 109, "Obsidian Giant", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Giant"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/OgreArsonist.java b/Mage.Sets/src/mage/sets/portalsecondage/OgreArsonist.java index 690e1185e62..3f0f04e4a24 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/OgreArsonist.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/OgreArsonist.java @@ -46,7 +46,7 @@ public class OgreArsonist extends CardImpl { public OgreArsonist(UUID ownerId) { super(ownerId, 110, "Ogre Arsonist", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Ogre"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/OgreBerserker.java b/Mage.Sets/src/mage/sets/portalsecondage/OgreBerserker.java index 49b14aa6a27..fd90f734722 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/OgreBerserker.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/OgreBerserker.java @@ -42,7 +42,7 @@ public class OgreBerserker extends CardImpl { public OgreBerserker(UUID ownerId) { super(ownerId, 111, "Ogre Berserker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{R}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Ogre"); this.subtype.add("Berserker"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/OgreTaskmaster.java b/Mage.Sets/src/mage/sets/portalsecondage/OgreTaskmaster.java index ee385cb2adb..c4bf8129699 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/OgreTaskmaster.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/OgreTaskmaster.java @@ -38,7 +38,7 @@ public class OgreTaskmaster extends mage.sets.ninthedition.OgreTaskmaster { public OgreTaskmaster(UUID ownerId) { super(ownerId); this.cardNumber = 112; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public OgreTaskmaster(final OgreTaskmaster card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/OgreWarrior.java b/Mage.Sets/src/mage/sets/portalsecondage/OgreWarrior.java index ce460dec72c..b869fda615c 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/OgreWarrior.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/OgreWarrior.java @@ -41,7 +41,7 @@ public class OgreWarrior extends CardImpl { public OgreWarrior(UUID ownerId) { super(ownerId, 113, "Ogre Warrior", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Ogre"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Plains1.java b/Mage.Sets/src/mage/sets/portalsecondage/Plains1.java index b9a69a9b96c..2de68b6f247 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Plains1.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Plains1.java @@ -39,7 +39,7 @@ public class Plains1 extends mage.cards.basiclands.Plains { public Plains1(UUID ownerId) { super(ownerId, 160); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Plains1(final Plains1 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Plains2.java b/Mage.Sets/src/mage/sets/portalsecondage/Plains2.java index c75a335ccf9..8a6da3cb042 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Plains2.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Plains2.java @@ -39,7 +39,7 @@ public class Plains2 extends mage.cards.basiclands.Plains { public Plains2(UUID ownerId) { super(ownerId, 161); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Plains2(final Plains2 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Plains3.java b/Mage.Sets/src/mage/sets/portalsecondage/Plains3.java index 0040d7d3d8a..e0aaf578484 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Plains3.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Plains3.java @@ -39,7 +39,7 @@ public class Plains3 extends mage.cards.basiclands.Plains { public Plains3(UUID ownerId) { super(ownerId, 162); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Plains3(final Plains3 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/PlatedWurm.java b/Mage.Sets/src/mage/sets/portalsecondage/PlatedWurm.java index 756fd084b3a..c297d3eb2d8 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/PlatedWurm.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/PlatedWurm.java @@ -41,7 +41,7 @@ public class PlatedWurm extends CardImpl { public PlatedWurm(UUID ownerId) { super(ownerId, 81, "Plated Wurm", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Wurm"); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/PredatoryNightstalker.java b/Mage.Sets/src/mage/sets/portalsecondage/PredatoryNightstalker.java index b6fccaad581..9f04d5566ed 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/PredatoryNightstalker.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/PredatoryNightstalker.java @@ -39,7 +39,7 @@ public class PredatoryNightstalker extends mage.sets.vintagemasters.PredatoryNig public PredatoryNightstalker(UUID ownerId) { super(ownerId); this.cardNumber = 22; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.UNCOMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/ProwlingNightstalker.java b/Mage.Sets/src/mage/sets/portalsecondage/ProwlingNightstalker.java index 6f4d8b85ef9..5a641ffa069 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/ProwlingNightstalker.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/ProwlingNightstalker.java @@ -38,7 +38,7 @@ public class ProwlingNightstalker extends mage.sets.masterseditioniv.ProwlingNig public ProwlingNightstalker(UUID ownerId) { super(ownerId); this.cardNumber = 23; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public ProwlingNightstalker(final ProwlingNightstalker card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RagingGoblin.java b/Mage.Sets/src/mage/sets/portalsecondage/RagingGoblin.java index cded85b0357..e632ae062df 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/RagingGoblin.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/RagingGoblin.java @@ -38,7 +38,7 @@ public class RagingGoblin extends mage.sets.tenthedition.RagingGoblin { public RagingGoblin(UUID ownerId) { super(ownerId); this.cardNumber = 114; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public RagingGoblin(final RagingGoblin card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RaidingNightstalker.java b/Mage.Sets/src/mage/sets/portalsecondage/RaidingNightstalker.java index 13d6804214b..397eb48889a 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/RaidingNightstalker.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/RaidingNightstalker.java @@ -42,7 +42,7 @@ public class RaidingNightstalker extends CardImpl { public RaidingNightstalker(UUID ownerId) { super(ownerId, 24, "Raiding Nightstalker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Nightstalker"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RainOfDaggers.java b/Mage.Sets/src/mage/sets/portalsecondage/RainOfDaggers.java index c52ab70492a..eccc67d54f7 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/RainOfDaggers.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/RainOfDaggers.java @@ -49,7 +49,7 @@ public class RainOfDaggers extends CardImpl { public RainOfDaggers(UUID ownerId) { super(ownerId, 25, "Rain of Daggers", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{4}{B}{B}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // Destroy all creatures target opponent controls. You lose 2 life for each creature destroyed this way. this.getSpellAbility().addEffect(new RainOfDaggersEffect()); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RaiseDead.java b/Mage.Sets/src/mage/sets/portalsecondage/RaiseDead.java index b9a4d831f2a..729e7493ded 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/RaiseDead.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/RaiseDead.java @@ -38,7 +38,7 @@ public class RaiseDead extends mage.sets.seventhedition.RaiseDead { public RaiseDead(UUID ownerId) { super(ownerId); this.cardNumber = 26; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public RaiseDead(final RaiseDead card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RavenousRats.java b/Mage.Sets/src/mage/sets/portalsecondage/RavenousRats.java index 4a6e4b91ac1..7d665ff4034 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/RavenousRats.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/RavenousRats.java @@ -38,7 +38,7 @@ public class RavenousRats extends mage.sets.tenthedition.RavenousRats { public RavenousRats(UUID ownerId) { super(ownerId); this.cardNumber = 27; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public RavenousRats(final RavenousRats card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RazorclawBear.java b/Mage.Sets/src/mage/sets/portalsecondage/RazorclawBear.java index 7a75ef37386..3fda93ee35a 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/RazorclawBear.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/RazorclawBear.java @@ -45,7 +45,7 @@ public class RazorclawBear extends CardImpl { public RazorclawBear(UUID ownerId) { super(ownerId, 82, "Razorclaw Bear", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Bear"); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RighteousCharge.java b/Mage.Sets/src/mage/sets/portalsecondage/RighteousCharge.java index dbb7c38b891..3c8ce2ed732 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/RighteousCharge.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/RighteousCharge.java @@ -39,7 +39,7 @@ public class RighteousCharge extends mage.sets.gatecrash.RighteousCharge { public RighteousCharge(UUID ownerId) { super(ownerId); this.cardNumber = 140; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.COMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RighteousFury.java b/Mage.Sets/src/mage/sets/portalsecondage/RighteousFury.java index a84a415d256..a8a975bec20 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/RighteousFury.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/RighteousFury.java @@ -38,7 +38,7 @@ public class RighteousFury extends mage.sets.starter1999.RighteousFury { public RighteousFury(UUID ownerId) { super(ownerId); this.cardNumber = 141; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public RighteousFury(final RighteousFury card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/RiverBear.java b/Mage.Sets/src/mage/sets/portalsecondage/RiverBear.java index 411a16cac2e..d1e9baabf61 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/RiverBear.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/RiverBear.java @@ -38,7 +38,7 @@ public class RiverBear extends mage.sets.ninthedition.RiverBear { public RiverBear(UUID ownerId) { super(ownerId); this.cardNumber = 84; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public RiverBear(final RiverBear card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Salvage.java b/Mage.Sets/src/mage/sets/portalsecondage/Salvage.java index 4916fd29680..cf7f0737d77 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Salvage.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Salvage.java @@ -42,7 +42,7 @@ public class Salvage extends CardImpl { public Salvage(UUID ownerId) { super(ownerId, 85, "Salvage", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // Put target card from your graveyard on top of your library. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/ScreechingDrake.java b/Mage.Sets/src/mage/sets/portalsecondage/ScreechingDrake.java index 0e1deda355c..faef68b06a9 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/ScreechingDrake.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/ScreechingDrake.java @@ -38,7 +38,7 @@ public class ScreechingDrake extends mage.sets.masterseditionii.ScreechingDrake public ScreechingDrake(UUID ownerId) { super(ownerId); this.cardNumber = 44; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public ScreechingDrake(final ScreechingDrake card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SeaDrake.java b/Mage.Sets/src/mage/sets/portalsecondage/SeaDrake.java index e3ecc6b6057..b2ebcbca77c 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/SeaDrake.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/SeaDrake.java @@ -40,7 +40,7 @@ public class SeaDrake extends mage.sets.masterseditionii.SeaDrake { public SeaDrake(UUID ownerId) { super(ownerId); this.cardNumber = 45; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.UNCOMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SleightOfHand.java b/Mage.Sets/src/mage/sets/portalsecondage/SleightOfHand.java index e064a325f65..a9f22ec45d7 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/SleightOfHand.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/SleightOfHand.java @@ -38,7 +38,7 @@ public class SleightOfHand extends mage.sets.ninthedition.SleightOfHand { public SleightOfHand(UUID ownerId) { super(ownerId); this.cardNumber = 46; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public SleightOfHand(final SleightOfHand card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SpittingEarth.java b/Mage.Sets/src/mage/sets/portalsecondage/SpittingEarth.java index 1485433acab..77fb9d0b49d 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/SpittingEarth.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/SpittingEarth.java @@ -38,7 +38,7 @@ public class SpittingEarth extends mage.sets.tenthedition.SpittingEarth { public SpittingEarth(UUID ownerId) { super(ownerId); this.cardNumber = 116; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public SpittingEarth(final SpittingEarth card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SteamCatapult.java b/Mage.Sets/src/mage/sets/portalsecondage/SteamCatapult.java index 9daed3d4a3e..fc990a2f215 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/SteamCatapult.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/SteamCatapult.java @@ -56,7 +56,7 @@ public class SteamCatapult extends CardImpl { public SteamCatapult(UUID ownerId) { super(ownerId, 142, "Steam Catapult", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SteamFrigate.java b/Mage.Sets/src/mage/sets/portalsecondage/SteamFrigate.java index 283627d87c0..2d3a736da45 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/SteamFrigate.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/SteamFrigate.java @@ -45,7 +45,7 @@ public class SteamFrigate extends CardImpl { public SteamFrigate(UUID ownerId) { super(ownerId, 47, "Steam Frigate", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Pirate"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/StoneRain.java b/Mage.Sets/src/mage/sets/portalsecondage/StoneRain.java index 9ad7227b804..7a6de1cddb2 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/StoneRain.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/StoneRain.java @@ -38,7 +38,7 @@ public class StoneRain extends mage.sets.tempest.StoneRain { public StoneRain(UUID ownerId) { super(ownerId); this.cardNumber = 117; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public StoneRain(final StoneRain card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Swamp1.java b/Mage.Sets/src/mage/sets/portalsecondage/Swamp1.java index 01d1517f272..d1d2d9dd278 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Swamp1.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Swamp1.java @@ -39,7 +39,7 @@ public class Swamp1 extends mage.cards.basiclands.Swamp { public Swamp1(UUID ownerId) { super(ownerId, 163); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Swamp1(final Swamp1 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Swamp2.java b/Mage.Sets/src/mage/sets/portalsecondage/Swamp2.java index 9452bb463ae..ede5044be9c 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Swamp2.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Swamp2.java @@ -39,7 +39,7 @@ public class Swamp2 extends mage.cards.basiclands.Swamp { public Swamp2(UUID ownerId) { super(ownerId, 164); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Swamp2(final Swamp2 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Swamp3.java b/Mage.Sets/src/mage/sets/portalsecondage/Swamp3.java index 5dbdfdb2260..fe68f31efc4 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Swamp3.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Swamp3.java @@ -39,7 +39,7 @@ public class Swamp3 extends mage.cards.basiclands.Swamp { public Swamp3(UUID ownerId) { super(ownerId, 165); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Swamp3(final Swamp3 card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SwarmOfRats.java b/Mage.Sets/src/mage/sets/portalsecondage/SwarmOfRats.java index ff6b3ec4ca3..85f59693b18 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/SwarmOfRats.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/SwarmOfRats.java @@ -39,7 +39,7 @@ public class SwarmOfRats extends mage.sets.ninthedition.SwarmOfRats { public SwarmOfRats(UUID ownerId) { super(ownerId); this.cardNumber = 29; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.COMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SylvanBasilisk.java b/Mage.Sets/src/mage/sets/portalsecondage/SylvanBasilisk.java index b75568c9f51..981f43296ea 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/SylvanBasilisk.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/SylvanBasilisk.java @@ -43,7 +43,7 @@ public class SylvanBasilisk extends CardImpl { public SylvanBasilisk(UUID ownerId) { super(ownerId, 86, "Sylvan Basilisk", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{G}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Basilisk"); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/SylvanYeti.java b/Mage.Sets/src/mage/sets/portalsecondage/SylvanYeti.java index 16c1d63677e..afd4a6b14be 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/SylvanYeti.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/SylvanYeti.java @@ -38,7 +38,7 @@ public class SylvanYeti extends mage.sets.starter1999.SylvanYeti { public SylvanYeti(UUID ownerId) { super(ownerId); this.cardNumber = 87; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public SylvanYeti(final SylvanYeti card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TalasAirShip.java b/Mage.Sets/src/mage/sets/portalsecondage/TalasAirShip.java index 4d5a54f14f8..6f3e8d69301 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TalasAirShip.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TalasAirShip.java @@ -42,7 +42,7 @@ public class TalasAirShip extends CardImpl { public TalasAirShip(UUID ownerId) { super(ownerId, 48, "Talas Air Ship", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Pirate"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TalasExplorer.java b/Mage.Sets/src/mage/sets/portalsecondage/TalasExplorer.java index d7baa547355..0372e509df4 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TalasExplorer.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TalasExplorer.java @@ -46,7 +46,7 @@ public class TalasExplorer extends CardImpl { public TalasExplorer(UUID ownerId) { super(ownerId, 49, "Talas Explorer", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Pirate"); this.subtype.add("Scout"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TalasMerchant.java b/Mage.Sets/src/mage/sets/portalsecondage/TalasMerchant.java index 21f4f7dc6b1..fbdd3efbaec 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TalasMerchant.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TalasMerchant.java @@ -41,7 +41,7 @@ public class TalasMerchant extends CardImpl { public TalasMerchant(UUID ownerId) { super(ownerId, 50, "Talas Merchant", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Pirate"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TalasResearcher.java b/Mage.Sets/src/mage/sets/portalsecondage/TalasResearcher.java index 33ca135a6f7..b2cc496f74b 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TalasResearcher.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TalasResearcher.java @@ -47,7 +47,7 @@ public class TalasResearcher extends CardImpl { public TalasResearcher(UUID ownerId) { super(ownerId, 51, "Talas Researcher", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Pirate"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TalasScout.java b/Mage.Sets/src/mage/sets/portalsecondage/TalasScout.java index c05fd6abfa3..dd0d8ff3250 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TalasScout.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TalasScout.java @@ -42,7 +42,7 @@ public class TalasScout extends CardImpl { public TalasScout(UUID ownerId) { super(ownerId, 52, "Talas Scout", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Pirate"); this.subtype.add("Scout"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TalasWarrior.java b/Mage.Sets/src/mage/sets/portalsecondage/TalasWarrior.java index 389cd457a6d..12dba3b27e3 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TalasWarrior.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TalasWarrior.java @@ -42,7 +42,7 @@ public class TalasWarrior extends CardImpl { public TalasWarrior(UUID ownerId) { super(ownerId, 53, "Talas Warrior", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Pirate"); this.subtype.add("Warrior"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TempleAcolyte.java b/Mage.Sets/src/mage/sets/portalsecondage/TempleAcolyte.java index ebaaddd1dab..97a675b3868 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TempleAcolyte.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TempleAcolyte.java @@ -38,7 +38,7 @@ public class TempleAcolyte extends mage.sets.elspethvstezzeret.TempleAcolyte { public TempleAcolyte(UUID ownerId) { super(ownerId); this.cardNumber = 143; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public TempleAcolyte(final TempleAcolyte card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TempleElder.java b/Mage.Sets/src/mage/sets/portalsecondage/TempleElder.java index 261ffbf9d13..ab7b054fafa 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TempleElder.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TempleElder.java @@ -47,7 +47,7 @@ public class TempleElder extends CardImpl { public TempleElder(UUID ownerId) { super(ownerId, 144, "Temple Elder", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Cleric"); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TemporalManipulation.java b/Mage.Sets/src/mage/sets/portalsecondage/TemporalManipulation.java index 8fbca56c0ab..d7c50beb317 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TemporalManipulation.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TemporalManipulation.java @@ -41,7 +41,7 @@ public class TemporalManipulation extends CardImpl { public TemporalManipulation(UUID ownerId) { super(ownerId, 54, "Temporal Manipulation", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // Take an extra turn after this one. this.getSpellAbility().addEffect(new AddExtraTurnControllerEffect()); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TheftOfDreams.java b/Mage.Sets/src/mage/sets/portalsecondage/TheftOfDreams.java index 0f2c0b3ebca..4035e36a471 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TheftOfDreams.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TheftOfDreams.java @@ -39,7 +39,7 @@ public class TheftOfDreams extends mage.sets.exodus.TheftOfDreams { public TheftOfDreams(UUID ownerId) { super(ownerId); this.cardNumber = 55; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.UNCOMMON; } diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TidalSurge.java b/Mage.Sets/src/mage/sets/portalsecondage/TidalSurge.java index 923d8a67e85..b35cb3dfd6e 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TidalSurge.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TidalSurge.java @@ -38,7 +38,7 @@ public class TidalSurge extends mage.sets.stronghold.TidalSurge { public TidalSurge(UUID ownerId) { super(ownerId); this.cardNumber = 56; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public TidalSurge(final TidalSurge card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TimeEbb.java b/Mage.Sets/src/mage/sets/portalsecondage/TimeEbb.java index e0d04030e9c..eb10137c823 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TimeEbb.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TimeEbb.java @@ -38,7 +38,7 @@ public class TimeEbb extends mage.sets.tempest.TimeEbb { public TimeEbb(UUID ownerId) { super(ownerId); this.cardNumber = 57; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public TimeEbb(final TimeEbb card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TouchOfBrilliance.java b/Mage.Sets/src/mage/sets/portalsecondage/TouchOfBrilliance.java index e86d404edec..cfe638a689b 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TouchOfBrilliance.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TouchOfBrilliance.java @@ -41,7 +41,7 @@ public class TouchOfBrilliance extends CardImpl { public TouchOfBrilliance(UUID ownerId) { super(ownerId, 58, "Touch of Brilliance", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{U}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; // Draw two cards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2)); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TownSentry.java b/Mage.Sets/src/mage/sets/portalsecondage/TownSentry.java index ba69c7fa613..93a3900098b 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TownSentry.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TownSentry.java @@ -44,7 +44,7 @@ public class TownSentry extends CardImpl { public TownSentry(UUID ownerId) { super(ownerId, 145, "Town Sentry", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{2}{W}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Soldier"); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TreeMonkey.java b/Mage.Sets/src/mage/sets/portalsecondage/TreeMonkey.java index 5b05596378a..5791e715a67 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TreeMonkey.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TreeMonkey.java @@ -38,7 +38,7 @@ public class TreeMonkey extends mage.sets.ninthedition.TreeMonkey { public TreeMonkey(UUID ownerId) { super(ownerId); this.cardNumber = 88; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public TreeMonkey(final TreeMonkey card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Tremor.java b/Mage.Sets/src/mage/sets/portalsecondage/Tremor.java index 4d33a01882b..7483d714e7e 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Tremor.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Tremor.java @@ -38,7 +38,7 @@ public class Tremor extends mage.sets.seventhedition.Tremor { public Tremor(UUID ownerId) { super(ownerId); this.cardNumber = 118; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Tremor(final Tremor card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/TrokinHighGuard.java b/Mage.Sets/src/mage/sets/portalsecondage/TrokinHighGuard.java index d14db96705a..5602a76b8ff 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/TrokinHighGuard.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/TrokinHighGuard.java @@ -41,7 +41,7 @@ public class TrokinHighGuard extends CardImpl { public TrokinHighGuard(UUID ownerId) { super(ownerId, 146, "Trokin High Guard", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{W}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Human"); this.subtype.add("Knight"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Undo.java b/Mage.Sets/src/mage/sets/portalsecondage/Undo.java index 04b564dbd00..a12965707ff 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Undo.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Undo.java @@ -38,7 +38,7 @@ public class Undo extends mage.sets.starter1999.Undo { public Undo(UUID ownerId) { super(ownerId); this.cardNumber = 59; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Undo(final Undo card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/UntamedWilds.java b/Mage.Sets/src/mage/sets/portalsecondage/UntamedWilds.java index ccdf65d20db..1a8f4a6a443 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/UntamedWilds.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/UntamedWilds.java @@ -38,7 +38,7 @@ public class UntamedWilds extends mage.sets.seventhedition.UntamedWilds { public UntamedWilds(UUID ownerId) { super(ownerId); this.cardNumber = 89; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public UntamedWilds(final UntamedWilds card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/VampiricSpirit.java b/Mage.Sets/src/mage/sets/portalsecondage/VampiricSpirit.java index 4eb033cf61e..9cce6926a3a 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/VampiricSpirit.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/VampiricSpirit.java @@ -38,7 +38,7 @@ public class VampiricSpirit extends mage.sets.eighthedition.VampiricSpirit { public VampiricSpirit(UUID ownerId) { super(ownerId); this.cardNumber = 30; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public VampiricSpirit(final VampiricSpirit card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Vengeance.java b/Mage.Sets/src/mage/sets/portalsecondage/Vengeance.java index b4de45058ee..292e3eb8927 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Vengeance.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Vengeance.java @@ -38,7 +38,7 @@ public class Vengeance extends mage.sets.seventhedition.Vengeance { public Vengeance(UUID ownerId) { super(ownerId); this.cardNumber = 147; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Vengeance(final Vengeance card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/VolcanicHammer.java b/Mage.Sets/src/mage/sets/portalsecondage/VolcanicHammer.java index fe811023a84..183ea1e830d 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/VolcanicHammer.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/VolcanicHammer.java @@ -38,7 +38,7 @@ public class VolcanicHammer extends mage.sets.ninthedition.VolcanicHammer { public VolcanicHammer(UUID ownerId) { super(ownerId); this.cardNumber = 119; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public VolcanicHammer(final VolcanicHammer card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/VolunteerMilitia.java b/Mage.Sets/src/mage/sets/portalsecondage/VolunteerMilitia.java index 7b024fef7bd..eef0db6d467 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/VolunteerMilitia.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/VolunteerMilitia.java @@ -38,7 +38,7 @@ public class VolunteerMilitia extends mage.sets.portalthreekingdoms.VolunteerMil public VolunteerMilitia(UUID ownerId) { super(ownerId); this.cardNumber = 148; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public VolunteerMilitia(final VolunteerMilitia card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/WildGriffin.java b/Mage.Sets/src/mage/sets/portalsecondage/WildGriffin.java index d73c8fff8a3..8477bee477c 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/WildGriffin.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/WildGriffin.java @@ -38,7 +38,7 @@ public class WildGriffin extends mage.sets.tenthedition.WildGriffin { public WildGriffin(UUID ownerId) { super(ownerId); this.cardNumber = 150; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public WildGriffin(final WildGriffin card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/WildOx.java b/Mage.Sets/src/mage/sets/portalsecondage/WildOx.java index 3175cae2b2d..f620411d002 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/WildOx.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/WildOx.java @@ -42,7 +42,7 @@ public class WildOx extends CardImpl { public WildOx(UUID ownerId) { super(ownerId, 90, "Wild Ox", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.subtype.add("Ox"); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/Wildfire.java b/Mage.Sets/src/mage/sets/portalsecondage/Wildfire.java index 81ba4044fd7..31cb69495ca 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/Wildfire.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/Wildfire.java @@ -38,7 +38,7 @@ public class Wildfire extends mage.sets.urzassaga.Wildfire { public Wildfire(UUID ownerId) { super(ownerId); this.cardNumber = 120; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; } public Wildfire(final Wildfire card) { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/WindSail.java b/Mage.Sets/src/mage/sets/portalsecondage/WindSail.java index 4bf0926d0bd..badb8027a25 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/WindSail.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/WindSail.java @@ -39,7 +39,7 @@ public class WindSail extends mage.sets.starter1999.WindSail { public WindSail(UUID ownerId) { super(ownerId); this.cardNumber = 60; - this.expansionSetCode = "P02"; + this.expansionSetCode = "PO2"; this.rarity = Rarity.COMMON; } diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java index a879bb96a90..21b3ce59354 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java @@ -12,7 +12,7 @@ public class AngelToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CFX", "GTC", "ISD", "M14", "ORI", "SOI", "ZEN")); + tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CFX", "GTC", "ISD", "M14", "ORI", "SOI", "ZEN", "C15")); } public AngelToken() { 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 27c443fef1c..a2803df9f7e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java @@ -30,7 +30,6 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Random; import mage.MageInt; import mage.constants.CardType; @@ -43,12 +42,21 @@ public class BeastToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12")); + tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE")); } public BeastToken() { + this(null, 0); + } + + public BeastToken(String setCode) { + this(setCode, 0); + } + + public BeastToken(String setCode, int tokenType) { super("Beast", "3/3 green Beast creature token"); availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Beast"); @@ -60,12 +68,12 @@ public class BeastToken extends Token { @Override public void setExpansionSetCodeForImage(String code) { super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode().equals("C14")) { - this.setTokenType(new Random().nextInt(2) + 1); - } if (getOriginalExpansionSetCode().equals("M15")) { this.setTokenType(2); } + if (getOriginalExpansionSetCode().equals("DD3GVL") || getOriginalExpansionSetCode().equals("C14") || getOriginalExpansionSetCode().equals("DDD")) { + this.setTokenType(1); + } } public BeastToken(final BeastToken token) { 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 4304707b4e2..ef82f2ace07 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java @@ -27,7 +27,9 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import mage.MageInt; import mage.constants.CardType; @@ -37,14 +39,29 @@ import mage.constants.CardType; */ public class BeastToken2 extends Token { + final static private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "DD3GVL")); + } + public BeastToken2() { + this(null, 0); + } + + public BeastToken2(String setCode) { + this(setCode, 0); + } + + public BeastToken2(String setCode, int tokenType) { super("Beast", "4/4 green Beast creature token"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Beast"); power = new MageInt(4); toughness = new MageInt(4); - availableImageSetCodes.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15")); } public BeastToken2(final BeastToken2 token) { @@ -59,7 +76,7 @@ public class BeastToken2 extends Token { @Override public void setExpansionSetCodeForImage(String code) { super.setExpansionSetCodeForImage(code); - if (getOriginalExpansionSetCode().equals("C14") || getOriginalExpansionSetCode().equals("DDD")) { + if (getOriginalExpansionSetCode().equals("C14") || getOriginalExpansionSetCode().equals("DDD") || getOriginalExpansionSetCode().equals("DD3GVL")) { this.setTokenType(2); } } 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 486891abbb1..b88e7009987 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken.java @@ -28,9 +28,11 @@ package mage.game.permanent.token; +import java.util.ArrayList; import java.util.Arrays; -import mage.constants.CardType; +import java.util.List; import mage.MageInt; +import mage.constants.CardType; /** * @@ -38,13 +40,28 @@ import mage.MageInt; */ public class CatToken extends Token { + final static private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("SOM", "M13", "M14", "C14", "C15")); + } + public CatToken() { + this(null, 0); + } + + public CatToken(String setCode) { + this(setCode, 0); + } + + public CatToken(String setCode, int tokenType) { super("Cat", "2/2 white Cat creature token"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add("Cat"); power = new MageInt(2); toughness = new MageInt(2); - availableImageSetCodes.addAll(Arrays.asList("SOM", "M13", "M14", "C14")); } } 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 824d6eb0a28..e1079b741bb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java @@ -29,9 +29,9 @@ package mage.game.permanent.token; import java.util.Arrays; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; /** * @@ -47,7 +47,7 @@ public class DemonToken extends Token { power = new MageInt(5); toughness = new MageInt(5); addAbility(FlyingAbility.getInstance()); - availableImageSetCodes.addAll(Arrays.asList("INN", "AVR", "C14", "ORI")); + availableImageSetCodes.addAll(Arrays.asList("ISD", "AVR", "C14", "ORI")); } public DemonToken(final DemonToken token) { 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 7a5b356f935..0059cc6768b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java @@ -28,9 +28,12 @@ package mage.game.permanent.token; -import mage.constants.CardType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; /** * @@ -38,8 +41,24 @@ import mage.abilities.keyword.FlyingAbility; */ public class DragonToken extends Token { + final static private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA")); + } + public DragonToken() { + this(null, 0); + } + + public DragonToken(String setCode) { + this(setCode, 0); + } + + public DragonToken(String setCode, int tokenType) { super("Dragon", "4/4 red Dragon creature token with flying"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add("Dragon"); 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 578178c9a67..7e44741069f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java @@ -28,10 +28,12 @@ package mage.game.permanent.token; +import java.util.ArrayList; import java.util.Arrays; -import mage.constants.CardType; +import java.util.List; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import mage.constants.CardType; /** * @@ -39,14 +41,29 @@ import mage.abilities.keyword.FlyingAbility; */ public class DragonToken2 extends Token { + final static private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("WWK", "10E", "BFZ", "C15")); + } + public DragonToken2() { + this(null, 0); + } + + public DragonToken2(String setCode) { + this(setCode, 0); + } + + public DragonToken2(String setCode, int tokenType) { super("Dragon", "5/5 red Dragon creature token with flying"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add("Dragon"); power = new MageInt(5); toughness = new MageInt(5); addAbility(FlyingAbility.getInstance()); - availableImageSetCodes.addAll(Arrays.asList("WWK", "10E")); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java index d0f44b8fc45..174f5c24191 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java @@ -27,9 +27,11 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; import java.util.Arrays; -import mage.constants.CardType; +import java.util.List; import mage.MageInt; +import mage.constants.CardType; /** * @@ -37,9 +39,16 @@ import mage.MageInt; */ public class ElementalShamanToken extends Token { - public ElementalShamanToken() { + final static private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("C15", "DD3JVC", "DD2", "LRW")); + } + + public ElementalShamanToken(String setCode, int tokenType) { super("Elemental Shaman", "3/1 red Elemental Shaman creature token"); - availableImageSetCodes.addAll(Arrays.asList("LRW", "DD2")); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add("Elemental"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java index e9b328a435a..5ba2207bf7a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java @@ -1,16 +1,16 @@ /* * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, this list * of conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR @@ -20,7 +20,7 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. @@ -28,6 +28,9 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.MageInt; import mage.constants.CardType; @@ -37,8 +40,16 @@ import mage.constants.CardType; */ public class ElementalToken extends Token { - public ElementalToken() { + final static private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("OGW", "CON", "DIS")); + } + + public ElementalToken(String setCode, int tokenType) { super("Elemental", "3/1 red Elemental creature token"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add("Elemental"); 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 a53476916b2..a2827d76551 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java @@ -1,16 +1,16 @@ /* * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, this list * of conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR @@ -20,7 +20,7 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. @@ -43,18 +43,26 @@ public class ElephantToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("C14", "CNS", "DDD", "MM2", "WWK", "OGW")); + tokenImageSets.addAll(Arrays.asList("C14", "CNS", "DDD", "MM2", "WWK", "OGW", "C15", "DD3GVL")); } public ElephantToken() { + this(null, 0); + } + + public ElephantToken(String setCode) { + this(setCode, 0); + } + + public ElephantToken(String setCode, int tokenType) { super("Elephant", "3/3 green Elephant creature token"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Elephant"); power = new MageInt(3); toughness = new MageInt(3); - - availableImageSetCodes = tokenImageSets; } } \ No newline at end of file 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 82ea1284145..09cc808a466 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java @@ -28,9 +28,11 @@ package mage.game.permanent.token; +import java.util.ArrayList; import java.util.Arrays; -import mage.constants.CardType; +import java.util.List; import mage.MageInt; +import mage.constants.CardType; /** * @@ -38,13 +40,28 @@ import mage.MageInt; */ public class GoatToken extends Token { + final static private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("EVE", "M13", "M14", "C14")); + } + public GoatToken() { + this(null, 0); + } + + public GoatToken(String setCode) { + this(setCode, 0); + } + + public GoatToken(String setCode, int tokenType) { super("Goat", "0/1 white Goat creature token"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add("Goat"); power = new MageInt(0); toughness = new MageInt(1); - availableImageSetCodes.addAll(Arrays.asList("EVE", "M13", "M14", "C14")); } } 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 798fdae0f89..dbcc5450679 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java @@ -27,7 +27,9 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import mage.MageInt; import mage.constants.CardType; @@ -37,14 +39,27 @@ import mage.constants.CardType; */ public class GoblinToken extends Token { - public GoblinToken() { - super("Goblin", "1/1 red Goblin creature token"); - availableImageSetCodes.addAll(Arrays.asList("10E", "ALA", "SOM", "M10", "NPH", "M13", "RTR", - "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN")); + final static private List tokenImageSets = new ArrayList<>(); + static { + tokenImageSets.addAll(Arrays.asList("10E", "ALA", "SOM", "M10", "NPH", "M13", "RTR", + "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", "DD3EVG", "MM2")); + } + + public GoblinToken() { + this(null, 0); + } + + public GoblinToken(String setCode) { + this(setCode, 0); + } + + public GoblinToken(String setCode, int tokenType) { + super("Goblin", "1/1 red Goblin creature token"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); subtype.add("Goblin"); - color.setRed(true); power = new MageInt(1); toughness = new MageInt(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 360ab35fce2..870c6b4ba3c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java @@ -3,9 +3,9 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; +import mage.constants.CardType; /** * @@ -16,11 +16,14 @@ public class KnightToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("ORI", "RTR")); + tokenImageSets.addAll(Arrays.asList("ORI", "RTR", "C15")); } public KnightToken() { super("Knight", "2/2 white Knight creature token with vigilance"); + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C15")) { + setTokenType(2); + } cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add("Knight"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java index b6e79eb952f..b6c856fc5fa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java @@ -31,7 +31,6 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import mage.MageInt; import mage.constants.CardType; @@ -44,18 +43,25 @@ public class SaprolingToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("10E", "ALA", "DDE", "DDH", "DDJ", "M12", "M13", "M14", "MM2", "MMA", "RTR")); + tokenImageSets.addAll(Arrays.asList("10E", "ALA", "DDE", "DDH", "DDJ", "M12", "M13", "M14", "MM2", "MMA", "RTR", "C15")); } public SaprolingToken() { + this(null, 0); + } + + public SaprolingToken(String setCode) { + this(setCode, 0); + } + + public SaprolingToken(String setCode, int tokenType) { super("Saproling", "1/1 green Saproling creature token"); - this.setOriginalExpansionSetCode("MMA"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Saproling"); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = tokenImageSets; } } \ No newline at end of file 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 19e778a015a..401e2cea7c5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java @@ -1,16 +1,16 @@ /* * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, this list * of conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR @@ -20,7 +20,7 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. @@ -31,7 +31,6 @@ package mage.game.permanent.token; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import mage.MageInt; import mage.constants.CardType; @@ -44,23 +43,24 @@ public class SnakeToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("ZEN", "KTK", "MM2")); + tokenImageSets.addAll(Arrays.asList("ZEN", "KTK", "MM2", "C15")); } public SnakeToken() { this(null); } - + public SnakeToken(String setCode) { super("Snake", "1/1 green Snake creature token"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C15")) { + setTokenType(1); + } cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Snake"); power = new MageInt(1); toughness = new MageInt(1); - - availableImageSetCodes = tokenImageSets; - setOriginalExpansionSetCode(setCode); } - -} +} \ No newline at end of file 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 6264190b018..8ce18a7b7a6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java @@ -43,7 +43,7 @@ public class SoldierToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("10E", "M15", "C14", "ORI", "ALA", "DDF", "THS", "M12", "M13", "MM2", "MMA", "RTR", "SOM", "DDF", "M10")); + tokenImageSets.addAll(Arrays.asList("10E", "M15", "C14", "ORI", "ALA", "DDF", "THS", "M12", "M13", "MM2", "MMA", "RTR", "SOM", "DDO", "M10", "ORI")); } public SoldierToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java index 6cfe350cf05..f2b09b9bdf3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java @@ -21,11 +21,21 @@ public class SpiderToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("INN", "EMN")); + tokenImageSets.addAll(Arrays.asList("ISD", "EMN", "C15", "SHM")); } public SpiderToken() { + this(null, 0); + } + + public SpiderToken(String setCode) { + this(setCode, 0); + } + + public SpiderToken(String setCode, int tokenType) { super("Spider", "1/2 green Spider creature token with reach"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add("Spider"); 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 79fb72ed80e..b0aa21deb1d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java @@ -27,6 +27,9 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.MageInt; import mage.constants.CardType; @@ -34,14 +37,48 @@ import mage.constants.CardType; * @author Loki */ public class SpiritToken extends Token { - - public SpiritToken() { - super("Spirit", "1/1 colorless Spirit creature token"); - setOriginalExpansionSetCode("CHK"); + final static private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("CHK", "EMA")); + } + + public SpiritToken() { + this(null, 0); + } + + public SpiritToken(String setCode) { + this(setCode, 0); + } + + public SpiritToken(String setCode, int tokenType) { + super("Spirit", "1/1 colorless Spirit creature token"); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode(setCode); + if (tokenType > 0) { + setTokenType(tokenType); + } cardType.add(CardType.CREATURE); subtype.add("Spirit"); power = new MageInt(1); toughness = new MageInt(1); } -} + + @Override + public void setExpansionSetCodeForImage(String code) { + super.setExpansionSetCodeForImage(code); + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMA")) { + setTokenType(1); + } + } + + public SpiritToken(final SpiritToken token) { + super(token); + } + + @Override + public SpiritToken copy() { + return new SpiritToken(this); + } +} \ No newline at end of file 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 cf5e5201187..3efff0c8629 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java @@ -42,7 +42,7 @@ public class SpiritWhiteToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM", "SOI")); + tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM", "SOI", "EMA")); } public SpiritWhiteToken() { @@ -65,7 +65,7 @@ public class SpiritWhiteToken extends Token { color.setWhite(true); power = new MageInt(1); toughness = new MageInt(1); - + addAbility(FlyingAbility.getInstance()); } 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 d2bd1c79075..127572df13b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java @@ -43,14 +43,18 @@ public class WolfToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("BNG", "C14", "CNS", "FNMP", "ISD", "LRW", "M10", "M14", "MM2", "SHM", "SOM", "ZEN", "SOI")); + tokenImageSets.addAll(Arrays.asList("BNG", "C14", "CNS", "FNMP", "ISD", "LRW", "M10", "M14", "MM2", "SHM", "SOM", "ZEN", "SOI", "C15", "M15")); } public WolfToken() { - this((String) null); + this(null, 0); } public WolfToken(String setCode) { + this(setCode, 0); + } + + public WolfToken(String setCode, int tokenType) { super("Wolf", "2/2 green Wolf creature token"); availableImageSetCodes = tokenImageSets; setOriginalExpansionSetCode(setCode); 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 3f803a61dad..fec1a2d90cd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -43,7 +43,8 @@ public class ZombieToken extends Token { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "CNS", "MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN")); + tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "CNS", + "MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA")); } public ZombieToken() { @@ -65,6 +66,9 @@ public class ZombieToken extends Token { if (getOriginalExpansionSetCode().equals("C14")) { this.setTokenType(2); } + if (getOriginalExpansionSetCode().equals("EMN")) { + this.setTokenType(new Random().nextInt(4) + 1); + } } public ZombieToken(final ZombieToken token) {