From 3e32287f0065f158368745d0917fb428077000c7 Mon Sep 17 00:00:00 2001 From: Marc Zwart Date: Tue, 3 Apr 2018 14:05:41 +0200 Subject: [PATCH] fixed Token/TokenImpl imports and references --- Mage.Common/src/main/java/mage/view/CardView.java | 2 +- Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java | 4 ++-- Mage.Sets/src/mage/cards/a/AjaniGoldmane.java | 4 ++-- Mage.Sets/src/mage/cards/a/AjanisChosen.java | 2 +- Mage.Sets/src/mage/cards/a/AkkiLavarunner.java | 4 ++-- Mage.Sets/src/mage/cards/a/AkroanHorse.java | 2 +- Mage.Sets/src/mage/cards/a/AmbushCommander.java | 4 ++-- Mage.Sets/src/mage/cards/a/AngelsTomb.java | 4 ++-- Mage.Sets/src/mage/cards/a/AnimateLand.java | 4 ++-- Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java | 4 ++-- Mage.Sets/src/mage/cards/a/AtarkaMonument.java | 4 ++-- Mage.Sets/src/mage/cards/a/AwakenTheAncient.java | 4 ++-- Mage.Sets/src/mage/cards/a/AwakenerDruid.java | 4 ++-- Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java | 4 ++-- Mage.Sets/src/mage/cards/b/BalduvianConjurer.java | 4 ++-- Mage.Sets/src/mage/cards/b/BalduvianFrostwaker.java | 4 ++-- Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java | 2 +- Mage.Sets/src/mage/cards/b/BlinkmothNexus.java | 4 ++-- Mage.Sets/src/mage/cards/b/BorosKeyrune.java | 4 ++-- Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java | 2 +- Mage.Sets/src/mage/cards/b/BudokaGardener.java | 4 ++-- Mage.Sets/src/mage/cards/b/BudokaPupil.java | 4 ++-- Mage.Sets/src/mage/cards/b/BushiTenderfoot.java | 4 ++-- Mage.Sets/src/mage/cards/c/CallowJushi.java | 4 ++-- Mage.Sets/src/mage/cards/c/CelestialColonnade.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChimericEgg.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChimericIdol.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChimericMass.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChimericSphere.java | 6 +++--- Mage.Sets/src/mage/cards/c/ChronatogTotem.java | 4 ++-- Mage.Sets/src/mage/cards/c/CorruptedZendikon.java | 4 ++-- Mage.Sets/src/mage/cards/c/CreepingTarPit.java | 4 ++-- Mage.Sets/src/mage/cards/c/CrusherZendikon.java | 4 ++-- Mage.Sets/src/mage/cards/c/CunningBandit.java | 4 ++-- Mage.Sets/src/mage/cards/d/DanceOfTheSkywise.java | 4 ++-- Mage.Sets/src/mage/cards/d/DarksteelBrute.java | 4 ++-- Mage.Sets/src/mage/cards/d/DarksteelMutation.java | 4 ++-- Mage.Sets/src/mage/cards/d/DaxossTorment.java | 4 ++-- Mage.Sets/src/mage/cards/d/DeathByDragons.java | 2 +- Mage.Sets/src/mage/cards/d/DecreeOfJustice.java | 2 +- Mage.Sets/src/mage/cards/d/DimirKeyrune.java | 4 ++-- Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java | 2 +- Mage.Sets/src/mage/cards/d/Dovescape.java | 2 +- Mage.Sets/src/mage/cards/d/Dragonshift.java | 4 ++-- Mage.Sets/src/mage/cards/d/DreadStatuary.java | 4 ++-- Mage.Sets/src/mage/cards/d/DromokaMonument.java | 4 ++-- Mage.Sets/src/mage/cards/d/DruidicSatchel.java | 2 +- Mage.Sets/src/mage/cards/e/ElementalUprising.java | 4 ++-- Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishBranchbender.java | 4 ++-- Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java | 4 ++-- Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java | 4 ++-- Mage.Sets/src/mage/cards/e/EnsoulArtifact.java | 4 ++-- Mage.Sets/src/mage/cards/e/EnsouledScimitar.java | 4 ++-- Mage.Sets/src/mage/cards/e/ErayoSoratamiAscendant.java | 4 ++-- Mage.Sets/src/mage/cards/f/FaerieConclave.java | 4 ++-- Mage.Sets/src/mage/cards/f/FaithfulSquire.java | 4 ++-- Mage.Sets/src/mage/cards/f/FendeepSummoner.java | 4 ++-- Mage.Sets/src/mage/cards/f/FigureOfDestiny.java | 8 ++++---- Mage.Sets/src/mage/cards/f/Flickerform.java | 2 +- Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java | 4 ++-- Mage.Sets/src/mage/cards/f/ForiysianTotem.java | 4 ++-- Mage.Sets/src/mage/cards/f/FowlPlay.java | 4 ++-- Mage.Sets/src/mage/cards/f/FuneralPyre.java | 2 +- Mage.Sets/src/mage/cards/g/GarbageElementalC.java | 2 +- Mage.Sets/src/mage/cards/g/GeistSnatch.java | 2 +- Mage.Sets/src/mage/cards/g/GeminiEngine.java | 2 +- Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java | 4 ++-- Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java | 4 ++-- Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java | 4 ++-- Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java | 4 ++-- Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java | 4 ++-- Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java | 4 ++-- Mage.Sets/src/mage/cards/g/GhituEncampment.java | 4 ++-- Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java | 2 +- Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java | 4 ++-- Mage.Sets/src/mage/cards/g/GideonBattleForged.java | 4 ++-- Mage.Sets/src/mage/cards/g/GideonChampionOfJustice.java | 4 ++-- Mage.Sets/src/mage/cards/g/GideonJura.java | 4 ++-- Mage.Sets/src/mage/cards/g/GideonMartialParagon.java | 4 ++-- Mage.Sets/src/mage/cards/g/GideonOfTheTrials.java | 4 ++-- Mage.Sets/src/mage/cards/g/GlintHawkIdol.java | 4 ++-- Mage.Sets/src/mage/cards/g/GoblinSpymaster.java | 2 +- Mage.Sets/src/mage/cards/g/GolgariKeyrune.java | 4 ++-- Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java | 4 ++-- Mage.Sets/src/mage/cards/g/GruulKeyrune.java | 4 ++-- Mage.Sets/src/mage/cards/g/GruulWarPlow.java | 4 ++-- Mage.Sets/src/mage/cards/g/GuardianIdol.java | 4 ++-- Mage.Sets/src/mage/cards/g/GuardianZendikon.java | 4 ++-- Mage.Sets/src/mage/cards/h/HalcyonGlaze.java | 4 ++-- Mage.Sets/src/mage/cards/h/HauntedPlateMail.java | 4 ++-- Mage.Sets/src/mage/cards/h/HiddenAncients.java | 4 ++-- Mage.Sets/src/mage/cards/h/HiddenGibbons.java | 4 ++-- Mage.Sets/src/mage/cards/h/HiddenGuerrillas.java | 4 ++-- Mage.Sets/src/mage/cards/h/HiddenHerd.java | 4 ++-- Mage.Sets/src/mage/cards/h/HiddenSpider.java | 4 ++-- Mage.Sets/src/mage/cards/h/HiredMuscle.java | 4 ++-- Mage.Sets/src/mage/cards/h/HissingQuagmire.java | 4 ++-- Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java | 4 ++-- Mage.Sets/src/mage/cards/h/HornetCannon.java | 2 +- Mage.Sets/src/mage/cards/h/HostileDesert.java | 4 ++-- Mage.Sets/src/mage/cards/h/HourOfNeed.java | 2 +- Mage.Sets/src/mage/cards/h/HuntingWilds.java | 4 ++-- Mage.Sets/src/mage/cards/h/Hydroform.java | 4 ++-- Mage.Sets/src/mage/cards/i/IgnitionTeam.java | 4 ++-- Mage.Sets/src/mage/cards/i/InitiateOfBlood.java | 4 ++-- Mage.Sets/src/mage/cards/i/InkmothNexus.java | 4 ++-- Mage.Sets/src/mage/cards/i/IzzetKeyrune.java | 4 ++-- Mage.Sets/src/mage/cards/j/JadeIdol.java | 4 ++-- Mage.Sets/src/mage/cards/j/JadeStatue.java | 4 ++-- Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java | 4 ++-- Mage.Sets/src/mage/cards/j/JushiApprentice.java | 4 ++-- Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java | 4 ++-- Mage.Sets/src/mage/cards/k/KamahlsSummons.java | 2 +- Mage.Sets/src/mage/cards/k/KinTreeInvocation.java | 4 ++-- Mage.Sets/src/mage/cards/k/KitsuneMystic.java | 4 ++-- Mage.Sets/src/mage/cards/k/KolaghanMonument.java | 4 ++-- Mage.Sets/src/mage/cards/k/KormusBell.java | 4 ++-- Mage.Sets/src/mage/cards/k/KothOfTheHammer.java | 4 ++-- Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java | 4 ++-- Mage.Sets/src/mage/cards/l/LavaclawReaches.java | 4 ++-- Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java | 4 ++-- Mage.Sets/src/mage/cards/l/LifeDeath.java | 4 ++-- Mage.Sets/src/mage/cards/l/LifecraftAwakening.java | 4 ++-- Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java | 4 ++-- Mage.Sets/src/mage/cards/l/Lignify.java | 4 ++-- Mage.Sets/src/mage/cards/l/LivingLands.java | 4 ++-- Mage.Sets/src/mage/cards/l/LivingPlane.java | 4 ++-- Mage.Sets/src/mage/cards/l/LivingTerrain.java | 4 ++-- Mage.Sets/src/mage/cards/l/LumberingFalls.java | 4 ++-- Mage.Sets/src/mage/cards/l/LurkingEvil.java | 4 ++-- Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java | 2 +- Mage.Sets/src/mage/cards/m/MishrasFactory.java | 4 ++-- Mage.Sets/src/mage/cards/m/MishrasGroundbreaker.java | 4 ++-- Mage.Sets/src/mage/cards/m/MongrelPack.java | 4 ++-- Mage.Sets/src/mage/cards/m/Mutavault.java | 4 ++-- Mage.Sets/src/mage/cards/m/MythRealized.java | 4 ++-- Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java | 2 +- Mage.Sets/src/mage/cards/n/NantukoMonastery.java | 4 ++-- Mage.Sets/src/mage/cards/n/NaturalEmergence.java | 4 ++-- Mage.Sets/src/mage/cards/n/NaturesRevolt.java | 4 ++-- Mage.Sets/src/mage/cards/n/NeedleSpires.java | 4 ++-- Mage.Sets/src/mage/cards/n/NezumiGraverobber.java | 4 ++-- Mage.Sets/src/mage/cards/n/NezumiShortfang.java | 4 ++-- Mage.Sets/src/mage/cards/n/NissaStewardOfElements.java | 4 ++-- Mage.Sets/src/mage/cards/n/NissaVitalForce.java | 4 ++-- Mage.Sets/src/mage/cards/n/NissaWorldwaker.java | 4 ++-- Mage.Sets/src/mage/cards/n/NotForgotten.java | 2 +- Mage.Sets/src/mage/cards/n/NoyanDarRoilShaper.java | 4 ++-- Mage.Sets/src/mage/cards/o/OjutaiMonument.java | 4 ++-- Mage.Sets/src/mage/cards/o/Omnibian.java | 4 ++-- Mage.Sets/src/mage/cards/o/OozeFlux.java | 2 +- Mage.Sets/src/mage/cards/o/OozeGarden.java | 4 ++-- Mage.Sets/src/mage/cards/o/OpalArchangel.java | 4 ++-- Mage.Sets/src/mage/cards/o/OpalCaryatid.java | 4 ++-- Mage.Sets/src/mage/cards/o/OpalChampion.java | 4 ++-- Mage.Sets/src/mage/cards/o/OpalGargoyle.java | 4 ++-- Mage.Sets/src/mage/cards/o/OpalGuardian.java | 4 ++-- Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java | 4 ++-- Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java | 4 ++-- Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java | 2 +- Mage.Sets/src/mage/cards/p/PhyrexianTotem.java | 4 ++-- Mage.Sets/src/mage/cards/p/PonybackBrigade.java | 2 +- Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java | 4 ++-- Mage.Sets/src/mage/cards/r/RagingRavine.java | 4 ++-- Mage.Sets/src/mage/cards/r/RakdosKeyrune.java | 4 ++-- Mage.Sets/src/mage/cards/r/Riddleform.java | 4 ++-- Mage.Sets/src/mage/cards/r/RiptideReplicator.java | 2 +- Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java | 2 +- Mage.Sets/src/mage/cards/r/RudeAwakening.java | 4 ++-- Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java | 4 ++-- Mage.Sets/src/mage/cards/r/RustedRelic.java | 4 ++-- Mage.Sets/src/mage/cards/s/SaprolingBurst.java | 2 +- Mage.Sets/src/mage/cards/s/SarkhanTheMad.java | 2 +- Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVii.java | 2 +- Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java | 4 ++-- Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShamblingVent.java | 4 ++-- Mage.Sets/src/mage/cards/s/SiegeOfTowers.java | 4 ++-- Mage.Sets/src/mage/cards/s/SilumgarMonument.java | 4 ++-- Mage.Sets/src/mage/cards/s/SimicKeyrune.java | 4 ++-- Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java | 4 ++-- Mage.Sets/src/mage/cards/s/Skinshifter.java | 8 ++++---- Mage.Sets/src/mage/cards/s/Soilshaper.java | 4 ++-- Mage.Sets/src/mage/cards/s/SpikeTiller.java | 4 ++-- Mage.Sets/src/mage/cards/s/StalkingStones.java | 4 ++-- Mage.Sets/src/mage/cards/s/StillLife.java | 4 ++-- Mage.Sets/src/mage/cards/s/StirringWildwood.java | 4 ++-- Mage.Sets/src/mage/cards/s/StudentOfElements.java | 4 ++-- Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java | 4 ++-- Mage.Sets/src/mage/cards/s/SwanSong.java | 2 +- Mage.Sets/src/mage/cards/t/TemptWithVengeance.java | 2 +- Mage.Sets/src/mage/cards/t/TestamentOfFaith.java | 4 ++-- Mage.Sets/src/mage/cards/t/TezzeretsTouch.java | 4 ++-- Mage.Sets/src/mage/cards/t/TheloniteDruid.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderTotem.java | 4 ++-- Mage.Sets/src/mage/cards/t/TidalWave.java | 2 +- Mage.Sets/src/mage/cards/t/TombstoneStairwell.java | 2 +- Mage.Sets/src/mage/cards/t/TreetopVillage.java | 4 ++-- Mage.Sets/src/mage/cards/t/TurnBurn.java | 4 ++-- Mage.Sets/src/mage/cards/v/VastwoodAnimist.java | 4 ++-- Mage.Sets/src/mage/cards/v/VastwoodZendikon.java | 4 ++-- Mage.Sets/src/mage/cards/v/VerdantTouch.java | 4 ++-- Mage.Sets/src/mage/cards/v/Vivify.java | 4 ++-- Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java | 2 +- Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java | 2 +- Mage.Sets/src/mage/cards/w/WanderingFumarole.java | 4 ++-- Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java | 6 +++--- Mage.Sets/src/mage/cards/w/WardenOfTheWall.java | 4 ++-- Mage.Sets/src/mage/cards/w/WarrenWeirding.java | 2 +- Mage.Sets/src/mage/cards/w/Waylay.java | 2 +- Mage.Sets/src/mage/cards/w/WeatherseedTotem.java | 4 ++-- Mage.Sets/src/mage/cards/w/WindZendikon.java | 4 ++-- Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java | 4 ++-- Mage.Sets/src/mage/cards/x/XanthicStatue.java | 4 ++-- .../activated/TokenImplActivatedAbilityTest.java | 2 +- .../test/cards/copy/CopyCreatureCardToTokenImplTest.java | 2 +- .../mage/abilities/effects/common/CopyTokenEffect.java | 2 +- .../mage/abilities/effects/common/CreateTokenEffect.java | 2 +- .../abilities/effects/common/CreateTokenTargetEffect.java | 2 +- .../mage/abilities/effects/common/FlipSourceEffect.java | 2 +- .../common/continuous/BecomesCreatureAllEffect.java | 2 +- .../common/continuous/BecomesCreatureAttachedEffect.java | 2 +- ...CreatureAttachedWithActivatedAbilityOrSpellEffect.java | 2 +- .../common/continuous/BecomesCreatureSourceEffect.java | 2 +- .../common/continuous/BecomesCreatureTargetEffect.java | 2 +- .../main/java/mage/abilities/keyword/AwakenAbility.java | 4 ++-- .../src/main/java/mage/game/permanent/PermanentToken.java | 2 +- .../main/java/mage/game/permanent/token/ATATToken.java | 2 +- .../game/permanent/token/AbhorrentOverlordHarpyToken.java | 2 +- .../game/permanent/token/AerieWorshippersBirdToken.java | 2 +- .../permanent/token/AkoumStonewakerElementalToken.java | 2 +- .../mage/game/permanent/token/AkroanSoldierToken.java | 2 +- .../main/java/mage/game/permanent/token/AngelToken.java | 2 +- .../mage/game/permanent/token/AnotherSpiritToken.java | 2 +- .../mage/game/permanent/token/AnthousaWarriorToken.java | 2 +- .../src/main/java/mage/game/permanent/token/ApeToken.java | 2 +- .../permanent/token/ArchitectOfTheUntamedBeastToken.java | 2 +- .../java/mage/game/permanent/token/AssassinToken.java | 2 +- .../mage/game/permanent/token/AssemblyWorkerToken.java | 2 +- .../main/java/mage/game/permanent/token/AvatarToken.java | 2 +- .../java/mage/game/permanent/token/BalduvianToken.java | 2 +- .../mage/game/permanent/token/BaruFistOfKrosaToken.java | 2 +- .../src/main/java/mage/game/permanent/token/BatToken.java | 2 +- .../main/java/mage/game/permanent/token/BearToken.java | 2 +- .../game/permanent/token/BearsCompanionBearToken.java | 2 +- .../main/java/mage/game/permanent/token/BeastToken.java | 2 +- .../main/java/mage/game/permanent/token/BeastToken2.java | 2 +- .../main/java/mage/game/permanent/token/BeastToken3.java | 2 +- .../mage/game/permanent/token/BeckonApparitionToken.java | 2 +- .../java/mage/game/permanent/token/BirdSoldierToken.java | 2 +- .../main/java/mage/game/permanent/token/BirdToken.java | 2 +- .../main/java/mage/game/permanent/token/BoarToken.java | 2 +- .../java/mage/game/permanent/token/BrainiacToken.java | 2 +- .../mage/game/permanent/token/BreedingPitThrullToken.java | 2 +- .../game/permanent/token/BrokenVisageSpiritToken.java | 2 +- .../mage/game/permanent/token/BroodKeeperDragonToken.java | 2 +- .../java/mage/game/permanent/token/ButterflyToken.java | 2 +- .../permanent/token/CallTheSkyBreakerElementalToken.java | 2 +- .../main/java/mage/game/permanent/token/CamaridToken.java | 2 +- .../main/java/mage/game/permanent/token/CaribouToken.java | 2 +- .../java/mage/game/permanent/token/CarnivoreToken.java | 2 +- .../game/permanent/token/CarrionBlackInsectToken.java | 2 +- .../game/permanent/token/CatSoldierCreatureToken.java | 3 +-- .../src/main/java/mage/game/permanent/token/CatToken.java | 2 +- .../main/java/mage/game/permanent/token/CatToken2.java | 2 +- .../java/mage/game/permanent/token/CatWarriorToken.java | 2 +- .../permanent/token/CentaurEnchantmentCreatureToken.java | 3 +-- .../main/java/mage/game/permanent/token/CentaurToken.java | 2 +- .../mage/game/permanent/token/ChasmSkulkerSquidToken.java | 2 +- .../main/java/mage/game/permanent/token/CitizenToken.java | 2 +- .../java/mage/game/permanent/token/CloudSpriteToken.java | 2 +- .../java/mage/game/permanent/token/ClueArtifactToken.java | 2 +- .../java/mage/game/permanent/token/ConstructToken.java | 2 +- .../mage/game/permanent/token/CoralBarrierSquidToken.java | 2 +- .../mage/game/permanent/token/CorpseweftZombieToken.java | 2 +- .../game/permanent/token/CorruptedZendikonOozeToken.java | 2 +- .../mage/game/permanent/token/CreakwoodLiegeToken.java | 2 +- .../mage/game/permanent/token/CrestedSunmareToken.java | 2 +- .../permanent/token/CribSwapShapeshifterWhiteToken.java | 2 +- .../mage/game/permanent/token/CrushOfTentaclesToken.java | 2 +- .../game/permanent/token/CurseOfTheSwineBoarToken.java | 2 +- .../mage/game/permanent/token/DarettiConstructToken.java | 2 +- .../java/mage/game/permanent/token/DaxosSpiritToken.java | 2 +- .../java/mage/game/permanent/token/DeadlyGrubToken.java | 2 +- .../mage/game/permanent/token/DeathpactAngelToken.java | 2 +- .../mage/game/permanent/token/DeathtouchRatToken.java | 2 +- .../mage/game/permanent/token/DeathtouchSnakeToken.java | 2 +- .../mage/game/permanent/token/DefenderPlantToken.java | 2 +- .../main/java/mage/game/permanent/token/DemonToken.java | 2 +- .../java/mage/game/permanent/token/DeserterToken.java | 2 +- .../permanent/token/DevastatingSummonsElementalToken.java | 2 +- .../main/java/mage/game/permanent/token/DevilToken.java | 2 +- .../mage/game/permanent/token/DinOfTheFireherdToken.java | 2 +- .../java/mage/game/permanent/token/DinosaurToken.java | 2 +- .../java/mage/game/permanent/token/DjinnMonkToken.java | 2 +- .../main/java/mage/game/permanent/token/DjinnToken.java | 2 +- .../mage/game/permanent/token/DokaiWeaverofLifeToken.java | 2 +- .../java/mage/game/permanent/token/DovescapeToken.java | 2 +- .../permanent/token/DragonBroodmotherDragonToken.java | 2 +- .../mage/game/permanent/token/DragonEggDragonToken.java | 2 +- .../main/java/mage/game/permanent/token/DragonToken.java | 2 +- .../main/java/mage/game/permanent/token/DragonToken2.java | 2 +- .../java/mage/game/permanent/token/DragonTokenGold.java | 2 +- .../main/java/mage/game/permanent/token/DrakeToken.java | 2 +- .../main/java/mage/game/permanent/token/DroidToken.java | 2 +- .../mage/game/permanent/token/DuneBroodNephilimToken.java | 2 +- .../java/mage/game/permanent/token/EdgarMarkovToken.java | 2 +- .../mage/game/permanent/token/EldraziHorrorToken.java | 2 +- .../java/mage/game/permanent/token/EldraziScionToken.java | 2 +- .../java/mage/game/permanent/token/EldraziSpawnToken.java | 2 +- .../main/java/mage/game/permanent/token/EldraziToken.java | 2 +- .../permanent/token/ElementalAppealElementalToken.java | 2 +- .../java/mage/game/permanent/token/ElementalCatToken.java | 2 +- .../permanent/token/ElementalMasteryElementalToken.java | 2 +- .../mage/game/permanent/token/ElementalShamanToken.java | 2 +- .../java/mage/game/permanent/token/ElementalToken.java | 2 +- .../game/permanent/token/ElephantResurgenceToken.java | 2 +- .../java/mage/game/permanent/token/ElephantToken.java | 2 +- .../src/main/java/mage/game/permanent/token/ElfToken.java | 2 +- .../main/java/mage/game/permanent/token/EmptyToken.java | 2 +- .../game/permanent/token/ErrandOfDutyKnightToken.java | 2 +- .../java/mage/game/permanent/token/EtheriumCellToken.java | 2 +- .../main/java/mage/game/permanent/token/EwokToken.java | 2 +- .../permanent/token/EyesOfTheWisentElementalToken.java | 2 +- .../java/mage/game/permanent/token/FaerieRogueToken.java | 2 +- .../main/java/mage/game/permanent/token/FaerieToken.java | 2 +- .../mage/game/permanent/token/FesteringGoblinToken.java | 2 +- .../mage/game/permanent/token/FleshCarverHorrorToken.java | 2 +- .../game/permanent/token/FlurryOfHornsMinotaurToken.java | 2 +- .../game/permanent/token/ForlornPseudammaZombieToken.java | 2 +- .../game/permanent/token/FreyaliseLlanowarsFuryToken.java | 2 +- .../main/java/mage/game/permanent/token/FrogToken.java | 2 +- .../java/mage/game/permanent/token/GargoyleToken.java | 2 +- .../permanent/token/GarrukApexPredatorBeastToken.java | 2 +- .../mage/game/permanent/token/GeminiEngineTwinToken.java | 2 +- .../main/java/mage/game/permanent/token/GermToken.java | 2 +- .../permanent/token/GiantBaitingGiantWarriorToken.java | 2 +- .../java/mage/game/permanent/token/GiantChickenToken.java | 2 +- .../main/java/mage/game/permanent/token/GiantToken.java | 2 +- .../java/mage/game/permanent/token/GiantWarriorToken.java | 2 +- .../main/java/mage/game/permanent/token/GnomeToken.java | 2 +- .../main/java/mage/game/permanent/token/GoatToken.java | 2 +- .../java/mage/game/permanent/token/GoblinRogueToken.java | 2 +- .../java/mage/game/permanent/token/GoblinScoutsToken.java | 2 +- .../mage/game/permanent/token/GoblinSoldierToken.java | 2 +- .../main/java/mage/game/permanent/token/GoblinToken.java | 2 +- .../mage/game/permanent/token/GoblinTrenchesToken.java | 2 +- .../permanent/token/GodFavoredGeneralSoldierToken.java | 2 +- .../java/mage/game/permanent/token/GodSireBeastToken.java | 2 +- .../game/permanent/token/GoldForgeGarrisonGolemToken.java | 2 +- .../main/java/mage/game/permanent/token/GoldToken.java | 2 +- .../mage/game/permanent/token/GoldmeadowHarrierToken.java | 2 +- .../main/java/mage/game/permanent/token/GolemToken.java | 2 +- .../main/java/mage/game/permanent/token/GremlinToken.java | 2 +- .../main/java/mage/game/permanent/token/GriffinToken.java | 2 +- .../game/permanent/token/GrovetenderDruidsPlantToken.java | 2 +- .../mage/game/permanent/token/GuardianIdolGolemToken.java | 2 +- .../java/mage/game/permanent/token/GutterGrimeToken.java | 2 +- .../game/permanent/token/HammerOfPurphorosGolemToken.java | 2 +- .../java/mage/game/permanent/token/HauntedAngelToken.java | 2 +- .../permanent/token/HazezonTamarSandWarriorToken.java | 2 +- .../mage/game/permanent/token/HeliodGodOfTheSunToken.java | 2 +- .../java/mage/game/permanent/token/HellionHasteToken.java | 2 +- .../main/java/mage/game/permanent/token/HellionToken.java | 2 +- .../main/java/mage/game/permanent/token/HippoToken.java | 2 +- .../main/java/mage/game/permanent/token/HippoToken2.java | 2 +- .../java/mage/game/permanent/token/HomunculusToken.java | 2 +- .../mage/game/permanent/token/HornetNestInsectToken.java | 2 +- .../mage/game/permanent/token/HornetQueenInsectToken.java | 2 +- .../main/java/mage/game/permanent/token/HornetToken.java | 2 +- .../main/java/mage/game/permanent/token/HorrorToken.java | 2 +- .../main/java/mage/game/permanent/token/HoundToken.java | 2 +- .../mage/game/permanent/token/HourOfNeedSphinxToken.java | 2 +- .../java/mage/game/permanent/token/HumanClericToken.java | 2 +- .../java/mage/game/permanent/token/HumanSoldierToken.java | 2 +- .../main/java/mage/game/permanent/token/HumanToken.java | 2 +- .../java/mage/game/permanent/token/HumanWizardToken.java | 2 +- .../mage/game/permanent/token/HuntedCentaurToken.java | 2 +- .../game/permanent/token/HuntedDragonKnightToken.java | 2 +- .../main/java/mage/game/permanent/token/HunterToken.java | 2 +- .../mage/game/permanent/token/HydraBroodmasterToken.java | 2 +- .../java/mage/game/permanent/token/IllusionToken.java | 2 +- .../game/permanent/token/InexorableBlobOozeToken.java | 2 +- .../java/mage/game/permanent/token/InsectInfectToken.java | 2 +- .../main/java/mage/game/permanent/token/InsectToken.java | 2 +- .../mage/game/permanent/token/IxalanVampireToken.java | 2 +- .../permanent/token/JaceCunningCastawayIllusionToken.java | 2 +- .../game/permanent/token/JoinTheRanksSoldierToken.java | 2 +- .../main/java/mage/game/permanent/token/KaldraToken.java | 2 +- .../mage/game/permanent/token/KalitasVampireToken.java | 2 +- .../token/KalonianTwingroveTreefolkWarriorToken.java | 2 +- .../mage/game/permanent/token/KarnConstructToken.java | 2 +- .../main/java/mage/game/permanent/token/KelpToken.java | 2 +- .../mage/game/permanent/token/KherKeepKoboldToken.java | 2 +- .../java/mage/game/permanent/token/KioraKrakenToken.java | 2 +- .../main/java/mage/game/permanent/token/KithkinToken.java | 2 +- .../java/mage/game/permanent/token/KnightAllyToken.java | 2 +- .../main/java/mage/game/permanent/token/KnightToken.java | 2 +- .../main/java/mage/game/permanent/token/KorAllyToken.java | 2 +- .../java/mage/game/permanent/token/KorSoldierToken.java | 2 +- .../java/mage/game/permanent/token/LandMineToken.java | 2 +- .../game/permanent/token/LeafdrakeRoostDrakeToken.java | 2 +- .../mage/game/permanent/token/LightningRagerToken.java | 2 +- .../java/mage/game/permanent/token/LinvalaAngelToken.java | 2 +- .../main/java/mage/game/permanent/token/LizardToken.java | 2 +- .../mage/game/permanent/token/LlanowarElvesToken.java | 2 +- .../token/MarathWillOfTheWildElementalToken.java | 2 +- .../permanent/token/MarduStrikeLeaderWarriorToken.java | 2 +- .../java/mage/game/permanent/token/MaritLageToken.java | 2 +- .../game/permanent/token/MasterOfWavesElementalToken.java | 2 +- .../game/permanent/token/MelokuTheCloudedMirrorToken.java | 2 +- .../java/mage/game/permanent/token/MercyKillingToken.java | 2 +- .../mage/game/permanent/token/MerfolkHexproofToken.java | 2 +- .../main/java/mage/game/permanent/token/MerfolkToken.java | 2 +- .../mage/game/permanent/token/MerfolkWizardToken.java | 2 +- .../token/MetallurgicSummoningsConstructToken.java | 2 +- .../main/java/mage/game/permanent/token/MinionToken.java | 2 +- .../main/java/mage/game/permanent/token/MinionToken2.java | 2 +- .../java/mage/game/permanent/token/MinorDemonToken.java | 2 +- .../game/permanent/token/MoltenBirthElementalToken.java | 2 +- .../mage/game/permanent/token/MonasteryMentorToken.java | 2 +- .../src/main/java/mage/game/permanent/token/MyrToken.java | 2 +- .../mage/game/permanent/token/MysticGenesisOozeToken.java | 2 +- .../token/NahiriTheLithomancerEquipmentToken.java | 2 +- .../permanent/token/NestOfScarabsBlackInsectToken.java | 2 +- .../game/permanent/token/NighteyesTheDesecratorToken.java | 2 +- .../mage/game/permanent/token/NightwingHorrorToken.java | 2 +- .../mage/game/permanent/token/NissaSageAnimistToken.java | 2 +- .../main/java/mage/game/permanent/token/OctopusToken.java | 2 +- .../main/java/mage/game/permanent/token/OgreToken.java | 2 +- .../mage/game/permanent/token/OmnathElementalToken.java | 2 +- .../mage/game/permanent/token/OneDozenEyesBeastToken.java | 2 +- .../mage/game/permanent/token/OonaQueenFaerieToken.java | 2 +- .../main/java/mage/game/permanent/token/Ooze2Token.java | 2 +- .../main/java/mage/game/permanent/token/OozeToken.java | 2 +- .../mage/game/permanent/token/OphiomancerSnakeToken.java | 2 +- .../game/permanent/token/OrderedMigrationBirdToken.java | 2 +- .../permanent/token/OviyaPashiriSageLifecrafterToken.java | 2 +- .../src/main/java/mage/game/permanent/token/OwlToken.java | 2 +- .../mage/game/permanent/token/PatagiaViperSnakeToken.java | 2 +- .../main/java/mage/game/permanent/token/PegasusToken.java | 2 +- .../java/mage/game/permanent/token/PentaviteToken.java | 2 +- .../mage/game/permanent/token/PenumbraBobcatToken.java | 2 +- .../java/mage/game/permanent/token/PenumbraKavuToken.java | 2 +- .../mage/game/permanent/token/PenumbraSpiderToken.java | 2 +- .../java/mage/game/permanent/token/PenumbraWurmToken.java | 2 +- .../main/java/mage/game/permanent/token/PestToken.java | 2 +- .../java/mage/game/permanent/token/PharikaSnakeToken.java | 2 +- .../game/permanent/token/PhyrexianRebirthHorrorToken.java | 2 +- .../main/java/mage/game/permanent/token/PincherToken.java | 2 +- .../main/java/mage/game/permanent/token/PirateToken.java | 2 +- .../main/java/mage/game/permanent/token/PlantToken.java | 2 +- .../java/mage/game/permanent/token/PongifyApeToken.java | 2 +- .../main/java/mage/game/permanent/token/PrismToken.java | 2 +- .../game/permanent/token/PromiseOfPowerDemonToken.java | 2 +- .../java/mage/game/permanent/token/ProsshKoboldToken.java | 2 +- .../game/permanent/token/QueenMarchesaAssassinToken.java | 2 +- .../permanent/token/QuestForTheGravelordZombieToken.java | 2 +- .../main/java/mage/game/permanent/token/RagavanToken.java | 2 +- .../game/permanent/token/RakdosGuildmageGoblinToken.java | 2 +- .../mage/game/permanent/token/RakkaMarElementalToken.java | 2 +- .../game/permanent/token/RallyTheHordeWarriorToken.java | 2 +- .../game/permanent/token/RapidHybridizationToken.java | 2 +- .../src/main/java/mage/game/permanent/token/RatToken.java | 2 +- .../mage/game/permanent/token/RebelStarshipToken.java | 2 +- .../main/java/mage/game/permanent/token/RebelToken.java | 2 +- .../java/mage/game/permanent/token/RedHumanToken.java | 2 +- .../java/mage/game/permanent/token/ReefWormFishToken.java | 2 +- .../mage/game/permanent/token/ReefWormKrakenToken.java | 2 +- .../mage/game/permanent/token/ReefWormWhaleToken.java | 2 +- .../mage/game/permanent/token/ReflectionPureToken.java | 2 +- .../java/mage/game/permanent/token/ReflectionToken.java | 2 +- .../mage/game/permanent/token/ReignOfThePitToken.java | 2 +- .../mage/game/permanent/token/RekindlingPhoenixToken.java | 2 +- .../game/permanent/token/RenownedWeaverSpiderToken.java | 2 +- .../permanent/token/RevelOfTheFallenGodSatyrToken.java | 2 +- .../main/java/mage/game/permanent/token/RhinoToken.java | 2 +- .../mage/game/permanent/token/RhonassLastStandToken.java | 2 +- .../mage/game/permanent/token/RhysTheRedeemedToken.java | 2 +- .../mage/game/permanent/token/RiftmarkedKnightToken.java | 2 +- .../mage/game/permanent/token/RiptideReplicatorToken.java | 2 +- .../mage/game/permanent/token/RiseOfEaglesBirdToken.java | 2 +- .../permanent/token/RitualOfTheReturnedZombieToken.java | 2 +- .../main/java/mage/game/permanent/token/RocEggToken.java | 2 +- .../java/mage/game/permanent/token/RoyalGuardToken.java | 2 +- .../java/mage/game/permanent/token/RukhEggBirdToken.java | 2 +- .../mage/game/permanent/token/SaprolingBurstToken.java | 2 +- .../java/mage/game/permanent/token/SaprolingToken.java | 2 +- .../game/permanent/token/SatyrNyxSmithElementalToken.java | 2 +- .../java/mage/game/permanent/token/SeedGuardianToken.java | 2 +- .../permanent/token/SekKuarDeathkeeperGravebornToken.java | 2 +- .../game/permanent/token/SengirNosferatuBatToken.java | 2 +- .../main/java/mage/game/permanent/token/SerfToken.java | 2 +- .../game/permanent/token/SerpentGeneratorSnakeToken.java | 2 +- .../main/java/mage/game/permanent/token/ServoToken.java | 2 +- .../main/java/mage/game/permanent/token/SheepToken.java | 2 +- .../java/mage/game/permanent/token/SkeletonToken.java | 2 +- .../mage/game/permanent/token/SkywiseTeachingsToken.java | 2 +- .../main/java/mage/game/permanent/token/SliverToken.java | 2 +- .../java/mage/game/permanent/token/SliversmithToken.java | 2 +- .../main/java/mage/game/permanent/token/SnakeToken.java | 2 +- .../main/java/mage/game/permanent/token/SoldierToken.java | 2 +- .../mage/game/permanent/token/SoldierTokenWithHaste.java | 2 +- .../permanent/token/SorinLordOfInnistradVampireToken.java | 2 +- .../permanent/token/SorinSolemnVisitorVampireToken.java | 2 +- .../java/mage/game/permanent/token/SoundTheCallToken.java | 2 +- .../mage/game/permanent/token/SparkElementalToken.java | 2 +- .../game/permanent/token/SpawningGroundsBeastToken.java | 2 +- .../java/mage/game/permanent/token/SpawningPitToken.java | 2 +- .../main/java/mage/game/permanent/token/SpiderToken.java | 2 +- .../main/java/mage/game/permanent/token/SpikeToken.java | 2 +- .../java/mage/game/permanent/token/SpiritBlueToken.java | 2 +- .../main/java/mage/game/permanent/token/SpiritToken.java | 2 +- .../java/mage/game/permanent/token/SpiritWhiteToken.java | 2 +- .../game/permanent/token/SpoilsOfBloodHorrorToken.java | 2 +- .../mage/game/permanent/token/SpyMasterGoblinToken.java | 2 +- .../java/mage/game/permanent/token/SquirrelToken.java | 2 +- .../java/mage/game/permanent/token/StanggTwinToken.java | 2 +- .../game/permanent/token/StitcherGeralfZombieToken.java | 2 +- .../token/StitchersApprenticeHomunculusToken.java | 2 +- .../mage/game/permanent/token/StoneTrapIdolToken.java | 2 +- .../java/mage/game/permanent/token/StormCrowToken.java | 2 +- .../permanent/token/SubterraneanTremorsLizardToken.java | 2 +- .../java/mage/game/permanent/token/SurvivorToken.java | 2 +- .../java/mage/game/permanent/token/SwanSongBirdToken.java | 2 +- .../game/permanent/token/SylvanOfferingTreefolkToken.java | 2 +- .../java/mage/game/permanent/token/TIEFighterToken.java | 2 +- .../mage/game/permanent/token/TatsumaDragonToken.java | 2 +- .../permanent/token/TemptWithVengeanceElementalToken.java | 2 +- .../java/mage/game/permanent/token/TetraviteToken.java | 2 +- .../game/permanent/token/TeysaEnvoyOfGhostsToken.java | 2 +- .../mage/game/permanent/token/ThatcherHumanToken.java | 2 +- .../game/permanent/token/TheLocustGodInsectToken.java | 2 +- .../mage/game/permanent/token/ThopterColorlessToken.java | 2 +- .../main/java/mage/game/permanent/token/ThopterToken.java | 2 +- .../main/java/mage/game/permanent/token/ThrullToken.java | 2 +- .../mage/game/permanent/token/TidalWaveWallToken.java | 2 +- .../permanent/token/TilonallisSummonerElementalToken.java | 2 +- .../mage/game/permanent/token/TitanForgeGolemToken.java | 2 +- .../token/TitaniaProtectorOfArgothElementalToken.java | 2 +- .../main/java/mage/game/permanent/token/TokenImpl.java | 8 ++++---- .../mage/game/permanent/token/TombspawnZombieToken.java | 2 +- .../java/mage/game/permanent/token/TreasureToken.java | 2 +- .../mage/game/permanent/token/TreefolkShamanToken.java | 2 +- .../java/mage/game/permanent/token/TriskelaviteToken.java | 2 +- .../main/java/mage/game/permanent/token/TrooperToken.java | 2 +- .../mage/game/permanent/token/TuktukTheReturnedToken.java | 2 +- .../java/mage/game/permanent/token/TuskenRaiderToken.java | 2 +- .../main/java/mage/game/permanent/token/UramiToken.java | 2 +- .../game/permanent/token/UtvaraHellkiteDragonToken.java | 2 +- .../mage/game/permanent/token/VampireKnightToken.java | 2 +- .../main/java/mage/game/permanent/token/VampireToken.java | 2 +- .../mage/game/permanent/token/VoiceOfResurgenceToken.java | 2 +- .../permanent/token/VoiceOfTheWoodsElementalToken.java | 2 +- .../main/java/mage/game/permanent/token/VojaToken.java | 2 +- .../game/permanent/token/VolrathsLaboratoryToken.java | 2 +- .../game/permanent/token/WaitingInTheWeedsCatToken.java | 2 +- .../mage/game/permanent/token/WalkerOfTheGroveToken.java | 2 +- .../mage/game/permanent/token/WallOfResurgenceToken.java | 2 +- .../main/java/mage/game/permanent/token/WallToken.java | 2 +- .../game/permanent/token/WandOfTheElementsFirstToken.java | 2 +- .../permanent/token/WandOfTheElementsSecondToken.java | 2 +- .../main/java/mage/game/permanent/token/WarriorToken.java | 2 +- .../mage/game/permanent/token/WarriorVigilantToken.java | 2 +- .../mage/game/permanent/token/WasitoraCatDragonToken.java | 2 +- .../main/java/mage/game/permanent/token/WaspToken.java | 2 +- .../main/java/mage/game/permanent/token/WaylayToken.java | 2 +- .../main/java/mage/game/permanent/token/WeirdToken.java | 2 +- .../mage/game/permanent/token/WhiteElementalToken.java | 2 +- .../java/mage/game/permanent/token/WingmateRocToken.java | 2 +- .../main/java/mage/game/permanent/token/WireflyToken.java | 2 +- .../main/java/mage/game/permanent/token/WolfToken.java | 2 +- .../game/permanent/token/WolfTokenWithDeathtouch.java | 2 +- .../main/java/mage/game/permanent/token/WoodToken.java | 2 +- .../java/mage/game/permanent/token/WormHarvestToken.java | 2 +- .../mage/game/permanent/token/WortTheRaidmotherToken.java | 2 +- .../main/java/mage/game/permanent/token/Wurm1Token.java | 2 +- .../main/java/mage/game/permanent/token/Wurm2Token.java | 2 +- .../mage/game/permanent/token/WurmCallingWurmToken.java | 2 +- .../main/java/mage/game/permanent/token/WurmToken.java | 2 +- .../main/java/mage/game/permanent/token/WurmToken2.java | 2 +- .../main/java/mage/game/permanent/token/WurmToken3.java | 2 +- .../java/mage/game/permanent/token/XenagosSatyrToken.java | 2 +- .../permanent/token/YoungPyromancerElementalToken.java | 2 +- .../game/permanent/token/ZektarShrineElementalToken.java | 2 +- .../game/permanent/token/ZendikarsRoilElementalToken.java | 2 +- .../main/java/mage/game/permanent/token/ZombieToken.java | 2 +- .../main/java/mage/game/permanent/token/ZombieToken2.java | 2 +- .../java/mage/game/permanent/token/ZombieWizardToken.java | 2 +- Mage/src/main/java/mage/util/CardUtil.java | 2 +- .../main/java/mage/util/functions/CopyTokenFunction.java | 2 +- 593 files changed, 778 insertions(+), 780 deletions(-) diff --git a/Mage.Common/src/main/java/mage/view/CardView.java b/Mage.Common/src/main/java/mage/view/CardView.java index cce41e6041b..42dc17a84b9 100644 --- a/Mage.Common/src/main/java/mage/view/CardView.java +++ b/Mage.Common/src/main/java/mage/view/CardView.java @@ -46,7 +46,7 @@ import mage.game.Game; import mage.game.command.Emblem; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.game.stack.Spell; import mage.game.stack.StackAbility; import mage.target.Target; diff --git a/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java b/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java index a8ccf6bbf78..d96a29e2ea3 100644 --- a/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java +++ b/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java @@ -43,7 +43,7 @@ import mage.constants.ColoredManaSymbol; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.StaticFilters; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -78,7 +78,7 @@ public class AbhorrentOverlord extends CardImpl { } } -class AbhorrentOverlordHarpyToken extends Token { +class AbhorrentOverlordHarpyToken extends TokenImpl { public AbhorrentOverlordHarpyToken() { super("Harpy", "1/1 black Harpy creature tokens with flying"); diff --git a/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java b/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java index aeae498476c..e5467627591 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java +++ b/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java @@ -47,7 +47,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** @@ -88,7 +88,7 @@ public class AjaniGoldmane extends CardImpl { } -class AvatarToken extends Token { +class AvatarToken extends TokenImpl { public AvatarToken() { super("Avatar", "white Avatar creature token with \"This creature's power and toughness are each equal to your life total.\""); diff --git a/Mage.Sets/src/mage/cards/a/AjanisChosen.java b/Mage.Sets/src/mage/cards/a/AjanisChosen.java index 56cdd436249..f5dbaa8365c 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisChosen.java +++ b/Mage.Sets/src/mage/cards/a/AjanisChosen.java @@ -38,7 +38,7 @@ import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.CatToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java b/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java index 698091d13ee..2e3eadc90f0 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java +++ b/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java @@ -19,7 +19,7 @@ import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author Loki @@ -84,7 +84,7 @@ class AkkiLavarunnerAbility extends TriggeredAbilityImpl { } } -class TokTokVolcanoBorn extends Token { +class TokTokVolcanoBorn extends TokenImpl { TokTokVolcanoBorn() { super("Tok-Tok, Volcano Born", ""); addSuperType(SuperType.LEGENDARY); diff --git a/Mage.Sets/src/mage/cards/a/AkroanHorse.java b/Mage.Sets/src/mage/cards/a/AkroanHorse.java index 6b309c0dc54..e503b544561 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanHorse.java +++ b/Mage.Sets/src/mage/cards/a/AkroanHorse.java @@ -43,7 +43,7 @@ import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SoldierToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/cards/a/AmbushCommander.java b/Mage.Sets/src/mage/cards/a/AmbushCommander.java index 20d1377dacb..a5012476930 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushCommander.java +++ b/Mage.Sets/src/mage/cards/a/AmbushCommander.java @@ -43,7 +43,7 @@ import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -89,7 +89,7 @@ public class AmbushCommander extends CardImpl { } } -class AmbushCommanderToken extends Token { +class AmbushCommanderToken extends TokenImpl { public AmbushCommanderToken() { super("Elf", "1/1 green Elf creatures"); diff --git a/Mage.Sets/src/mage/cards/a/AngelsTomb.java b/Mage.Sets/src/mage/cards/a/AngelsTomb.java index 593071707a7..4ea1179a77f 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsTomb.java +++ b/Mage.Sets/src/mage/cards/a/AngelsTomb.java @@ -37,7 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -62,7 +62,7 @@ public class AngelsTomb extends CardImpl { } } -class AngelTombToken extends Token { +class AngelTombToken extends TokenImpl { public AngelTombToken() { super("", "3/3 white Angel artifact creature with flying"); diff --git a/Mage.Sets/src/mage/cards/a/AnimateLand.java b/Mage.Sets/src/mage/cards/a/AnimateLand.java index c2082360457..da38f6a23d7 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateLand.java +++ b/Mage.Sets/src/mage/cards/a/AnimateLand.java @@ -34,7 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -61,7 +61,7 @@ public class AnimateLand extends CardImpl { } } -class AnimatedLand extends Token { +class AnimatedLand extends TokenImpl { public AnimatedLand() { super("", "3/3 creature"); diff --git a/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java b/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java index 17761ffe348..6cbd9c574ec 100644 --- a/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java +++ b/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java @@ -39,7 +39,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetControlledPermanent; /** @@ -73,7 +73,7 @@ public class AnthousaSetessanHero extends CardImpl { } } -class AnthousaWarriorToken extends Token { +class AnthousaWarriorToken extends TokenImpl { public AnthousaWarriorToken() { super("", "2/2 Warrior creatures"); diff --git a/Mage.Sets/src/mage/cards/a/AtarkaMonument.java b/Mage.Sets/src/mage/cards/a/AtarkaMonument.java index cc5df38e228..5f79f171271 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaMonument.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaMonument.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -70,7 +70,7 @@ public class AtarkaMonument extends CardImpl { return new AtarkaMonument(this); } - private static class AtarkaMonumentToken extends Token { + private static class AtarkaMonumentToken extends TokenImpl { AtarkaMonumentToken() { super("", "4/4 red and green Dragon artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java index e5c324e15ad..11301ce531a 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java @@ -39,7 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -78,7 +78,7 @@ public class AwakenTheAncient extends CardImpl { return new AwakenTheAncient(this); } - private static class GiantToken extends Token { + private static class GiantToken extends TokenImpl { GiantToken() { super("Giant", "7/7 red Giant creature with haste"); diff --git a/Mage.Sets/src/mage/cards/a/AwakenerDruid.java b/Mage.Sets/src/mage/cards/a/AwakenerDruid.java index bde1b4d8e15..5cf9580d642 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenerDruid.java +++ b/Mage.Sets/src/mage/cards/a/AwakenerDruid.java @@ -40,7 +40,7 @@ import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -107,7 +107,7 @@ class AwakenerDruidBecomesCreatureEffect extends BecomesCreatureTargetEffect { } } -class AwakenerDruidToken extends Token { +class AwakenerDruidToken extends TokenImpl { public AwakenerDruidToken() { super("", "4/5 green Treefolk creature as long as {this} is on the battlefield"); diff --git a/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java b/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java index f5e1f9eb5fd..c3dfeb59f44 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author LevelX2 @@ -68,7 +68,7 @@ public class AzoriusKeyrune extends CardImpl { return new AzoriusKeyrune(this); } - private static class AzoriusKeyruneToken extends Token { + private static class AzoriusKeyruneToken extends TokenImpl { AzoriusKeyruneToken() { super("", "2/2 white and blue Bird artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/b/BalduvianConjurer.java b/Mage.Sets/src/mage/cards/b/BalduvianConjurer.java index 5079e105f91..0086f29a52f 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianConjurer.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianConjurer.java @@ -37,7 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import java.util.UUID; @@ -77,7 +77,7 @@ public class BalduvianConjurer extends CardImpl { } } -class AnimatedLand extends Token { +class AnimatedLand extends TokenImpl { public AnimatedLand() { super("", "2/2 creature"); diff --git a/Mage.Sets/src/mage/cards/b/BalduvianFrostwaker.java b/Mage.Sets/src/mage/cards/b/BalduvianFrostwaker.java index fb30f81c4f8..9d8788d8652 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianFrostwaker.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianFrostwaker.java @@ -40,7 +40,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -79,7 +79,7 @@ public class BalduvianFrostwaker extends CardImpl { } } -class BalduvianFrostwakerToken extends Token { +class BalduvianFrostwakerToken extends TokenImpl { public BalduvianFrostwakerToken() { super("Elemental", "2/2 blue Elemental creature with flying"); diff --git a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java index a4c067a4bb4..c7c1a966a64 100644 --- a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java +++ b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java @@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.BaruFistOfKrosaToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java b/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java index 1e630af5c73..9d246d91e56 100644 --- a/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java +++ b/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java @@ -46,7 +46,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -88,7 +88,7 @@ public class BlinkmothNexus extends CardImpl { } -class BlinkmothNexusToken extends Token { +class BlinkmothNexusToken extends TokenImpl { public BlinkmothNexusToken() { super("Blinkmoth", "1/1 Blinkmoth artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/b/BorosKeyrune.java b/Mage.Sets/src/mage/cards/b/BorosKeyrune.java index 42d9b1c10d1..77b9f78b27e 100644 --- a/Mage.Sets/src/mage/cards/b/BorosKeyrune.java +++ b/Mage.Sets/src/mage/cards/b/BorosKeyrune.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -69,7 +69,7 @@ public class BorosKeyrune extends CardImpl { return new BorosKeyrune(this); } - private static class BorosKeyruneToken extends Token { + private static class BorosKeyruneToken extends TokenImpl { BorosKeyruneToken() { super("Soldier", "1/1 red and white Soldier artifact creature with double strike"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java b/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java index 8dd22ace155..78741e2b435 100644 --- a/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java +++ b/Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java @@ -45,7 +45,7 @@ import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; import mage.game.permanent.token.CatSoldierCreatureToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** diff --git a/Mage.Sets/src/mage/cards/b/BudokaGardener.java b/Mage.Sets/src/mage/cards/b/BudokaGardener.java index f71c9257148..c75db54b7a7 100644 --- a/Mage.Sets/src/mage/cards/b/BudokaGardener.java +++ b/Mage.Sets/src/mage/cards/b/BudokaGardener.java @@ -43,7 +43,7 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; import mage.game.permanent.token.DokaiWeaverofLifeToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import java.util.UUID; @@ -111,7 +111,7 @@ class BudokaGardenerEffect extends OneShotEffect { } -class DokaiWeaverofLife extends Token { +class DokaiWeaverofLife extends TokenImpl { DokaiWeaverofLife() { super("Dokai, Weaver of Life", ""); diff --git a/Mage.Sets/src/mage/cards/b/BudokaPupil.java b/Mage.Sets/src/mage/cards/b/BudokaPupil.java index a95317fc2ed..1434686a2a3 100644 --- a/Mage.Sets/src/mage/cards/b/BudokaPupil.java +++ b/Mage.Sets/src/mage/cards/b/BudokaPupil.java @@ -45,7 +45,7 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.events.GameEvent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -85,7 +85,7 @@ public class BudokaPupil extends CardImpl { } } -class IchigaWhoTopplesOaks extends Token { +class IchigaWhoTopplesOaks extends TokenImpl { IchigaWhoTopplesOaks() { super("Ichiga, Who Topples Oaks", ""); diff --git a/Mage.Sets/src/mage/cards/b/BushiTenderfoot.java b/Mage.Sets/src/mage/cards/b/BushiTenderfoot.java index d43b9ade3be..0a7740944f9 100644 --- a/Mage.Sets/src/mage/cards/b/BushiTenderfoot.java +++ b/Mage.Sets/src/mage/cards/b/BushiTenderfoot.java @@ -43,7 +43,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.UUID; @@ -83,7 +83,7 @@ public class BushiTenderfoot extends CardImpl { } } -class KenzoTheHardhearted extends Token { +class KenzoTheHardhearted extends TokenImpl { KenzoTheHardhearted() { super("Kenzo the Hardhearted", ""); diff --git a/Mage.Sets/src/mage/cards/c/CallowJushi.java b/Mage.Sets/src/mage/cards/c/CallowJushi.java index e05fb6a1f9e..5fa3a8dd198 100644 --- a/Mage.Sets/src/mage/cards/c/CallowJushi.java +++ b/Mage.Sets/src/mage/cards/c/CallowJushi.java @@ -49,7 +49,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.events.GameEvent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetSpell; /** @@ -88,7 +88,7 @@ public class CallowJushi extends CardImpl { } } -class JarakuTheInterloper extends Token { +class JarakuTheInterloper extends TokenImpl { JarakuTheInterloper() { super("Jaraku the Interloper", ""); diff --git a/Mage.Sets/src/mage/cards/c/CelestialColonnade.java b/Mage.Sets/src/mage/cards/c/CelestialColonnade.java index 1c6069e81b5..c92dc74d067 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialColonnade.java +++ b/Mage.Sets/src/mage/cards/c/CelestialColonnade.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -71,7 +71,7 @@ public class CelestialColonnade extends CardImpl { } -class CelestialColonnadeToken extends Token { +class CelestialColonnadeToken extends TokenImpl { public CelestialColonnadeToken() { super("", "4/4 white and blue Elemental creature with flying and vigilance"); diff --git a/Mage.Sets/src/mage/cards/c/ChimericEgg.java b/Mage.Sets/src/mage/cards/c/ChimericEgg.java index 2b6932d4591..701f50ca9fc 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericEgg.java +++ b/Mage.Sets/src/mage/cards/c/ChimericEgg.java @@ -46,7 +46,7 @@ import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; @@ -82,7 +82,7 @@ public class ChimericEgg extends CardImpl { return new ChimericEgg(this); } - private static class ChimericEggToken extends Token { + private static class ChimericEggToken extends TokenImpl { ChimericEggToken() { super("", "6/6 Construct artifact creature with trample"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/c/ChimericIdol.java b/Mage.Sets/src/mage/cards/c/ChimericIdol.java index 3978a253a28..af3bfbfe6f2 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericIdol.java +++ b/Mage.Sets/src/mage/cards/c/ChimericIdol.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -69,7 +69,7 @@ public class ChimericIdol extends CardImpl { } } -class ChimericIdolToken extends Token { +class ChimericIdolToken extends TokenImpl { public ChimericIdolToken() { super("Turtle", "3/3 Turtle artifact creature token"); diff --git a/Mage.Sets/src/mage/cards/c/ChimericMass.java b/Mage.Sets/src/mage/cards/c/ChimericMass.java index 27a662d0d7c..32de3ec92f6 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericMass.java +++ b/Mage.Sets/src/mage/cards/c/ChimericMass.java @@ -44,7 +44,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.counters.CounterType; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author BetaSteward_at_googlemail.com @@ -73,7 +73,7 @@ public class ChimericMass extends CardImpl { } -class ChimericMassToken extends Token { +class ChimericMassToken extends TokenImpl { public ChimericMassToken() { super("", "Construct artifact creature with \"This creature's power and toughness are each equal to the number of charge counters on it.\""); diff --git a/Mage.Sets/src/mage/cards/c/ChimericSphere.java b/Mage.Sets/src/mage/cards/c/ChimericSphere.java index f66139a8380..8a448d52819 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericSphere.java +++ b/Mage.Sets/src/mage/cards/c/ChimericSphere.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -67,7 +67,7 @@ public class ChimericSphere extends CardImpl { } } -class ChimericSphereCreature1 extends Token { +class ChimericSphereCreature1 extends TokenImpl { public ChimericSphereCreature1() { super("Chimeric Sphere", "2/1 Construct artifact creature with flying"); @@ -87,7 +87,7 @@ class ChimericSphereCreature1 extends Token { } } -class ChimericSphereCreature2 extends Token { +class ChimericSphereCreature2 extends TokenImpl { public ChimericSphereCreature2() { super("Chimeric Sphere", "3/2 Construct artifact creature without flying"); diff --git a/Mage.Sets/src/mage/cards/c/ChronatogTotem.java b/Mage.Sets/src/mage/cards/c/ChronatogTotem.java index b875f16fe00..031ace444a8 100644 --- a/Mage.Sets/src/mage/cards/c/ChronatogTotem.java +++ b/Mage.Sets/src/mage/cards/c/ChronatogTotem.java @@ -50,7 +50,7 @@ import mage.constants.EffectType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -122,7 +122,7 @@ class ChronatogTotemAbility extends LimitedTimesPerTurnActivatedAbility { } } -class ChronatogTotemToken extends Token { +class ChronatogTotemToken extends TokenImpl { ChronatogTotemToken() { super("Atog", "1/2 blue Atog artifact creature"); diff --git a/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java b/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java index 43e2a6ec20f..6855eb2a3a8 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java @@ -43,7 +43,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -85,7 +85,7 @@ public class CorruptedZendikon extends CardImpl { } } -class CorruptedZendikonOozeToken extends Token { +class CorruptedZendikonOozeToken extends TokenImpl { public CorruptedZendikonOozeToken() { super("Ooze", "3/3 black Ooze creature"); diff --git a/Mage.Sets/src/mage/cards/c/CreepingTarPit.java b/Mage.Sets/src/mage/cards/c/CreepingTarPit.java index cf92dc64031..8dc43b186ca 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingTarPit.java +++ b/Mage.Sets/src/mage/cards/c/CreepingTarPit.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -76,7 +76,7 @@ public class CreepingTarPit extends CardImpl { } -class CreepingTarPitToken extends Token { +class CreepingTarPitToken extends TokenImpl { public CreepingTarPitToken() { super("", "3/2 blue and black Elemental creature and can't be blocked"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/c/CrusherZendikon.java b/Mage.Sets/src/mage/cards/c/CrusherZendikon.java index ee670313cef..bdadafec543 100644 --- a/Mage.Sets/src/mage/cards/c/CrusherZendikon.java +++ b/Mage.Sets/src/mage/cards/c/CrusherZendikon.java @@ -44,7 +44,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -83,7 +83,7 @@ public class CrusherZendikon extends CardImpl { } } -class BeastToken extends Token { +class BeastToken extends TokenImpl { BeastToken() { super("", "4/2 red Beast creature with trample"); diff --git a/Mage.Sets/src/mage/cards/c/CunningBandit.java b/Mage.Sets/src/mage/cards/c/CunningBandit.java index 537bd2b2b85..886f3a1637c 100644 --- a/Mage.Sets/src/mage/cards/c/CunningBandit.java +++ b/Mage.Sets/src/mage/cards/c/CunningBandit.java @@ -49,7 +49,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.events.GameEvent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; /** @@ -88,7 +88,7 @@ public class CunningBandit extends CardImpl { } } -class AzamukiTreacheryIncarnate extends Token { +class AzamukiTreacheryIncarnate extends TokenImpl { AzamukiTreacheryIncarnate() { super("Azamuki, Treachery Incarnate", ""); diff --git a/Mage.Sets/src/mage/cards/d/DanceOfTheSkywise.java b/Mage.Sets/src/mage/cards/d/DanceOfTheSkywise.java index ff963a861b2..1dd1242283c 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfTheSkywise.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfTheSkywise.java @@ -37,7 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -65,7 +65,7 @@ public class DanceOfTheSkywise extends CardImpl { return new DanceOfTheSkywise(this); } - private static class DragonIllusionToken extends Token { + private static class DragonIllusionToken extends TokenImpl { public DragonIllusionToken() { super("Dragon", "blue Dragon Illusion with base power and toughness 4/4 and with flying"); diff --git a/Mage.Sets/src/mage/cards/d/DarksteelBrute.java b/Mage.Sets/src/mage/cards/d/DarksteelBrute.java index a8372297859..7045480fc1a 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelBrute.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelBrute.java @@ -39,7 +39,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -64,7 +64,7 @@ public class DarksteelBrute extends CardImpl { } -class DarksteelBruteToken extends Token { +class DarksteelBruteToken extends TokenImpl { public DarksteelBruteToken() { super("", "2/2 Beast artifact creature"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/d/DarksteelMutation.java b/Mage.Sets/src/mage/cards/d/DarksteelMutation.java index 2c5e3176802..7f2d8f724a5 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelMutation.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelMutation.java @@ -42,7 +42,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -81,7 +81,7 @@ public class DarksteelMutation extends CardImpl { } } -class DarksteelMutationInsectToken extends Token { +class DarksteelMutationInsectToken extends TokenImpl { public DarksteelMutationInsectToken() { super("Insect", "Insect artifact creature with base power and toughness 0/1"); diff --git a/Mage.Sets/src/mage/cards/d/DaxossTorment.java b/Mage.Sets/src/mage/cards/d/DaxossTorment.java index 4648c3d3373..f1dea4d56f2 100644 --- a/Mage.Sets/src/mage/cards/d/DaxossTorment.java +++ b/Mage.Sets/src/mage/cards/d/DaxossTorment.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -63,7 +63,7 @@ public class DaxossTorment extends CardImpl { } } -class DaxossTormentToken extends Token { +class DaxossTormentToken extends TokenImpl { public DaxossTormentToken() { super("", "5/5 Demon creature with flying and haste"); diff --git a/Mage.Sets/src/mage/cards/d/DeathByDragons.java b/Mage.Sets/src/mage/cards/d/DeathByDragons.java index 793f6bea106..f82a6831a68 100644 --- a/Mage.Sets/src/mage/cards/d/DeathByDragons.java +++ b/Mage.Sets/src/mage/cards/d/DeathByDragons.java @@ -36,7 +36,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.DragonToken2; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java b/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java index 8b13bccdb7a..c066bce5153 100644 --- a/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java +++ b/Mage.Sets/src/mage/cards/d/DecreeOfJustice.java @@ -44,7 +44,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.AngelToken; import mage.game.permanent.token.SoldierToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** diff --git a/Mage.Sets/src/mage/cards/d/DimirKeyrune.java b/Mage.Sets/src/mage/cards/d/DimirKeyrune.java index a531bd6a90d..e6fd6c158ee 100644 --- a/Mage.Sets/src/mage/cards/d/DimirKeyrune.java +++ b/Mage.Sets/src/mage/cards/d/DimirKeyrune.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -69,7 +69,7 @@ public class DimirKeyrune extends CardImpl { return new DimirKeyrune(this); } - private static class DimirKeyruneToken extends Token { + private static class DimirKeyruneToken extends TokenImpl { DimirKeyruneToken() { super("Horror", "2/2 blue and black Horror until end of turn and can't be blocked this turn"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java b/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java index 52af8e5dd15..a1b61ff65ce 100644 --- a/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java +++ b/Mage.Sets/src/mage/cards/d/DinOfTheFireherd.java @@ -42,7 +42,7 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; import mage.game.permanent.token.DinOfTheFireherdToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetOpponent; import mage.target.targetpointer.FixedTarget; diff --git a/Mage.Sets/src/mage/cards/d/Dovescape.java b/Mage.Sets/src/mage/cards/d/Dovescape.java index 2b8e339aa4d..4bbfec03374 100644 --- a/Mage.Sets/src/mage/cards/d/Dovescape.java +++ b/Mage.Sets/src/mage/cards/d/Dovescape.java @@ -41,7 +41,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.game.permanent.token.DovescapeToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.game.stack.Spell; /** diff --git a/Mage.Sets/src/mage/cards/d/Dragonshift.java b/Mage.Sets/src/mage/cards/d/Dragonshift.java index 4ded574f55f..ddac8f9ad8b 100644 --- a/Mage.Sets/src/mage/cards/d/Dragonshift.java +++ b/Mage.Sets/src/mage/cards/d/Dragonshift.java @@ -46,7 +46,7 @@ import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -85,7 +85,7 @@ public class Dragonshift extends CardImpl { return new Dragonshift(this); } - private class DragonToken extends Token { + private class DragonToken extends TokenImpl { public DragonToken() { super("Dragon", "blue and red Dragon with base power and toughness 4/4 and with flying"); diff --git a/Mage.Sets/src/mage/cards/d/DreadStatuary.java b/Mage.Sets/src/mage/cards/d/DreadStatuary.java index 858fbd79221..8d5809fd2ca 100644 --- a/Mage.Sets/src/mage/cards/d/DreadStatuary.java +++ b/Mage.Sets/src/mage/cards/d/DreadStatuary.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -65,7 +65,7 @@ public class DreadStatuary extends CardImpl { } -class DreadStatuaryToken extends Token { +class DreadStatuaryToken extends TokenImpl { public DreadStatuaryToken() { super("", "4/2 Golem artifact creature"); diff --git a/Mage.Sets/src/mage/cards/d/DromokaMonument.java b/Mage.Sets/src/mage/cards/d/DromokaMonument.java index 63d5f578f8f..31654312b98 100644 --- a/Mage.Sets/src/mage/cards/d/DromokaMonument.java +++ b/Mage.Sets/src/mage/cards/d/DromokaMonument.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -70,7 +70,7 @@ public class DromokaMonument extends CardImpl { return new DromokaMonument(this); } - private class DromokaMonumentToken extends Token { + private class DromokaMonumentToken extends TokenImpl { DromokaMonumentToken() { super("", "4/4 green and white Dragon artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/d/DruidicSatchel.java b/Mage.Sets/src/mage/cards/d/DruidicSatchel.java index 57120c0d688..f2ce0462d40 100644 --- a/Mage.Sets/src/mage/cards/d/DruidicSatchel.java +++ b/Mage.Sets/src/mage/cards/d/DruidicSatchel.java @@ -39,7 +39,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.token.SaprolingToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** diff --git a/Mage.Sets/src/mage/cards/e/ElementalUprising.java b/Mage.Sets/src/mage/cards/e/ElementalUprising.java index 3e408b5acb7..61cd63f2999 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalUprising.java +++ b/Mage.Sets/src/mage/cards/e/ElementalUprising.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterControlledLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -69,7 +69,7 @@ public class ElementalUprising extends CardImpl { } } -class ElementalUprisingToken extends Token { +class ElementalUprisingToken extends TokenImpl { public ElementalUprisingToken() { super("", "4/4 Elemental creature with haste"); diff --git a/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java b/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java index fd12ee7237f..5f129000cfe 100644 --- a/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java +++ b/Mage.Sets/src/mage/cards/e/ElspethKnightErrant.java @@ -45,7 +45,7 @@ import mage.constants.Duration; import mage.constants.SuperType; import mage.game.command.emblems.ElspethKnightErrantEmblem; import mage.game.permanent.token.SoldierToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java b/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java index 8a9557f1fe0..a46aad096d4 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java +++ b/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java @@ -43,7 +43,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -112,7 +112,7 @@ class ElvishBranchbenderEffect extends OneShotEffect { } } -class ElvishBranchbenderToken extends Token { +class ElvishBranchbenderToken extends TokenImpl { ElvishBranchbenderToken(int xValue) { super("Treefolk", "X/X Treefolk creature in addition to its other types, where X is the number of Elves you control"); diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java index 7c3f4e0e094..a64686de60f 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfFury.java @@ -45,7 +45,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -90,7 +90,7 @@ public class EmbodimentOfFury extends CardImpl { } } -class EmbodimentOfFuryToken extends Token { +class EmbodimentOfFuryToken extends TokenImpl { public EmbodimentOfFuryToken() { super("", "3/3 Elemental creature with haste"); diff --git a/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java b/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java index 01b53ce1f3a..3f11670d200 100644 --- a/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java +++ b/Mage.Sets/src/mage/cards/e/EmbodimentOfInsight.java @@ -45,7 +45,7 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -90,7 +90,7 @@ public class EmbodimentOfInsight extends CardImpl { } } -class EmbodimentOfInsightToken extends Token { +class EmbodimentOfInsightToken extends TokenImpl { public EmbodimentOfInsightToken() { super("", "3/3 Elemental creature with haste"); diff --git a/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java b/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java index dedb7eff263..8398522e68b 100644 --- a/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java +++ b/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; @@ -80,7 +80,7 @@ public class EnsoulArtifact extends CardImpl { } } -class EnsoulArtifactToken extends Token { +class EnsoulArtifactToken extends TokenImpl { EnsoulArtifactToken() { super("", "5/5"); diff --git a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java index abf55013f15..69a3878e135 100644 --- a/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java +++ b/Mage.Sets/src/mage/cards/e/EnsouledScimitar.java @@ -43,7 +43,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -73,7 +73,7 @@ public class EnsouledScimitar extends CardImpl { } } -class EnsouledScimitarToken extends Token { +class EnsouledScimitarToken extends TokenImpl { public EnsouledScimitarToken() { super("Pincher", "1/5 Spirit artifact creature with flying"); diff --git a/Mage.Sets/src/mage/cards/e/ErayoSoratamiAscendant.java b/Mage.Sets/src/mage/cards/e/ErayoSoratamiAscendant.java index 6c461c8e3f3..37680eb2c08 100644 --- a/Mage.Sets/src/mage/cards/e/ErayoSoratamiAscendant.java +++ b/Mage.Sets/src/mage/cards/e/ErayoSoratamiAscendant.java @@ -43,7 +43,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.CastSpellLastTurnWatcher; @@ -119,7 +119,7 @@ class ErayoSoratamiAscendantTriggeredAbility extends TriggeredAbilityImpl { } } -class ErayosEssence extends Token { +class ErayosEssence extends TokenImpl { ErayosEssence() { super("Erayo's Essence", ""); diff --git a/Mage.Sets/src/mage/cards/f/FaerieConclave.java b/Mage.Sets/src/mage/cards/f/FaerieConclave.java index be15956b23a..8a1f7cfa1ea 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieConclave.java +++ b/Mage.Sets/src/mage/cards/f/FaerieConclave.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -66,7 +66,7 @@ public class FaerieConclave extends CardImpl { } } -class FaerieConclaveToken extends Token { +class FaerieConclaveToken extends TokenImpl { FaerieConclaveToken() { super("Faerie", "2/1 blue Faerie creature with flying"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/f/FaithfulSquire.java b/Mage.Sets/src/mage/cards/f/FaithfulSquire.java index 5f31a9dc1a1..52799aed9b5 100644 --- a/Mage.Sets/src/mage/cards/f/FaithfulSquire.java +++ b/Mage.Sets/src/mage/cards/f/FaithfulSquire.java @@ -52,7 +52,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.events.GameEvent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; /** @@ -91,7 +91,7 @@ public class FaithfulSquire extends CardImpl { } } -class KaisoMemoryOfLoyalty extends Token { +class KaisoMemoryOfLoyalty extends TokenImpl { KaisoMemoryOfLoyalty() { super("Kaiso, Memory of Loyalty", ""); diff --git a/Mage.Sets/src/mage/cards/f/FendeepSummoner.java b/Mage.Sets/src/mage/cards/f/FendeepSummoner.java index bd1b31ff7e5..93d731defa8 100644 --- a/Mage.Sets/src/mage/cards/f/FendeepSummoner.java +++ b/Mage.Sets/src/mage/cards/f/FendeepSummoner.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -79,7 +79,7 @@ public class FendeepSummoner extends CardImpl { } } -class FendeepSummonerToken extends Token { +class FendeepSummonerToken extends TokenImpl { public FendeepSummonerToken() { super("", "3/5 Treefolk Warrior"); diff --git a/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java b/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java index 21385e94c87..2970f83819d 100644 --- a/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java +++ b/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java @@ -45,7 +45,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -101,7 +101,7 @@ public class FigureOfDestiny extends CardImpl { return new FigureOfDestiny(this); } - private class FigureOfDestinyToken1 extends Token { + private class FigureOfDestinyToken1 extends TokenImpl { public FigureOfDestinyToken1() { super("Figure of Destiny", "Kithkin Spirit with base power and toughness 2/2"); @@ -124,7 +124,7 @@ public class FigureOfDestiny extends CardImpl { } } - private class FigureOfDestinyToken2 extends Token { + private class FigureOfDestinyToken2 extends TokenImpl { public FigureOfDestinyToken2() { super("Figure of Destiny", "Kithkin Spirit Warrior with base power and toughness 4/4"); @@ -148,7 +148,7 @@ public class FigureOfDestiny extends CardImpl { } - private class FigureOfDestinyToken3 extends Token { + private class FigureOfDestinyToken3 extends TokenImpl { public FigureOfDestinyToken3() { super("Figure of Destiny", "Kithkin Spirit Warrior Avatar with base power and toughness 8/8, flying, and first strike"); diff --git a/Mage.Sets/src/mage/cards/f/Flickerform.java b/Mage.Sets/src/mage/cards/f/Flickerform.java index 391d965e997..8106d6c561a 100644 --- a/Mage.Sets/src/mage/cards/f/Flickerform.java +++ b/Mage.Sets/src/mage/cards/f/Flickerform.java @@ -50,7 +50,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.Target; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java index f5bd0f1c66f..3e94aa6b093 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddingWatchtower.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -71,7 +71,7 @@ public class ForbiddingWatchtower extends CardImpl { } } -class ForbiddingWatchtowerToken extends Token { +class ForbiddingWatchtowerToken extends TokenImpl { ForbiddingWatchtowerToken() { super("Soldier", "1/5 white Soldier creature"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java index 0b53934c229..fb13746e0f4 100644 --- a/Mage.Sets/src/mage/cards/f/ForiysianTotem.java +++ b/Mage.Sets/src/mage/cards/f/ForiysianTotem.java @@ -45,7 +45,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -79,7 +79,7 @@ public class ForiysianTotem extends CardImpl { } -class ForiysianTotemToken extends Token { +class ForiysianTotemToken extends TokenImpl { public ForiysianTotemToken() { super("", "4/4 red Giant artifact creature with trample"); diff --git a/Mage.Sets/src/mage/cards/f/FowlPlay.java b/Mage.Sets/src/mage/cards/f/FowlPlay.java index f5c7b783d82..e21d007ac70 100644 --- a/Mage.Sets/src/mage/cards/f/FowlPlay.java +++ b/Mage.Sets/src/mage/cards/f/FowlPlay.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; /** @@ -80,7 +80,7 @@ public class FowlPlay extends CardImpl { } } -class FowlPlayToken extends Token { +class FowlPlayToken extends TokenImpl { public FowlPlayToken() { super("Chicken", "a Chicken with base power and toughness 1/1 with no abilities"); diff --git a/Mage.Sets/src/mage/cards/f/FuneralPyre.java b/Mage.Sets/src/mage/cards/f/FuneralPyre.java index b0459e80a26..c3f7a29a5d5 100644 --- a/Mage.Sets/src/mage/cards/f/FuneralPyre.java +++ b/Mage.Sets/src/mage/cards/f/FuneralPyre.java @@ -37,7 +37,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.SpiritWhiteToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; import mage.util.CardUtil; diff --git a/Mage.Sets/src/mage/cards/g/GarbageElementalC.java b/Mage.Sets/src/mage/cards/g/GarbageElementalC.java index 98787e370ee..18ef8d53490 100644 --- a/Mage.Sets/src/mage/cards/g/GarbageElementalC.java +++ b/Mage.Sets/src/mage/cards/g/GarbageElementalC.java @@ -42,7 +42,7 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.CounterPredicate; import mage.game.Game; import mage.game.permanent.token.GoblinToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** diff --git a/Mage.Sets/src/mage/cards/g/GeistSnatch.java b/Mage.Sets/src/mage/cards/g/GeistSnatch.java index 6d7b17c0eab..6d211fa4ea7 100644 --- a/Mage.Sets/src/mage/cards/g/GeistSnatch.java +++ b/Mage.Sets/src/mage/cards/g/GeistSnatch.java @@ -37,7 +37,7 @@ import mage.constants.Outcome; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.token.SpiritBlueToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/g/GeminiEngine.java b/Mage.Sets/src/mage/cards/g/GeminiEngine.java index d7939a3a13d..73f22ee54ab 100644 --- a/Mage.Sets/src/mage/cards/g/GeminiEngine.java +++ b/Mage.Sets/src/mage/cards/g/GeminiEngine.java @@ -43,7 +43,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.GeminiEngineTwinToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.targetpointer.FixedTarget; diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java index 4396ecca374..935b2d6e344 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -85,7 +85,7 @@ public class GenjuOfTheCedars extends CardImpl { return new GenjuOfTheCedars(this); } - private static class SpiritToken extends Token { + private static class SpiritToken extends TokenImpl { SpiritToken() { super("", "4/4 green Spirit creature"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java index 0abc9a84f7f..9cb14110ad9 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java @@ -42,7 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -83,7 +83,7 @@ public class GenjuOfTheFalls extends CardImpl { return new GenjuOfTheFalls(this); } - private static class SpiritToken extends Token { + private static class SpiritToken extends TokenImpl { SpiritToken() { super("Spirit", "3/2 blue Spirit creature with flying"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java index 559711bc42d..7fb3460bae8 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java @@ -43,7 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -84,7 +84,7 @@ public class GenjuOfTheFens extends CardImpl { return new GenjuOfTheFens(this); } - private static class SpiritToken extends Token { + private static class SpiritToken extends TokenImpl { SpiritToken() { super("Spirit", "2/2 black Spirit creature with \"{B}: This creature gets +1/+1 until end of turn.\""); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java index 7e15d34f1b7..ed1d5d9760f 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java @@ -44,7 +44,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -90,7 +90,7 @@ public class GenjuOfTheFields extends CardImpl { return new GenjuOfTheFields(this); } - private static class SpiritToken extends Token { + private static class SpiritToken extends TokenImpl { SpiritToken() { super("Spirit", "2/5 white Spirit creature"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java index d29f2dde980..6dc5d422475 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java @@ -41,7 +41,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -81,7 +81,7 @@ public class GenjuOfTheRealm extends CardImpl { return new GenjuOfTheRealm(this); } - private static class SpiritToken extends Token { + private static class SpiritToken extends TokenImpl { SpiritToken() { super("Spirit", "legendary 8/12 Spirit creature with trample"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java index f7ebb952762..b3ec2f3176c 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java @@ -41,7 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -82,7 +82,7 @@ public class GenjuOfTheSpires extends CardImpl { return new GenjuOfTheSpires(this); } - private static class SpiritToken extends Token { + private static class SpiritToken extends TokenImpl { SpiritToken() { super("Spirit", "6/1 red Spirit creature"); diff --git a/Mage.Sets/src/mage/cards/g/GhituEncampment.java b/Mage.Sets/src/mage/cards/g/GhituEncampment.java index f3d0ce9bed5..31ea5d821f9 100644 --- a/Mage.Sets/src/mage/cards/g/GhituEncampment.java +++ b/Mage.Sets/src/mage/cards/g/GhituEncampment.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -69,7 +69,7 @@ public class GhituEncampment extends CardImpl { } } -class GhituEncampmentToken extends Token { +class GhituEncampmentToken extends TokenImpl { public GhituEncampmentToken() { super("Warrior", "2/1 red Warrior creature with first strike"); diff --git a/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java b/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java index 3066f945354..3221d15b9d8 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java +++ b/Mage.Sets/src/mage/cards/g/GhoulcallerGisa.java @@ -45,7 +45,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java b/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java index ed42edd367c..0751a6a1f28 100644 --- a/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java +++ b/Mage.Sets/src/mage/cards/g/GideonAllyOfZendikar.java @@ -45,7 +45,7 @@ import mage.constants.Duration; import mage.constants.SuperType; import mage.game.command.emblems.GideonAllyOfZendikarEmblem; import mage.game.permanent.token.KnightAllyToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -84,7 +84,7 @@ public class GideonAllyOfZendikar extends CardImpl { } } -class GideonAllyOfZendikarToken extends Token { +class GideonAllyOfZendikarToken extends TokenImpl { public GideonAllyOfZendikarToken() { super("", "5/5 Human Soldier Ally creature with indestructible"); diff --git a/Mage.Sets/src/mage/cards/g/GideonBattleForged.java b/Mage.Sets/src/mage/cards/g/GideonBattleForged.java index 9f730b87db4..f582ad8c667 100644 --- a/Mage.Sets/src/mage/cards/g/GideonBattleForged.java +++ b/Mage.Sets/src/mage/cards/g/GideonBattleForged.java @@ -52,7 +52,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; /** @@ -113,7 +113,7 @@ public class GideonBattleForged extends CardImpl { } } -class GideonBattleForgedToken extends Token { +class GideonBattleForgedToken extends TokenImpl { public GideonBattleForgedToken() { super("", "4/4 Human Soldier creature with indestructible"); diff --git a/Mage.Sets/src/mage/cards/g/GideonChampionOfJustice.java b/Mage.Sets/src/mage/cards/g/GideonChampionOfJustice.java index cf3cc0a8450..71590ddcaf8 100644 --- a/Mage.Sets/src/mage/cards/g/GideonChampionOfJustice.java +++ b/Mage.Sets/src/mage/cards/g/GideonChampionOfJustice.java @@ -51,7 +51,7 @@ import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetOpponent; /** @@ -122,7 +122,7 @@ class GideonExileAllOtherPermanentsEffect extends OneShotEffect { } } -class GideonChampionOfJusticeToken extends Token { +class GideonChampionOfJusticeToken extends TokenImpl { public GideonChampionOfJusticeToken() { super("", "indestructible Human Soldier creature with power and toughness each equal to the number of loyalty counters on him"); diff --git a/Mage.Sets/src/mage/cards/g/GideonJura.java b/Mage.Sets/src/mage/cards/g/GideonJura.java index 99bb583a721..c0d4a4d1b0d 100644 --- a/Mage.Sets/src/mage/cards/g/GideonJura.java +++ b/Mage.Sets/src/mage/cards/g/GideonJura.java @@ -49,7 +49,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetOpponent; @@ -101,7 +101,7 @@ public class GideonJura extends CardImpl { } -class GideonJuraToken extends Token { +class GideonJuraToken extends TokenImpl { public GideonJuraToken() { super("", "6/6 Human Soldier creature"); diff --git a/Mage.Sets/src/mage/cards/g/GideonMartialParagon.java b/Mage.Sets/src/mage/cards/g/GideonMartialParagon.java index 0961b7fec12..e49696e3255 100644 --- a/Mage.Sets/src/mage/cards/g/GideonMartialParagon.java +++ b/Mage.Sets/src/mage/cards/g/GideonMartialParagon.java @@ -46,7 +46,7 @@ import mage.constants.Duration; import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterOpponentsCreaturePermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -95,7 +95,7 @@ public class GideonMartialParagon extends CardImpl { } } -class GideonMartialParagonToken extends Token { +class GideonMartialParagonToken extends TokenImpl { public GideonMartialParagonToken() { super("", "5/5 Human Soldier creature with indestructible"); diff --git a/Mage.Sets/src/mage/cards/g/GideonOfTheTrials.java b/Mage.Sets/src/mage/cards/g/GideonOfTheTrials.java index 1f9fcbac8c5..67e56e60e15 100644 --- a/Mage.Sets/src/mage/cards/g/GideonOfTheTrials.java +++ b/Mage.Sets/src/mage/cards/g/GideonOfTheTrials.java @@ -44,7 +44,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.SuperType; import mage.game.command.emblems.GideonOfTheTrialsEmblem; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -90,7 +90,7 @@ public class GideonOfTheTrials extends CardImpl { } } -class GideonOfTheTrialsToken extends Token { +class GideonOfTheTrialsToken extends TokenImpl { public GideonOfTheTrialsToken() { super("", "a 4/4 Human Soldier creature with indestructible"); diff --git a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java index c191023f5d8..61408d163dd 100644 --- a/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java +++ b/Mage.Sets/src/mage/cards/g/GlintHawkIdol.java @@ -42,7 +42,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -78,7 +78,7 @@ public class GlintHawkIdol extends CardImpl { } -class GlintHawkIdolToken extends Token { +class GlintHawkIdolToken extends TokenImpl { GlintHawkIdolToken() { super("", "2/2 Bird artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java b/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java index cd4448de52a..20aab2771d9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.game.Game; import mage.game.permanent.token.SpyMasterGoblinToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** diff --git a/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java b/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java index 7b41f13cdca..5b021cfa679 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java +++ b/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author LevelX2 @@ -68,7 +68,7 @@ public class GolgariKeyrune extends CardImpl { return new GolgariKeyrune(this); } - private static class GolgariKeyruneToken extends Token { + private static class GolgariKeyruneToken extends TokenImpl { GolgariKeyruneToken() { super("", "2/2 black and green Insect artifact creature with deathtouch"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java index f6384496401..12061210906 100644 --- a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java +++ b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java @@ -47,7 +47,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -84,7 +84,7 @@ public class GroveOfTheGuardian extends CardImpl { return new GroveOfTheGuardian(this); } - private static class ElementalToken extends Token { + private static class ElementalToken extends TokenImpl { ElementalToken() { super("Elemental", "8/8 green and white Elemental creature token with vigilance"); diff --git a/Mage.Sets/src/mage/cards/g/GruulKeyrune.java b/Mage.Sets/src/mage/cards/g/GruulKeyrune.java index 159a9475737..0e309af49df 100644 --- a/Mage.Sets/src/mage/cards/g/GruulKeyrune.java +++ b/Mage.Sets/src/mage/cards/g/GruulKeyrune.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -69,7 +69,7 @@ public class GruulKeyrune extends CardImpl { return new GruulKeyrune(this); } - private static class GruulKeyruneToken extends Token { + private static class GruulKeyruneToken extends TokenImpl { GruulKeyruneToken() { super("Beast", "3/2 red and green Beast artifact creature with trample"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java index e7e1c06603a..508f8bdd759 100644 --- a/Mage.Sets/src/mage/cards/g/GruulWarPlow.java +++ b/Mage.Sets/src/mage/cards/g/GruulWarPlow.java @@ -42,7 +42,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author Loki @@ -69,7 +69,7 @@ public class GruulWarPlow extends CardImpl { } } -class GruulWarPlowToken extends Token { +class GruulWarPlowToken extends TokenImpl { GruulWarPlowToken() { super("Juggernaut", "4/4 Juggernaut artifact creature"); diff --git a/Mage.Sets/src/mage/cards/g/GuardianIdol.java b/Mage.Sets/src/mage/cards/g/GuardianIdol.java index cb3cde658f0..e42c73ec6cd 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianIdol.java +++ b/Mage.Sets/src/mage/cards/g/GuardianIdol.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -69,7 +69,7 @@ public class GuardianIdol extends CardImpl { } } -class GuardianIdolGolemToken extends Token { +class GuardianIdolGolemToken extends TokenImpl { public GuardianIdolGolemToken() { super("Golem", "2/2 Golem artifact creature token"); diff --git a/Mage.Sets/src/mage/cards/g/GuardianZendikon.java b/Mage.Sets/src/mage/cards/g/GuardianZendikon.java index 784a032cb8a..a49c116bb6d 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianZendikon.java +++ b/Mage.Sets/src/mage/cards/g/GuardianZendikon.java @@ -44,7 +44,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -86,7 +86,7 @@ public class GuardianZendikon extends CardImpl { } } -class WallToken extends Token { +class WallToken extends TokenImpl { WallToken() { super("", "2/6 white wall creature with defender"); diff --git a/Mage.Sets/src/mage/cards/h/HalcyonGlaze.java b/Mage.Sets/src/mage/cards/h/HalcyonGlaze.java index 5a59ebb7c24..10916d09590 100644 --- a/Mage.Sets/src/mage/cards/h/HalcyonGlaze.java +++ b/Mage.Sets/src/mage/cards/h/HalcyonGlaze.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.StaticFilters; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -66,7 +66,7 @@ public class HalcyonGlaze extends CardImpl { } } -class HalcyonGlazeToken extends Token { +class HalcyonGlazeToken extends TokenImpl { HalcyonGlazeToken() { super("", "4/4 Illusion creature with flying"); diff --git a/Mage.Sets/src/mage/cards/h/HauntedPlateMail.java b/Mage.Sets/src/mage/cards/h/HauntedPlateMail.java index a4eb157fe9f..48d7633098f 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedPlateMail.java +++ b/Mage.Sets/src/mage/cards/h/HauntedPlateMail.java @@ -46,7 +46,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -82,7 +82,7 @@ public class HauntedPlateMail extends CardImpl { } } -class HauntedPlateMailToken extends Token { +class HauntedPlateMailToken extends TokenImpl { public HauntedPlateMailToken() { super("Spirit", "4/4 Spirit artifact creature that's no longer an Equipment"); diff --git a/Mage.Sets/src/mage/cards/h/HiddenAncients.java b/Mage.Sets/src/mage/cards/h/HiddenAncients.java index 28831e42b9e..5f4f5e16cce 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenAncients.java +++ b/Mage.Sets/src/mage/cards/h/HiddenAncients.java @@ -41,7 +41,7 @@ import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.StaticFilters; import mage.filter.predicate.mageobject.CardTypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.UUID; @@ -78,7 +78,7 @@ public class HiddenAncients extends CardImpl { } } -class HiddenAncientsTreefolk extends Token { +class HiddenAncientsTreefolk extends TokenImpl { public HiddenAncientsTreefolk() { super("Treefolk", "5/5 Treefolk creature"); diff --git a/Mage.Sets/src/mage/cards/h/HiddenGibbons.java b/Mage.Sets/src/mage/cards/h/HiddenGibbons.java index 2a33eb26625..90f314b7650 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenGibbons.java +++ b/Mage.Sets/src/mage/cards/h/HiddenGibbons.java @@ -41,7 +41,7 @@ import mage.constants.Duration; import mage.filter.FilterSpell; import mage.filter.StaticFilters; import mage.filter.predicate.mageobject.CardTypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.UUID; @@ -78,7 +78,7 @@ public class HiddenGibbons extends CardImpl { } } -class HiddenGibbonsApe extends Token { +class HiddenGibbonsApe extends TokenImpl { public HiddenGibbonsApe() { super("Ape", "4/4 Ape creature"); diff --git a/Mage.Sets/src/mage/cards/h/HiddenGuerrillas.java b/Mage.Sets/src/mage/cards/h/HiddenGuerrillas.java index 789582c7670..a522199b4af 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenGuerrillas.java +++ b/Mage.Sets/src/mage/cards/h/HiddenGuerrillas.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.filter.StaticFilters; import mage.filter.common.FilterArtifactSpell; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.UUID; @@ -72,7 +72,7 @@ public class HiddenGuerrillas extends CardImpl { } } -class HiddenGuerrillasSoldier extends Token { +class HiddenGuerrillasSoldier extends TokenImpl { public HiddenGuerrillasSoldier() { super("Soldier", "5/3 Soldier creature with trample"); diff --git a/Mage.Sets/src/mage/cards/h/HiddenHerd.java b/Mage.Sets/src/mage/cards/h/HiddenHerd.java index 2868276a599..1a1573d7467 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenHerd.java +++ b/Mage.Sets/src/mage/cards/h/HiddenHerd.java @@ -44,7 +44,7 @@ import mage.filter.StaticFilters; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -105,7 +105,7 @@ class HiddenHerdAbility extends TriggeredAbilityImpl { } } -class HiddenHerdBeast extends Token { +class HiddenHerdBeast extends TokenImpl { public HiddenHerdBeast() { super("Beast", "3/3 Beast creature"); diff --git a/Mage.Sets/src/mage/cards/h/HiddenSpider.java b/Mage.Sets/src/mage/cards/h/HiddenSpider.java index f6218c9016e..4091714a438 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenSpider.java +++ b/Mage.Sets/src/mage/cards/h/HiddenSpider.java @@ -43,7 +43,7 @@ import mage.constants.Duration; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureSpell; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.UUID; @@ -80,7 +80,7 @@ public class HiddenSpider extends CardImpl { } } -class HiddenSpiderToken extends Token { +class HiddenSpiderToken extends TokenImpl { public HiddenSpiderToken() { super("Spider", "3/5 Spider creature with reach"); diff --git a/Mage.Sets/src/mage/cards/h/HiredMuscle.java b/Mage.Sets/src/mage/cards/h/HiredMuscle.java index 835dc9c20fd..12e0cd388aa 100644 --- a/Mage.Sets/src/mage/cards/h/HiredMuscle.java +++ b/Mage.Sets/src/mage/cards/h/HiredMuscle.java @@ -50,7 +50,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.events.GameEvent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; /** @@ -89,7 +89,7 @@ public class HiredMuscle extends CardImpl { } } -class Scarmaker extends Token { +class Scarmaker extends TokenImpl { Scarmaker() { super("Scarmaker", ""); diff --git a/Mage.Sets/src/mage/cards/h/HissingQuagmire.java b/Mage.Sets/src/mage/cards/h/HissingQuagmire.java index daa5814fd8b..8b356e34f15 100644 --- a/Mage.Sets/src/mage/cards/h/HissingQuagmire.java +++ b/Mage.Sets/src/mage/cards/h/HissingQuagmire.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -77,7 +77,7 @@ public class HissingQuagmire extends CardImpl { } } -class HissingQuagmireToken extends Token { +class HissingQuagmireToken extends TokenImpl { public HissingQuagmireToken() { super("", "2/2 black and green Elemental creature with deathtouch"); diff --git a/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java b/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java index 4f33c873c22..8ad12e9b20d 100644 --- a/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java +++ b/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java @@ -52,7 +52,7 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** @@ -127,7 +127,7 @@ class HomuraReturnFlippedSourceEffect extends OneShotEffect { } -class HomurasEssence2 extends Token { +class HomurasEssence2 extends TokenImpl { HomurasEssence2() { super("Homura's Essence", ""); diff --git a/Mage.Sets/src/mage/cards/h/HornetCannon.java b/Mage.Sets/src/mage/cards/h/HornetCannon.java index f05993ea329..c184800bd9c 100644 --- a/Mage.Sets/src/mage/cards/h/HornetCannon.java +++ b/Mage.Sets/src/mage/cards/h/HornetCannon.java @@ -43,7 +43,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.HornetToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTarget; /** diff --git a/Mage.Sets/src/mage/cards/h/HostileDesert.java b/Mage.Sets/src/mage/cards/h/HostileDesert.java index 1026502b13a..7023395473a 100644 --- a/Mage.Sets/src/mage/cards/h/HostileDesert.java +++ b/Mage.Sets/src/mage/cards/h/HostileDesert.java @@ -42,7 +42,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterLandCard; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCardInYourGraveyard; /** @@ -74,7 +74,7 @@ public class HostileDesert extends CardImpl { } } -class HostileDesertToken extends Token { +class HostileDesertToken extends TokenImpl { public HostileDesertToken() { super("", "3/4 elemental creature"); diff --git a/Mage.Sets/src/mage/cards/h/HourOfNeed.java b/Mage.Sets/src/mage/cards/h/HourOfNeed.java index ec971df313d..5d2874b49d5 100644 --- a/Mage.Sets/src/mage/cards/h/HourOfNeed.java +++ b/Mage.Sets/src/mage/cards/h/HourOfNeed.java @@ -39,7 +39,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.HourOfNeedSphinxToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/h/HuntingWilds.java b/Mage.Sets/src/mage/cards/h/HuntingWilds.java index 50e9e16af91..6e59ab660bf 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingWilds.java +++ b/Mage.Sets/src/mage/cards/h/HuntingWilds.java @@ -50,7 +50,7 @@ import mage.constants.SubType; import mage.filter.common.FilterLandCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCardInLibrary; import mage.target.targetpointer.FixedTargets; @@ -125,7 +125,7 @@ class HuntingWildsEffect extends OneShotEffect { } } -class HuntingWildsToken extends Token { +class HuntingWildsToken extends TokenImpl { public HuntingWildsToken() { super("", "3/3 green creature with haste"); diff --git a/Mage.Sets/src/mage/cards/h/Hydroform.java b/Mage.Sets/src/mage/cards/h/Hydroform.java index 732b8914aec..59926bb34af 100644 --- a/Mage.Sets/src/mage/cards/h/Hydroform.java +++ b/Mage.Sets/src/mage/cards/h/Hydroform.java @@ -36,7 +36,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -64,7 +64,7 @@ public class Hydroform extends CardImpl { } } -class HydroformToken extends Token { +class HydroformToken extends TokenImpl { public HydroformToken() { super("", "3/3 Elemental creature with flying"); diff --git a/Mage.Sets/src/mage/cards/i/IgnitionTeam.java b/Mage.Sets/src/mage/cards/i/IgnitionTeam.java index fd3f090f470..9caefb4d601 100644 --- a/Mage.Sets/src/mage/cards/i/IgnitionTeam.java +++ b/Mage.Sets/src/mage/cards/i/IgnitionTeam.java @@ -48,7 +48,7 @@ import mage.counters.CounterType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -116,7 +116,7 @@ class TappedLandsCount implements DynamicValue { } } -class IgnitionTeamToken extends Token { +class IgnitionTeamToken extends TokenImpl { public IgnitionTeamToken() { super("", "4/4 red Elemental creature"); diff --git a/Mage.Sets/src/mage/cards/i/InitiateOfBlood.java b/Mage.Sets/src/mage/cards/i/InitiateOfBlood.java index 16bab86800c..950a781f499 100644 --- a/Mage.Sets/src/mage/cards/i/InitiateOfBlood.java +++ b/Mage.Sets/src/mage/cards/i/InitiateOfBlood.java @@ -45,7 +45,7 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; /** @@ -89,7 +89,7 @@ public class InitiateOfBlood extends CardImpl { } } -class GokaTheUnjust extends Token { +class GokaTheUnjust extends TokenImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that was dealt damage this turn"); diff --git a/Mage.Sets/src/mage/cards/i/InkmothNexus.java b/Mage.Sets/src/mage/cards/i/InkmothNexus.java index 763f74efefa..2100acd38af 100644 --- a/Mage.Sets/src/mage/cards/i/InkmothNexus.java +++ b/Mage.Sets/src/mage/cards/i/InkmothNexus.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -73,7 +73,7 @@ public class InkmothNexus extends CardImpl { } } -class InkmothNexusToken extends Token { +class InkmothNexusToken extends TokenImpl { public InkmothNexusToken() { super("Blinkmoth", "1/1 Blinkmoth artifact creature with flying and infect"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java index b17607529d9..4350435524e 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java +++ b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java @@ -45,7 +45,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** @@ -105,7 +105,7 @@ public class IzzetKeyrune extends CardImpl { } } - private static class IzzetKeyruneToken extends Token { + private static class IzzetKeyruneToken extends TokenImpl { IzzetKeyruneToken() { super("", "2/1 blue and red Elemental artifact creature"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/j/JadeIdol.java b/Mage.Sets/src/mage/cards/j/JadeIdol.java index 8bf878a8520..754279d44ab 100644 --- a/Mage.Sets/src/mage/cards/j/JadeIdol.java +++ b/Mage.Sets/src/mage/cards/j/JadeIdol.java @@ -38,7 +38,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.StaticFilters; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author Loki @@ -61,7 +61,7 @@ public class JadeIdol extends CardImpl { } -class JadeIdolToken extends Token { +class JadeIdolToken extends TokenImpl { JadeIdolToken() { super("", "4/4 Spirit artifact creature"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/j/JadeStatue.java b/Mage.Sets/src/mage/cards/j/JadeStatue.java index 111441c7eea..31b14dae85c 100644 --- a/Mage.Sets/src/mage/cards/j/JadeStatue.java +++ b/Mage.Sets/src/mage/cards/j/JadeStatue.java @@ -40,7 +40,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TurnPhase; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -65,7 +65,7 @@ public class JadeStatue extends CardImpl { return new JadeStatue(this); } - private static class JadeStatueToken extends Token { + private static class JadeStatueToken extends TokenImpl { JadeStatueToken() { super("", "3/6 Golem artifact creature"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java b/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java index 8590714e3ee..c6c9fbea791 100644 --- a/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java +++ b/Mage.Sets/src/mage/cards/j/JolraelEmpressOfBeasts.java @@ -44,7 +44,7 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetCardInHand; @@ -110,7 +110,7 @@ class JolraelEmpressOfBeastsEffect extends OneShotEffect { } } -class JolraelLandsToken extends Token { +class JolraelLandsToken extends TokenImpl { public JolraelLandsToken() { super("", "3/3 creature"); diff --git a/Mage.Sets/src/mage/cards/j/JushiApprentice.java b/Mage.Sets/src/mage/cards/j/JushiApprentice.java index f66c1e2a40f..2f699a3241e 100644 --- a/Mage.Sets/src/mage/cards/j/JushiApprentice.java +++ b/Mage.Sets/src/mage/cards/j/JushiApprentice.java @@ -46,7 +46,7 @@ import mage.constants.SubType; import mage.constants.ComparisonType; import mage.constants.SuperType; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPlayer; /** @@ -83,7 +83,7 @@ public class JushiApprentice extends CardImpl { } } -class TomoyaTheRevealer extends Token { +class TomoyaTheRevealer extends TokenImpl { TomoyaTheRevealer() { super("Tomoya the Revealer", ""); diff --git a/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java b/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java index 82b1523a8c5..51e93702f6e 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java +++ b/Mage.Sets/src/mage/cards/k/KamahlFistOfKrosa.java @@ -43,7 +43,7 @@ import mage.constants.Duration; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -87,7 +87,7 @@ public class KamahlFistOfKrosa extends CardImpl { } } -class KamahlFistOfKrosaLandToken extends Token { +class KamahlFistOfKrosaLandToken extends TokenImpl { public KamahlFistOfKrosaLandToken() { super("", "1/1 creature"); diff --git a/Mage.Sets/src/mage/cards/k/KamahlsSummons.java b/Mage.Sets/src/mage/cards/k/KamahlsSummons.java index 505c12a9306..f14003c785b 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlsSummons.java +++ b/Mage.Sets/src/mage/cards/k/KamahlsSummons.java @@ -43,7 +43,7 @@ import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.permanent.token.BearToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetCardInHand; diff --git a/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java b/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java index 69d1faab133..c182ff583f7 100644 --- a/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java +++ b/Mage.Sets/src/mage/cards/k/KinTreeInvocation.java @@ -42,7 +42,7 @@ import mage.constants.SubType; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.util.SubTypeList; /** @@ -101,7 +101,7 @@ class KinTreeInvocationCreateTokenEffect extends OneShotEffect { } -class SpiritWarriorToken extends Token { +class SpiritWarriorToken extends TokenImpl { public SpiritWarriorToken() { this(1); diff --git a/Mage.Sets/src/mage/cards/k/KitsuneMystic.java b/Mage.Sets/src/mage/cards/k/KitsuneMystic.java index 2d2e194bac8..c45dfa37ae6 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneMystic.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneMystic.java @@ -46,7 +46,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -82,7 +82,7 @@ public class KitsuneMystic extends CardImpl { } } -class AutumnTailKitsuneSage extends Token { +class AutumnTailKitsuneSage extends TokenImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("Aura attached to a creature"); diff --git a/Mage.Sets/src/mage/cards/k/KolaghanMonument.java b/Mage.Sets/src/mage/cards/k/KolaghanMonument.java index 00b0d00aced..6341f7ad8e4 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghanMonument.java +++ b/Mage.Sets/src/mage/cards/k/KolaghanMonument.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -70,7 +70,7 @@ public class KolaghanMonument extends CardImpl { return new KolaghanMonument(this); } - private class KolaghanMonumentToken extends Token { + private class KolaghanMonumentToken extends TokenImpl { KolaghanMonumentToken() { super("", "4/4 black and red Dragon artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/k/KormusBell.java b/Mage.Sets/src/mage/cards/k/KormusBell.java index f394b60f53f..961b9bc21db 100644 --- a/Mage.Sets/src/mage/cards/k/KormusBell.java +++ b/Mage.Sets/src/mage/cards/k/KormusBell.java @@ -36,7 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -66,7 +66,7 @@ public class KormusBell extends CardImpl { } } -class KormusBellToken extends Token { +class KormusBellToken extends TokenImpl { public KormusBellToken() { super("", "1/1 black creatures"); diff --git a/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java b/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java index fc6fe615450..3630454eb5b 100644 --- a/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java +++ b/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java @@ -49,7 +49,7 @@ import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.command.emblems.KothOfTheHammerEmblem; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -96,7 +96,7 @@ public class KothOfTheHammer extends CardImpl { } } -class KothOfTheHammerToken extends Token { +class KothOfTheHammerToken extends TokenImpl { public KothOfTheHammerToken() { super("Elemental", "4/4 red Elemental"); diff --git a/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java b/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java index 59dad8d95c6..1a1ed9aa6ba 100644 --- a/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java +++ b/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java @@ -44,7 +44,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.watchers.common.CreaturesDiedWatcher; /** @@ -84,7 +84,7 @@ public class KuonOgreAscendant extends CardImpl { } } -class KuonsEssenceToken extends Token { +class KuonsEssenceToken extends TokenImpl { KuonsEssenceToken() { super("Kuon's Essence", ""); diff --git a/Mage.Sets/src/mage/cards/l/LavaclawReaches.java b/Mage.Sets/src/mage/cards/l/LavaclawReaches.java index 0c849fe97be..1ddddd9783e 100644 --- a/Mage.Sets/src/mage/cards/l/LavaclawReaches.java +++ b/Mage.Sets/src/mage/cards/l/LavaclawReaches.java @@ -44,7 +44,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -75,7 +75,7 @@ public class LavaclawReaches extends CardImpl { } -class LavaclawReachesToken extends Token { +class LavaclawReachesToken extends TokenImpl { public LavaclawReachesToken() { super("", "2/2 black and red Elemental creature with \"{X}: This creature gets +X/+0 until end of turn.\""); diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java b/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java index bb4bae6d587..d7b556019a9 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfTheTangle.java @@ -47,7 +47,7 @@ import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.Target; import mage.target.common.TargetLandPermanent; @@ -184,7 +184,7 @@ class LiegeOfTheTangleEffect extends ContinuousEffectImpl { } -class AwakeningLandToken extends Token { +class AwakeningLandToken extends TokenImpl { public AwakeningLandToken() { super("", "8/8 green Elemental creature"); diff --git a/Mage.Sets/src/mage/cards/l/LifeDeath.java b/Mage.Sets/src/mage/cards/l/LifeDeath.java index d2837ede859..f1ac528ac63 100644 --- a/Mage.Sets/src/mage/cards/l/LifeDeath.java +++ b/Mage.Sets/src/mage/cards/l/LifeDeath.java @@ -43,7 +43,7 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; @@ -80,7 +80,7 @@ public class LifeDeath extends SplitCard { } } -class LifeLandToken extends Token { +class LifeLandToken extends TokenImpl { public LifeLandToken() { super("", "1/1 creatures"); diff --git a/Mage.Sets/src/mage/cards/l/LifecraftAwakening.java b/Mage.Sets/src/mage/cards/l/LifecraftAwakening.java index a7e57d383c9..6d9d14613e4 100644 --- a/Mage.Sets/src/mage/cards/l/LifecraftAwakening.java +++ b/Mage.Sets/src/mage/cards/l/LifecraftAwakening.java @@ -42,7 +42,7 @@ import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetArtifactPermanent; import mage.target.targetpointer.FixedTarget; @@ -109,7 +109,7 @@ class LifecraftAwakeningEffect extends OneShotEffect { } } -class LifecraftAwakeningToken extends Token { +class LifecraftAwakeningToken extends TokenImpl { LifecraftAwakeningToken() { super("", "0/0 Construct artifact creature"); diff --git a/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java b/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java index f052f384698..6faae3658aa 100644 --- a/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java +++ b/Mage.Sets/src/mage/cards/l/LifesparkSpellbomb.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -77,7 +77,7 @@ public class LifesparkSpellbomb extends CardImpl { } -class LifesparkSpellbombToken extends Token { +class LifesparkSpellbombToken extends TokenImpl { public LifesparkSpellbombToken() { super("", "3/3 creature"); diff --git a/Mage.Sets/src/mage/cards/l/Lignify.java b/Mage.Sets/src/mage/cards/l/Lignify.java index 7a6d5de6762..18fb5485c14 100644 --- a/Mage.Sets/src/mage/cards/l/Lignify.java +++ b/Mage.Sets/src/mage/cards/l/Lignify.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -81,7 +81,7 @@ public class Lignify extends CardImpl { } } -class LignifyTreefolkToken extends Token { +class LignifyTreefolkToken extends TokenImpl { public LignifyTreefolkToken() { super("Treefolk", "a Treefolk with base power and toughness 0/4 with no abilities"); diff --git a/Mage.Sets/src/mage/cards/l/LivingLands.java b/Mage.Sets/src/mage/cards/l/LivingLands.java index 7a0b7372db7..9f9514cb5bc 100644 --- a/Mage.Sets/src/mage/cards/l/LivingLands.java +++ b/Mage.Sets/src/mage/cards/l/LivingLands.java @@ -36,7 +36,7 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.UUID; @@ -71,7 +71,7 @@ public class LivingLands extends CardImpl { } } -class LivingLandsToken extends Token { +class LivingLandsToken extends TokenImpl { public LivingLandsToken() { super("", "1/1 creatures"); diff --git a/Mage.Sets/src/mage/cards/l/LivingPlane.java b/Mage.Sets/src/mage/cards/l/LivingPlane.java index c3f88d3f14b..1926d262483 100644 --- a/Mage.Sets/src/mage/cards/l/LivingPlane.java +++ b/Mage.Sets/src/mage/cards/l/LivingPlane.java @@ -38,7 +38,7 @@ import mage.constants.Duration; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -64,7 +64,7 @@ public class LivingPlane extends CardImpl { } } -class LivingPlaneToken extends Token { +class LivingPlaneToken extends TokenImpl { public LivingPlaneToken() { super("Land", "1/1 creatures"); diff --git a/Mage.Sets/src/mage/cards/l/LivingTerrain.java b/Mage.Sets/src/mage/cards/l/LivingTerrain.java index 80ba14ca38f..56746793c5f 100644 --- a/Mage.Sets/src/mage/cards/l/LivingTerrain.java +++ b/Mage.Sets/src/mage/cards/l/LivingTerrain.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -73,7 +73,7 @@ public class LivingTerrain extends CardImpl { } } -class TreefolkToken extends Token { +class TreefolkToken extends TokenImpl { TreefolkToken() { super("Treefolk", "5/6 green Treefolk creature"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/l/LumberingFalls.java b/Mage.Sets/src/mage/cards/l/LumberingFalls.java index ce66e6de151..054abc80af6 100644 --- a/Mage.Sets/src/mage/cards/l/LumberingFalls.java +++ b/Mage.Sets/src/mage/cards/l/LumberingFalls.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -74,7 +74,7 @@ public class LumberingFalls extends CardImpl { } } -class LumberingFallsToken extends Token { +class LumberingFallsToken extends TokenImpl { public LumberingFallsToken() { super("", "3/3 green and blue Elemental creature with hexproof"); diff --git a/Mage.Sets/src/mage/cards/l/LurkingEvil.java b/Mage.Sets/src/mage/cards/l/LurkingEvil.java index 899429dc311..f4886938d08 100644 --- a/Mage.Sets/src/mage/cards/l/LurkingEvil.java +++ b/Mage.Sets/src/mage/cards/l/LurkingEvil.java @@ -43,7 +43,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** @@ -109,7 +109,7 @@ class LurkingEvilCost extends CostImpl { } } -class LurkingEvilToken extends Token { +class LurkingEvilToken extends TokenImpl { LurkingEvilToken() { super("Horror", "4/4 Horror creature with flying"); diff --git a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java index cac2b03bc5f..a4c8199f4cf 100644 --- a/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java +++ b/Mage.Sets/src/mage/cards/m/MarathWillOfTheWild.java @@ -56,7 +56,7 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.MarathWillOfTheWildElementalToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/m/MishrasFactory.java b/Mage.Sets/src/mage/cards/m/MishrasFactory.java index dfe71a86207..0eb336f842b 100644 --- a/Mage.Sets/src/mage/cards/m/MishrasFactory.java +++ b/Mage.Sets/src/mage/cards/m/MishrasFactory.java @@ -43,7 +43,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; /** @@ -84,7 +84,7 @@ public class MishrasFactory extends CardImpl { } } -class AssemblyWorkerToken extends Token { +class AssemblyWorkerToken extends TokenImpl { public AssemblyWorkerToken() { super("Assembly-Worker", "2/2 Assembly-Worker artifact creature"); diff --git a/Mage.Sets/src/mage/cards/m/MishrasGroundbreaker.java b/Mage.Sets/src/mage/cards/m/MishrasGroundbreaker.java index 996c626e34c..be9d292e90f 100644 --- a/Mage.Sets/src/mage/cards/m/MishrasGroundbreaker.java +++ b/Mage.Sets/src/mage/cards/m/MishrasGroundbreaker.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -70,7 +70,7 @@ public class MishrasGroundbreaker extends CardImpl { } -class MishrasGroundbreakerToken extends Token { +class MishrasGroundbreakerToken extends TokenImpl { public MishrasGroundbreakerToken() { super("", "3/3 artifact creature"); diff --git a/Mage.Sets/src/mage/cards/m/MongrelPack.java b/Mage.Sets/src/mage/cards/m/MongrelPack.java index 039e5a4c04a..ee88600acab 100644 --- a/Mage.Sets/src/mage/cards/m/MongrelPack.java +++ b/Mage.Sets/src/mage/cards/m/MongrelPack.java @@ -39,7 +39,7 @@ import mage.constants.TurnPhase; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -94,7 +94,7 @@ class MongrelPackAbility extends ZoneChangeTriggeredAbility { } } -class HoundToken extends Token { +class HoundToken extends TokenImpl { public HoundToken() { super("Hound", "1/1 green Hound creature token"); diff --git a/Mage.Sets/src/mage/cards/m/Mutavault.java b/Mage.Sets/src/mage/cards/m/Mutavault.java index 621896f8290..6cbf39ac480 100644 --- a/Mage.Sets/src/mage/cards/m/Mutavault.java +++ b/Mage.Sets/src/mage/cards/m/Mutavault.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -67,7 +67,7 @@ public class Mutavault extends CardImpl { } } -class MutavaultToken extends Token { +class MutavaultToken extends TokenImpl { public MutavaultToken() { super("", "2/2 creature with all creature types"); diff --git a/Mage.Sets/src/mage/cards/m/MythRealized.java b/Mage.Sets/src/mage/cards/m/MythRealized.java index 5c735e8931f..0cfdc32bb73 100644 --- a/Mage.Sets/src/mage/cards/m/MythRealized.java +++ b/Mage.Sets/src/mage/cards/m/MythRealized.java @@ -53,7 +53,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** @@ -96,7 +96,7 @@ public class MythRealized extends CardImpl { } } -class MythRealizedToken extends Token { +class MythRealizedToken extends TokenImpl { public MythRealizedToken() { super("", "Monk Avatar creature in addition to its other types and gains \"This creature's power and toughness are each equal to the number of lore counters on it.\""); diff --git a/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java b/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java index a8e82d707f2..1d23c1c2947 100644 --- a/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java +++ b/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java @@ -50,7 +50,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.KorSoldierToken; import mage.game.permanent.token.NahiriTheLithomancerEquipmentToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInHand; diff --git a/Mage.Sets/src/mage/cards/n/NantukoMonastery.java b/Mage.Sets/src/mage/cards/n/NantukoMonastery.java index 4f312ff85f9..59d7253ba5b 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoMonastery.java +++ b/Mage.Sets/src/mage/cards/n/NantukoMonastery.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -74,7 +74,7 @@ public class NantukoMonastery extends CardImpl { } } -class NantukoMonasteryToken extends Token { +class NantukoMonasteryToken extends TokenImpl { public NantukoMonasteryToken() { super("", "4/4 green and white Insect Monk creature with first strike"); diff --git a/Mage.Sets/src/mage/cards/n/NaturalEmergence.java b/Mage.Sets/src/mage/cards/n/NaturalEmergence.java index c34a4813ae1..47e7c516095 100644 --- a/Mage.Sets/src/mage/cards/n/NaturalEmergence.java +++ b/Mage.Sets/src/mage/cards/n/NaturalEmergence.java @@ -45,7 +45,7 @@ import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -82,7 +82,7 @@ public class NaturalEmergence extends CardImpl { } } -class NaturalEmergenceToken extends Token { +class NaturalEmergenceToken extends TokenImpl { public NaturalEmergenceToken() { super("Land", "2/2 creatures with first strike"); diff --git a/Mage.Sets/src/mage/cards/n/NaturesRevolt.java b/Mage.Sets/src/mage/cards/n/NaturesRevolt.java index 6102ded9bc6..ff02572d96c 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesRevolt.java +++ b/Mage.Sets/src/mage/cards/n/NaturesRevolt.java @@ -37,7 +37,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -64,7 +64,7 @@ public class NaturesRevolt extends CardImpl { } } -class NaturesRevoltToken extends Token { +class NaturesRevoltToken extends TokenImpl { public NaturesRevoltToken() { super("Land", "2/2 creatures"); diff --git a/Mage.Sets/src/mage/cards/n/NeedleSpires.java b/Mage.Sets/src/mage/cards/n/NeedleSpires.java index cfb34e279c7..69e79c37cc1 100644 --- a/Mage.Sets/src/mage/cards/n/NeedleSpires.java +++ b/Mage.Sets/src/mage/cards/n/NeedleSpires.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -77,7 +77,7 @@ public class NeedleSpires extends CardImpl { } } -class NeedleSpiresToken extends Token { +class NeedleSpiresToken extends TokenImpl { public NeedleSpiresToken() { super("", "2/1 red and white Elemental creature with double strike"); diff --git a/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java b/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java index aac5e480e92..154805444e5 100644 --- a/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java +++ b/Mage.Sets/src/mage/cards/n/NezumiGraverobber.java @@ -47,7 +47,7 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetCardInGraveyard; @@ -118,7 +118,7 @@ class NezumiGraverobberFlipEffect extends OneShotEffect { } -class NighteyesTheDesecratorToken extends Token { +class NighteyesTheDesecratorToken extends TokenImpl { NighteyesTheDesecratorToken() { super("Nighteyes the Desecrator", ""); diff --git a/Mage.Sets/src/mage/cards/n/NezumiShortfang.java b/Mage.Sets/src/mage/cards/n/NezumiShortfang.java index f3fea2d26e5..576764753d5 100644 --- a/Mage.Sets/src/mage/cards/n/NezumiShortfang.java +++ b/Mage.Sets/src/mage/cards/n/NezumiShortfang.java @@ -43,7 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetOpponent; @@ -83,7 +83,7 @@ public class NezumiShortfang extends CardImpl { } } -class StabwhiskerTheOdious extends Token { +class StabwhiskerTheOdious extends TokenImpl { StabwhiskerTheOdious() { super("Stabwhisker the Odious", ""); diff --git a/Mage.Sets/src/mage/cards/n/NissaStewardOfElements.java b/Mage.Sets/src/mage/cards/n/NissaStewardOfElements.java index a3730a0e20e..bd7917dcc4c 100644 --- a/Mage.Sets/src/mage/cards/n/NissaStewardOfElements.java +++ b/Mage.Sets/src/mage/cards/n/NissaStewardOfElements.java @@ -50,7 +50,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.TargetPermanent; @@ -141,7 +141,7 @@ class NissaStewardOfElementsEffect extends OneShotEffect { } } -class NissaStewardOfElementsToken extends Token { +class NissaStewardOfElementsToken extends TokenImpl { public NissaStewardOfElementsToken() { super("", "5/5 Elemental creature with flying and haste"); diff --git a/Mage.Sets/src/mage/cards/n/NissaVitalForce.java b/Mage.Sets/src/mage/cards/n/NissaVitalForce.java index 9d36345b26f..cc76760c09e 100644 --- a/Mage.Sets/src/mage/cards/n/NissaVitalForce.java +++ b/Mage.Sets/src/mage/cards/n/NissaVitalForce.java @@ -47,7 +47,7 @@ import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.command.emblems.NissaVitalForceEmblem; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetLandPermanent; @@ -95,7 +95,7 @@ public class NissaVitalForce extends CardImpl { } } -class NissaVitalForceToken extends Token { +class NissaVitalForceToken extends TokenImpl { public NissaVitalForceToken() { super("", "5/5 Elemental creature with haste"); diff --git a/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java b/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java index 598802c2281..7cc93304ce1 100644 --- a/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java +++ b/Mage.Sets/src/mage/cards/n/NissaWorldwaker.java @@ -45,7 +45,7 @@ import mage.filter.StaticFilters; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetCardInLibrary; @@ -138,7 +138,7 @@ class NissaWorldwakerSearchEffect extends OneShotEffect { } } -class NissaWorldwakerToken extends Token { +class NissaWorldwakerToken extends TokenImpl { public NissaWorldwakerToken() { super("", "4/4 Elemental creature with trample"); diff --git a/Mage.Sets/src/mage/cards/n/NotForgotten.java b/Mage.Sets/src/mage/cards/n/NotForgotten.java index 297468ccfe2..0b0d6c218dd 100644 --- a/Mage.Sets/src/mage/cards/n/NotForgotten.java +++ b/Mage.Sets/src/mage/cards/n/NotForgotten.java @@ -38,7 +38,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.token.SpiritWhiteToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; diff --git a/Mage.Sets/src/mage/cards/n/NoyanDarRoilShaper.java b/Mage.Sets/src/mage/cards/n/NoyanDarRoilShaper.java index a532f412a7e..ef4cfa3be2c 100644 --- a/Mage.Sets/src/mage/cards/n/NoyanDarRoilShaper.java +++ b/Mage.Sets/src/mage/cards/n/NoyanDarRoilShaper.java @@ -50,7 +50,7 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.Target; import mage.target.common.TargetControlledPermanent; import mage.target.targetpointer.FixedTarget; @@ -130,7 +130,7 @@ class NoyanDarEffect extends OneShotEffect { } -class AwakenElementalToken extends Token { +class AwakenElementalToken extends TokenImpl { public AwakenElementalToken() { super("", "0/0 Elemental creature with haste"); diff --git a/Mage.Sets/src/mage/cards/o/OjutaiMonument.java b/Mage.Sets/src/mage/cards/o/OjutaiMonument.java index e1556928811..d39eabcb251 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaiMonument.java +++ b/Mage.Sets/src/mage/cards/o/OjutaiMonument.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -70,7 +70,7 @@ public class OjutaiMonument extends CardImpl { return new OjutaiMonument(this); } - private static class OjutaiMonumentToken extends Token { + private static class OjutaiMonumentToken extends TokenImpl { OjutaiMonumentToken() { super("", "4/4 white and blue Dragon artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/o/Omnibian.java b/Mage.Sets/src/mage/cards/o/Omnibian.java index 2c18236fc7d..42b516f0978 100644 --- a/Mage.Sets/src/mage/cards/o/Omnibian.java +++ b/Mage.Sets/src/mage/cards/o/Omnibian.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; /** @@ -71,7 +71,7 @@ public class Omnibian extends CardImpl { } } -class OmnibianFrogToken extends Token { +class OmnibianFrogToken extends TokenImpl { public OmnibianFrogToken() { super("", "3/3 Frog"); diff --git a/Mage.Sets/src/mage/cards/o/OozeFlux.java b/Mage.Sets/src/mage/cards/o/OozeFlux.java index d33ebcc25bd..fbe52397eea 100644 --- a/Mage.Sets/src/mage/cards/o/OozeFlux.java +++ b/Mage.Sets/src/mage/cards/o/OozeFlux.java @@ -43,7 +43,7 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.token.OozeToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * diff --git a/Mage.Sets/src/mage/cards/o/OozeGarden.java b/Mage.Sets/src/mage/cards/o/OozeGarden.java index 1ceda58a6dc..d0926d15886 100644 --- a/Mage.Sets/src/mage/cards/o/OozeGarden.java +++ b/Mage.Sets/src/mage/cards/o/OozeGarden.java @@ -49,7 +49,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; import mage.util.SubTypeList; @@ -114,7 +114,7 @@ class OozeGardenCreateTokenEffect extends OneShotEffect { } } -class OozeToken extends Token { +class OozeToken extends TokenImpl { public OozeToken() { this(1); diff --git a/Mage.Sets/src/mage/cards/o/OpalArchangel.java b/Mage.Sets/src/mage/cards/o/OpalArchangel.java index d480c588a0a..7c045f32164 100644 --- a/Mage.Sets/src/mage/cards/o/OpalArchangel.java +++ b/Mage.Sets/src/mage/cards/o/OpalArchangel.java @@ -42,7 +42,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureSpell; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.UUID; @@ -73,7 +73,7 @@ public class OpalArchangel extends CardImpl { } } -class OpalArchangelToken extends Token { +class OpalArchangelToken extends TokenImpl { public OpalArchangelToken() { super("Angel", "5/5 Angel creature with flying and vigilance"); diff --git a/Mage.Sets/src/mage/cards/o/OpalCaryatid.java b/Mage.Sets/src/mage/cards/o/OpalCaryatid.java index d7ff4128a72..fea60c83241 100644 --- a/Mage.Sets/src/mage/cards/o/OpalCaryatid.java +++ b/Mage.Sets/src/mage/cards/o/OpalCaryatid.java @@ -40,7 +40,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureSpell; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.UUID; @@ -71,7 +71,7 @@ public class OpalCaryatid extends CardImpl { } } -class OpalCaryatidSoldier extends Token { +class OpalCaryatidSoldier extends TokenImpl { public OpalCaryatidSoldier() { super("Soldier", "2/2 Soldier creature"); diff --git a/Mage.Sets/src/mage/cards/o/OpalChampion.java b/Mage.Sets/src/mage/cards/o/OpalChampion.java index c4c87b4f7ac..e5f24f2cd99 100644 --- a/Mage.Sets/src/mage/cards/o/OpalChampion.java +++ b/Mage.Sets/src/mage/cards/o/OpalChampion.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureSpell; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.UUID; @@ -72,7 +72,7 @@ public class OpalChampion extends CardImpl { } } -class OpalChampionKnight extends Token { +class OpalChampionKnight extends TokenImpl { public OpalChampionKnight() { super("Knight", "3/3 Knight creature with first strike"); diff --git a/Mage.Sets/src/mage/cards/o/OpalGargoyle.java b/Mage.Sets/src/mage/cards/o/OpalGargoyle.java index 02aedb03e63..ba878f569d1 100644 --- a/Mage.Sets/src/mage/cards/o/OpalGargoyle.java +++ b/Mage.Sets/src/mage/cards/o/OpalGargoyle.java @@ -41,7 +41,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureSpell; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.UUID; @@ -72,7 +72,7 @@ public class OpalGargoyle extends CardImpl { } } -class OpalGargoyleToken extends Token { +class OpalGargoyleToken extends TokenImpl { public OpalGargoyleToken() { super("Gargoyle", "2/2 Gargoyle creature with flying"); diff --git a/Mage.Sets/src/mage/cards/o/OpalGuardian.java b/Mage.Sets/src/mage/cards/o/OpalGuardian.java index 729a709612e..8c5935ec517 100644 --- a/Mage.Sets/src/mage/cards/o/OpalGuardian.java +++ b/Mage.Sets/src/mage/cards/o/OpalGuardian.java @@ -43,7 +43,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureSpell; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.UUID; @@ -74,7 +74,7 @@ public class OpalGuardian extends CardImpl { } } -class OpalGuardianGargoyle extends Token { +class OpalGuardianGargoyle extends TokenImpl { public OpalGuardianGargoyle() { super("Gargoyle", "3/4 Gargoyle creature with flying and protection from red"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java index 7bac70575f5..b486580d374 100644 --- a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java +++ b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java @@ -52,7 +52,7 @@ import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.permanent.token.SnakeToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -90,7 +90,7 @@ public class OrochiEggwatcher extends CardImpl { } } -class ShidakoBroodmistress extends Token { +class ShidakoBroodmistress extends TokenImpl { ShidakoBroodmistress() { super("Shidako, Broodmistress", ""); diff --git a/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java b/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java index 5ce0d7266f0..9f3f8c11a5b 100644 --- a/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java +++ b/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -69,7 +69,7 @@ public class OrzhovKeyrune extends CardImpl { return new OrzhovKeyrune(this); } - private static class OrzhovKeyruneToken extends Token { + private static class OrzhovKeyruneToken extends TokenImpl { OrzhovKeyruneToken() { super("Thrull", "1/4 white and black Thrull artifact creature with lifelink"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java b/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java index 17d82dbc086..ea9cdacdf9c 100644 --- a/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/o/OverseerOfTheDamned.java @@ -44,7 +44,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java b/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java index 353376badeb..083329429e8 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java @@ -47,7 +47,7 @@ import mage.filter.common.FilterControlledPermanent; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTarget; /** @@ -77,7 +77,7 @@ public class PhyrexianTotem extends CardImpl { return new PhyrexianTotem(this); } - private static class PhyrexianTotemToken extends Token { + private static class PhyrexianTotemToken extends TokenImpl { PhyrexianTotemToken() { super("Horror", "5/5 black Horror artifact creature with trample"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/p/PonybackBrigade.java b/Mage.Sets/src/mage/cards/p/PonybackBrigade.java index d5d5fdc5468..bfe762247d7 100644 --- a/Mage.Sets/src/mage/cards/p/PonybackBrigade.java +++ b/Mage.Sets/src/mage/cards/p/PonybackBrigade.java @@ -43,7 +43,7 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.game.permanent.token.GoblinToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * diff --git a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java index 49b4abbe6b9..6dd26cc966c 100644 --- a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java +++ b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java @@ -46,7 +46,7 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * * @author fireshoes @@ -87,7 +87,7 @@ public class PrideOfTheClouds extends CardImpl { return new PrideOfTheClouds(this); } - private static class BirdToken extends Token { + private static class BirdToken extends TokenImpl { public BirdToken() { super("Bird", "1/1 white and blue Bird creature token with flying"); diff --git a/Mage.Sets/src/mage/cards/r/RagingRavine.java b/Mage.Sets/src/mage/cards/r/RagingRavine.java index d7c9ee51920..362d281a528 100644 --- a/Mage.Sets/src/mage/cards/r/RagingRavine.java +++ b/Mage.Sets/src/mage/cards/r/RagingRavine.java @@ -48,7 +48,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.counters.CounterType; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -85,7 +85,7 @@ public class RagingRavine extends CardImpl { } -class RagingRavineToken extends Token { +class RagingRavineToken extends TokenImpl { public RagingRavineToken() { super("", "3/3 red and green Elemental creature"); diff --git a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java index c4faa0f10ca..6e2c67bdb66 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java +++ b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author LevelX2 @@ -68,7 +68,7 @@ public class RakdosKeyrune extends CardImpl { return new RakdosKeyrune(this); } - private static class RakdosKeyruneToken extends Token { + private static class RakdosKeyruneToken extends TokenImpl { RakdosKeyruneToken() { super("", "3/1 black and red Devil artifact creature with first strike"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/r/Riddleform.java b/Mage.Sets/src/mage/cards/r/Riddleform.java index 3f44049ace6..141ca9f57e8 100644 --- a/Mage.Sets/src/mage/cards/r/Riddleform.java +++ b/Mage.Sets/src/mage/cards/r/Riddleform.java @@ -46,7 +46,7 @@ import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -83,7 +83,7 @@ public class Riddleform extends CardImpl { } } -class RiddleformToken extends Token { +class RiddleformToken extends TokenImpl { public RiddleformToken() { super("", "3/3 Sphinx creature with flying"); diff --git a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java index d536c3a500b..86632c75c69 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideReplicator.java +++ b/Mage.Sets/src/mage/cards/r/RiptideReplicator.java @@ -49,7 +49,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.token.RiptideReplicatorToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * diff --git a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java index f480d83f2f0..6cf2bedfe22 100644 --- a/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java +++ b/Mage.Sets/src/mage/cards/r/RiseOfTheHobgoblins.java @@ -53,7 +53,7 @@ import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.GoblinSoldierToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** diff --git a/Mage.Sets/src/mage/cards/r/RudeAwakening.java b/Mage.Sets/src/mage/cards/r/RudeAwakening.java index 463a2d857f3..85f4e4cee79 100644 --- a/Mage.Sets/src/mage/cards/r/RudeAwakening.java +++ b/Mage.Sets/src/mage/cards/r/RudeAwakening.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterControlledLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -73,7 +73,7 @@ public class RudeAwakening extends CardImpl { } } -class RudeAwakeningToken extends Token { +class RudeAwakeningToken extends TokenImpl { public RudeAwakeningToken() { super("", "2/2 creatures"); diff --git a/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java b/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java index a209bd96436..34afd6a9286 100644 --- a/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java +++ b/Mage.Sets/src/mage/cards/r/RuneTailKitsuneAscendant.java @@ -43,7 +43,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreatureInPlay; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** @@ -108,7 +108,7 @@ class RuneTailKitsuneAscendantFlipAbility extends StateTriggeredAbility { } -class RuneTailEssence extends Token { +class RuneTailEssence extends TokenImpl { RuneTailEssence() { super("Rune-Tail's Essence", ""); diff --git a/Mage.Sets/src/mage/cards/r/RustedRelic.java b/Mage.Sets/src/mage/cards/r/RustedRelic.java index f02dbb0b0c1..b1a3b574644 100644 --- a/Mage.Sets/src/mage/cards/r/RustedRelic.java +++ b/Mage.Sets/src/mage/cards/r/RustedRelic.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -67,7 +67,7 @@ public class RustedRelic extends CardImpl { } } -class RustedRelicToken extends Token { +class RustedRelicToken extends TokenImpl { public RustedRelicToken() { super("Rusted Relic", "5/5 Golem artifact creature"); diff --git a/Mage.Sets/src/mage/cards/s/SaprolingBurst.java b/Mage.Sets/src/mage/cards/s/SaprolingBurst.java index 0ffde66becd..57bd96a2212 100644 --- a/Mage.Sets/src/mage/cards/s/SaprolingBurst.java +++ b/Mage.Sets/src/mage/cards/s/SaprolingBurst.java @@ -48,7 +48,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.game.permanent.token.SaprolingBurstToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.util.CardUtil; /** diff --git a/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java b/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java index bd2621b3bd7..4e6ec0ca599 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java @@ -49,7 +49,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.DragonToken2; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.Target; import mage.target.TargetPlayer; diff --git a/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVii.java b/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVii.java index 7ad03a350cd..f5c1e13208d 100644 --- a/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVii.java +++ b/Mage.Sets/src/mage/cards/s/SarpadianEmpiresVolVii.java @@ -47,7 +47,7 @@ import mage.game.permanent.token.CitizenToken; import mage.game.permanent.token.GoblinToken; import mage.game.permanent.token.SaprolingToken; import mage.game.permanent.token.ThrullToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** diff --git a/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java b/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java index 71f1203d6a4..4326ca4720d 100644 --- a/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java +++ b/Mage.Sets/src/mage/cards/s/SasayaOrochiAscendant.java @@ -51,7 +51,7 @@ import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** @@ -115,7 +115,7 @@ class SasayaOrochiAscendantFlipEffect extends OneShotEffect { } } -class SasayasEssence extends Token { +class SasayasEssence extends TokenImpl { SasayasEssence() { super("Sasaya's Essence", ""); diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java b/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java index d5bda2587ac..60beaf403c6 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java @@ -40,7 +40,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author LevelX2 @@ -67,7 +67,7 @@ public class SelesnyaKeyrune extends CardImpl { return new SelesnyaKeyrune(this); } - private static class SelesnyaKeyruneToken extends Token { + private static class SelesnyaKeyruneToken extends TokenImpl { SelesnyaKeyruneToken() { super("", "3/3 green and white Wolf artifact creature"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/s/ShamblingVent.java b/Mage.Sets/src/mage/cards/s/ShamblingVent.java index 434694d10bf..0fcbd9589f0 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingVent.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingVent.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -75,7 +75,7 @@ public class ShamblingVent extends CardImpl { } } -class ShamblingVentToken extends Token { +class ShamblingVentToken extends TokenImpl { public ShamblingVentToken() { super("", "2/3 white and black Elemental creature with lifelink"); diff --git a/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java b/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java index 8c338712ced..8078ec7d2c7 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java +++ b/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java @@ -39,7 +39,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -78,7 +78,7 @@ public class SiegeOfTowers extends CardImpl { } } -class SiegeOfTowersToken extends Token { +class SiegeOfTowersToken extends TokenImpl { public SiegeOfTowersToken() { super("", "3/1 creature"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/s/SilumgarMonument.java b/Mage.Sets/src/mage/cards/s/SilumgarMonument.java index 758c28739e4..e9061f0ad1f 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarMonument.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarMonument.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -70,7 +70,7 @@ public class SilumgarMonument extends CardImpl { return new SilumgarMonument(this); } - private static class OjutaiMonumentToken extends Token { + private static class OjutaiMonumentToken extends TokenImpl { OjutaiMonumentToken() { super("", "4/4 blue and black Dragon artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/s/SimicKeyrune.java b/Mage.Sets/src/mage/cards/s/SimicKeyrune.java index cb8dbf9ec40..a4cbb74a228 100644 --- a/Mage.Sets/src/mage/cards/s/SimicKeyrune.java +++ b/Mage.Sets/src/mage/cards/s/SimicKeyrune.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -69,7 +69,7 @@ public class SimicKeyrune extends CardImpl { return new SimicKeyrune(this); } - private static class SimicKeyruneToken extends Token { + private static class SimicKeyruneToken extends TokenImpl { SimicKeyruneToken() { super("Crab", "2/3 green and blue Crab artifact creature with hexproof"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java b/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java index d797375d9f2..1fc2f26551f 100644 --- a/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SkarrgGuildmage.java @@ -43,7 +43,7 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledLandPermanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -81,7 +81,7 @@ public class SkarrgGuildmage extends CardImpl { } } -class SkarrgGuildmageToken extends Token { +class SkarrgGuildmageToken extends TokenImpl { public SkarrgGuildmageToken() { super("", "4/4 Elemental creature"); diff --git a/Mage.Sets/src/mage/cards/s/Skinshifter.java b/Mage.Sets/src/mage/cards/s/Skinshifter.java index 34e28c17ede..c98c9a52db0 100644 --- a/Mage.Sets/src/mage/cards/s/Skinshifter.java +++ b/Mage.Sets/src/mage/cards/s/Skinshifter.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -82,7 +82,7 @@ public class Skinshifter extends CardImpl { return new Skinshifter(this); } - private class RhinoToken extends Token { + private class RhinoToken extends TokenImpl { public RhinoToken() { super("Rhino", "Rhino with base power and toughness 4/4 and gains trample"); @@ -103,7 +103,7 @@ public class Skinshifter extends CardImpl { } } - private class BirdToken extends Token { + private class BirdToken extends TokenImpl { public BirdToken() { super("Bird", "Bird with base power and toughness 2/2 and gains flying"); @@ -124,7 +124,7 @@ public class Skinshifter extends CardImpl { } } - private class PlantToken extends Token { + private class PlantToken extends TokenImpl { public PlantToken() { super("Plant", "Plant with base power and toughness 0/8"); diff --git a/Mage.Sets/src/mage/cards/s/Soilshaper.java b/Mage.Sets/src/mage/cards/s/Soilshaper.java index 60f2ac6ee0c..2b051680734 100644 --- a/Mage.Sets/src/mage/cards/s/Soilshaper.java +++ b/Mage.Sets/src/mage/cards/s/Soilshaper.java @@ -39,7 +39,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.StaticFilters; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -72,7 +72,7 @@ public class Soilshaper extends CardImpl { } -class SoilshaperToken extends Token { +class SoilshaperToken extends TokenImpl { public SoilshaperToken() { super("", "3/3 creature"); diff --git a/Mage.Sets/src/mage/cards/s/SpikeTiller.java b/Mage.Sets/src/mage/cards/s/SpikeTiller.java index 8bb0bbd4833..8474f9cbf41 100644 --- a/Mage.Sets/src/mage/cards/s/SpikeTiller.java +++ b/Mage.Sets/src/mage/cards/s/SpikeTiller.java @@ -44,7 +44,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.counters.CounterType; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; @@ -88,7 +88,7 @@ public class SpikeTiller extends CardImpl { } } -class SpikeTillerToken extends Token { +class SpikeTillerToken extends TokenImpl { public SpikeTillerToken() { super("", "2/2 creature"); diff --git a/Mage.Sets/src/mage/cards/s/StalkingStones.java b/Mage.Sets/src/mage/cards/s/StalkingStones.java index ee65ce0db3b..7b0e3593a92 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingStones.java +++ b/Mage.Sets/src/mage/cards/s/StalkingStones.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -62,7 +62,7 @@ public class StalkingStones extends CardImpl { } } -class StalkingStonesToken extends Token { +class StalkingStonesToken extends TokenImpl { public StalkingStonesToken() { super("Elemental", "3/3 Elemental artifact"); diff --git a/Mage.Sets/src/mage/cards/s/StillLife.java b/Mage.Sets/src/mage/cards/s/StillLife.java index 2facbfe2509..ecc407ed20d 100644 --- a/Mage.Sets/src/mage/cards/s/StillLife.java +++ b/Mage.Sets/src/mage/cards/s/StillLife.java @@ -38,7 +38,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -64,7 +64,7 @@ public class StillLife extends CardImpl { } } -class StillLifeCentaur extends Token { +class StillLifeCentaur extends TokenImpl { public StillLifeCentaur() { super("Centaur", "4/3 Centaur creature token"); diff --git a/Mage.Sets/src/mage/cards/s/StirringWildwood.java b/Mage.Sets/src/mage/cards/s/StirringWildwood.java index cc70201c0e0..ec9767862f7 100644 --- a/Mage.Sets/src/mage/cards/s/StirringWildwood.java +++ b/Mage.Sets/src/mage/cards/s/StirringWildwood.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -70,7 +70,7 @@ public class StirringWildwood extends CardImpl { } -class StirringWildwoodToken extends Token { +class StirringWildwoodToken extends TokenImpl { public StirringWildwoodToken() { super("", "3/4 green and white Elemental creature with reach"); diff --git a/Mage.Sets/src/mage/cards/s/StudentOfElements.java b/Mage.Sets/src/mage/cards/s/StudentOfElements.java index b7f66ed8118..bd62eb24bb7 100644 --- a/Mage.Sets/src/mage/cards/s/StudentOfElements.java +++ b/Mage.Sets/src/mage/cards/s/StudentOfElements.java @@ -45,7 +45,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -108,7 +108,7 @@ class StudentOfElementsHasFlyingAbility extends StateTriggeredAbility { } -class TobitaMasterOfWinds extends Token { +class TobitaMasterOfWinds extends TokenImpl { TobitaMasterOfWinds() { super("Tobita, Master of Winds", ""); diff --git a/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java b/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java index a1bf3a860aa..8e90304704a 100644 --- a/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java +++ b/Mage.Sets/src/mage/cards/s/SvogthosTheRestlessTomb.java @@ -44,7 +44,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -73,7 +73,7 @@ public class SvogthosTheRestlessTomb extends CardImpl { } } -class SvogthosToken extends Token { +class SvogthosToken extends TokenImpl { public SvogthosToken() { super("", "black and green Plant Zombie creature with \"This creature's power and toughness are each equal to the number of creature cards in your graveyard.\""); diff --git a/Mage.Sets/src/mage/cards/s/SwanSong.java b/Mage.Sets/src/mage/cards/s/SwanSong.java index c8f7780d094..f9f145db1ab 100644 --- a/Mage.Sets/src/mage/cards/s/SwanSong.java +++ b/Mage.Sets/src/mage/cards/s/SwanSong.java @@ -39,7 +39,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.game.permanent.token.SwanSongBirdToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.game.stack.Spell; import mage.target.TargetSpell; diff --git a/Mage.Sets/src/mage/cards/t/TemptWithVengeance.java b/Mage.Sets/src/mage/cards/t/TemptWithVengeance.java index 5c48e08471b..ee85181b824 100644 --- a/Mage.Sets/src/mage/cards/t/TemptWithVengeance.java +++ b/Mage.Sets/src/mage/cards/t/TemptWithVengeance.java @@ -36,7 +36,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.token.TemptWithVengeanceElementalToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; /** diff --git a/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java b/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java index 877d02319cf..abae16fd0ac 100644 --- a/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java +++ b/Mage.Sets/src/mage/cards/t/TestamentOfFaith.java @@ -47,7 +47,7 @@ import mage.constants.SubLayer; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -175,7 +175,7 @@ class TestamentOfFaithBecomesCreatureSourceEffect extends ContinuousEffectImpl i } -class TestamentOfFaithToken extends Token { +class TestamentOfFaithToken extends TokenImpl { TestamentOfFaithToken() { super("Wall", "X/X Wall creature with defender"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java b/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java index bdc1b06211c..0ab11c16194 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java @@ -43,7 +43,7 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; @@ -84,7 +84,7 @@ public class TezzeretsTouch extends CardImpl { } } -class TezzeretsTouchToken extends Token { +class TezzeretsTouchToken extends TokenImpl { TezzeretsTouchToken() { super("", "5/5"); diff --git a/Mage.Sets/src/mage/cards/t/TheloniteDruid.java b/Mage.Sets/src/mage/cards/t/TheloniteDruid.java index cd2dc8a44d8..f80833088fb 100644 --- a/Mage.Sets/src/mage/cards/t/TheloniteDruid.java +++ b/Mage.Sets/src/mage/cards/t/TheloniteDruid.java @@ -42,7 +42,7 @@ import mage.constants.*; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -86,7 +86,7 @@ public class TheloniteDruid extends CardImpl { } } -class TheloniteDruidLandToken extends Token { +class TheloniteDruidLandToken extends TokenImpl { public TheloniteDruidLandToken() { super("", "2/3 creatures"); diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java b/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java index 229aedff4f8..181f89f6940 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java +++ b/Mage.Sets/src/mage/cards/t/ThroneOfEmpires.java @@ -41,7 +41,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SoldierToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author nantuko diff --git a/Mage.Sets/src/mage/cards/t/ThunderTotem.java b/Mage.Sets/src/mage/cards/t/ThunderTotem.java index 4ca9816f184..b468a26edd3 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderTotem.java +++ b/Mage.Sets/src/mage/cards/t/ThunderTotem.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -71,7 +71,7 @@ public class ThunderTotem extends CardImpl { return new ThunderTotem(this); } - private static class ThunderTotemToken extends Token { + private static class ThunderTotemToken extends TokenImpl { ThunderTotemToken() { super("", "2/2 white Spirit artifact creature with flying and first strike"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/t/TidalWave.java b/Mage.Sets/src/mage/cards/t/TidalWave.java index 7c98cb43512..17bf055864c 100644 --- a/Mage.Sets/src/mage/cards/t/TidalWave.java +++ b/Mage.Sets/src/mage/cards/t/TidalWave.java @@ -39,7 +39,7 @@ import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.TidalWaveWallToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTarget; /** diff --git a/Mage.Sets/src/mage/cards/t/TombstoneStairwell.java b/Mage.Sets/src/mage/cards/t/TombstoneStairwell.java index e2e6216f740..618900305d9 100644 --- a/Mage.Sets/src/mage/cards/t/TombstoneStairwell.java +++ b/Mage.Sets/src/mage/cards/t/TombstoneStairwell.java @@ -51,7 +51,7 @@ import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.game.permanent.token.TombspawnZombieToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; diff --git a/Mage.Sets/src/mage/cards/t/TreetopVillage.java b/Mage.Sets/src/mage/cards/t/TreetopVillage.java index 6626a21d021..f9a43f01429 100644 --- a/Mage.Sets/src/mage/cards/t/TreetopVillage.java +++ b/Mage.Sets/src/mage/cards/t/TreetopVillage.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -66,7 +66,7 @@ public class TreetopVillage extends CardImpl { } } -class ApeToken extends Token { +class ApeToken extends TokenImpl { ApeToken() { super("Ape", "3/3 green Ape creature with trample"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/t/TurnBurn.java b/Mage.Sets/src/mage/cards/t/TurnBurn.java index f4cff441d7f..d6c3b49e81e 100644 --- a/Mage.Sets/src/mage/cards/t/TurnBurn.java +++ b/Mage.Sets/src/mage/cards/t/TurnBurn.java @@ -38,7 +38,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.SpellAbilityType; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; @@ -76,7 +76,7 @@ public class TurnBurn extends SplitCard { return new TurnBurn(this); } - private static class WeirdToken extends Token { + private static class WeirdToken extends TokenImpl { private WeirdToken() { super("Weird", "a red Weird with base power and toughness 0/1"); diff --git a/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java b/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java index 5b3d7215d30..8ae5a038ce0 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java @@ -43,7 +43,7 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetControlledPermanent; /** @@ -109,7 +109,7 @@ class VastwoodAnimistEffect extends OneShotEffect { } } -class VastwoodAnimistElementalToken extends Token { +class VastwoodAnimistElementalToken extends TokenImpl { VastwoodAnimistElementalToken(int amount) { super("", "X/X Elemental creature, where X is the number of Allies you control"); diff --git a/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java b/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java index 588f3f0b5a8..edcec557cb5 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java @@ -39,7 +39,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -81,7 +81,7 @@ public class VastwoodZendikon extends CardImpl { } } -class VastwoodElementalToken extends Token { +class VastwoodElementalToken extends TokenImpl { VastwoodElementalToken() { super("", "6/4 green Elemental creature"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/v/VerdantTouch.java b/Mage.Sets/src/mage/cards/v/VerdantTouch.java index 6f1107f4e58..35c60702cf4 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantTouch.java +++ b/Mage.Sets/src/mage/cards/v/VerdantTouch.java @@ -35,7 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -65,7 +65,7 @@ public class VerdantTouch extends CardImpl { } } -class VerdantTouchLandToken extends Token { +class VerdantTouchLandToken extends TokenImpl { public VerdantTouchLandToken() { super("", "2/2 creature"); diff --git a/Mage.Sets/src/mage/cards/v/Vivify.java b/Mage.Sets/src/mage/cards/v/Vivify.java index 493e6c3ef65..c36c5a29b97 100644 --- a/Mage.Sets/src/mage/cards/v/Vivify.java +++ b/Mage.Sets/src/mage/cards/v/Vivify.java @@ -35,7 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.common.TargetLandPermanent; /** @@ -64,7 +64,7 @@ public class Vivify extends CardImpl { } } -class AnimatedLand extends Token { +class AnimatedLand extends TokenImpl { public AnimatedLand() { super("", "3/3 creature"); diff --git a/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java b/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java index 098118bce03..ba4ef33eea5 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsLaboratory.java @@ -45,7 +45,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.game.permanent.token.VolrathsLaboratoryToken; /** diff --git a/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java b/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java index 1bf0993879f..1f8a37b5ae1 100644 --- a/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java +++ b/Mage.Sets/src/mage/cards/w/WaitingInTheWeeds.java @@ -40,7 +40,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.game.permanent.token.WaitingInTheWeedsCatToken; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/w/WanderingFumarole.java b/Mage.Sets/src/mage/cards/w/WanderingFumarole.java index 95c2dc23cde..3ccd217222b 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingFumarole.java +++ b/Mage.Sets/src/mage/cards/w/WanderingFumarole.java @@ -43,7 +43,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -78,7 +78,7 @@ public class WanderingFumarole extends CardImpl { } } -class WanderingFumaroleToken extends Token { +class WanderingFumaroleToken extends TokenImpl { public WanderingFumaroleToken() { super("", "1/4 blue and red Elemental creature with \"0: Switch this creature's power and toughness until end of turn.\""); diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java b/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java index 4989c873fa6..7c93cfc4bb1 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java @@ -48,7 +48,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -107,7 +107,7 @@ public class WardenOfTheFirstTree extends CardImpl { } } -class WardenOfTheFirstTree1 extends Token { +class WardenOfTheFirstTree1 extends TokenImpl { public WardenOfTheFirstTree1() { super("Warden of the First Tree", "Human Warrior with base power and toughness 3/3"); @@ -127,7 +127,7 @@ class WardenOfTheFirstTree1 extends Token { } } -class WardenOfTheFirstTree2 extends Token { +class WardenOfTheFirstTree2 extends TokenImpl { public WardenOfTheFirstTree2() { super("Warden of the First Tree", "Human Spirit Warrior with trample and lifelink"); diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java index cb73dd8169f..9b5cad7ec9a 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java @@ -42,7 +42,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -73,7 +73,7 @@ public class WardenOfTheWall extends CardImpl { } } -class GargoyleToken extends Token { +class GargoyleToken extends TokenImpl { public GargoyleToken() { super("", "2/3 Gargoyle artifact creature with flying"); diff --git a/Mage.Sets/src/mage/cards/w/WarrenWeirding.java b/Mage.Sets/src/mage/cards/w/WarrenWeirding.java index bc205a14bb8..d2e36c35d22 100644 --- a/Mage.Sets/src/mage/cards/w/WarrenWeirding.java +++ b/Mage.Sets/src/mage/cards/w/WarrenWeirding.java @@ -49,7 +49,7 @@ import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.GoblinRogueToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/w/Waylay.java b/Mage.Sets/src/mage/cards/w/Waylay.java index 795197e9294..aaf793f8dcb 100644 --- a/Mage.Sets/src/mage/cards/w/Waylay.java +++ b/Mage.Sets/src/mage/cards/w/Waylay.java @@ -41,7 +41,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.game.permanent.token.WaylayToken; import mage.target.targetpointer.FixedTargets; diff --git a/Mage.Sets/src/mage/cards/w/WeatherseedTotem.java b/Mage.Sets/src/mage/cards/w/WeatherseedTotem.java index 4aff44d0e22..0eb75af9bde 100644 --- a/Mage.Sets/src/mage/cards/w/WeatherseedTotem.java +++ b/Mage.Sets/src/mage/cards/w/WeatherseedTotem.java @@ -47,7 +47,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -98,7 +98,7 @@ class WeatherseedTotemCondition implements Condition { } } -class WeatherseedTotemToken extends Token { +class WeatherseedTotemToken extends TokenImpl { public WeatherseedTotemToken() { super("", "5/3 green Treefolk artifact creature with trample"); diff --git a/Mage.Sets/src/mage/cards/w/WindZendikon.java b/Mage.Sets/src/mage/cards/w/WindZendikon.java index b3337dad4df..a2bbf2a2b9c 100644 --- a/Mage.Sets/src/mage/cards/w/WindZendikon.java +++ b/Mage.Sets/src/mage/cards/w/WindZendikon.java @@ -40,7 +40,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -81,7 +81,7 @@ public class WindZendikon extends CardImpl { return new WindZendikon(this); } - class ElementalToken extends Token { + class ElementalToken extends TokenImpl { ElementalToken() { super("", "2/2 blue Elemental creature with flying"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java b/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java index 1fe3d7d16d4..6af5f081830 100644 --- a/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java +++ b/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java @@ -43,7 +43,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -85,7 +85,7 @@ public class WoodwraithCorrupter extends CardImpl { } } -class WoodwraithCorrupterToken extends Token { +class WoodwraithCorrupterToken extends TokenImpl { public WoodwraithCorrupterToken() { super("", "4/4 black and green Elemental Horror creature"); diff --git a/Mage.Sets/src/mage/cards/x/XanthicStatue.java b/Mage.Sets/src/mage/cards/x/XanthicStatue.java index 41ceee6cd80..88c54e53fec 100644 --- a/Mage.Sets/src/mage/cards/x/XanthicStatue.java +++ b/Mage.Sets/src/mage/cards/x/XanthicStatue.java @@ -38,7 +38,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @@ -64,7 +64,7 @@ public class XanthicStatue extends CardImpl { } } -class XanthicStatueCreature extends Token { +class XanthicStatueCreature extends TokenImpl { public XanthicStatueCreature() { super("Xanthic Statue", "8/8 Golem artifact creature with trample"); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java index 4c51e467d86..af19dd96d97 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/activated/TokenImplActivatedAbilityTest.java @@ -38,7 +38,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * * @author LevelX2 */ -public class TokenActivatedAbilityTest extends CardTestPlayerBase { +public class TokenImplActivatedAbilityTest extends CardTestPlayerBase { /** * Check that activated ability of created token works diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyCreatureCardToTokenImplTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyCreatureCardToTokenImplTest.java index d7295c0960b..02341d56f57 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyCreatureCardToTokenImplTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyCreatureCardToTokenImplTest.java @@ -14,7 +14,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase; * * @author LevelX2 */ -public class CopyCreatureCardToTokenTest extends CardTestPlayerBase { +public class CopyCreatureCardToTokenImplTest extends CardTestPlayerBase { /** * Unesh, Criosphinx Sovereign did not have his ETB effect trigger when he diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java index 3207be060e2..48e5dc23b15 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java @@ -5,7 +5,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; public class CopyTokenEffect extends ContinuousEffectImpl { protected Token token; diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java index 05712cd92e2..87d3e684356 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenEffect.java @@ -37,7 +37,7 @@ import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTarget; import mage.util.CardUtil; diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java index 418b9e75936..3d9cf6b9119 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java @@ -7,7 +7,7 @@ import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.util.CardUtil; /** diff --git a/Mage/src/main/java/mage/abilities/effects/common/FlipSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FlipSourceEffect.java index 2ed186cd42c..73b8b1a2c4a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/FlipSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/FlipSourceEffect.java @@ -8,7 +8,7 @@ import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.players.Player; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java index ce9b5c41a42..599f1190c28 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAllEffect.java @@ -39,7 +39,7 @@ import mage.constants.SubLayer; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import java.util.HashSet; import java.util.Set; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java index da2e7b4a5e1..5a02355e1d3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedEffect.java @@ -32,7 +32,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author jeffwadsworth diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java index 9b62e1e9335..b489a2c70a9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect.java @@ -33,7 +33,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author jeffwadsworth diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java index 344b38bb32a..79381531892 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureSourceEffect.java @@ -34,7 +34,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author BetaSteward_at_googlemail.com diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java index b95e5b79e5f..81af12e3719 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesCreatureTargetEffect.java @@ -33,7 +33,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.Target; import mage.util.CardUtil; diff --git a/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java b/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java index 998c0d1c39c..478c1fd8629 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AwakenAbility.java @@ -48,7 +48,7 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; import mage.target.Target; import mage.target.common.TargetControlledPermanent; import mage.target.targetpointer.FixedTarget; @@ -158,7 +158,7 @@ public class AwakenAbility extends SpellAbility { } -class AwakenElementalToken extends Token { +class AwakenElementalToken extends TokenImpl { public AwakenElementalToken() { super("", "0/0 Elemental creature with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/PermanentToken.java b/Mage/src/main/java/mage/game/permanent/PermanentToken.java index c005bef4294..a1d6e950e05 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentToken.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentToken.java @@ -32,7 +32,7 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCost; import mage.game.Game; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token;import mage.game.permanent.token.Token; /** * diff --git a/Mage/src/main/java/mage/game/permanent/token/ATATToken.java b/Mage/src/main/java/mage/game/permanent/token/ATATToken.java index f5d0f534ba2..d922acfa4f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ATATToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ATATToken.java @@ -37,7 +37,7 @@ import mage.abilities.effects.common.CreateTokenEffect; * * @author spjspj */ -public class ATATToken extends Token { +public class ATATToken extends TokenImpl { public ATATToken() { super("AT-AT", "5/5 white artifact AT-AT creature tokens with \"When this creature dies, create two 1/1 white Trooper creature tokens.\"", 5, 5); diff --git a/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java b/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java index 69bd4353a6d..ace77ce752e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AbhorrentOverlordHarpyToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class AbhorrentOverlordHarpyToken extends Token { +public class AbhorrentOverlordHarpyToken extends TokenImpl { public AbhorrentOverlordHarpyToken() { super("Harpy", "1/1 black Harpy creature tokens with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java index 9a0ebc34068..6ce726b7a1e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AerieWorshippersBirdToken.java @@ -38,7 +38,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class AerieWorshippersBirdToken extends Token { +public class AerieWorshippersBirdToken extends TokenImpl { public AerieWorshippersBirdToken() { super("Bird", "2/2 blue Bird enchantment creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java index b941cb52816..91ee184fee4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java @@ -38,7 +38,7 @@ import mage.abilities.keyword.TrampleAbility; * * @author spjspj */ -public class AkoumStonewakerElementalToken extends Token { +public class AkoumStonewakerElementalToken extends TokenImpl { public AkoumStonewakerElementalToken() { super("Elemental", "3/1 red Elemental creature token with trample and haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java index 93ff3bcdba5..17edfe81deb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AkroanSoldierToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class AkroanSoldierToken extends Token { +public class AkroanSoldierToken extends TokenImpl { public AkroanSoldierToken() { super("Soldier", "1/1 red Soldier creature token with haste"); 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 1b723f10f3e..455e5f2dac3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java @@ -8,7 +8,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -public class AngelToken extends Token { +public class AngelToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java index a5764a6bae1..5c740f16f91 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AnotherSpiritToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class AnotherSpiritToken extends Token { +public class AnotherSpiritToken extends TokenImpl { public AnotherSpiritToken() { super("Spirit", "3/3 white Spirit creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/AnthousaWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/AnthousaWarriorToken.java index 4c12b905bc0..d7e4d9a19c3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AnthousaWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AnthousaWarriorToken.java @@ -36,7 +36,7 @@ import mage.MageInt; * * @author spjspj */ -public class AnthousaWarriorToken extends Token { +public class AnthousaWarriorToken extends TokenImpl { public AnthousaWarriorToken() { super("", "2/2 Warrior creatures"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ApeToken.java b/Mage/src/main/java/mage/game/permanent/token/ApeToken.java index e974542ce4f..8d293135fcc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ApeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ApeToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class ApeToken extends Token { +public class ApeToken extends TokenImpl { public ApeToken() { super("Ape", "2/2 green Ape creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java index 05b43e1f31a..7e52bf41877 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ArchitectOfTheUntamedBeastToken.java @@ -36,7 +36,7 @@ import mage.MageInt; * * @author spjspj */ -public class ArchitectOfTheUntamedBeastToken extends Token { +public class ArchitectOfTheUntamedBeastToken extends TokenImpl { public ArchitectOfTheUntamedBeastToken() { super("Beast", "6/6 colorless Beast artifact creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java b/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java index a4c80b67fd7..c3a78c1c05b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssassinToken.java @@ -38,7 +38,7 @@ import mage.abilities.effects.common.LoseGameTargetPlayerEffect; * * @author spjspj */ -public class AssassinToken extends Token { +public class AssassinToken extends TokenImpl { public AssassinToken() { super("Assassin", "1/1 black Assassin creature tokens with \"Whenever this creature deals combat damage to a player, that player loses the game.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java index 4ea327d3450..3425261e898 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AssemblyWorkerToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class AssemblyWorkerToken extends Token { +public class AssemblyWorkerToken extends TokenImpl { public AssemblyWorkerToken() { super("Assembly-Worker", "2/2 Assembly-Worker artifact creature"); diff --git a/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java b/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java index 4f845171d2e..52376adfaaf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AvatarToken.java @@ -46,7 +46,7 @@ import mage.players.Player; * * @author spjspj */ -public class AvatarToken extends Token { +public class AvatarToken extends TokenImpl { public AvatarToken() { super("Avatar", "white Avatar creature token with \"This creature's power and toughness are each equal to your life total.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java b/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java index ac5c1d7aa6a..d4a8c55e915 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BalduvianToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class BalduvianToken extends Token { +public class BalduvianToken extends TokenImpl { public BalduvianToken() { super("Graveborn", "3/1 black and red Graveborn creature token with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java b/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java index 4189d6dd1c7..a6803fd20aa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BaruFistOfKrosaToken.java @@ -36,7 +36,7 @@ import mage.MageInt; * * @author spjspj */ -public class BaruFistOfKrosaToken extends Token { +public class BaruFistOfKrosaToken extends TokenImpl { public BaruFistOfKrosaToken() { this(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/BatToken.java b/Mage/src/main/java/mage/game/permanent/token/BatToken.java index f9ae4c1d478..a62ecd7c7bc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BatToken.java @@ -5,7 +5,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; -public class BatToken extends Token { +public class BatToken extends TokenImpl { public BatToken() { super("Bat", "1/1 black Bat creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/BearToken.java b/Mage/src/main/java/mage/game/permanent/token/BearToken.java index c4a800f6970..b0b6214e806 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BearToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BearToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author BetaSteward_at_googlemail.com */ -public class BearToken extends Token { +public class BearToken extends TokenImpl { public BearToken() { super("Bear", "2/2 green Bear creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java b/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java index 20180e24f3a..bb3ef58c795 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class BearsCompanionBearToken extends Token { +public class BearsCompanionBearToken extends TokenImpl { public BearsCompanionBearToken() { super("Bear", "4/4 green Bear creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java index 5e416b6ed1c..7bb5ab5dcaf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author BetaSteward_at_googlemail.com */ -public class BeastToken extends Token { +public class BeastToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); 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 7bba12d9769..ac205e801da 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author LoneFox */ -public class BeastToken2 extends Token { +public class BeastToken2 extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java index 74300155e68..f5d79e6cc77 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken3.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author fireshoes */ -public class BeastToken3 extends Token { +public class BeastToken3 extends TokenImpl { public BeastToken3() { this(null, 0); diff --git a/Mage/src/main/java/mage/game/permanent/token/BeckonApparitionToken.java b/Mage/src/main/java/mage/game/permanent/token/BeckonApparitionToken.java index 0b7f9fd045a..652d94c8507 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BeckonApparitionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BeckonApparitionToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class BeckonApparitionToken extends Token { +public class BeckonApparitionToken extends TokenImpl { public BeckonApparitionToken() { super("Spirit", "1/1 white and black Spirit creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java index d2ec885ef7d..435921807b1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdSoldierToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class BirdSoldierToken extends Token { +public class BirdSoldierToken extends TokenImpl { public BirdSoldierToken() { super("Bird Soldier", "1/1 white Bird Soldier creature with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java index e9183088439..92101b5dd33 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BirdToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author LoneFox */ -public class BirdToken extends Token { +public class BirdToken extends TokenImpl { public BirdToken() { super("Bird", "1/1 white Bird creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/BoarToken.java b/Mage/src/main/java/mage/game/permanent/token/BoarToken.java index 229298bf212..9f4e9c78364 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BoarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BoarToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class BoarToken extends Token { +public class BoarToken extends TokenImpl { public BoarToken() { super("Boar", "3/3 green Boar creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java b/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java index abf6667d5c5..bf3e694b76f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BrainiacToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class BrainiacToken extends Token { +public class BrainiacToken extends TokenImpl { public BrainiacToken() { super("Brainiac", "1/1 red Brainiac creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java b/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java index 2773894d49d..00c4e8ff672 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BreedingPitThrullToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class BreedingPitThrullToken extends Token { +public class BreedingPitThrullToken extends TokenImpl { public BreedingPitThrullToken() { super("Thrull", "0/1 black Thrull creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java index 028f82f0133..af64bf698d4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BrokenVisageSpiritToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj & L_J */ -public class BrokenVisageSpiritToken extends Token { +public class BrokenVisageSpiritToken extends TokenImpl { public BrokenVisageSpiritToken() { this(0,0); diff --git a/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java index cb28d61306d..b0487c7ac33 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java @@ -41,7 +41,7 @@ import mage.constants.Zone; * * @author spjspj */ -public class BroodKeeperDragonToken extends Token { +public class BroodKeeperDragonToken extends TokenImpl { public BroodKeeperDragonToken() { super("Dragon", "2/2 red Dragon creature token with flying. It has \"{R}: This creature gets +1/+0 until end of turn.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java b/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java index 181821baa45..e021ec68b13 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ButterflyToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class ButterflyToken extends Token { +public class ButterflyToken extends TokenImpl { public ButterflyToken() { super("Butterfly", "1/1 green Insect creature token with flying named Butterfly"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java index 81521718a6a..92c6d00be6f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CallTheSkyBreakerElementalToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class CallTheSkyBreakerElementalToken extends Token { +public class CallTheSkyBreakerElementalToken extends TokenImpl { public CallTheSkyBreakerElementalToken() { super("Elemental", "5/5 blue and red Elemental creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java b/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java index 99b91f9747f..36d0271410d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CamaridToken.java @@ -34,7 +34,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class CamaridToken extends Token { +public class CamaridToken extends TokenImpl { public CamaridToken() { super("Camarid", "1/1 blue Camarid creature tokens"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java b/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java index bf8ee1086d0..e62ac8352ef 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CaribouToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class CaribouToken extends Token { +public class CaribouToken extends TokenImpl { public CaribouToken() { super("Caribou", "0/1 white Caribou creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java b/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java index 2b35bc9aa45..3ecd377c109 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CarnivoreToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class CarnivoreToken extends Token { +public class CarnivoreToken extends TokenImpl { public CarnivoreToken() { super("Carnivore", "3/1 red Beast creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java index 2227e044ea0..96f06dcf150 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CarrionBlackInsectToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author TheElk801 */ -public class CarrionBlackInsectToken extends Token { +public class CarrionBlackInsectToken extends TokenImpl { public CarrionBlackInsectToken() { super("Insect", "0/1 black Insect creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java b/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java index 819f0974e5a..d1e9c380327 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatSoldierCreatureToken.java @@ -31,13 +31,12 @@ import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; -import mage.game.permanent.token.Token; /** * * @author LevelX2 */ -public class CatSoldierCreatureToken extends Token { +public class CatSoldierCreatureToken extends TokenImpl { public CatSoldierCreatureToken() { super("Cat Soldier", "1/1 white Cat Soldier creature token with vigilance"); 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 1eaa6447894..52c5ff44b79 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken.java @@ -39,7 +39,7 @@ import mage.constants.SubType; * * @author LoneFox */ -public class CatToken extends Token { +public class CatToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java b/Mage/src/main/java/mage/game/permanent/token/CatToken2.java index 2a8691db041..28c67a2f638 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken2.java @@ -37,7 +37,7 @@ import mage.constants.SubType; * * @author fireshoes */ -public class CatToken2 extends Token { +public class CatToken2 extends TokenImpl { public CatToken2() { this((String)null); diff --git a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java index 8b61344f1eb..147b1ab6206 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class CatWarriorToken extends Token { +public class CatWarriorToken extends TokenImpl { public CatWarriorToken() { super("Cat Warrior", "2/2 green Cat Warrior creature token with forestwalk"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java index c3a72e3aaa6..83d5d93c9fe 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurEnchantmentCreatureToken.java @@ -30,13 +30,12 @@ package mage.game.permanent.token; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.game.permanent.token.Token; /** * * @author LevelX2 */ -public class CentaurEnchantmentCreatureToken extends Token { +public class CentaurEnchantmentCreatureToken extends TokenImpl { public CentaurEnchantmentCreatureToken() { super("Centaur", "3/3 green Centaur enchantment creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java index 540e22fcf75..2e70aad6b42 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java @@ -40,7 +40,7 @@ import mage.util.RandomUtil; * * @author LevelX2 */ -public class CentaurToken extends Token { +public class CentaurToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java b/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java index 3b28441a5d9..92b6696340b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.IslandwalkAbility; * * @author spjspj */ -public class ChasmSkulkerSquidToken extends Token { +public class ChasmSkulkerSquidToken extends TokenImpl { public ChasmSkulkerSquidToken() { super("Squid", "1/1 blue Squid creature token with islandwalk"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java b/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java index d9191c5a19c..65dbbf24d6d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author Quercitron */ -public class CitizenToken extends Token { +public class CitizenToken extends TokenImpl { public CitizenToken() { super("Citizen", "1/1 white Citizen creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java b/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java index b026b286202..e04b3242ab7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CloudSpriteToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class CloudSpriteToken extends Token { +public class CloudSpriteToken extends TokenImpl { public CloudSpriteToken() { super("Cloud Sprite", "1/1 blue faerie creature token named Cloud Sprite with flying and \"Cloud Sprite can block only creatures with flying.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java index a269c524c59..590568f02c4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java @@ -44,7 +44,7 @@ import java.util.List; /** * */ -public class ClueArtifactToken extends Token { +public class ClueArtifactToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java index 732b9baae46..30c1a633fb9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ConstructToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.DefenderAbility; * * @author spjspj */ -public class ConstructToken extends Token { +public class ConstructToken extends TokenImpl { public ConstructToken() { this("CNS"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java b/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java index d3d84d51155..eadc4e5d9d4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.IslandwalkAbility; * * @author spjspj */ -public class CoralBarrierSquidToken extends Token { +public class CoralBarrierSquidToken extends TokenImpl { public CoralBarrierSquidToken() { super("Squid", "1/1 blue Squid creature token with islandwalk"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java index 44b0c4fbd49..c63875ac35d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CorpseweftZombieToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class CorpseweftZombieToken extends Token { +public class CorpseweftZombieToken extends TokenImpl { public CorpseweftZombieToken() { this(2,2); diff --git a/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java index 292be0e97f3..f81e0c3bfc2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CorruptedZendikonOozeToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class CorruptedZendikonOozeToken extends Token { +public class CorruptedZendikonOozeToken extends TokenImpl { public CorruptedZendikonOozeToken() { super("Ooze", "3/3 black Ooze creature"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java b/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java index 9f50192ceef..3f0c89d42d8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class CreakwoodLiegeToken extends Token { +public class CreakwoodLiegeToken extends TokenImpl { public CreakwoodLiegeToken() { super("Worm", "1/1 black and green Worm creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java index a8f1d74501b..884cb97ad4e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class CrestedSunmareToken extends Token { +public class CrestedSunmareToken extends TokenImpl { public CrestedSunmareToken() { super("Horse", "5/5 white Horse creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java index 2261f05aa48..6b10184069c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CribSwapShapeshifterWhiteToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.ChangelingAbility; * * @author spjspj */ -public class CribSwapShapeshifterWhiteToken extends Token { +public class CribSwapShapeshifterWhiteToken extends TokenImpl { public CribSwapShapeshifterWhiteToken() { super("Shapeshifter", "1/1 colorless Shapeshifter creature token with changeling"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java b/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java index 0c2f2f92449..c403041c1b2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class CrushOfTentaclesToken extends Token { +public class CrushOfTentaclesToken extends TokenImpl { public CrushOfTentaclesToken() { super("Octopus", "8/8 blue Octopus creature"); diff --git a/Mage/src/main/java/mage/game/permanent/token/CurseOfTheSwineBoarToken.java b/Mage/src/main/java/mage/game/permanent/token/CurseOfTheSwineBoarToken.java index 45af833c1c2..59e3596d7e8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CurseOfTheSwineBoarToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CurseOfTheSwineBoarToken.java @@ -36,7 +36,7 @@ import mage.MageInt; * * @author spjspj */ -public class CurseOfTheSwineBoarToken extends Token { +public class CurseOfTheSwineBoarToken extends TokenImpl { public CurseOfTheSwineBoarToken() { super("Boar", "2/2 green Boar creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java index 8260989a4a2..3b3d3a20329 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DarettiConstructToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.DefenderAbility; * * @author spjspj */ -public class DarettiConstructToken extends Token { +public class DarettiConstructToken extends TokenImpl { public DarettiConstructToken() { this("CNS"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java index 7e90635bb02..f06833b713f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DaxosSpiritToken.java @@ -48,7 +48,7 @@ import mage.players.Player; * * @author spjspj */ -public class DaxosSpiritToken extends Token { +public class DaxosSpiritToken extends TokenImpl { public 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.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubToken.java b/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubToken.java index 306af0b980b..10824529a05 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeadlyGrubToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.ShroudAbility; * * @author spjspj */ -public class DeadlyGrubToken extends Token { +public class DeadlyGrubToken extends TokenImpl { public DeadlyGrubToken() { super("Insect", "6/1 green Insect creature token with shroud"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java index 87a11633701..cdf002a95e8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathpactAngelToken.java @@ -45,7 +45,7 @@ import mage.target.common.TargetCardInYourGraveyard; * * @author spjspj */ -public class DeathpactAngelToken extends Token { +public class DeathpactAngelToken extends TokenImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("card named Deathpact Angel from your graveyard"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java index ece5b1f7f79..91cf8cf3d79 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author Saga */ -public class DeathtouchRatToken extends Token { +public class DeathtouchRatToken extends TokenImpl { public DeathtouchRatToken() { super("Rat", "1/1 black Rat creature token with deathtouch"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java index 1fb277bcb81..a11d1fee318 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchSnakeToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.DeathtouchAbility; * * @author spjspj */ -public class DeathtouchSnakeToken extends Token { +public class DeathtouchSnakeToken extends TokenImpl { public DeathtouchSnakeToken() { super("Snake", "1/1 green Snake creature token with deathtouch"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java b/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java index fb00fa5ed40..2cb66b22483 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DefenderPlantToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author TheElk801 */ -public class DefenderPlantToken extends Token { +public class DefenderPlantToken extends TokenImpl { public DefenderPlantToken() { this(null, 0); 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 ea7fc60f5b2..6889c0290ff 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DemonToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author LoneFox */ -public class DemonToken extends Token { +public class DemonToken extends TokenImpl { public DemonToken() { super("Demon", "5/5 black Demon creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java b/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java index 274594dfbf6..33ae2e16bd7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeserterToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class DeserterToken extends Token { +public class DeserterToken extends TokenImpl { public DeserterToken() { super("Deserter", "0/1 white Deserter creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java index 7d62952f02c..055477d308f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DevastatingSummonsElementalToken.java @@ -34,7 +34,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class DevastatingSummonsElementalToken extends Token { +public class DevastatingSummonsElementalToken extends TokenImpl { public DevastatingSummonsElementalToken() { super("Elemental", "X/X red Elemental creature"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java index a8311972f06..7c6dd1a53e8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreatureOrPlayer; * * @author fireshoes */ -public class DevilToken extends Token { +public class DevilToken extends TokenImpl { public DevilToken() { super("Devil", "1/1 red Devil creature with \"When this creature dies, it deals 1 damage to target creature or player.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java b/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java index d61f603d3be..68b11b58c15 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class DinOfTheFireherdToken extends Token { +public class DinOfTheFireherdToken extends TokenImpl { public DinOfTheFireherdToken() { super("Elemental", "5/5 black and red Elemental creature"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java index ca60d9c8a82..782e56af569 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author TheElk801 */ -public class DinosaurToken extends Token { +public class DinosaurToken extends TokenImpl { public DinosaurToken() { super("Dinosaur", "3/3 green Dinosaur creature token with trample"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java b/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java index d8e05d68879..8b648aa9cdc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class DjinnMonkToken extends Token { +public class DjinnMonkToken extends TokenImpl { public DjinnMonkToken() { super("Djinn Monk", "2/2 blue Djinn Monk creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java b/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java index e4bfde54d7d..79fbb204bef 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DjinnToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class DjinnToken extends Token { +public class DjinnToken extends TokenImpl { public DjinnToken() { super("Djinn", "5/5 colorless Djinn artifact creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java index 2803d365358..32c95253a26 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java @@ -43,7 +43,7 @@ import mage.filter.common.FilterControlledPermanent; * * @author spjspj */ -public class DokaiWeaverofLifeToken extends Token { +public class DokaiWeaverofLifeToken extends TokenImpl { final static FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java b/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java index 8f8f0d311e8..ce278daa26b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DovescapeToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class DovescapeToken extends Token { +public class DovescapeToken extends TokenImpl { public DovescapeToken() { super("Bird", "1/1 white and blue Bird creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java index 30273fea9d2..ab75430696c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonBroodmotherDragonToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class DragonBroodmotherDragonToken extends Token { +public class DragonBroodmotherDragonToken extends TokenImpl { public DragonBroodmotherDragonToken() { super("Dragon", "1/1 red and green Dragon creature token with flying and devour 2"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java index 84fe1516ee7..11e36d2b12d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java @@ -41,7 +41,7 @@ import mage.constants.Zone; * * @author spjspj */ -public class DragonEggDragonToken extends Token { +public class DragonEggDragonToken extends TokenImpl { public DragonEggDragonToken() { super("Dragon", "2/2 red Dragon creature token with flying that has \"{R}: This creature gets +1/+0 until end of turn"); 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 110939b2a02..125243d346b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java @@ -40,7 +40,7 @@ import mage.constants.SubType; * * @author BetaSteward_at_googlemail.com */ -public class DragonToken extends Token { +public class DragonToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); 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 0d5035f5ed9..797c1127f76 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java @@ -39,7 +39,7 @@ import mage.constants.SubType; * * @author LoneFox */ -public class DragonToken2 extends Token { +public class DragonToken2 extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java b/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java index 0b420a732e2..bdefe85c854 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java @@ -40,7 +40,7 @@ import mage.constants.SubType; * * @author Saga */ -public class DragonTokenGold extends Token { +public class DragonTokenGold extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java index 24f80045d76..fca92799fba 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author North */ -public class DrakeToken extends Token { +public class DrakeToken extends TokenImpl { public DrakeToken() { super("Drake", "2/2 blue Drake creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DroidToken.java b/Mage/src/main/java/mage/game/permanent/token/DroidToken.java index c71f12aa5a9..62d0f387742 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DroidToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DroidToken.java @@ -37,7 +37,7 @@ import mage.constants.SubType; * * @author Styxo */ -public class DroidToken extends Token { +public class DroidToken extends TokenImpl { public DroidToken() { super("Droid", "1/1 colorless Droid creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java b/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java index 01fb3359fb9..419fe943356 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DuneBroodNephilimToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class DuneBroodNephilimToken extends Token { +public class DuneBroodNephilimToken extends TokenImpl { public DuneBroodNephilimToken() { super("Sand", "1/1 colorless Sand creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java index a0d0b3347b3..fb84b3ddac0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class EdgarMarkovToken extends Token { +public class EdgarMarkovToken extends TokenImpl { public EdgarMarkovToken() { super("Vampire", "1/1 black Vampire creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java index 244845746e0..6bb54e8671b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ -public class EldraziHorrorToken extends Token { +public class EldraziHorrorToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java index 4b9f85e8b6f..444f39fbdc0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java @@ -44,7 +44,7 @@ import mage.util.RandomUtil; * * @author fireshoes */ -public class EldraziScionToken extends Token { +public class EldraziScionToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java index 06d1281b5c9..59d0162ef25 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java @@ -44,7 +44,7 @@ import mage.util.RandomUtil; * * @author BetaSteward_at_googlemail.com */ -public class EldraziSpawnToken extends Token { +public class EldraziSpawnToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java index 45ad3f9cd92..29b2d1e4401 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class EldraziToken extends Token { +public class EldraziToken extends TokenImpl { public EldraziToken() { super("Eldrazi", "10/10 colorless Eldrazi creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalAppealElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalAppealElementalToken.java index 994af3ce671..f823da7dbe8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalAppealElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalAppealElementalToken.java @@ -37,7 +37,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class ElementalAppealElementalToken extends Token { +public class ElementalAppealElementalToken extends TokenImpl { public ElementalAppealElementalToken() { super("Elemental", "7/1 red Elemental creature token with trample and haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java index c0c05a25c79..eb16cb96660 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalCatToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class ElementalCatToken extends Token { +public class ElementalCatToken extends TokenImpl { public ElementalCatToken() { super("Elemental Cat", "1/1 red Elemental Cat creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalMasteryElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ElementalMasteryElementalToken.java index 06e1fca275c..50ce0ee2d89 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalMasteryElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalMasteryElementalToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class ElementalMasteryElementalToken extends Token { +public class ElementalMasteryElementalToken extends TokenImpl { public ElementalMasteryElementalToken() { super("Elemental", "1/1 red Elemental creature token with haste"); 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 a9110c11c62..4ba4d2803fb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author Styxo */ -public class ElementalShamanToken extends Token { +public class ElementalShamanToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); 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 7606275407e..7e9089baf08 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElementalToken.java @@ -40,7 +40,7 @@ import mage.constants.SubType; * * @author magenoxx */ -public class ElementalToken extends Token { +public class ElementalToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java index 1e354e4d8ef..2d8ff61a2dc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantResurgenceToken.java @@ -41,7 +41,7 @@ import mage.filter.common.FilterCreatureCard; * * @author TheElk801 */ -public class ElephantResurgenceToken extends Token { +public class ElephantResurgenceToken extends TokenImpl { public ElephantResurgenceToken() { super("Elephant", "green Elephant creature token. Those creatures have \"This creature's power and toughness are each equal to the number of creature cards in its controller's graveyard.\""); 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 3a12c9e7867..9fa0e9f002b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java @@ -39,7 +39,7 @@ import mage.constants.SubType; * * @author BetaSteward_at_googlemail.com */ -public class ElephantToken extends Token { +public class ElephantToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfToken.java index 2df96973925..02a91edaf3f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ElfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ElfToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author Loki */ -public class ElfToken extends Token { +public class ElfToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/EmptyToken.java b/Mage/src/main/java/mage/game/permanent/token/EmptyToken.java index 1fe70ecf1ae..13637bff30d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EmptyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EmptyToken.java @@ -30,7 +30,7 @@ package mage.game.permanent.token; /** * @author nantuko */ -public class EmptyToken extends Token { +public class EmptyToken extends TokenImpl { public EmptyToken() { super("", ""); diff --git a/Mage/src/main/java/mage/game/permanent/token/ErrandOfDutyKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/ErrandOfDutyKnightToken.java index f13d3aedad7..1405cc051e1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ErrandOfDutyKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ErrandOfDutyKnightToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author L_J */ -public class ErrandOfDutyKnightToken extends Token { +public class ErrandOfDutyKnightToken extends TokenImpl { public ErrandOfDutyKnightToken() { super("Knight", "1/1 white Knight creature token with banding"); diff --git a/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java b/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java index a54264d9258..e99cf6c1dbd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EtheriumCellToken.java @@ -39,7 +39,7 @@ import mage.constants.Zone; * * @author spjspj */ -public class EtheriumCellToken extends Token { +public class EtheriumCellToken extends TokenImpl { public EtheriumCellToken() { super("Etherium Cell", "colorless artifact token named Etherium Cell which has \"{T}, Sacrifice this artifact: Add one mana of any color to your mana pool.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/EwokToken.java b/Mage/src/main/java/mage/game/permanent/token/EwokToken.java index 7545bd9cbcb..3b1bb6ade86 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EwokToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EwokToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author Styxo */ -public class EwokToken extends Token { +public class EwokToken extends TokenImpl { public EwokToken() { super("Ewok", "1/1 green Ewok creature tokens", 1, 1); diff --git a/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java index 977204cac9d..027fab5eb3d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class EyesOfTheWisentElementalToken extends Token { +public class EyesOfTheWisentElementalToken extends TokenImpl { public EyesOfTheWisentElementalToken() { super("Elemental", "4/4 green Elemental creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java index f524f73d3ff..e8cea5333f5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java @@ -41,7 +41,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author LoneFox */ -public class FaerieRogueToken extends Token { +public class FaerieRogueToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java index ae6399880fa..d23705e9747 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FaerieToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class FaerieToken extends Token { +public class FaerieToken extends TokenImpl { public FaerieToken() { super("Faerie", "1/1 blue Faerie creature tokens with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/FesteringGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/FesteringGoblinToken.java index 0962f470d32..5a190953ddd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FesteringGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FesteringGoblinToken.java @@ -40,7 +40,7 @@ import mage.target.common.TargetCreaturePermanent; * * @author spjspj */ -public class FesteringGoblinToken extends Token { +public class FesteringGoblinToken extends TokenImpl { public FesteringGoblinToken() { super("Festering Goblin", "1/1 black Zombie Goblin creature token named Festering Goblin with \"When Festering Goblin dies, target creature gets -1/-1 until end of turn.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java index cf690bda77e..f8f2ff3c1f5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class FleshCarverHorrorToken extends Token { +public class FleshCarverHorrorToken extends TokenImpl { public FleshCarverHorrorToken() { this(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java b/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java index e079bfe9e92..4e9e18da4ab 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class FlurryOfHornsMinotaurToken extends Token { +public class FlurryOfHornsMinotaurToken extends TokenImpl { public FlurryOfHornsMinotaurToken() { super("Minotaur", "2/3 red Minotaur creature tokens with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java index bca6d597afa..e546d7738bb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ForlornPseudammaZombieToken.java @@ -36,7 +36,7 @@ import mage.MageInt; * * @author spjspj */ -public class ForlornPseudammaZombieToken extends Token { +public class ForlornPseudammaZombieToken extends TokenImpl { public ForlornPseudammaZombieToken() { super("Zombie", "2/2 black Zombie enchantment creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java b/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java index 5e2645e4279..429a5d4376d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java @@ -40,7 +40,7 @@ import mage.abilities.mana.GreenManaAbility; * * @author spjspj */ -public class FreyaliseLlanowarsFuryToken extends Token { +public class FreyaliseLlanowarsFuryToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/FrogToken.java b/Mage/src/main/java/mage/game/permanent/token/FrogToken.java index dde5bccbf6e..c6f0cc5976d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FrogToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FrogToken.java @@ -36,7 +36,7 @@ import mage.MageInt; * * @author nantuko */ -public class FrogToken extends Token { +public class FrogToken extends TokenImpl { public FrogToken() { super("Frog", "1/1 blue Frog creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java index a4a40594700..baa9ce69485 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GargoyleToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class GargoyleToken extends Token { +public class GargoyleToken extends TokenImpl { public GargoyleToken() { super("Gargoyle", "3/4 colorless Gargoyle artifact creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java index 3665ffb1d04..a2211ce07e1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GarrukApexPredatorBeastToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.DeathtouchAbility; * * @author spjspj */ -public class GarrukApexPredatorBeastToken extends Token { +public class GarrukApexPredatorBeastToken extends TokenImpl { public GarrukApexPredatorBeastToken() { super("Beast", "3/3 black Beast creature token with deathtouch"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GeminiEngineTwinToken.java b/Mage/src/main/java/mage/game/permanent/token/GeminiEngineTwinToken.java index 55c2bb72a1c..951b7f611fd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GeminiEngineTwinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GeminiEngineTwinToken.java @@ -4,7 +4,7 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -public class GeminiEngineTwinToken extends Token { +public class GeminiEngineTwinToken extends TokenImpl { public GeminiEngineTwinToken(int power, int toughness) { super("Twin", "colorless Construct artifact creature token named Twin that's attacking. Its power is equal to Gemini Engine's power and its toughness is equal to Gemini Engine's toughness."); diff --git a/Mage/src/main/java/mage/game/permanent/token/GermToken.java b/Mage/src/main/java/mage/game/permanent/token/GermToken.java index a81b8d1a987..57b6bf4d24f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GermToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GermToken.java @@ -37,7 +37,7 @@ import mage.constants.SubType; /** * @author spjspj */ -public class GermToken extends Token { +public class GermToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java index f03604e2406..7389d22db4d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantBaitingGiantWarriorToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class GiantBaitingGiantWarriorToken extends Token { +public class GiantBaitingGiantWarriorToken extends TokenImpl { public GiantBaitingGiantWarriorToken() { super("Giant Warrior", "4/4 red and green Giant Warrior creature token with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantChickenToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantChickenToken.java index 8c9746eb148..6610d6fe913 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantChickenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantChickenToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * @author ciaccona007 */ -public class GiantChickenToken extends Token { +public class GiantChickenToken extends TokenImpl { public GiantChickenToken() { super("Giant Chicken", "4/4 red Giant Chicken creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantToken.java index 8262f2ce69b..116e7caa146 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class GiantToken extends Token { +public class GiantToken extends TokenImpl { public GiantToken() { super("Giant", "4/4 red Giant creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java index 3ffd0bb705f..eb5df8a1bb3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GiantWarriorToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class GiantWarriorToken extends Token { +public class GiantWarriorToken extends TokenImpl { public GiantWarriorToken() { super("Giant Warrior", "5/5 white Giant Warrior creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java b/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java index 8a5c7860b79..424007e54c6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GnomeToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class GnomeToken extends Token { +public class GnomeToken extends TokenImpl { public GnomeToken() { super("Gnome", "1/1 colorless Gnome artifact creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java index 45725c09bb5..623af62fdfa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoatToken.java @@ -39,7 +39,7 @@ import mage.constants.SubType; * * @author LoneFox */ -public class GoatToken extends Token { +public class GoatToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java index 5d68adf615b..d9d6e59f38f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinRogueToken.java @@ -37,7 +37,7 @@ import mage.MageInt; * * @author LoneFox */ -public class GoblinRogueToken extends Token { +public class GoblinRogueToken extends TokenImpl { public GoblinRogueToken() { super("Goblin Rogue", "1/1 black Goblin Rogue creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java index 2386d2f8b85..47fa75c5f24 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinScoutsToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.MountainwalkAbility; * * @author spjspj */ -public class GoblinScoutsToken extends Token { +public class GoblinScoutsToken extends TokenImpl { public GoblinScoutsToken() { super("Goblin Scout", "1/1 red Goblin Scout creature tokens with mountainwalk"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java index 76789d9f477..35555114ca3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class GoblinSoldierToken extends Token { +public class GoblinSoldierToken extends TokenImpl { public GoblinSoldierToken() { super("Goblin Soldier", "1/1 red and white Goblin Soldier creature tokens"); 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 4875284b48b..52f5a2a3bd1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author North */ -public class GoblinToken extends Token { +public class GoblinToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java index 6cb1f09eaa0..bcd794808c2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinTrenchesToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class GoblinTrenchesToken extends Token { +public class GoblinTrenchesToken extends TokenImpl { public GoblinTrenchesToken() { super("Goblin Soldier", "1/1 red and white Goblin Soldier creature tokens"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java index dda922bbec9..5abcbefc17c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GodFavoredGeneralSoldierToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class GodFavoredGeneralSoldierToken extends Token { +public class GodFavoredGeneralSoldierToken extends TokenImpl { public GodFavoredGeneralSoldierToken() { super("Soldier", "1/1 white Soldier enchantment creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java index e63ba90dd50..a07a32c470f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GodSireBeastToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class GodSireBeastToken extends Token { +public class GodSireBeastToken extends TokenImpl { public GodSireBeastToken() { super("Beast", "8/8 Beast creature token that's red, green, and white"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoldForgeGarrisonGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldForgeGarrisonGolemToken.java index 443bbfa63d3..686f006955f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoldForgeGarrisonGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldForgeGarrisonGolemToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; * * @author LevelX2 */ -public class GoldForgeGarrisonGolemToken extends Token { +public class GoldForgeGarrisonGolemToken extends TokenImpl { public GoldForgeGarrisonGolemToken() { super("Golem", "4/4 colorless Golem artifact creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java index b5e1c2792d0..e6661dbb4e9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldToken.java @@ -41,7 +41,7 @@ import mage.constants.Zone; * * @author LevelX2 */ -public class GoldToken extends Token { +public class GoldToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); static { diff --git a/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java b/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java index d572b88701c..77e6c38ebe0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoldmeadowHarrierToken.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreaturePermanent; * * @author spjspj */ -public class GoldmeadowHarrierToken extends Token { +public class GoldmeadowHarrierToken extends TokenImpl { public GoldmeadowHarrierToken() { super("Goldmeadow Harrier", "1/1 white Kithkin Soldier creature token named Goldmeadow Harrier with \"{W}, {T}: Tap target creature.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java index c00ae69403a..2ce83267cdd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GolemToken.java @@ -39,7 +39,7 @@ import mage.MageInt; * * @author North */ -public class GolemToken extends Token { +public class GolemToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java b/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java index 1138bb995a5..90dc38e0440 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GremlinToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author Styxo */ -public class GremlinToken extends Token { +public class GremlinToken extends TokenImpl { public GremlinToken() { super("Gremlin", "2/2 red Gremlin creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java index 735b9ac89be..a1b9b225206 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class GriffinToken extends Token { +public class GriffinToken extends TokenImpl { public GriffinToken() { super("Griffin", "2/2 white Griffin creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java b/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java index aa67353fac2..c31ef0cf336 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class GrovetenderDruidsPlantToken extends Token { +public class GrovetenderDruidsPlantToken extends TokenImpl { public GrovetenderDruidsPlantToken() { super("Plant", "1/1 green Plant creature"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java index d9b0acf817f..656feb46103 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GuardianIdolGolemToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class GuardianIdolGolemToken extends Token { +public class GuardianIdolGolemToken extends TokenImpl { public GuardianIdolGolemToken() { super("Golem", "2/2 Golem artifact creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java b/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java index 8248c97148c..e06ad31741a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GutterGrimeToken.java @@ -46,7 +46,7 @@ import mage.game.permanent.Permanent; * * @author spjspj */ -public class GutterGrimeToken extends Token { +public class GutterGrimeToken extends TokenImpl { public GutterGrimeToken() { this ((UUID)null); diff --git a/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java index 09a5e1505f6..aa4bd17bd92 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HammerOfPurphorosGolemToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class HammerOfPurphorosGolemToken extends Token { +public class HammerOfPurphorosGolemToken extends TokenImpl { public HammerOfPurphorosGolemToken() { super("Golem", "3/3 colorless Golem enchantment artifact creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java index e4c801077b0..7af99728408 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HauntedAngelToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class HauntedAngelToken extends Token { +public class HauntedAngelToken extends TokenImpl { public HauntedAngelToken() { super("Angel", "3/3 black Angel creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java index a1aaaeddb32..8c568263bec 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HazezonTamarSandWarriorToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class HazezonTamarSandWarriorToken extends Token { +public class HazezonTamarSandWarriorToken extends TokenImpl { public HazezonTamarSandWarriorToken() { super("Sand Warrior", "1/1 Sand Warrior creature tokens that are red, green, and white"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java b/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java index 2d3fcac4b1d..e86944de354 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HeliodGodOfTheSunToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class HeliodGodOfTheSunToken extends Token { +public class HeliodGodOfTheSunToken extends TokenImpl { public HeliodGodOfTheSunToken() { super("Cleric", "2/1 white Cleric enchantment creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java b/Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java index 1a20173b55f..8fe7b0a3aca 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class HellionHasteToken extends Token { +public class HellionHasteToken extends TokenImpl { public HellionHasteToken() { super("Hellion", "4/4 red Hellion creature token with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HellionToken.java b/Mage/src/main/java/mage/game/permanent/token/HellionToken.java index e5ed1b24751..4ff78f8aa74 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HellionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HellionToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class HellionToken extends Token { +public class HellionToken extends TokenImpl { public HellionToken() { super("Hellion", "4/4 red Hellion creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HippoToken.java b/Mage/src/main/java/mage/game/permanent/token/HippoToken.java index 02c0df8550a..0b58bfe2420 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HippoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HippoToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author Styxo */ -public class HippoToken extends Token { +public class HippoToken extends TokenImpl { public HippoToken() { super("Hippo", "1/1 green Hippo creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HippoToken2.java b/Mage/src/main/java/mage/game/permanent/token/HippoToken2.java index 30bca6f8049..a2c98b16b1e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HippoToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/HippoToken2.java @@ -35,7 +35,7 @@ import mage.constants.SubType; /** * @author Stravant */ -public class HippoToken2 extends Token { +public class HippoToken2 extends TokenImpl { public HippoToken2() { super("Hippo", "3/3 green Hippo creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java b/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java index 82993616f4b..4136945d9e9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HomunculusToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class HomunculusToken extends Token { +public class HomunculusToken extends TokenImpl { public HomunculusToken() { super("Homunculus", "0/1 blue Homunculus artifact creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HornetNestInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/HornetNestInsectToken.java index 5ccacb21af4..0343d8106b3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HornetNestInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HornetNestInsectToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class HornetNestInsectToken extends Token { +public class HornetNestInsectToken extends TokenImpl { public HornetNestInsectToken() { super("Insect", "1/1 green Insect creature tokens with flying and deathtouch"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HornetQueenInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/HornetQueenInsectToken.java index 444387bfb92..4f8af8d6f96 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HornetQueenInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HornetQueenInsectToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class HornetQueenInsectToken extends Token { +public class HornetQueenInsectToken extends TokenImpl { public HornetQueenInsectToken() { super("Insect", "1/1 green Insect creature token with flying and deathtouch"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HornetToken.java b/Mage/src/main/java/mage/game/permanent/token/HornetToken.java index 40bfbdddee9..4dcec93fe1f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HornetToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HornetToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author FenrisulfrX */ -public class HornetToken extends Token { +public class HornetToken extends TokenImpl { public HornetToken() { this("DDE"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java index bb7d6221e03..729e358fe8c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HorrorToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class HorrorToken extends Token { +public class HorrorToken extends TokenImpl { public HorrorToken() { super("Horror", "4/4 black Horror creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HoundToken.java b/Mage/src/main/java/mage/game/permanent/token/HoundToken.java index 78d230f1982..d11e3febfef 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HoundToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HoundToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class HoundToken extends Token { +public class HoundToken extends TokenImpl { public HoundToken() { super("Hound", "1/1 green Hound creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java b/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java index 3a465c130d0..72f6dcaf0cb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HourOfNeedSphinxToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class HourOfNeedSphinxToken extends Token { +public class HourOfNeedSphinxToken extends TokenImpl { public HourOfNeedSphinxToken() { super("Sphinx", "4/4 blue Sphinx creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java index 09ac03c74ef..9ff7450f25c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanClericToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class HumanClericToken extends Token { +public class HumanClericToken extends TokenImpl { public HumanClericToken() { super("Human Cleric", "1/1 white and black Human Cleric creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java index afc18957d7c..1792c3e9cc2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanSoldierToken.java @@ -4,7 +4,7 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -public class HumanSoldierToken extends Token { +public class HumanSoldierToken extends TokenImpl { public HumanSoldierToken() { super("Human Soldier", "1/1 white Human Soldier creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java index e846da968bf..793f8a74384 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java @@ -37,7 +37,7 @@ import mage.MageInt; * * @author LoneFox */ -public class HumanToken extends Token { +public class HumanToken extends TokenImpl { public HumanToken() { super("Human", "1/1 white Human creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java index a656c0ec5be..b039785f5f8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HumanWizardToken.java @@ -4,7 +4,7 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -public class HumanWizardToken extends Token { +public class HumanWizardToken extends TokenImpl { public HumanWizardToken() { super("Human Wizard", "1/1 blue Human Wizard creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java index 0f0f6fa4ed5..ce455137ac7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java @@ -40,7 +40,7 @@ import mage.abilities.keyword.ProtectionAbility; * * @author LevelX2 */ -public class HuntedCentaurToken extends Token { +public class HuntedCentaurToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java index 671995c2c6e..d57998ad18b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class HuntedDragonKnightToken extends Token { +public class HuntedDragonKnightToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/HunterToken.java b/Mage/src/main/java/mage/game/permanent/token/HunterToken.java index 2870b7fc485..059585f3d36 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HunterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HunterToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class HunterToken extends Token { +public class HunterToken extends TokenImpl { public HunterToken() { super("Hunter", "4/4 red Hunter creature token", 4, 4); diff --git a/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java b/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java index 1af6c044f8c..e5a22feae01 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HydraBroodmasterToken.java @@ -36,7 +36,7 @@ import mage.MageInt; * * @author spjspj */ -public class HydraBroodmasterToken extends Token { +public class HydraBroodmasterToken extends TokenImpl { public HydraBroodmasterToken() { this(1,1); diff --git a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java index e88b55ce1e2..83be9739155 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java @@ -34,7 +34,7 @@ import mage.MageInt; * * @author spjspj */ -public class IllusionToken extends Token { +public class IllusionToken extends TokenImpl { public IllusionToken() { super("Illusion", "2/2 blue Illusion creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java index 4262b111954..325eb30decd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InexorableBlobOozeToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class InexorableBlobOozeToken extends Token { +public class InexorableBlobOozeToken extends TokenImpl { public InexorableBlobOozeToken() { super("Ooze", "3/3 green Ooze creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java index f1112166395..28685057c02 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectInfectToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.InfectAbility; * * @author nantuko */ -public class InsectInfectToken extends Token { +public class InsectInfectToken extends TokenImpl { public InsectInfectToken() { super("Insect", "1/1 green Insect creature token with infect"); diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java index 5a99a019dd8..b96ec609d15 100644 --- a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java @@ -39,7 +39,7 @@ import mage.constants.SubType; * * @author BetaSteward_at_googlemail.com */ -public class InsectToken extends Token { +public class InsectToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java index 133f1f2fd6d..ca60f1747e6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.LifelinkAbility; * * @author TheElk801 */ -public class IxalanVampireToken extends Token { +public class IxalanVampireToken extends TokenImpl { public IxalanVampireToken() { super("Vampire", "1/1 white Vampire creature token with lifelink"); diff --git a/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java index fe5ea5f8a42..b5ad57036a8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/JaceCunningCastawayIllusionToken.java @@ -43,7 +43,7 @@ import mage.target.targetpointer.FixedTarget; * * @author TheElk801 */ -public class JaceCunningCastawayIllusionToken extends Token { +public class JaceCunningCastawayIllusionToken extends TokenImpl { public JaceCunningCastawayIllusionToken() { super("Illusion", "2/2 blue Illusion creature token with \"When this creature becomes the target of a spell, sacrifice it.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java index ce65198467e..608dda4d3a4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/JoinTheRanksSoldierToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class JoinTheRanksSoldierToken extends Token { +public class JoinTheRanksSoldierToken extends TokenImpl { public JoinTheRanksSoldierToken() { super("Soldier Ally", "1/1 white Soldier Ally creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/KaldraToken.java b/Mage/src/main/java/mage/game/permanent/token/KaldraToken.java index 7c3042eb878..6990478e1b9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KaldraToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KaldraToken.java @@ -36,7 +36,7 @@ import mage.constants.SuperType; * * @author spjspj */ -public class KaldraToken extends Token { +public class KaldraToken extends TokenImpl { public KaldraToken() { super("Kaldra", "legendary 4/4 colorless Avatar creature token named Kaldra"); diff --git a/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java index 0c87aa9d0ab..64ec85efc6a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KalitasVampireToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class KalitasVampireToken extends Token { +public class KalitasVampireToken extends TokenImpl { public KalitasVampireToken() { this(1,1); diff --git a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java index 824fbfabec4..9f8226728f5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java @@ -42,7 +42,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; * * @author spjspj */ -public class KalonianTwingroveTreefolkWarriorToken extends Token { +public class KalonianTwingroveTreefolkWarriorToken extends TokenImpl { final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); diff --git a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java index d9cd56169eb..a4a3aaee441 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java @@ -44,7 +44,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate; * * @author spjspj */ -public class KarnConstructToken extends Token { +public class KarnConstructToken extends TokenImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifacts you control"); diff --git a/Mage/src/main/java/mage/game/permanent/token/KelpToken.java b/Mage/src/main/java/mage/game/permanent/token/KelpToken.java index 27b7d10275e..73a89869544 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KelpToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KelpToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.DefenderAbility; * * @author spjspj */ -public class KelpToken extends Token { +public class KelpToken extends TokenImpl { public KelpToken() { super("Kelp", "0/1 blue Plant Wall creature token with defender named Kelp"); diff --git a/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java b/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java index 8b53699c8ff..15d77f129ad 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class KherKeepKoboldToken extends Token { +public class KherKeepKoboldToken extends TokenImpl { public KherKeepKoboldToken() { super("Kobolds of Kher Keep", "0/1 red Kobold creature token named Kobolds of Kher Keep"); diff --git a/Mage/src/main/java/mage/game/permanent/token/KioraKrakenToken.java b/Mage/src/main/java/mage/game/permanent/token/KioraKrakenToken.java index 08711222c12..571810e084f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KioraKrakenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KioraKrakenToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class KioraKrakenToken extends Token { +public class KioraKrakenToken extends TokenImpl { public KioraKrakenToken() { super("Kraken", "9/9 blue Kraken creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/KithkinToken.java b/Mage/src/main/java/mage/game/permanent/token/KithkinToken.java index ebecf91c4b7..a3a4965169e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KithkinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KithkinToken.java @@ -9,7 +9,7 @@ import mage.constants.SubType; * * @author Loki */ -public class KithkinToken extends Token { +public class KithkinToken extends TokenImpl { public KithkinToken() { super("Kithkin Soldier", "1/1 white Kithkin Soldier creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java index 1578f8fa7a7..8b2858e1559 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightAllyToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class KnightAllyToken extends Token { +public class KnightAllyToken extends TokenImpl { public KnightAllyToken() { super("Knight Ally", "2/2 white Knight Ally creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java index 96a14a0803a..ee9f395396d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java @@ -12,7 +12,7 @@ import mage.constants.SubType; * * @author LevelX2 */ -public class KnightToken extends Token { +public class KnightToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java b/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java index ef040dd5b19..af080933a10 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KorAllyToken.java @@ -4,7 +4,7 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -public class KorAllyToken extends Token { +public class KorAllyToken extends TokenImpl { public KorAllyToken() { super("Kor Ally", "1/1 white Kor Ally creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java index 336c6963e58..f55e4c45926 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KorSoldierToken.java @@ -38,7 +38,7 @@ import mage.MageInt; * * @author LoneFox */ -public class KorSoldierToken extends Token { +public class KorSoldierToken extends TokenImpl { public KorSoldierToken() { super("Kor Soldier", "1/1 white Kor Soldier creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java b/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java index 11fae41c3ed..6566bca1a6e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LandMineToken.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent; * * @author spjspj */ -public class LandMineToken extends Token { +public class LandMineToken extends TokenImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature without flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java index b8e4e3efa91..1698cd06eee 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java @@ -39,7 +39,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class LeafdrakeRoostDrakeToken extends Token { +public class LeafdrakeRoostDrakeToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java b/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java index 464bee2903e..8c3a8624fb5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java @@ -40,7 +40,7 @@ import mage.constants.TargetController; * * @author spjspj */ -public class LightningRagerToken extends Token { +public class LightningRagerToken extends TokenImpl { public LightningRagerToken() { super("Lightning Rager", "5/1 red Elemental creature token named Lightning Rager." diff --git a/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java index 79c5e838064..4343d3c9321 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class LinvalaAngelToken extends Token { +public class LinvalaAngelToken extends TokenImpl { public LinvalaAngelToken() { super("Angel", "3/3 white Angel creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/LizardToken.java b/Mage/src/main/java/mage/game/permanent/token/LizardToken.java index e23d621fcbf..270ec5129e5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LizardToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class LizardToken extends Token { +public class LizardToken extends TokenImpl { public LizardToken() { super("Lizard", "2/2 green Lizard creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java b/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java index 9e7ce5be255..aa5e3e7fa6a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LlanowarElvesToken.java @@ -36,7 +36,7 @@ import mage.abilities.mana.GreenManaAbility; * * @author spjspj */ -public class LlanowarElvesToken extends Token { +public class LlanowarElvesToken extends TokenImpl { public LlanowarElvesToken() { super("Llanowar Elves", "1/1 green Elf Druid creature token named Llanowar Elves with \"{T}: Add {G} to your mana pool.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java index fc80ed031a1..a4315bf9ef0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class MarathWillOfTheWildElementalToken extends Token { +public class MarathWillOfTheWildElementalToken extends TokenImpl { public MarathWillOfTheWildElementalToken() { super("Elemental", "X/X green Elemental creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java index f1936f3e485..2db209cf0ae 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MarduStrikeLeaderWarriorToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class MarduStrikeLeaderWarriorToken extends Token { +public class MarduStrikeLeaderWarriorToken extends TokenImpl { public MarduStrikeLeaderWarriorToken() { super("Warrior", "2/1 black Warrior creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java b/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java index 39339817b2f..18e28a28087 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MaritLageToken.java @@ -38,7 +38,7 @@ import mage.constants.SuperType; * * @author spjspj */ -public class MaritLageToken extends Token { +public class MaritLageToken extends TokenImpl { public MaritLageToken() { super("Marit Lage", "legendary 20/20 black Avatar creature token with flying and indestructible named Marit Lage"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java index f940e08718d..c49ecd27db0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class MasterOfWavesElementalToken extends Token { +public class MasterOfWavesElementalToken extends TokenImpl { public MasterOfWavesElementalToken() { super("Elemental", "1/0 blue Elemental creature"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java b/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java index fdf5d57bba3..fcee01d96c1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MelokuTheCloudedMirrorToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class MelokuTheCloudedMirrorToken extends Token { +public class MelokuTheCloudedMirrorToken extends TokenImpl { public MelokuTheCloudedMirrorToken() { super("Illusion", "1/1 blue Illusion creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java b/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java index 898b6a6809e..d9c11cd3e14 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MercyKillingToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class MercyKillingToken extends Token { +public class MercyKillingToken extends TokenImpl { public MercyKillingToken() { super("Elf Warrior", "1/1 green and white Elf Warrior creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkHexproofToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkHexproofToken.java index 8cecdde3079..0c38802075a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MerfolkHexproofToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkHexproofToken.java @@ -16,7 +16,7 @@ import mage.constants.SubType; * @author TacomenX */ -public class MerfolkHexproofToken extends Token { +public class MerfolkHexproofToken extends TokenImpl { public MerfolkHexproofToken() { super("Merfolk", "1/1 blue Merfolk creature token with hexproof"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java index c135603749d..4f3dfe932c1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class MerfolkToken extends Token { +public class MerfolkToken extends TokenImpl { public MerfolkToken() { super("Merfolk", "1/1 blue Merfolk creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java index 6696f644442..41f5b9ff5f8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkWizardToken.java @@ -8,7 +8,7 @@ import mage.constants.SubType; * * @author Loki */ -public class MerfolkWizardToken extends Token { +public class MerfolkWizardToken extends TokenImpl { public MerfolkWizardToken() { super("Merfolk Wizard", "1/1 blue Merfolk Wizard creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java index 1ecb61edff1..f9e94bf52fa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MetallurgicSummoningsConstructToken.java @@ -36,7 +36,7 @@ import mage.util.RandomUtil; * * @author spjspj */ -public class MetallurgicSummoningsConstructToken extends Token { +public class MetallurgicSummoningsConstructToken extends TokenImpl { public MetallurgicSummoningsConstructToken() { this (1); diff --git a/Mage/src/main/java/mage/game/permanent/token/MinionToken.java b/Mage/src/main/java/mage/game/permanent/token/MinionToken.java index b3b6e6b9aa2..9742b4fe9c2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinionToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author FenrisulfrX */ -public class MinionToken extends Token { +public class MinionToken extends TokenImpl { public MinionToken() { this("DDE"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java b/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java index 1852fe6f945..6c4d801509c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinionToken2.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author Quercitron */ -public class MinionToken2 extends Token { +public class MinionToken2 extends TokenImpl { public MinionToken2() { this("PCY"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MinorDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/MinorDemonToken.java index fcbcf0940ad..05c406725bf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MinorDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MinorDemonToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class MinorDemonToken extends Token { +public class MinorDemonToken extends TokenImpl { public MinorDemonToken() { super("Minor Demon", "1/1 black and red Demon creature token named Minor Demon"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MoltenBirthElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/MoltenBirthElementalToken.java index adc8f3016d4..b8b6f84647b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MoltenBirthElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MoltenBirthElementalToken.java @@ -36,7 +36,7 @@ import mage.util.RandomUtil; * * @author spjspj */ -public class MoltenBirthElementalToken extends Token { +public class MoltenBirthElementalToken extends TokenImpl { public MoltenBirthElementalToken() { super("Elemental", "1/1 red Elemental creature"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java b/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java index 9f2fb5a68e7..9de17bf5979 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.ProwessAbility; * * @author spjspj */ -public class MonasteryMentorToken extends Token { +public class MonasteryMentorToken extends TokenImpl { public MonasteryMentorToken() { super("Monk", "1/1 white Monk creature token with prowess"); diff --git a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java index 597005bbda8..039d32d1550 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MyrToken.java @@ -8,7 +8,7 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -public class MyrToken extends Token { +public class MyrToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java b/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java index e0aaf002922..23b03f4a9fd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MysticGenesisOozeToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class MysticGenesisOozeToken extends Token { +public class MysticGenesisOozeToken extends TokenImpl { public MysticGenesisOozeToken() { this(0); diff --git a/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java b/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java index faa8a6e2a23..a22b4acf579 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NahiriTheLithomancerEquipmentToken.java @@ -46,7 +46,7 @@ import mage.constants.Zone; * * @author spjspj */ -public class NahiriTheLithomancerEquipmentToken extends Token { +public class NahiriTheLithomancerEquipmentToken extends TokenImpl { public NahiriTheLithomancerEquipmentToken() { super("Stoneforged Blade", "colorless Equipment artifact token named Stoneforged Blade with indestructible, \"Equipped creature gets +5/+5 and has double strike,\" and equip {0}"); diff --git a/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java index 1e3cc5d4c0f..8e90a6b14a5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NestOfScarabsBlackInsectToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class NestOfScarabsBlackInsectToken extends Token { +public class NestOfScarabsBlackInsectToken extends TokenImpl { public NestOfScarabsBlackInsectToken() { super("Insect", "1/1 black Insect creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java b/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java index 630ccdea942..5e47f709e7f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCardInGraveyard; * * @author spjspj */ -public class NighteyesTheDesecratorToken extends Token { +public class NighteyesTheDesecratorToken extends TokenImpl { public NighteyesTheDesecratorToken() { super("Nighteyes the Desecrator", ""); diff --git a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java index 4c994989ac1..c403a46feb4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NightwingHorrorToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class NightwingHorrorToken extends Token { +public class NightwingHorrorToken extends TokenImpl { public NightwingHorrorToken() { super("Horror", "1/1 blue and black Horror creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/NissaSageAnimistToken.java b/Mage/src/main/java/mage/game/permanent/token/NissaSageAnimistToken.java index 26f4c308b2c..970237db343 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NissaSageAnimistToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NissaSageAnimistToken.java @@ -35,7 +35,7 @@ import mage.constants.SuperType; * * @author spjspj */ -public class NissaSageAnimistToken extends Token { +public class NissaSageAnimistToken extends TokenImpl { public NissaSageAnimistToken() { super("Ashaya, the Awoken World", "legendary 4/4 green Elemental creature token named Ashaya, the Awoken World"); diff --git a/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java b/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java index 8b9ef50f9ee..f0886b8fab6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OctopusToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class OctopusToken extends Token { +public class OctopusToken extends TokenImpl { public OctopusToken() { super("Octopus", "8/8 blue Octopus creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/OgreToken.java b/Mage/src/main/java/mage/game/permanent/token/OgreToken.java index d606357d603..ecc25928cc0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OgreToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OgreToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class OgreToken extends Token { +public class OgreToken extends TokenImpl { public OgreToken() { super("Ogre", "3/3 red Ogre creature"); diff --git a/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java index e5b64ebafb9..952ba5e0358 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class OmnathElementalToken extends Token { +public class OmnathElementalToken extends TokenImpl { public OmnathElementalToken() { super("Elemental", "5/5 red and green Elemental creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java index 37cd9d088e5..dc936b7054a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OneDozenEyesBeastToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class OneDozenEyesBeastToken extends Token { +public class OneDozenEyesBeastToken extends TokenImpl { public OneDozenEyesBeastToken() { super("Beast", "5/5 green Beast creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieToken.java b/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieToken.java index d537126745a..ab99e931ca6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OonaQueenFaerieToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class OonaQueenFaerieToken extends Token { +public class OonaQueenFaerieToken extends TokenImpl { public OonaQueenFaerieToken() { super("Faerie Rogue", "1/1 blue and black Faerie Rogue creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java b/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java index ec2b305ed8f..8e952c5c958 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java @@ -37,7 +37,7 @@ import mage.abilities.effects.common.CreateTokenEffect; * * @author spjspj */ -public class Ooze2Token extends Token { +public class Ooze2Token extends TokenImpl { public Ooze2Token() { super("Ooze", "2/2 green Ooze creature tokens with \"When this creature is put into a graveyard, create two 1/1 green Ooze creature tokens.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/OozeToken.java b/Mage/src/main/java/mage/game/permanent/token/OozeToken.java index 3e57d6c49ed..48c5f5beea7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OozeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OozeToken.java @@ -4,7 +4,7 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -public class OozeToken extends Token { +public class OozeToken extends TokenImpl { public OozeToken(int power, int toughness) { super("Ooze", power + "/" + toughness + " green ooze creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java index 8aaa3ce78a4..dfb9e0e6aac 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OphiomancerSnakeToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.DeathtouchAbility; * * @author spjspj */ -public class OphiomancerSnakeToken extends Token { +public class OphiomancerSnakeToken extends TokenImpl { public OphiomancerSnakeToken() { super("Snake", "1/1 black Snake creature token with deathtouch"); diff --git a/Mage/src/main/java/mage/game/permanent/token/OrderedMigrationBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/OrderedMigrationBirdToken.java index f1de06485d0..267811e8879 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OrderedMigrationBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OrderedMigrationBirdToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author LoneFox */ -public class OrderedMigrationBirdToken extends Token { +public class OrderedMigrationBirdToken extends TokenImpl { public OrderedMigrationBirdToken() { super("Bird", "1/1 blue Bird creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java b/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java index bb18a765603..65b16d9b850 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java @@ -37,7 +37,7 @@ import mage.util.RandomUtil; * * @author spjspj */ -public class OviyaPashiriSageLifecrafterToken extends Token { +public class OviyaPashiriSageLifecrafterToken extends TokenImpl { final static FilterControlledCreaturePermanent filterCreature = new FilterControlledCreaturePermanent("creatures you control"); diff --git a/Mage/src/main/java/mage/game/permanent/token/OwlToken.java b/Mage/src/main/java/mage/game/permanent/token/OwlToken.java index 409e1ab656a..19e5e8dccc1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/OwlToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/OwlToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class OwlToken extends Token { +public class OwlToken extends TokenImpl { public OwlToken() { super("Bird", "1/1 blue Bird creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java index ff2b3c20dc5..2a2c25fd7c2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PatagiaViperSnakeToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class PatagiaViperSnakeToken extends Token { +public class PatagiaViperSnakeToken extends TokenImpl { public PatagiaViperSnakeToken() { super("Snake", "1/1 green and blue Snake creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java index 4fb74cb9016..9a9e8324da6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java @@ -38,7 +38,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author LoneFox */ -public class PegasusToken extends Token { +public class PegasusToken extends TokenImpl { public PegasusToken() { super("Pegasus", "1/1 white Pegasus creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java b/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java index fe22e52e63b..15cdaf2a9ba 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PentaviteToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class PentaviteToken extends Token { +public class PentaviteToken extends TokenImpl { public PentaviteToken() { super("Pentavite", "1/1 colorless Pentavite artifact creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java index dad086d2e67..068bd48506a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraBobcatToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class PenumbraBobcatToken extends Token { +public class PenumbraBobcatToken extends TokenImpl { public PenumbraBobcatToken() { super("Cat", "2/1 black Cat creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java index 6b39c74d64f..f513d286117 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraKavuToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class PenumbraKavuToken extends Token { +public class PenumbraKavuToken extends TokenImpl { public PenumbraKavuToken() { super("Kavu", "3/3 black Kavu creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java index b07143d94c2..64d9e91ac4a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.ReachAbility; * * @author spjspj */ -public class PenumbraSpiderToken extends Token { +public class PenumbraSpiderToken extends TokenImpl { public PenumbraSpiderToken() { diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java index 264532b27cb..1b199e4a8f7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraWurmToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.TrampleAbility; * * @author spjspj */ -public class PenumbraWurmToken extends Token { +public class PenumbraWurmToken extends TokenImpl { public PenumbraWurmToken() { super("Wurm", "6/6 black Wurm creature token with trample"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PestToken.java b/Mage/src/main/java/mage/game/permanent/token/PestToken.java index 2b759c69351..0684dc2e383 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PestToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PestToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class PestToken extends Token { +public class PestToken extends TokenImpl { public PestToken() { super("Pest", "0/1 colorless Pest artifact creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java index b6e04c0a5fa..437fce1d4df 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PharikaSnakeToken.java @@ -35,7 +35,7 @@ import mage.abilities.keyword.DeathtouchAbility; * * @author spjspj */ -public class PharikaSnakeToken extends Token { +public class PharikaSnakeToken extends TokenImpl { public PharikaSnakeToken() { super("Snake", "1/1 black and green Snake enchantment creature token with deathtouch", 1, 1); diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java index d0f53e7b0bc..64ffb4bd0c7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianRebirthHorrorToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class PhyrexianRebirthHorrorToken extends Token { +public class PhyrexianRebirthHorrorToken extends TokenImpl { public PhyrexianRebirthHorrorToken() { super("Horror", "X/X colorless Horror artifact creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PincherToken.java b/Mage/src/main/java/mage/game/permanent/token/PincherToken.java index 54db9d9837a..ea7bf26ca20 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PincherToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PincherToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class PincherToken extends Token { +public class PincherToken extends TokenImpl { public PincherToken() { super("Pincher", "2/2 colorless Pincher creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PirateToken.java b/Mage/src/main/java/mage/game/permanent/token/PirateToken.java index 3359d2b8d6f..6641e301c6b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PirateToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PirateToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author TheElk801 */ -public class PirateToken extends Token { +public class PirateToken extends TokenImpl { public PirateToken() { super("Pirate", "2/2 black Pirate creature token with menace"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java index c964e22ef87..bec6aa61af9 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java @@ -35,7 +35,7 @@ import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -public class PlantToken extends Token { +public class PlantToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java b/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java index cf47d0fb3ba..fdf49824614 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class PongifyApeToken extends Token { +public class PongifyApeToken extends TokenImpl { public PongifyApeToken() { super("Ape", "3/3 green Ape creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java index 814082f49a7..5046c675d54 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PrismToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PrismToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author fireshoes */ -public class PrismToken extends Token { +public class PrismToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/PromiseOfPowerDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/PromiseOfPowerDemonToken.java index 02e46d5e4c8..9df33285fa6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/PromiseOfPowerDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/PromiseOfPowerDemonToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class PromiseOfPowerDemonToken extends Token { +public class PromiseOfPowerDemonToken extends TokenImpl { public PromiseOfPowerDemonToken() { this(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/ProsshKoboldToken.java b/Mage/src/main/java/mage/game/permanent/token/ProsshKoboldToken.java index ec3332d2235..0da7d0e5bf5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ProsshKoboldToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ProsshKoboldToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class ProsshKoboldToken extends Token { +public class ProsshKoboldToken extends TokenImpl { public ProsshKoboldToken() { super("Kobolds of Kher Keep", "0/1 red Kobold creature tokens"); diff --git a/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java b/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java index 7c7fa4d3634..aff128d0157 100644 --- a/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/QueenMarchesaAssassinToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class QueenMarchesaAssassinToken extends Token { +public class QueenMarchesaAssassinToken extends TokenImpl { public QueenMarchesaAssassinToken() { super("Assassin", "1/1 black Assassin creature tokens with deathtouch and haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java index 25419ea1686..fccd47fc03a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/QuestForTheGravelordZombieToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * spjspj */ -public class QuestForTheGravelordZombieToken extends Token { +public class QuestForTheGravelordZombieToken extends TokenImpl { public QuestForTheGravelordZombieToken() { super("Zombie Giant", "5/5 black Zombie Giant creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java b/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java index 945209b19f5..d3d0af43ebd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RagavanToken.java @@ -35,7 +35,7 @@ import mage.constants.SuperType; * * @author spjspj */ -public class RagavanToken extends Token { +public class RagavanToken extends TokenImpl { public RagavanToken() { super("Ragavan", "legendary 2/1 red Monkey creature token named Ragavan"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java index db68e089bff..4a768fceda1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RakdosGuildmageGoblinToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class RakdosGuildmageGoblinToken extends Token { +public class RakdosGuildmageGoblinToken extends TokenImpl { public RakdosGuildmageGoblinToken() { super("Goblin", "2/1 red Goblin creature token with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RakkaMarElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/RakkaMarElementalToken.java index a224852917e..4d775923242 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RakkaMarElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RakkaMarElementalToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class RakkaMarElementalToken extends Token { +public class RakkaMarElementalToken extends TokenImpl { public RakkaMarElementalToken () { super("Elemental", "3/1 red Elemental creature with Haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java index 3f464e21a68..121d57be9f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class RallyTheHordeWarriorToken extends Token { +public class RallyTheHordeWarriorToken extends TokenImpl { public RallyTheHordeWarriorToken() { super("Warrior", "1/1 red Warrior creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RapidHybridizationToken.java b/Mage/src/main/java/mage/game/permanent/token/RapidHybridizationToken.java index be441cb51c1..5fab0e92908 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RapidHybridizationToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RapidHybridizationToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class RapidHybridizationToken extends Token { +public class RapidHybridizationToken extends TokenImpl { public RapidHybridizationToken() { super("Frog Lizard", "3/3 green Frog Lizard creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RatToken.java b/Mage/src/main/java/mage/game/permanent/token/RatToken.java index d3cb36973b8..6b344077b7e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RatToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author LevelX2 */ -public class RatToken extends Token { +public class RatToken extends TokenImpl { public RatToken() { this("GTC"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java b/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java index 8c1d6d1751f..d5b86cd9b55 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RebelStarshipToken.java @@ -35,7 +35,7 @@ import mage.abilities.keyword.SpaceflightAbility; * * @author spjspj */ -public class RebelStarshipToken extends Token { +public class RebelStarshipToken extends TokenImpl { public RebelStarshipToken() { super("B-Wing", "2/3 blue Rebel Starship artifact creature tokens with spaceflight name B-Wing", 2, 3); diff --git a/Mage/src/main/java/mage/game/permanent/token/RebelToken.java b/Mage/src/main/java/mage/game/permanent/token/RebelToken.java index 6df33e8e514..7985ec0893f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RebelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RebelToken.java @@ -34,7 +34,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class RebelToken extends Token { +public class RebelToken extends TokenImpl { public RebelToken() { super("Rebel", "1/1 white Rebel creature token", 1, 1); diff --git a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java index 688f658a7ad..6a64c15c2a4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java @@ -36,7 +36,7 @@ import mage.ObjectColor; * * @author spjspj */ -public class RedHumanToken extends Token { +public class RedHumanToken extends TokenImpl { public RedHumanToken() { super("Human", "1/1 red Human creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java index 07824ea6aed..79361a05074 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java @@ -37,7 +37,7 @@ import mage.abilities.effects.common.CreateTokenEffect; * * @author spjspj */ -public class ReefWormFishToken extends Token { +public class ReefWormFishToken extends TokenImpl { public ReefWormFishToken() { super("Fish", "3/3 blue Fish creature token with \"When this creature dies, create a 6/6 blue Whale creature token with \"When this creature dies, create a 9/9 blue Kraken creature token.\"\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormKrakenToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormKrakenToken.java index 8646bec9ee2..027568ceffc 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormKrakenToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormKrakenToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class ReefWormKrakenToken extends Token { +public class ReefWormKrakenToken extends TokenImpl { public ReefWormKrakenToken() { super("Kraken", "9/9 blue Kraken creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java index 60e5713ffa7..7910bdcfcdb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java @@ -37,7 +37,7 @@ import mage.abilities.effects.common.CreateTokenEffect; * * @author spjspj */ -public class ReefWormWhaleToken extends Token { +public class ReefWormWhaleToken extends TokenImpl { public ReefWormWhaleToken() { super("Whale", "6/6 blue Whale creature token with \"When this creature dies, create a 9/9 blue Kraken creature token.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java b/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java index 6ea78adb839..74308d895eb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReflectionPureToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author SpikesCafe-google */ -public class ReflectionPureToken extends Token { +public class ReflectionPureToken extends TokenImpl { public ReflectionPureToken() { this(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java b/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java index aa0ec32c614..0db0288368e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReflectionToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class ReflectionToken extends Token { +public class ReflectionToken extends TokenImpl { public ReflectionToken() { super("Reflection", "2/2 white Reflection creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ReignOfThePitToken.java b/Mage/src/main/java/mage/game/permanent/token/ReignOfThePitToken.java index a4ec58f2c57..a16d9365aea 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReignOfThePitToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReignOfThePitToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class ReignOfThePitToken extends Token { +public class ReignOfThePitToken extends TokenImpl { public ReignOfThePitToken() { this(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java b/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java index 0ee06706e2c..b76ec69549a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RekindlingPhoenixToken.java @@ -47,7 +47,7 @@ import mage.target.common.TargetCardInYourGraveyard; * * @author LevelX2 */ -public class RekindlingPhoenixToken extends Token { +public class RekindlingPhoenixToken extends TokenImpl { public RekindlingPhoenixToken() { super("Elemental", "0/1 red Elemental creature token with \"At the beginning of your upkeep, sacrifice this creature and return target card named Rekindling Phoenix from your graveyard to the battlefield. It gains haste until end of turn.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java index 0463fb417f9..8cec529bfda 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RenownedWeaverSpiderToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.ReachAbility; * * @author spjspj */ -public class RenownedWeaverSpiderToken extends Token { +public class RenownedWeaverSpiderToken extends TokenImpl { public RenownedWeaverSpiderToken() { super("Spider", "1/3 green Spider enchantment creature token with reach"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RevelOfTheFallenGodSatyrToken.java b/Mage/src/main/java/mage/game/permanent/token/RevelOfTheFallenGodSatyrToken.java index 13f726ae56f..08db6cb25a1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RevelOfTheFallenGodSatyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RevelOfTheFallenGodSatyrToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class RevelOfTheFallenGodSatyrToken extends Token { +public class RevelOfTheFallenGodSatyrToken extends TokenImpl { public RevelOfTheFallenGodSatyrToken() { super("Satyr", "2/2 red and green Satyr creature tokens with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java index 49db819bdaa..b16bfd2a320 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.TrampleAbility; * * @author spjspj */ -public class RhinoToken extends Token { +public class RhinoToken extends TokenImpl { public RhinoToken() { super("Rhino", "4/4 green Rhino creature token with trample"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java b/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java index fa9c57b2109..cda0aa08e5c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhonassLastStandToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class RhonassLastStandToken extends Token { +public class RhonassLastStandToken extends TokenImpl { public RhonassLastStandToken() { super("Snake", "5/4 green Snake creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java b/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java index 4b6b74e5733..e683d43753e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RhysTheRedeemedToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class RhysTheRedeemedToken extends Token { +public class RhysTheRedeemedToken extends TokenImpl { public RhysTheRedeemedToken() { super("Elf Warrior", "1/1 green and white Elf Warrior creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java index 213af256554..27ff1d57f0c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiftmarkedKnightToken.java @@ -39,7 +39,7 @@ import mage.abilities.keyword.ProtectionAbility; * * @author spjspj */ -public class RiftmarkedKnightToken extends Token { +public class RiftmarkedKnightToken extends TokenImpl { public RiftmarkedKnightToken() { super("Knight", "2/2 black Knight creature token with flanking, protection from white, and haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java b/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java index 0fb0f73ae17..3cbad8b40b3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class RiptideReplicatorToken extends Token { +public class RiptideReplicatorToken extends TokenImpl { public RiptideReplicatorToken() { this(null, null, 1); diff --git a/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java index b09214451f6..cf8e2c4c8a0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiseOfEaglesBirdToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class RiseOfEaglesBirdToken extends Token { +public class RiseOfEaglesBirdToken extends TokenImpl { public RiseOfEaglesBirdToken() { super("Bird", "2/2 blue Bird enchantment creature tokens with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java index 916a605f122..9f4af319360 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RitualOfTheReturnedZombieToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class RitualOfTheReturnedZombieToken extends Token { +public class RitualOfTheReturnedZombieToken extends TokenImpl { public RitualOfTheReturnedZombieToken() { this(1,1); diff --git a/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java b/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java index 0f1418aeda2..d88770ef9d4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RocEggToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class RocEggToken extends Token { +public class RocEggToken extends TokenImpl { public RocEggToken() { super("Bird", "3/3 white Bird creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java b/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java index 75c01aa3981..1248eb570ba 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RoyalGuardToken.java @@ -35,7 +35,7 @@ import mage.abilities.keyword.FirstStrikeAbility; * * @author spjspj */ -public class RoyalGuardToken extends Token { +public class RoyalGuardToken extends TokenImpl { public RoyalGuardToken() { super("Royal Guard", "2/2 red Soldier creature token with first strike named Royal Guard", 2, 2); diff --git a/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java index c3afc77d3d8..4281d645973 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RukhEggBirdToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class RukhEggBirdToken extends Token { +public class RukhEggBirdToken extends TokenImpl { public RukhEggBirdToken() { this("ARN"); //there is no such token in either ARN, 8ED or 9ED diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java index 2109b39ca3c..60639d32fd1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingBurstToken.java @@ -46,7 +46,7 @@ import mage.game.permanent.Permanent; * * @author spjspj */ -public class SaprolingBurstToken extends Token { +public class SaprolingBurstToken extends TokenImpl { public SaprolingBurstToken() { this((MageObjectReference)null); 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 694d40b990a..8837db22f47 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java @@ -40,7 +40,7 @@ import mage.util.RandomUtil; * * @author BetaSteward_at_googlemail.com */ -public class SaprolingToken extends Token { +public class SaprolingToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java index a5f7eceb0b7..d65c795fbc5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SatyrNyxSmithElementalToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class SatyrNyxSmithElementalToken extends Token { +public class SatyrNyxSmithElementalToken extends TokenImpl { public SatyrNyxSmithElementalToken() { super("Elemental", "3/1 red Elemental enchantment creature token with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java b/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java index 598587d9901..659c66d02fe 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class SeedGuardianToken extends Token { +public class SeedGuardianToken extends TokenImpl { public SeedGuardianToken() { this(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java b/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java index 96dacff727f..6b45a1c9412 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SekKuarDeathkeeperGravebornToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class SekKuarDeathkeeperGravebornToken extends Token { +public class SekKuarDeathkeeperGravebornToken extends TokenImpl { public SekKuarDeathkeeperGravebornToken() { super("Graveborn", "3/1 black and red Graveborn creature token with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java index 88c177816a7..31fbc838b62 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java @@ -51,7 +51,7 @@ import mage.target.common.TargetCardInExile; * * @author spjspj */ -public class SengirNosferatuBatToken extends Token { +public class SengirNosferatuBatToken extends TokenImpl { public SengirNosferatuBatToken() { super("Bat", "1/2 black Bat creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SerfToken.java b/Mage/src/main/java/mage/game/permanent/token/SerfToken.java index 08cded7146b..1e387858582 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SerfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SerfToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class SerfToken extends Token { +public class SerfToken extends TokenImpl { public SerfToken() { super("Serf", "0/1 black Serf creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SerpentGeneratorSnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/SerpentGeneratorSnakeToken.java index 6c5f9233a96..0cad2d4d7fa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SerpentGeneratorSnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SerpentGeneratorSnakeToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author BetaSteward_at_googlemail.com */ -public class SerpentGeneratorSnakeToken extends Token { +public class SerpentGeneratorSnakeToken extends TokenImpl { public SerpentGeneratorSnakeToken() { super("Snake", "1/1 colorless Snake artifact creature token with \"Whenever this creature deals damage to a player, that player gets a poison counter.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java index 09f37cf2d43..19694596ffa 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ServoToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ServoToken.java @@ -39,7 +39,7 @@ import mage.util.RandomUtil; * * @author fireshoes */ -public class ServoToken extends Token { +public class ServoToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/SheepToken.java b/Mage/src/main/java/mage/game/permanent/token/SheepToken.java index 2ee7ae22f7d..eff37d97f0d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SheepToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SheepToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author L_J */ -public class SheepToken extends Token { +public class SheepToken extends TokenImpl { public SheepToken() { super("Sheep", "0/1 green Sheep creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java b/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java index 5384a65f193..501c72bf1d0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkeletonToken.java @@ -9,7 +9,7 @@ import mage.constants.SubType; import mage.constants.ColoredManaSymbol; import mage.constants.Zone; -public class SkeletonToken extends Token { +public class SkeletonToken extends TokenImpl { public SkeletonToken() { super("Skeleton", "1/1 black Skeleton creature with \"{B}: Regenerate this creature\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java b/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java index bb0057eb28a..6a354e2f881 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class SkywiseTeachingsToken extends Token { +public class SkywiseTeachingsToken extends TokenImpl { public SkywiseTeachingsToken() { super("Djinn Monk", "2/2 blue Djinn Monk creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SliverToken.java b/Mage/src/main/java/mage/game/permanent/token/SliverToken.java index 9222cd21efd..5b306373458 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SliverToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SliverToken.java @@ -37,7 +37,7 @@ import mage.MageInt; * * @author LoneFox */ -public class SliverToken extends Token { +public class SliverToken extends TokenImpl { public SliverToken() { super("Sliver", "1/1 colorless Sliver creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SliversmithToken.java b/Mage/src/main/java/mage/game/permanent/token/SliversmithToken.java index 4d37bbc7500..5e55150e440 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SliversmithToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SliversmithToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class SliversmithToken extends Token { +public class SliversmithToken extends TokenImpl { public SliversmithToken() { super("Metallic Sliver", "1/1 colorless Sliver creature token named Metallic Sliver"); 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 867653f56ee..944512339da 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java @@ -39,7 +39,7 @@ import mage.constants.SubType; * * @author BetaSteward_at_googlemail.com */ -public class SnakeToken extends Token { +public class SnakeToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); 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 eec6d47f31f..5960e940258 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java @@ -39,7 +39,7 @@ import mage.util.RandomUtil; * * @author BetaSteward_at_googlemail.com */ -public class SoldierToken extends Token { +public class SoldierToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java index 0dfc964681f..995613e3fa2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java @@ -40,7 +40,7 @@ import mage.abilities.keyword.HasteAbility; * * @author LoneFox */ -public class SoldierTokenWithHaste extends Token { +public class SoldierTokenWithHaste extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java index 936a3d1333d..c079ab91dd6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SorinLordOfInnistradVampireToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.LifelinkAbility; * * @author spjspj */ -public class SorinLordOfInnistradVampireToken extends Token { +public class SorinLordOfInnistradVampireToken extends TokenImpl { public SorinLordOfInnistradVampireToken() { super("Vampire", "1/1 black Vampire creature token with lifelink"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java index cf49acecd45..e9c590d454a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class SorinSolemnVisitorVampireToken extends Token { +public class SorinSolemnVisitorVampireToken extends TokenImpl { public SorinSolemnVisitorVampireToken() { super("Vampire", "2/2 black Vampire creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java b/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java index ce909176cc1..9550ff78986 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoundTheCallToken.java @@ -43,7 +43,7 @@ import mage.filter.predicate.mageobject.NamePredicate; * * @author TheElk801 */ -public class SoundTheCallToken extends Token { +public class SoundTheCallToken extends TokenImpl { private static final FilterCard filter = new FilterCard("card named Sound the Call"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java index 784401d1e63..76dcff8cf3e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java @@ -40,7 +40,7 @@ import mage.constants.TargetController; * * @author spjspj */ -public class SparkElementalToken extends Token { +public class SparkElementalToken extends TokenImpl { public SparkElementalToken() { super("Spark Elemental", "3/1 red Elemental creature token named Spark Elemental with trample, haste, and \"At the beginning of the end step, sacrifice Spark Elemental.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java b/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java index d8d0817468e..297e0633a2c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpawningGroundsBeastToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.TrampleAbility; * * @author spjspj */ -public class SpawningGroundsBeastToken extends Token { +public class SpawningGroundsBeastToken extends TokenImpl { public SpawningGroundsBeastToken() { super("Beast", "5/5 green Beast creature token with trample"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java b/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java index 60276d5b496..7652d5085bb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpawningPitToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class SpawningPitToken extends Token { +public class SpawningPitToken extends TokenImpl { public SpawningPitToken() { super("Spawn", "2/2 colorless Spawn artifact creature token"); 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 61a98139a33..21fc6b4bd9b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java @@ -17,7 +17,7 @@ import mage.constants.SubType; * * @author fireshoes */ -public class SpiderToken extends Token { +public class SpiderToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java b/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java index 90e9ec13d2d..9a078ce4b94 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpikeToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class SpikeToken extends Token { +public class SpikeToken extends TokenImpl { public SpikeToken() { super("Spike", "1/1 green Spike creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java index 72414f89da1..07b4fefde2e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class SpiritBlueToken extends Token { +public class SpiritBlueToken extends TokenImpl { public SpiritBlueToken() { super("Spirit", "1/1 blue Spirit creature token with flying"); 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 2cc4737d866..b59b91c3cb3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java @@ -37,7 +37,7 @@ import mage.constants.SubType; /** * @author Loki */ -public class SpiritToken extends Token { +public class SpiritToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); 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 d6f16e234e7..caae236982e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; /** * @author nantuko */ -public class SpiritWhiteToken extends Token { +public class SpiritWhiteToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java b/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java index c96bb2b94eb..1213ac6d729 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class SpoilsOfBloodHorrorToken extends Token { +public class SpoilsOfBloodHorrorToken extends TokenImpl { public SpoilsOfBloodHorrorToken() { this(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java index d441af5d134..9c87faf2522 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SpyMasterGoblinToken.java @@ -43,7 +43,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; * * @author spjspj */ -public class SpyMasterGoblinToken extends Token { +public class SpyMasterGoblinToken extends TokenImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java index c610020f20b..05d50106c9c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java @@ -38,7 +38,7 @@ import mage.constants.SubType; * * @author North */ -public class SquirrelToken extends Token { +public class SquirrelToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java b/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java index 881aceb77b4..7cfc7268cda 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java @@ -36,7 +36,7 @@ import mage.constants.SuperType; * * @author L_J */ -public class StanggTwinToken extends Token { +public class StanggTwinToken extends TokenImpl { public StanggTwinToken() { super("Stangg Twin", "legendary 3/4 red and green Human Warrior creature token named Stangg Twin"); diff --git a/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java index 2af136f3131..266152c06d6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StitcherGeralfZombieToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class StitcherGeralfZombieToken extends Token { +public class StitcherGeralfZombieToken extends TokenImpl { public StitcherGeralfZombieToken() { this(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java index 792a4a7d97d..be07a3d4d06 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class StitchersApprenticeHomunculusToken extends Token { +public class StitchersApprenticeHomunculusToken extends TokenImpl { public StitchersApprenticeHomunculusToken() { super("Homunculus", "2/2 blue Homunculus creature"); diff --git a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java b/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java index ea82474c6e1..ddd7e28f020 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StoneTrapIdolToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.TrampleAbility; * * @author spjspj */ -public class StoneTrapIdolToken extends Token { +public class StoneTrapIdolToken extends TokenImpl { public StoneTrapIdolToken() { super("Construct", "6/12 colorless Construct artifact creature token with trample"); diff --git a/Mage/src/main/java/mage/game/permanent/token/StormCrowToken.java b/Mage/src/main/java/mage/game/permanent/token/StormCrowToken.java index 8dda6cacc5e..9482f8665eb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/StormCrowToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/StormCrowToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class StormCrowToken extends Token { +public class StormCrowToken extends TokenImpl { public StormCrowToken() { super("Storm Crow", "1/2 blue Bird creature token with flying named Storm Crow"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java b/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java index c3ff0ca7779..c1c210b9ac8 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SubterraneanTremorsLizardToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class SubterraneanTremorsLizardToken extends Token { +public class SubterraneanTremorsLizardToken extends TokenImpl { public SubterraneanTremorsLizardToken() { super("Lizard", "an 8/8 red Lizard creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SurvivorToken.java b/Mage/src/main/java/mage/game/permanent/token/SurvivorToken.java index 02d4a911812..de04ef5664f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SurvivorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SurvivorToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author North */ -public class SurvivorToken extends Token { +public class SurvivorToken extends TokenImpl { public SurvivorToken() { super("Survivor", "1/1 red Survivor creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java index 3420c78cc03..31af6246a6c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class SwanSongBirdToken extends Token { +public class SwanSongBirdToken extends TokenImpl { public SwanSongBirdToken() { super("Bird", "2/2 blue Bird creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java b/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java index 77923469539..bf89d314ab2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SylvanOfferingTreefolkToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class SylvanOfferingTreefolkToken extends Token { +public class SylvanOfferingTreefolkToken extends TokenImpl { public SylvanOfferingTreefolkToken() { this(1); diff --git a/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java b/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java index 689918e2ab5..5bd100959d3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TIEFighterToken.java @@ -13,7 +13,7 @@ import mage.constants.SubType; * * @author Styxo */ -public class TIEFighterToken extends Token { +public class TIEFighterToken extends TokenImpl { public TIEFighterToken() { super("TIE Fighter", "1/1 black Starship artifact creature tokens with Spaceflight named TIE Fighter", 1, 1); diff --git a/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java index e2d03b44fa3..aced2071f4f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TatsumaDragonToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class TatsumaDragonToken extends Token { +public class TatsumaDragonToken extends TokenImpl { public TatsumaDragonToken() { super("Dragon Spirit", "5/5 blue Dragon Spirit creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java index 894de459c90..0f111cdf3eb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class TemptWithVengeanceElementalToken extends Token { +public class TemptWithVengeanceElementalToken extends TokenImpl { public TemptWithVengeanceElementalToken() { super("Elemental", "1/1 red Elemental creature tokens with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java index fdf5127522d..0bb4b1a500c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TetraviteToken.java @@ -40,7 +40,7 @@ import mage.game.Game; * * @author spjspj */ -public class TetraviteToken extends Token { +public class TetraviteToken extends TokenImpl { public TetraviteToken() { super("Tetravite", "1/1 colorless Tetravite artifact creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/TeysaEnvoyOfGhostsToken.java b/Mage/src/main/java/mage/game/permanent/token/TeysaEnvoyOfGhostsToken.java index 513af728c5c..4c6d8fb3184 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TeysaEnvoyOfGhostsToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TeysaEnvoyOfGhostsToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class TeysaEnvoyOfGhostsToken extends Token { +public class TeysaEnvoyOfGhostsToken extends TokenImpl { public TeysaEnvoyOfGhostsToken() { super("Spirit", "1/1 white and black Spirit creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThatcherHumanToken.java b/Mage/src/main/java/mage/game/permanent/token/ThatcherHumanToken.java index 4e89adc30e4..ec6a108a901 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThatcherHumanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThatcherHumanToken.java @@ -37,7 +37,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class ThatcherHumanToken extends Token { +public class ThatcherHumanToken extends TokenImpl { public ThatcherHumanToken() { super("Human", "1/1 red Human creature token with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java b/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java index 9a4b2dd7de1..fdb5badbd54 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TheLocustGodInsectToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class TheLocustGodInsectToken extends Token { +public class TheLocustGodInsectToken extends TokenImpl { public TheLocustGodInsectToken() { super("Insect", "1/1 blue and red Insect creature token with flying and haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java index b0162d264fa..01af59aba13 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java @@ -40,7 +40,7 @@ import mage.util.RandomUtil; * * @author fireshoes */ -public class ThopterColorlessToken extends Token { +public class ThopterColorlessToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java index bf153a8ac29..669bf7140a1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThopterToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class ThopterToken extends Token { +public class ThopterToken extends TokenImpl { public ThopterToken() { super("Thopter", "1/1 blue Thopter artifact creature tokens with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java index 3dbcac03347..1d6450a5101 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ThrullToken.java @@ -39,7 +39,7 @@ import mage.constants.SubType; * * @author Quercitron */ -public class ThrullToken extends Token { +public class ThrullToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java b/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java index 306ff1ef06f..379fe43c58e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.DefenderAbility; * * @author spjspj */ -public class TidalWaveWallToken extends Token { +public class TidalWaveWallToken extends TokenImpl { public TidalWaveWallToken() { super("Wall", "5/5 blue Wall creature token with defender"); diff --git a/Mage/src/main/java/mage/game/permanent/token/TilonallisSummonerElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/TilonallisSummonerElementalToken.java index e5a54c63b29..c53ccda01f1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TilonallisSummonerElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TilonallisSummonerElementalToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author LevelX2 */ -public class TilonallisSummonerElementalToken extends Token { +public class TilonallisSummonerElementalToken extends TokenImpl { public TilonallisSummonerElementalToken() { super("Elemental", "1/1 red Elemental creature tokens"); diff --git a/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java index b33e899547a..997548da244 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TitanForgeGolemToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class TitanForgeGolemToken extends Token { +public class TitanForgeGolemToken extends TokenImpl { public TitanForgeGolemToken() { super("Golem", "9/9 colorless Golem artifact creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java index a66cb8fda50..1614e3e92fe 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java @@ -39,7 +39,7 @@ import mage.ObjectColor; * * @author spjspj */ -public class TitaniaProtectorOfArgothElementalToken extends Token { +public class TitaniaProtectorOfArgothElementalToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java index 8c0df48a6b9..b817f3f714a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java +++ b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java @@ -49,7 +49,7 @@ import mage.players.Player; import mage.util.RandomUtil; import mage.util.SubTypeList; -public abstract class Token extends MageObjectImpl { +public abstract class TokenImpl extends MageObjectImpl implements Token { protected String description; private final ArrayList lastAddedTokenIds = new ArrayList<>(); @@ -80,18 +80,18 @@ public abstract class Token extends MageObjectImpl { } } - public Token(String name, String description) { + public TokenImpl(String name, String description) { this.name = name; this.description = description; } - public Token(String name, String description, int power, int toughness) { + public TokenImpl(String name, String description, int power, int toughness) { this(name, description); this.power.modifyBaseValue(power); this.toughness.modifyBaseValue(toughness); } - public Token(final Token token) { + public TokenImpl(final TokenImpl token) { super(token); this.description = token.description; this.tokenType = token.tokenType; diff --git a/Mage/src/main/java/mage/game/permanent/token/TombspawnZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/TombspawnZombieToken.java index 4102cbc9116..c3008ea9906 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TombspawnZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TombspawnZombieToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.HasteAbility; * * @author L_J */ -public class TombspawnZombieToken extends Token { +public class TombspawnZombieToken extends TokenImpl { public TombspawnZombieToken() { super("Tombspawn", "2/2 black Zombie creature token with haste named Tombspawn"); diff --git a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java index 292b9cbaefc..42b23d47f21 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java @@ -43,7 +43,7 @@ import mage.constants.Zone; * * @author TheElk801 */ -public class TreasureToken extends Token { +public class TreasureToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java index 907636d24cb..5930809c658 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TreefolkShamanToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class TreefolkShamanToken extends Token { +public class TreefolkShamanToken extends TokenImpl { public TreefolkShamanToken() { super("Treefolk Shaman", "2/5 green Treefolk Shaman creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java index 58cbe866e9e..4249a8f5266 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TriskelaviteToken.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreatureOrPlayer; * * @author spjspj */ -public class TriskelaviteToken extends Token { +public class TriskelaviteToken extends TokenImpl { public TriskelaviteToken() { super("Triskelavite", "1/1 colorless Triskelavite artifact creature token with flying. It has \"Sacrifice this creature: This creature deals 1 damage to target creature or player.\""); diff --git a/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java b/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java index 53962ab36e2..175ae1a409d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TrooperToken.java @@ -37,7 +37,7 @@ import mage.constants.SubType; * * @author Styxo */ -public class TrooperToken extends Token { +public class TrooperToken extends TokenImpl { public TrooperToken() { super("Trooper", "1/1 white Trooper creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java b/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java index fe0592ae05c..beabad96d81 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java @@ -36,7 +36,7 @@ import mage.constants.SuperType; * * @author spjspj */ -public class TuktukTheReturnedToken extends Token { +public class TuktukTheReturnedToken extends TokenImpl { public TuktukTheReturnedToken() { this("ROE"); diff --git a/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java b/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java index 2f54102cb05..c9630ab3a7d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/TuskenRaiderToken.java @@ -34,7 +34,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class TuskenRaiderToken extends Token { +public class TuskenRaiderToken extends TokenImpl { public TuskenRaiderToken() { super("Tusken Raider", "white Tusken Raider creature token", 1, 1); diff --git a/Mage/src/main/java/mage/game/permanent/token/UramiToken.java b/Mage/src/main/java/mage/game/permanent/token/UramiToken.java index a4284b93a13..ef15b2fd786 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UramiToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UramiToken.java @@ -37,7 +37,7 @@ import mage.constants.SuperType; * * @author spjspj */ -public class UramiToken extends Token { +public class UramiToken extends TokenImpl { public UramiToken() { super("Urami", "legendary 5/5 black Demon Spirit creature token with flying named Urami"); diff --git a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java index 7e085163026..b2a74140ff4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class UtvaraHellkiteDragonToken extends Token { +public class UtvaraHellkiteDragonToken extends TokenImpl { public UtvaraHellkiteDragonToken() { super("Dragon", "6/6 red Dragon creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java index 1b9464b41c6..98d45e57129 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VampireKnightToken.java @@ -5,7 +5,7 @@ import mage.abilities.keyword.LifelinkAbility; import mage.constants.CardType; import mage.constants.SubType; -public class VampireKnightToken extends Token { +public class VampireKnightToken extends TokenImpl { public VampireKnightToken() { super("Vampire Knight", "1/1 black Vampire Knight creature token with lifelink"); diff --git a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java b/Mage/src/main/java/mage/game/permanent/token/VampireToken.java index d6ef4c38c1e..8fff06f5ada 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VampireToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class VampireToken extends Token { +public class VampireToken extends TokenImpl { public VampireToken() { super("Vampire", "2/2 black Vampire creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java index f9d7f28f53a..65fb9ed7327 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VoiceOfResurgenceToken.java @@ -41,7 +41,7 @@ import mage.filter.common.FilterControlledCreaturePermanent; * * @author spjspj */ -public class VoiceOfResurgenceToken extends Token { +public class VoiceOfResurgenceToken extends TokenImpl { public VoiceOfResurgenceToken() { super("Elemental", "X/X green and white Elemental creature with with \"This creature's power and toughness are each equal to the number of creatures you control."); diff --git a/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java index d62893f2c15..b1fd4289e99 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VoiceOfTheWoodsElementalToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.TrampleAbility; * * @author spjspj */ -public class VoiceOfTheWoodsElementalToken extends Token { +public class VoiceOfTheWoodsElementalToken extends TokenImpl { public VoiceOfTheWoodsElementalToken() { super("Elemental", "7/7 green Elemental creature token with trample"); diff --git a/Mage/src/main/java/mage/game/permanent/token/VojaToken.java b/Mage/src/main/java/mage/game/permanent/token/VojaToken.java index a72c978796d..c5f1db75f8c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VojaToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VojaToken.java @@ -36,7 +36,7 @@ import mage.constants.SuperType; * * @author spjspj */ -public class VojaToken extends Token { +public class VojaToken extends TokenImpl { public VojaToken() { super("Voja", "legendary 2/2 green and white Wolf creature token named Voja"); diff --git a/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java b/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java index dec5aa715c7..063bfceef63 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class VolrathsLaboratoryToken extends Token { +public class VolrathsLaboratoryToken extends TokenImpl { public VolrathsLaboratoryToken() { this(null, null); diff --git a/Mage/src/main/java/mage/game/permanent/token/WaitingInTheWeedsCatToken.java b/Mage/src/main/java/mage/game/permanent/token/WaitingInTheWeedsCatToken.java index aa10f75af4a..a9fb285e224 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WaitingInTheWeedsCatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WaitingInTheWeedsCatToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class WaitingInTheWeedsCatToken extends Token { +public class WaitingInTheWeedsCatToken extends TokenImpl { public WaitingInTheWeedsCatToken() { super("Cat", "1/1 green Cat creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java b/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java index 29f0ce6cfc5..7185d774f08 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class WalkerOfTheGroveToken extends Token { +public class WalkerOfTheGroveToken extends TokenImpl { public WalkerOfTheGroveToken() { super("Elemental", "4/4 green Elemental creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WallOfResurgenceToken.java b/Mage/src/main/java/mage/game/permanent/token/WallOfResurgenceToken.java index 41f2cf0bee6..14a0511d18d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WallOfResurgenceToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WallOfResurgenceToken.java @@ -5,7 +5,7 @@ import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; -public class WallOfResurgenceToken extends Token { +public class WallOfResurgenceToken extends TokenImpl { public WallOfResurgenceToken() { super("", "0/0 Elemental creature with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WallToken.java b/Mage/src/main/java/mage/game/permanent/token/WallToken.java index db50f5889e6..296b8a315d7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WallToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WallToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.DefenderAbility; * * @author spjspj */ -public class WallToken extends Token { +public class WallToken extends TokenImpl { public WallToken() { super("", "2/6 white wall creature with defender"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java index 1e25bd6a8fd..44e04eaa9d1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsFirstToken.java @@ -36,7 +36,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class WandOfTheElementsFirstToken extends Token { +public class WandOfTheElementsFirstToken extends TokenImpl { public WandOfTheElementsFirstToken() { super("Elemental", "2/2 blue Elemental creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java index d0a34bad978..d887a01d17e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WandOfTheElementsSecondToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class WandOfTheElementsSecondToken extends Token { +public class WandOfTheElementsSecondToken extends TokenImpl { public WandOfTheElementsSecondToken() { super("Elemental", "3/3 red Elemental creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java index 8b39a35d627..dde6c1a554b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WarriorToken.java @@ -39,7 +39,7 @@ import mage.util.RandomUtil; * * @author LoneFox */ -public class WarriorToken extends Token { +public class WarriorToken extends TokenImpl { public WarriorToken() { super("Warrior", "1/1 white Warrior creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java b/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java index 6a09017f744..aba2c8302cb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WarriorVigilantToken.java @@ -39,7 +39,7 @@ import mage.constants.SubType; * * @author fireshoes */ -public class WarriorVigilantToken extends Token { +public class WarriorVigilantToken extends TokenImpl { public WarriorVigilantToken() { super("Warrior", "1/1 white Warrior creature token with vigilance"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java index b3b8ae04805..eeb7623d960 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class WasitoraCatDragonToken extends Token { +public class WasitoraCatDragonToken extends TokenImpl { public WasitoraCatDragonToken() { super("Cat Dragon", "3/3 black, red, and green Cat Dragon creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WaspToken.java b/Mage/src/main/java/mage/game/permanent/token/WaspToken.java index f5ae0d15540..c53e361553b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WaspToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WaspToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class WaspToken extends Token { +public class WaspToken extends TokenImpl { public WaspToken() { super("Wasp", "1/1 colorless Insect artifact creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java b/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java index 077f81d2f0e..87ec8d5e882 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WaylayToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class WaylayToken extends Token { +public class WaylayToken extends TokenImpl { public WaylayToken() { super("Knight", "2/2 white Knight creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java b/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java index 986f21a88b3..0984adf3dd7 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WeirdToken.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class WeirdToken extends Token { +public class WeirdToken extends TokenImpl { public WeirdToken() { super("Weird", "3/3 blue Weird create token with defender and flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java index 0f12958f048..e82cb72d62a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WhiteElementalToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class WhiteElementalToken extends Token { +public class WhiteElementalToken extends TokenImpl { public WhiteElementalToken() { super("Elemental", "4/4 white Elemental creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java b/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java index 92cf0666d3d..287e6e2ad30 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WingmateRocToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.FlyingAbility; * * @author spjspj */ -public class WingmateRocToken extends Token { +public class WingmateRocToken extends TokenImpl { public WingmateRocToken() { super("Bird", "3/4 white Bird creature token with flying"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java b/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java index fcc4b195a00..6d3577e1807 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WireflyToken.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class WireflyToken extends Token { +public class WireflyToken extends TokenImpl { public WireflyToken() { super("Wirefly", "2/2 colorless Insect artifact creature token with flying named Wirefly"); 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 b5b5898d907..1bdf5e5fd66 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java @@ -39,7 +39,7 @@ import mage.constants.SubType; * * @author BetaSteward_at_googlemail.com */ -public class WolfToken extends Token { +public class WolfToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java index f2836a791ec..98357e81124 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java @@ -37,7 +37,7 @@ import mage.abilities.keyword.DeathtouchAbility; * * @author nantuko */ -public class WolfTokenWithDeathtouch extends Token { +public class WolfTokenWithDeathtouch extends TokenImpl { public WolfTokenWithDeathtouch() { super("Wolf", "1/1 black Wolf creature token with deathtouch"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WoodToken.java b/Mage/src/main/java/mage/game/permanent/token/WoodToken.java index 9e1902ee7eb..6883dbb6bf5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WoodToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WoodToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.DefenderAbility; * * @author spjspj */ -public class WoodToken extends Token { +public class WoodToken extends TokenImpl { public WoodToken() { super("Wood", "0/1 green Wall creature token with defender named Wood"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java b/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java index 18672557d3d..a6609eb2eee 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class WormHarvestToken extends Token { +public class WormHarvestToken extends TokenImpl { public WormHarvestToken() { super("Worm", "1/1 black and green Worm creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WortTheRaidmotherToken.java b/Mage/src/main/java/mage/game/permanent/token/WortTheRaidmotherToken.java index ee50cbdb40d..f6a1e079913 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WortTheRaidmotherToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WortTheRaidmotherToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class WortTheRaidmotherToken extends Token { +public class WortTheRaidmotherToken extends TokenImpl { public WortTheRaidmotherToken() { super("Goblin Warrior", "1/1 red and green Goblin Warrior creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java index 88f1bc2cfc7..502ca063756 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.DeathtouchAbility; * * @author spjspj */ -public class Wurm1Token extends Token { +public class Wurm1Token extends TokenImpl { public Wurm1Token() { this("MBS"); diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm2Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm2Token.java index 1341cd3a43c..4327087756c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Wurm2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Wurm2Token.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.LifelinkAbility; * * @author spjspj */ -public class Wurm2Token extends Token { +public class Wurm2Token extends TokenImpl { public Wurm2Token() { this("MBS"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmCallingWurmToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmCallingWurmToken.java index 5d6d4385fd6..9aefc7fb576 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmCallingWurmToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmCallingWurmToken.java @@ -34,7 +34,7 @@ import mage.constants.SubType; /** * @author spjspj */ -public class WurmCallingWurmToken extends Token { +public class WurmCallingWurmToken extends TokenImpl { public WurmCallingWurmToken() { super("Wurm", "X/X green Wurm creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmToken.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken.java index 91d35ba3832..f84e3f4f2ed 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken.java @@ -34,7 +34,7 @@ import mage.constants.SubType; /** * @author magenoxx_at_gmail.com */ -public class WurmToken extends Token { +public class WurmToken extends TokenImpl { public WurmToken() { super("Wurm", "6/6 green Wurm creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java index 2e60b1cc048..0f305ae9d00 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken2.java @@ -40,7 +40,7 @@ import mage.abilities.keyword.TrampleAbility; * * @author LoneFox */ -public class WurmToken2 extends Token { +public class WurmToken2 extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java b/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java index 4096e9e3af3..6628b6e400b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java +++ b/Mage/src/main/java/mage/game/permanent/token/WurmToken3.java @@ -39,7 +39,7 @@ import mage.MageInt; * * @author fireshoes */ -public class WurmToken3 extends Token { +public class WurmToken3 extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java index 9f33d7eee8d..d3d67bec61e 100644 --- a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java @@ -36,7 +36,7 @@ import mage.abilities.keyword.HasteAbility; * * @author spjspj */ -public class XenagosSatyrToken extends Token { +public class XenagosSatyrToken extends TokenImpl { public XenagosSatyrToken() { super("Satyr", "2/2 red and green Satyr creature token with haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/YoungPyromancerElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/YoungPyromancerElementalToken.java index 8d9c31dc18e..161eb6b1644 100644 --- a/Mage/src/main/java/mage/game/permanent/token/YoungPyromancerElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/YoungPyromancerElementalToken.java @@ -36,7 +36,7 @@ import mage.util.RandomUtil; * * @author spjspj */ -public class YoungPyromancerElementalToken extends Token { +public class YoungPyromancerElementalToken extends TokenImpl { public YoungPyromancerElementalToken() { super("Elemental", "1/1 red Elemental creature"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZektarShrineElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ZektarShrineElementalToken.java index 820c3e252b2..a8bf50342a2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZektarShrineElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZektarShrineElementalToken.java @@ -37,7 +37,7 @@ import mage.constants.SubType; * * @author spjspj */ -public class ZektarShrineElementalToken extends Token { +public class ZektarShrineElementalToken extends TokenImpl { public ZektarShrineElementalToken() { super("Elemental", "7/1 red Elemental creature token with trample and haste"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java index d626ae26094..d31a7a34086 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZendikarsRoilElementalToken.java @@ -35,7 +35,7 @@ import mage.MageInt; * * @author spjspj */ -public class ZendikarsRoilElementalToken extends Token { +public class ZendikarsRoilElementalToken extends TokenImpl { public ZendikarsRoilElementalToken() { super("Elemental", "2/2 green Elemental creature token"); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java index ddc955b60e6..fed8e100bc0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java @@ -40,7 +40,7 @@ import mage.util.RandomUtil; * * @author BetaSteward_at_googlemail.com */ -public class ZombieToken extends Token { +public class ZombieToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java index e0e564d6030..85fc82bec74 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken2.java @@ -35,7 +35,7 @@ import mage.constants.SubType; * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) */ -public class ZombieToken2 extends Token { +public class ZombieToken2 extends TokenImpl { public ZombieToken2() { this(0, 0); diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java index 92b6b36e9c0..131dcb11552 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieWizardToken.java @@ -36,7 +36,7 @@ import mage.MageInt; * * @author spjspj */ -public class ZombieWizardToken extends Token { +public class ZombieWizardToken extends TokenImpl { public ZombieWizardToken() { super("Zombie Wizard", "1/1 blue and black Zombie Wizard creature token"); diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index bdc5e2a1b52..6a253a745d6 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -37,7 +37,7 @@ import mage.abilities.costs.mana.*; import mage.cards.Card; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token;import mage.game.permanent.token.Token; import mage.util.functions.CopyTokenFunction; import java.util.UUID; diff --git a/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java b/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java index 81830b77442..4a886f14fd2 100644 --- a/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java +++ b/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java @@ -36,7 +36,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.game.permanent.PermanentCard; import mage.game.permanent.PermanentToken; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.TokenImpl;import mage.game.permanent.token.Token; /** * @author nantuko