From d1cbfc51e11c7217bf956ee8448c11a2629892e9 Mon Sep 17 00:00:00 2001 From: jeffwadsworth Date: Mon, 29 Jun 2020 10:51:34 -0500 Subject: [PATCH] - Refactored DiesTriggeredAbility to DiesSourceTriggeredAbility --- .../src/mage/cards/a/AbnormalEndurance.java | 4 +- Mage.Sets/src/mage/cards/a/AbuJafar.java | 4 +- .../src/mage/cards/a/AbyssalGatekeeper.java | 4 +- .../src/mage/cards/a/AbzanSkycaptain.java | 4 +- Mage.Sets/src/mage/cards/a/AcademyRector.java | 4 +- Mage.Sets/src/mage/cards/a/AccursedWitch.java | 4 +- .../src/mage/cards/a/AkkiBlizzardHerder.java | 4 +- .../src/mage/cards/a/AlabasterDragon.java | 4 +- .../src/mage/cards/a/AncientStoneIdol.java | 4 +- Mage.Sets/src/mage/cards/a/AngelOfFury.java | 4 +- Mage.Sets/src/mage/cards/a/AnodetLurker.java | 4 +- .../src/mage/cards/a/AphettoVulture.java | 4 +- .../src/mage/cards/a/ArashinSovereign.java | 4 +- .../mage/cards/a/ArchonOfFallingStars.java | 4 +- .../src/mage/cards/a/ArchonOfJustice.java | 4 +- Mage.Sets/src/mage/cards/a/ArcticNishoba.java | 4 +- Mage.Sets/src/mage/cards/a/ArenaRector.java | 4 +- .../src/mage/cards/a/AshcloudPhoenix.java | 4 +- .../src/mage/cards/a/AshenSkinZubera.java | 4 +- .../src/mage/cards/a/AttendantOfVraska.java | 4 +- Mage.Sets/src/mage/cards/a/AuraThief.java | 4 +- .../src/mage/cards/a/AuspiciousAncestor.java | 4 +- Mage.Sets/src/mage/cards/a/AvenFisher.java | 4 +- Mage.Sets/src/mage/cards/a/AvengingAngel.java | 4 +- .../src/mage/cards/b/BantSojourners.java | 4 +- Mage.Sets/src/mage/cards/b/Barishi.java | 4 +- Mage.Sets/src/mage/cards/b/BarteredCow.java | 4 +- .../src/mage/cards/b/BearerOfTheHeavens.java | 4 +- Mage.Sets/src/mage/cards/b/BibFortuna.java | 4 +- .../src/mage/cards/b/BitterheartWitch.java | 4 +- Mage.Sets/src/mage/cards/b/BlackCat.java | 4 +- Mage.Sets/src/mage/cards/b/BlazingEffigy.java | 4 +- Mage.Sets/src/mage/cards/b/Blistergrub.java | 4 +- Mage.Sets/src/mage/cards/b/Blisterpod.java | 4 +- Mage.Sets/src/mage/cards/b/BodySnatcher.java | 4 +- .../src/mage/cards/b/BogardanFirefiend.java | 4 +- .../src/mage/cards/b/BogardanPhoenix.java | 4 +- Mage.Sets/src/mage/cards/b/BrindleShoat.java | 4 +- Mage.Sets/src/mage/cards/b/BrineHag.java | 4 +- .../src/mage/cards/b/BronzehideLion.java | 4 +- .../src/mage/cards/b/BurningEyeZubera.java | 4 +- Mage.Sets/src/mage/cards/b/BywayCourier.java | 4 +- Mage.Sets/src/mage/cards/c/CanopyStalker.java | 4 +- .../src/mage/cards/c/CarelessCelebrant.java | 4 +- Mage.Sets/src/mage/cards/c/CarrierThrall.java | 4 +- Mage.Sets/src/mage/cards/c/CarrionThrash.java | 4 +- Mage.Sets/src/mage/cards/c/Cathodion.java | 4 +- Mage.Sets/src/mage/cards/c/CausticHound.java | 4 +- .../src/mage/cards/c/CavalierOfDawn.java | 4 +- .../src/mage/cards/c/CavalierOfFlame.java | 4 +- .../src/mage/cards/c/CavalierOfGales.java | 4 +- .../src/mage/cards/c/CavalierOfNight.java | 4 +- .../src/mage/cards/c/CavalierOfThorns.java | 4 +- .../src/mage/cards/c/CelestialGatekeeper.java | 4 +- .../src/mage/cards/c/CentaurSafeguard.java | 4 +- Mage.Sets/src/mage/cards/c/ChasmSkulker.java | 4 +- .../src/mage/cards/c/CherishedHatchling.java | 4 +- Mage.Sets/src/mage/cards/c/ChildOfAlara.java | 4 +- Mage.Sets/src/mage/cards/c/ChimneyImp.java | 4 +- Mage.Sets/src/mage/cards/c/Chronozoa.java | 4 +- .../src/mage/cards/c/CitywatchSphinx.java | 4 +- Mage.Sets/src/mage/cards/c/CloneShell.java | 4 +- .../src/mage/cards/c/ConclaveCavalier.java | 4 +- .../src/mage/cards/c/ConclaveMentor.java | 4 +- Mage.Sets/src/mage/cards/c/CoreProwler.java | 4 +- Mage.Sets/src/mage/cards/c/CorpseAugur.java | 4 +- Mage.Sets/src/mage/cards/c/CycloneSire.java | 4 +- .../src/mage/cards/c/CyclopeanGiant.java | 4 +- .../src/mage/cards/c/CyclopeanMummy.java | 4 +- Mage.Sets/src/mage/cards/d/DarkRevenant.java | 4 +- .../src/mage/cards/d/DarkslickDrake.java | 4 +- .../src/mage/cards/d/DeadbridgeShaman.java | 4 +- Mage.Sets/src/mage/cards/d/DeadlyGrub.java | 4 +- .../src/mage/cards/d/DeathbloomThallid.java | 4 +- .../src/mage/cards/d/DeathcurseOgre.java | 4 +- .../src/mage/cards/d/DeathpactAngel.java | 4 +- .../src/mage/cards/d/DeathsHeadBuzzard.java | 4 +- .../src/mage/cards/d/DesperateSentry.java | 4 +- .../src/mage/cards/d/DestructorDragon.java | 4 +- .../src/mage/cards/d/DireFleetHoarder.java | 4 +- .../src/mage/cards/d/DiscordantPiper.java | 4 +- .../src/mage/cards/d/DiseaseCarriers.java | 4 +- .../src/mage/cards/d/DoomedDissenter.java | 4 +- .../src/mage/cards/d/DoomedTraveler.java | 4 +- Mage.Sets/src/mage/cards/d/DragonEgg.java | 4 +- .../src/mage/cards/d/DrainpipeVermin.java | 4 +- .../src/mage/cards/d/DreadhordeButcher.java | 4 +- .../mage/cards/d/DrippingTongueZubera.java | 4 +- .../src/mage/cards/d/DriverOfTheDead.java | 4 +- Mage.Sets/src/mage/cards/d/DroidCommando.java | 4 +- Mage.Sets/src/mage/cards/d/DuskUrchins.java | 4 +- .../src/mage/cards/d/DutifulAttendant.java | 4 +- Mage.Sets/src/mage/cards/e/ElderCathar.java | 4 +- .../src/mage/cards/e/ElendaTheDuskRose.java | 4 +- .../src/mage/cards/e/ElgaudInquisitor.java | 4 +- .../src/mage/cards/e/ElvishSoultiller.java | 4 +- .../src/mage/cards/e/EmberFistZubera.java | 4 +- .../src/mage/cards/e/EmielTheBlessed.java | 8 +- Mage.Sets/src/mage/cards/e/EnatuGolem.java | 4 +- .../src/mage/cards/e/EndlessCockroaches.java | 4 +- .../src/mage/cards/e/EndlessWhispers.java | 4 +- Mage.Sets/src/mage/cards/e/Epochrasite.java | 4 +- .../src/mage/cards/e/EsperSojourners.java | 4 +- Mage.Sets/src/mage/cards/e/ExiledBoggart.java | 4 +- .../src/mage/cards/e/ExultantCultist.java | 4 +- Mage.Sets/src/mage/cards/f/FalseProphet.java | 4 +- Mage.Sets/src/mage/cards/f/FeralProwler.java | 4 +- .../src/mage/cards/f/FesteringGoblin.java | 4 +- .../src/mage/cards/f/FesteringMummy.java | 4 +- Mage.Sets/src/mage/cards/f/FesteringNewt.java | 4 +- .../src/mage/cards/f/FiligreeCrawler.java | 4 +- .../src/mage/cards/f/FiligreeFamiliar.java | 4 +- Mage.Sets/src/mage/cards/f/FireSnake.java | 4 +- .../mage/cards/f/FlameWreathedPhoenix.java | 4 +- Mage.Sets/src/mage/cards/f/FleshCarver.java | 4 +- .../src/mage/cards/f/FlightSpellbomb.java | 4 +- .../src/mage/cards/f/FloatingDreamZubera.java | 4 +- .../src/mage/cards/f/FootlightFiend.java | 4 +- .../src/mage/cards/f/ForsakenDrifters.java | 4 +- Mage.Sets/src/mage/cards/f/FyndhornDruid.java | 4 +- Mage.Sets/src/mage/cards/g/Gamekeeper.java | 4 +- Mage.Sets/src/mage/cards/g/GangOfDevils.java | 4 +- Mage.Sets/src/mage/cards/g/GarrisonCat.java | 4 +- .../mage/cards/g/GerrardWeatherlightHero.java | 4 +- .../src/mage/cards/g/GiantAlbatross.java | 4 +- .../src/mage/cards/g/GleamingBarrier.java | 4 +- .../src/mage/cards/g/GoblinArsonist.java | 4 +- .../src/mage/cards/g/GoblinAssaultTeam.java | 4 +- .../src/mage/cards/g/GoblinGardener.java | 4 +- Mage.Sets/src/mage/cards/g/GoblinMasons.java | 4 +- Mage.Sets/src/mage/cards/g/GolgariThug.java | 4 +- Mage.Sets/src/mage/cards/g/Greedo.java | 4 +- .../src/mage/cards/g/GreenwardenOfMurasa.java | 4 +- Mage.Sets/src/mage/cards/g/GriefTyrant.java | 4 +- Mage.Sets/src/mage/cards/g/GrimInitiate.java | 4 +- Mage.Sets/src/mage/cards/g/GrimPhysician.java | 4 +- .../src/mage/cards/g/GrixisSojourners.java | 4 +- .../mage/cards/g/GuanYuSaintedWarrior.java | 4 +- .../src/mage/cards/g/GuardianAutomaton.java | 4 +- .../mage/cards/h/HaakonStromgaldScourge.java | 4 +- .../mage/cards/h/HallowedSpiritkeeper.java | 4 +- .../src/mage/cards/h/HangarbackWalker.java | 4 +- Mage.Sets/src/mage/cards/h/HarvestHand.java | 4 +- Mage.Sets/src/mage/cards/h/HauntedAngel.java | 4 +- Mage.Sets/src/mage/cards/h/HavocDemon.java | 4 +- Mage.Sets/src/mage/cards/h/Helvault.java | 4 +- .../mage/cards/h/HeraldOfTheDreadhorde.java | 4 +- Mage.Sets/src/mage/cards/h/HighlandGame.java | 4 +- .../src/mage/cards/h/HoardingDragon.java | 4 +- .../mage/cards/h/HomuraHumanAscendant.java | 4 +- Mage.Sets/src/mage/cards/h/HoodedHydra.java | 4 +- .../src/mage/cards/h/HorizonSpellbomb.java | 4 +- .../src/mage/cards/h/HornetHarasser.java | 4 +- Mage.Sets/src/mage/cards/h/HuntedWitness.java | 4 +- Mage.Sets/src/mage/cards/h/HurloonShaman.java | 4 +- .../src/mage/cards/i/ImmortalPhoenix.java | 4 +- Mage.Sets/src/mage/cards/i/InameAsOne.java | 4 +- .../src/mage/cards/i/InameLifeAspect.java | 4 +- .../src/mage/cards/i/InfectiousHost.java | 4 +- .../src/mage/cards/i/InfernalScarring.java | 4 +- .../src/mage/cards/i/InsidiousBookworms.java | 4 +- Mage.Sets/src/mage/cards/i/IvoryGargoyle.java | 4 +- Mage.Sets/src/mage/cards/j/JeskaiSage.java | 4 +- .../src/mage/cards/j/JotunOwlKeeper.java | 4 +- .../src/mage/cards/j/JuganTheRisingStar.java | 4 +- .../src/mage/cards/j/JundSojourners.java | 4 +- Mage.Sets/src/mage/cards/j/JunkDiver.java | 4 +- .../src/mage/cards/k/KeigaTheTideStar.java | 4 +- Mage.Sets/src/mage/cards/k/Kingfisher.java | 4 +- .../mage/cards/k/KinsbaileBorderguard.java | 4 +- .../mage/cards/k/KokushoTheEveningStar.java | 4 +- Mage.Sets/src/mage/cards/l/LawlessBroker.java | 4 +- .../mage/cards/l/LeoninOfTheLostPride.java | 4 +- .../src/mage/cards/l/LiegeOfTheHollows.java | 4 +- .../src/mage/cards/l/LifebloodHydra.java | 4 +- .../src/mage/cards/l/LightOfTheLegion.java | 4 +- .../src/mage/cards/l/LivingLightning.java | 4 +- .../src/mage/cards/l/LoathsomeCatoblepas.java | 4 +- .../src/mage/cards/l/LockjawSnapper.java | 4 +- Mage.Sets/src/mage/cards/l/LoyalCathar.java | 4 +- Mage.Sets/src/mage/cards/m/MaalfeldTwins.java | 4 +- Mage.Sets/src/mage/cards/m/MagmaPhoenix.java | 4 +- Mage.Sets/src/mage/cards/m/MarkerBeetles.java | 4 +- .../src/mage/cards/m/MartyrForTheCause.java | 4 +- Mage.Sets/src/mage/cards/m/MartyrOfDusk.java | 4 +- .../src/mage/cards/m/MathasFiendSeeker.java | 4 +- .../src/mage/cards/m/MatterReshaper.java | 4 +- .../src/mage/cards/m/MausoleumGuard.java | 4 +- Mage.Sets/src/mage/cards/m/MerfolkSeer.java | 4 +- .../src/mage/cards/m/MessengerDrake.java | 4 +- Mage.Sets/src/mage/cards/m/MindeyeDrake.java | 4 +- Mage.Sets/src/mage/cards/m/Mindslicer.java | 4 +- .../src/mage/cards/m/MistmoonGriffin.java | 4 +- Mage.Sets/src/mage/cards/m/MitoticSlime.java | 4 +- .../src/mage/cards/m/MoldgrafMonstrosity.java | 4 +- .../src/mage/cards/m/MoltenFirebird.java | 4 +- Mage.Sets/src/mage/cards/m/MortisDogs.java | 4 +- Mage.Sets/src/mage/cards/m/MortusStrider.java | 4 +- Mage.Sets/src/mage/cards/m/MouseDroid.java | 4 +- .../mage/cards/m/MudbuttonTorchrunner.java | 4 +- .../src/mage/cards/m/MurderousRider.java | 4 +- .../src/mage/cards/m/MycosynthWellspring.java | 4 +- Mage.Sets/src/mage/cards/m/MyrMoonvessel.java | 4 +- Mage.Sets/src/mage/cards/m/MyrRetriever.java | 4 +- Mage.Sets/src/mage/cards/m/MyrSire.java | 4 +- .../src/mage/cards/n/NayaSojourners.java | 4 +- Mage.Sets/src/mage/cards/n/Necropede.java | 4 +- .../src/mage/cards/n/NihilSpellbomb.java | 4 +- .../src/mage/cards/n/NobleBenefactor.java | 4 +- .../src/mage/cards/n/NocturnalFeeder.java | 4 +- Mage.Sets/src/mage/cards/n/NoxiousDragon.java | 4 +- Mage.Sets/src/mage/cards/n/NoxiousToad.java | 4 +- Mage.Sets/src/mage/cards/o/Oculus.java | 4 +- Mage.Sets/src/mage/cards/o/Onulet.java | 4 +- .../src/mage/cards/o/OrcishHellraiser.java | 4 +- .../src/mage/cards/o/OriginSpellbomb.java | 4 +- .../src/mage/cards/p/PalaceFamiliar.java | 4 +- .../src/mage/cards/p/PaladinOfAtonement.java | 4 +- Mage.Sets/src/mage/cards/p/PelakkaWurm.java | 4 +- .../src/mage/cards/p/PenumbraBobcat.java | 4 +- Mage.Sets/src/mage/cards/p/PenumbraKavu.java | 4 +- .../src/mage/cards/p/PenumbraSpider.java | 4 +- Mage.Sets/src/mage/cards/p/PenumbraWurm.java | 4 +- Mage.Sets/src/mage/cards/p/PerilousMyr.java | 4 +- .../src/mage/cards/p/PersonalIncarnation.java | 4 +- Mage.Sets/src/mage/cards/p/Phytotitan.java | 4 +- .../src/mage/cards/p/PitchburnDevils.java | 4 +- Mage.Sets/src/mage/cards/p/PlagueDogs.java | 4 +- Mage.Sets/src/mage/cards/p/PlagueSpitter.java | 4 +- Mage.Sets/src/mage/cards/p/PollutedDead.java | 4 +- Mage.Sets/src/mage/cards/p/PrimalDruid.java | 4 +- Mage.Sets/src/mage/cards/p/ProteanHulk.java | 4 +- .../src/mage/cards/p/PurpleCrystalCrab.java | 4 +- Mage.Sets/src/mage/cards/r/RebornHero.java | 4 +- Mage.Sets/src/mage/cards/r/ReefWorm.java | 4 +- .../src/mage/cards/r/RekindlingPhoenix.java | 4 +- .../src/mage/cards/r/RelentlessDead.java | 6 +- Mage.Sets/src/mage/cards/r/ReliquaryMonk.java | 4 +- .../src/mage/cards/r/ReturnedReveler.java | 4 +- Mage.Sets/src/mage/cards/r/RiptideCrab.java | 4 +- .../src/mage/cards/r/RoaleskApexHybrid.java | 4 +- Mage.Sets/src/mage/cards/r/RocEgg.java | 4 +- Mage.Sets/src/mage/cards/r/RootingKavu.java | 4 +- Mage.Sets/src/mage/cards/r/RotcrownGhoul.java | 4 +- .../src/mage/cards/r/RottenheartGhoul.java | 4 +- Mage.Sets/src/mage/cards/r/RuinRat.java | 4 +- .../src/mage/cards/r/RuinationRioter.java | 4 +- Mage.Sets/src/mage/cards/r/RukhEgg.java | 4 +- Mage.Sets/src/mage/cards/r/RunedServitor.java | 4 +- Mage.Sets/src/mage/cards/r/Runewing.java | 4 +- .../src/mage/cards/r/RushingTideZubera.java | 4 +- .../mage/cards/r/RyuseiTheFallingStar.java | 4 +- .../src/mage/cards/s/SadisticAugermage.java | 4 +- Mage.Sets/src/mage/cards/s/SalvageDrone.java | 4 +- .../src/mage/cards/s/ScreechingBuzzard.java | 4 +- .../src/mage/cards/s/ScuttlingDoomEngine.java | 4 +- Mage.Sets/src/mage/cards/s/SeedGuardian.java | 4 +- Mage.Sets/src/mage/cards/s/SeedguideAsh.java | 4 +- .../src/mage/cards/s/SellSwordBrute.java | 4 +- .../src/mage/cards/s/SerratedScorpion.java | 4 +- Mage.Sets/src/mage/cards/s/SerumRaker.java | 4 +- .../src/mage/cards/s/ServantOfTheScale.java | 4 +- Mage.Sets/src/mage/cards/s/ShaakHerd.java | 4 +- .../src/mage/cards/s/ShamblingGoblin.java | 4 +- .../src/mage/cards/s/ShamblingSwarm.java | 4 +- Mage.Sets/src/mage/cards/s/ShivanPhoenix.java | 4 +- Mage.Sets/src/mage/cards/s/Showstopper.java | 4 +- .../src/mage/cards/s/SilentChantZubera.java | 4 +- .../src/mage/cards/s/SilverbackShaman.java | 4 +- .../mage/cards/s/SlaughterhouseBouncer.java | 4 +- .../src/mage/cards/s/SmolderingEfreet.java | 4 +- .../src/mage/cards/s/SolemnSimulacrum.java | 4 +- Mage.Sets/src/mage/cards/s/SoulcageFiend.java | 4 +- Mage.Sets/src/mage/cards/s/Soulstinger.java | 4 +- .../src/mage/cards/s/SparringConstruct.java | 4 +- .../src/mage/cards/s/SpinalCentipede.java | 4 +- .../src/mage/cards/s/SpiritOfMalevolence.java | 4 +- .../src/mage/cards/s/SproutingThrinax.java | 4 +- .../src/mage/cards/s/SteadfastSentry.java | 4 +- Mage.Sets/src/mage/cards/s/SuChi.java | 4 +- .../src/mage/cards/s/SultaiEmissary.java | 4 +- Mage.Sets/src/mage/cards/s/SummonersEgg.java | 4 +- .../src/mage/cards/s/SupernaturalStamina.java | 4 +- .../src/mage/cards/s/SurveillingSprite.java | 4 +- .../src/mage/cards/s/SylvanHierophant.java | 4 +- .../src/mage/cards/s/SymbioticBeast.java | 4 +- Mage.Sets/src/mage/cards/s/SymbioticElf.java | 4 +- Mage.Sets/src/mage/cards/s/SymbioticWurm.java | 4 +- Mage.Sets/src/mage/cards/t/Tarpan.java | 4 +- Mage.Sets/src/mage/cards/t/TatteredMummy.java | 4 +- Mage.Sets/src/mage/cards/t/TenaciousDead.java | 4 +- Mage.Sets/src/mage/cards/t/TheLocustGod.java | 4 +- Mage.Sets/src/mage/cards/t/TheScarabGod.java | 4 +- .../src/mage/cards/t/TheScorpionGod.java | 4 +- Mage.Sets/src/mage/cards/t/ThoughtSponge.java | 4 +- Mage.Sets/src/mage/cards/t/TibaltsRager.java | 4 +- .../src/mage/cards/t/TreacherousVampire.java | 4 +- .../src/mage/cards/t/TreacherousWerewolf.java | 4 +- .../src/mage/cards/t/TreasureKeeper.java | 4 +- .../src/mage/cards/t/TreeshakerChimera.java | 4 +- .../src/mage/cards/t/TukatongueThallid.java | 4 +- .../src/mage/cards/t/TuktukTheExplorer.java | 4 +- .../src/mage/cards/u/UndeadExecutioner.java | 4 +- .../src/mage/cards/u/UnderworldCerberus.java | 4 +- .../src/mage/cards/u/UnderworldSentinel.java | 4 +- Mage.Sets/src/mage/cards/u/UndyingBeast.java | 4 +- Mage.Sets/src/mage/cards/v/VastwoodHydra.java | 4 +- .../src/mage/cards/v/VenerableKnight.java | 4 +- .../src/mage/cards/v/VengeantVampire.java | 4 +- .../src/mage/cards/v/VerdantRebirth.java | 4 +- .../src/mage/cards/v/VeteranExplorer.java | 4 +- Mage.Sets/src/mage/cards/v/VexingSphinx.java | 4 +- .../src/mage/cards/v/VindictiveLich.java | 4 +- .../src/mage/cards/v/ViridianEmissary.java | 4 +- .../src/mage/cards/v/VodalianWarMachine.java | 4 +- .../src/mage/cards/v/VoiceOfResurgence.java | 4 +- Mage.Sets/src/mage/cards/v/VolatileRig.java | 4 +- .../src/mage/cards/w/WantedScoundrels.java | 4 +- .../src/mage/cards/w/WeatherseedTreefolk.java | 4 +- Mage.Sets/src/mage/cards/w/WelkinHawk.java | 4 +- .../src/mage/cards/w/WhirlpoolDrake.java | 4 +- .../mage/cards/w/WhisperwoodElemental.java | 4 +- .../src/mage/cards/w/WirewoodHerald.java | 4 +- .../src/mage/cards/w/WorkshopAssistant.java | 4 +- Mage.Sets/src/mage/cards/w/WorldShaper.java | 4 +- .../src/mage/cards/w/WorldspineWurm.java | 4 +- Mage.Sets/src/mage/cards/w/WretchedCamel.java | 4 +- .../src/mage/cards/w/WurmcoilEngine.java | 4 +- Mage.Sets/src/mage/cards/y/YavimayaElder.java | 4 +- .../src/mage/cards/y/YoseiTheMorningStar.java | 4 +- .../src/mage/cards/y/YouthfulScholar.java | 4 +- Mage.Sets/src/mage/cards/z/ZodiacDragon.java | 4 +- .../common/DiesSourceTriggeredAbility.java | 79 +++++++++++++++++++ ...tlefieldUnderOwnerControlTargetEffect.java | 2 +- .../abilities/keyword/AfflictAbility.java | 4 +- .../abilities/keyword/AfterlifeAbility.java | 4 +- .../keyword/CumulativeUpkeepAbility.java | 1 - .../abilities/keyword/ModularAbility.java | 4 +- .../mage/abilities/keyword/MorphAbility.java | 3 +- .../abilities/keyword/PersistAbility.java | 4 +- .../abilities/keyword/RampageAbility.java | 4 +- .../mage/abilities/keyword/RepairAbility.java | 4 +- .../abilities/keyword/SoulshiftAbility.java | 6 +- .../abilities/keyword/UndyingAbility.java | 6 +- .../mage/game/permanent/token/ATATToken.java | 4 +- .../mage/game/permanent/token/DevilToken.java | 4 +- .../permanent/token/FesteringGoblinToken.java | 4 +- .../token/GarrukCursedHuntsmanToken.java | 4 +- .../permanent/token/NestingDragonToken.java | 4 +- .../mage/game/permanent/token/Ooze2Token.java | 4 +- .../permanent/token/ReefWormFishToken.java | 4 +- .../permanent/token/ReefWormWhaleToken.java | 4 +- .../permanent/token/WolfsQuarryToken.java | 4 +- 353 files changed, 786 insertions(+), 705 deletions(-) create mode 100644 Mage/src/main/java/mage/abilities/common/DiesSourceTriggeredAbility.java diff --git a/Mage.Sets/src/mage/cards/a/AbnormalEndurance.java b/Mage.Sets/src/mage/cards/a/AbnormalEndurance.java index 847823acadc..1aa6c118264 100644 --- a/Mage.Sets/src/mage/cards/a/AbnormalEndurance.java +++ b/Mage.Sets/src/mage/cards/a/AbnormalEndurance.java @@ -1,7 +1,7 @@ package mage.cards.a; import java.util.UUID; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -26,7 +26,7 @@ public final class AbnormalEndurance extends CardImpl { .setText("Until end of turn, target creature gets +2/+0") ); getSpellAbility().addEffect(new GainAbilityTargetEffect( - new DiesTriggeredAbility(new ReturnSourceFromGraveyardToBattlefieldEffect(true, true), false), + new DiesSourceTriggeredAbility(new ReturnSourceFromGraveyardToBattlefieldEffect(true, true), false), Duration.EndOfTurn, "and gains \"When this creature dies, return it to the battlefield tapped under its owner's control.\"" )); diff --git a/Mage.Sets/src/mage/cards/a/AbuJafar.java b/Mage.Sets/src/mage/cards/a/AbuJafar.java index 1435c02087f..b83054c00e1 100644 --- a/Mage.Sets/src/mage/cards/a/AbuJafar.java +++ b/Mage.Sets/src/mage/cards/a/AbuJafar.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -31,7 +31,7 @@ public final class AbuJafar extends CardImpl { new BlockingAttackerIdPredicate(this.getId()))); // When Abu Ja'far dies, destroy all creatures blocking or blocked by it. They can't be regenerated. - this.addAbility(new DiesTriggeredAbility(new DestroyAllEffect(filter, true), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DestroyAllEffect(filter, true), false)); } public AbuJafar(final AbuJafar card) { diff --git a/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java b/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java index cb8017787d4..2219dcb20ee 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class AbyssalGatekeeper extends CardImpl { this.toughness = new MageInt(1); // When Abyssal Gatekeeper dies, each player sacrifices a creature. - this.addAbility(new DiesTriggeredAbility(new SacrificeAllEffect(1, new FilterControlledCreaturePermanent("creature")))); + this.addAbility(new DiesSourceTriggeredAbility(new SacrificeAllEffect(1, new FilterControlledCreaturePermanent("creature")))); } public AbyssalGatekeeper(final AbyssalGatekeeper card) { diff --git a/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java b/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java index 72dd6ba0110..50faba04dbd 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java +++ b/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.keyword.BolsterEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class AbzanSkycaptain extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Abzan Captain dies, bolster 2. - this.addAbility(new DiesTriggeredAbility(new BolsterEffect(2))); + this.addAbility(new DiesSourceTriggeredAbility(new BolsterEffect(2))); } public AbzanSkycaptain(final AbzanSkycaptain card) { diff --git a/Mage.Sets/src/mage/cards/a/AcademyRector.java b/Mage.Sets/src/mage/cards/a/AcademyRector.java index e20df2f5ed9..2c519616d39 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyRector.java +++ b/Mage.Sets/src/mage/cards/a/AcademyRector.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.common.ExileSourceFromGraveCost; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; @@ -29,7 +29,7 @@ public final class AcademyRector extends CardImpl { this.toughness = new MageInt(2); // When Academy Rector dies, you may exile it. If you do, search your library for an enchantment card, put that card onto the battlefield, then shuffle your library. - this.addAbility(new DiesTriggeredAbility( + this.addAbility(new DiesSourceTriggeredAbility( new DoIfCostPaid( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterEnchantmentCard())), new ExileSourceFromGraveCost(), diff --git a/Mage.Sets/src/mage/cards/a/AccursedWitch.java b/Mage.Sets/src/mage/cards/a/AccursedWitch.java index aba9e8a30eb..497724b2b63 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedWitch.java +++ b/Mage.Sets/src/mage/cards/a/AccursedWitch.java @@ -5,7 +5,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.SpellAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.cost.CostModificationEffectImpl; @@ -42,7 +42,7 @@ public final class AccursedWitch extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AccursedWitchSpellsCostReductionEffect())); // When Accursed Witch dies, return it to the battlefield transformed under your control attached to target opponent. this.addAbility(new TransformAbility()); - Ability ability = new DiesTriggeredAbility(new AccursedWitchReturnTransformedEffect()); + Ability ability = new DiesSourceTriggeredAbility(new AccursedWitchReturnTransformedEffect()); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java b/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java index 41eb809c1d3..03a30612529 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java +++ b/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -29,7 +29,7 @@ public final class AkkiBlizzardHerder extends CardImpl { this.toughness = new MageInt(1); // When Akki Blizzard-Herder dies, each player sacrifices a land. - this.addAbility(new DiesTriggeredAbility(new SacrificeAllEffect(filter))); + this.addAbility(new DiesSourceTriggeredAbility(new SacrificeAllEffect(filter))); } public AkkiBlizzardHerder(final AkkiBlizzardHerder card) { diff --git a/Mage.Sets/src/mage/cards/a/AlabasterDragon.java b/Mage.Sets/src/mage/cards/a/AlabasterDragon.java index 49843f304a9..62fbda2d27f 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterDragon.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterDragon.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class AlabasterDragon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Alabaster Dragon dies, shuffle it into its owner's library. - this.addAbility(new DiesTriggeredAbility(new ShuffleIntoLibrarySourceEffect())); } + this.addAbility(new DiesSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect())); } public AlabasterDragon(final AlabasterDragon card) { super(card); diff --git a/Mage.Sets/src/mage/cards/a/AncientStoneIdol.java b/Mage.Sets/src/mage/cards/a/AncientStoneIdol.java index 499c85e2656..095ca784ba2 100644 --- a/Mage.Sets/src/mage/cards/a/AncientStoneIdol.java +++ b/Mage.Sets/src/mage/cards/a/AncientStoneIdol.java @@ -1,7 +1,7 @@ package mage.cards.a; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.AttackingCreatureCount; @@ -44,7 +44,7 @@ public final class AncientStoneIdol extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // When Ancient Stone Idol dies, create a 6/12 colorless Construct artifact creature token with trample. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new StoneTrapIdolToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new StoneTrapIdolToken()))); } public AncientStoneIdol(final AncientStoneIdol card) { diff --git a/Mage.Sets/src/mage/cards/a/AngelOfFury.java b/Mage.Sets/src/mage/cards/a/AngelOfFury.java index 9bbdb35252d..e6f7115a0c7 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfFury.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfFury.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class AngelOfFury extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Angel of Fury is put into your graveyard from the battlefield, you may shuffle it into your library. - this.addAbility(new DiesTriggeredAbility(new ShuffleIntoLibrarySourceEffect(), true)); + this.addAbility(new DiesSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect(), true)); } public AngelOfFury(final AngelOfFury card) { diff --git a/Mage.Sets/src/mage/cards/a/AnodetLurker.java b/Mage.Sets/src/mage/cards/a/AnodetLurker.java index ecd459aad4b..983985f0353 100644 --- a/Mage.Sets/src/mage/cards/a/AnodetLurker.java +++ b/Mage.Sets/src/mage/cards/a/AnodetLurker.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class AnodetLurker extends CardImpl { this.toughness = new MageInt(3); // When Anodet Lurker dies, you gain 3 life. - this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(3))); + this.addAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(3))); } public AnodetLurker(final AnodetLurker card) { diff --git a/Mage.Sets/src/mage/cards/a/AphettoVulture.java b/Mage.Sets/src/mage/cards/a/AphettoVulture.java index f62b8b9f223..7096706082f 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoVulture.java +++ b/Mage.Sets/src/mage/cards/a/AphettoVulture.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -38,7 +38,7 @@ public final class AphettoVulture extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Aphetto Vulture dies, you may put target Zombie card from your graveyard on top of your library. - Ability ability = new DiesTriggeredAbility(new PutOnLibraryTargetEffect(true), true); + Ability ability = new DiesSourceTriggeredAbility(new PutOnLibraryTargetEffect(true), true); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/ArashinSovereign.java b/Mage.Sets/src/mage/cards/a/ArashinSovereign.java index 88676ac5f6b..0aeac68a2d4 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinSovereign.java +++ b/Mage.Sets/src/mage/cards/a/ArashinSovereign.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; @@ -33,7 +33,7 @@ public final class ArashinSovereign extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Arashin Sovereign dies, you may put it on the top or bottom of its owner's library. - this.addAbility(new DiesTriggeredAbility(new ArashinSovereignEffect(), true)); + this.addAbility(new DiesSourceTriggeredAbility(new ArashinSovereignEffect(), true)); } public ArashinSovereign(final ArashinSovereign card) { diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfFallingStars.java b/Mage.Sets/src/mage/cards/a/ArchonOfFallingStars.java index 0ac34127ddf..0e32d828501 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfFallingStars.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfFallingStars.java @@ -2,7 +2,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -33,7 +33,7 @@ public final class ArchonOfFallingStars extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Archon of Falling Stars dies, you may return target enchantment card from your graveyard to the battlefield. - Ability ability = new DiesTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(false, false), true); + Ability ability = new DiesSourceTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(false, false), true); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java b/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java index 755522cb19d..c08485495bd 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class ArchonOfJustice extends CardImpl { this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new DiesTriggeredAbility(new ExileTargetEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new ExileTargetEffect(), false); ability.addTarget(new TargetPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/ArcticNishoba.java b/Mage.Sets/src/mage/cards/a/ArcticNishoba.java index 5425eed0364..11fb4439dd1 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticNishoba.java +++ b/Mage.Sets/src/mage/cards/a/ArcticNishoba.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.OrCost; import mage.constants.SubType; import mage.abilities.keyword.TrampleAbility; @@ -45,7 +45,7 @@ public final class ArcticNishoba extends CardImpl { // When Arctic Nishoba dies, you gain 2 life for each age counter on it. Effect effect = new GainLifeEffect(new MultipliedValue(new CountersSourceCount(CounterType.AGE), 2)); effect.setText("you gain 2 life for each age counter on it"); - this.addAbility(new DiesTriggeredAbility(effect)); + this.addAbility(new DiesSourceTriggeredAbility(effect)); } public ArcticNishoba(final ArcticNishoba card) { diff --git a/Mage.Sets/src/mage/cards/a/ArenaRector.java b/Mage.Sets/src/mage/cards/a/ArenaRector.java index b1fa212eb28..53510af308b 100644 --- a/Mage.Sets/src/mage/cards/a/ArenaRector.java +++ b/Mage.Sets/src/mage/cards/a/ArenaRector.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.common.ExileSourceFromGraveCost; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; @@ -29,7 +29,7 @@ public final class ArenaRector extends CardImpl { this.toughness = new MageInt(2); // When Arena Rector dies, you may exile it. If you do, search your library for a planeswalker card, put it onto the battlefield, then shuffle your library. - this.addAbility(new DiesTriggeredAbility( + this.addAbility(new DiesSourceTriggeredAbility( new DoIfCostPaid( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterPlaneswalkerCard())), new ExileSourceFromGraveCost(), diff --git a/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java b/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java index c63e5d77abb..d4b74755af4 100644 --- a/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java +++ b/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; @@ -36,7 +36,7 @@ public final class AshcloudPhoenix extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Ashcloud Phoenix dies, return it to the battlefield face down under your control. - this.addAbility(new DiesTriggeredAbility(new AshcloudPhoenixEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new AshcloudPhoenixEffect())); // Morph {4}{R}{R} this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{R}{R}"))); diff --git a/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java b/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java index 050b2493a30..79fb5cfd077 100644 --- a/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java +++ b/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java @@ -5,7 +5,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class AshenSkinZubera extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new DiesTriggeredAbility(new DiscardTargetEffect(ZuberasDiedDynamicValue.instance)); + Ability ability = new DiesSourceTriggeredAbility(new DiscardTargetEffect(ZuberasDiedDynamicValue.instance)); ability.addTarget(new TargetOpponent()); this.addAbility(ability, new ZuberasDiedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java b/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java index ca986d1948c..0222b630499 100644 --- a/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java +++ b/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java @@ -2,7 +2,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; @@ -38,7 +38,7 @@ public final class AttendantOfVraska extends CardImpl { // When Attendant of Vraska dies, if you control a Vraska planeswalker, you gain life equal to Attendant of Vraska's power. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new DiesTriggeredAbility(new GainLifeEffect( + new DiesSourceTriggeredAbility(new GainLifeEffect( new SourcePermanentPowerCount() ), false), new PermanentsOnTheBattlefieldCondition(filter), "When {this} dies, if you control a Vraska planeswalker, " diff --git a/Mage.Sets/src/mage/cards/a/AuraThief.java b/Mage.Sets/src/mage/cards/a/AuraThief.java index 9a148b7e92f..d44d77becb3 100644 --- a/Mage.Sets/src/mage/cards/a/AuraThief.java +++ b/Mage.Sets/src/mage/cards/a/AuraThief.java @@ -7,7 +7,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; @@ -43,7 +43,7 @@ public final class AuraThief extends CardImpl { // When Aura Thief dies, you gain control of all enchantments. You don't get // to move Auras. - this.addAbility(new DiesTriggeredAbility(new AuraThiefDiesTriggeredEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new AuraThiefDiesTriggeredEffect())); } public AuraThief(final AuraThief card) { diff --git a/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java b/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java index 505daa753c9..09612cb5c47 100644 --- a/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java +++ b/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DoIfCostPaid; @@ -36,7 +36,7 @@ public final class AuspiciousAncestor extends CardImpl { this.toughness = new MageInt(3); // When Auspicious Ancestor dies, you gain 3 life. - this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(3), false)); + this.addAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(3), false)); // Whenever a player casts a white spell, you may pay {1}. If you do, you gain 1 life. this.addAbility(new SpellCastAllTriggeredAbility(new DoIfCostPaid(new GainLifeEffect(1), new ManaCostsImpl("{1}")), filter, true)); } diff --git a/Mage.Sets/src/mage/cards/a/AvenFisher.java b/Mage.Sets/src/mage/cards/a/AvenFisher.java index 8ce46a7e9fd..7842c555fed 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFisher.java +++ b/Mage.Sets/src/mage/cards/a/AvenFisher.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class AvenFisher extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); } public AvenFisher(final AvenFisher card) { diff --git a/Mage.Sets/src/mage/cards/a/AvengingAngel.java b/Mage.Sets/src/mage/cards/a/AvengingAngel.java index 2397ba31092..5769a74414a 100644 --- a/Mage.Sets/src/mage/cards/a/AvengingAngel.java +++ b/Mage.Sets/src/mage/cards/a/AvengingAngel.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; @@ -33,7 +33,7 @@ public final class AvengingAngel extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Avenging Angel dies, you may put it on top of its owner's library. - this.addAbility(new DiesTriggeredAbility(new AvengingAngelEffect(), true)); + this.addAbility(new DiesSourceTriggeredAbility(new AvengingAngelEffect(), true)); } public AvengingAngel(final AvengingAngel card) { diff --git a/Mage.Sets/src/mage/cards/b/BantSojourners.java b/Mage.Sets/src/mage/cards/b/BantSojourners.java index 85063e89a3f..1aa6ebb6dbb 100644 --- a/Mage.Sets/src/mage/cards/b/BantSojourners.java +++ b/Mage.Sets/src/mage/cards/b/BantSojourners.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.CyclingAbility; @@ -30,7 +30,7 @@ public final class BantSojourners extends CardImpl { // When you cycle Bant Sojourners or it dies, you may create a 1/1 white Soldier creature token. Ability ability1 = new CycleTriggeredAbility(new CreateTokenEffect(new SoldierToken()), true); - Ability ability2 = new DiesTriggeredAbility(new CreateTokenEffect(new SoldierToken()), true); + Ability ability2 = new DiesSourceTriggeredAbility(new CreateTokenEffect(new SoldierToken()), true); this.addAbility(ability1); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/b/Barishi.java b/Mage.Sets/src/mage/cards/b/Barishi.java index 41c85f15c73..fa9196a7e4d 100644 --- a/Mage.Sets/src/mage/cards/b/Barishi.java +++ b/Mage.Sets/src/mage/cards/b/Barishi.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSourceEffect; import mage.constants.SubType; @@ -31,7 +31,7 @@ public final class Barishi extends CardImpl { this.toughness = new MageInt(3); // When Barishi dies, exile Barishi, then shuffle all creature cards from your graveyard into your library. - this.addAbility(new DiesTriggeredAbility(new BarishiEffect(), false)); + this.addAbility(new DiesSourceTriggeredAbility(new BarishiEffect(), false)); } public Barishi(final Barishi card) { diff --git a/Mage.Sets/src/mage/cards/b/BarteredCow.java b/Mage.Sets/src/mage/cards/b/BarteredCow.java index 07fb03f4e69..9675188862e 100644 --- a/Mage.Sets/src/mage/cards/b/BarteredCow.java +++ b/Mage.Sets/src/mage/cards/b/BarteredCow.java @@ -2,7 +2,7 @@ package mage.cards.b; import mage.MageInt; import mage.MageObject; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DiscardCardControllerTriggeredAbility; @@ -41,7 +41,7 @@ public final class BarteredCow extends CardImpl { // When Bartered Cow dies or when you discard it, create a Food token. this.addAbility(new OrTriggeredAbility( Zone.ALL, new CreateTokenEffect(new FoodToken()), false, - "When {this} dies or when you discard it, ", new DiesTriggeredAbility((Effect) null), + "When {this} dies or when you discard it, ", new DiesSourceTriggeredAbility((Effect) null), new DiscardCardControllerTriggeredAbility(null, false, filter) )); } diff --git a/Mage.Sets/src/mage/cards/b/BearerOfTheHeavens.java b/Mage.Sets/src/mage/cards/b/BearerOfTheHeavens.java index d935f234c4a..0cdf4f2efbe 100644 --- a/Mage.Sets/src/mage/cards/b/BearerOfTheHeavens.java +++ b/Mage.Sets/src/mage/cards/b/BearerOfTheHeavens.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; @@ -31,7 +31,7 @@ public final class BearerOfTheHeavens extends CardImpl { DelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new DestroyAllEffect(StaticFilters.FILTER_PERMANENT)); Effect effect = new CreateDelayedTriggeredAbilityEffect(delayedAbility); effect.setText("destroy all permanents at the beginning of the next end step"); - this.addAbility(new DiesTriggeredAbility(effect, false)); + this.addAbility(new DiesSourceTriggeredAbility(effect, false)); } public BearerOfTheHeavens(final BearerOfTheHeavens card) { diff --git a/Mage.Sets/src/mage/cards/b/BibFortuna.java b/Mage.Sets/src/mage/cards/b/BibFortuna.java index c2a33363c8b..8ac710afa35 100644 --- a/Mage.Sets/src/mage/cards/b/BibFortuna.java +++ b/Mage.Sets/src/mage/cards/b/BibFortuna.java @@ -4,7 +4,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.effects.common.ShuffleLibrarySourceEffect; @@ -35,7 +35,7 @@ public final class BibFortuna extends CardImpl { this.addAbility(ability); // When Bib Fortuna dies shuffle your library. - this.addAbility(new DiesTriggeredAbility(new ShuffleLibrarySourceEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new ShuffleLibrarySourceEffect())); } public BibFortuna(final BibFortuna card) { diff --git a/Mage.Sets/src/mage/cards/b/BitterheartWitch.java b/Mage.Sets/src/mage/cards/b/BitterheartWitch.java index 4527fc3c3a4..2b4b0623a4a 100644 --- a/Mage.Sets/src/mage/cards/b/BitterheartWitch.java +++ b/Mage.Sets/src/mage/cards/b/BitterheartWitch.java @@ -4,7 +4,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.Card; @@ -36,7 +36,7 @@ public final class BitterheartWitch extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // When Bitterheart Witch dies, you may search your library for a Curse card, put it onto the battlefield attached to target player, then shuffle your library. - Ability ability = new DiesTriggeredAbility(new BitterheartWitchEffect(), true); + Ability ability = new DiesSourceTriggeredAbility(new BitterheartWitchEffect(), true); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BlackCat.java b/Mage.Sets/src/mage/cards/b/BlackCat.java index d6f263c9072..f12607a99c8 100644 --- a/Mage.Sets/src/mage/cards/b/BlackCat.java +++ b/Mage.Sets/src/mage/cards/b/BlackCat.java @@ -32,7 +32,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -54,7 +54,7 @@ public final class BlackCat extends CardImpl { this.toughness = new MageInt(1); // When Black Cat dies, target opponent discards a card at random. - Ability ability = new DiesTriggeredAbility(new DiscardTargetEffect(1, true),false); + Ability ability = new DiesSourceTriggeredAbility(new DiscardTargetEffect(1, true),false); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BlazingEffigy.java b/Mage.Sets/src/mage/cards/b/BlazingEffigy.java index ddf098cd72d..d429166ebe4 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingEffigy.java +++ b/Mage.Sets/src/mage/cards/b/BlazingEffigy.java @@ -7,7 +7,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -35,7 +35,7 @@ public final class BlazingEffigy extends CardImpl { this.toughness = new MageInt(3); // When Blazing Effigy dies, it deals X damage to target creature, where X is 3 plus the amount of damage dealt to Blazing Effigy this turn by other sources named Blazing Effigy. - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(BlazingEffigyCount.instance), false); + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(BlazingEffigyCount.instance), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability, new BlazingEffigyWatcher()); } diff --git a/Mage.Sets/src/mage/cards/b/Blistergrub.java b/Mage.Sets/src/mage/cards/b/Blistergrub.java index 7519cb0dd58..198b9e0537a 100644 --- a/Mage.Sets/src/mage/cards/b/Blistergrub.java +++ b/Mage.Sets/src/mage/cards/b/Blistergrub.java @@ -4,7 +4,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class Blistergrub extends CardImpl { // Swampwalk (This creature can't be blocked as long as defending player controls a Swamp.) this.addAbility(new SwampwalkAbility()); // When Blistergrub dies, each opponent loses 2 life. - this.addAbility(new DiesTriggeredAbility(new LoseLifeOpponentsEffect(2), false)); + this.addAbility(new DiesSourceTriggeredAbility(new LoseLifeOpponentsEffect(2), false)); } public Blistergrub (final Blistergrub card) { diff --git a/Mage.Sets/src/mage/cards/b/Blisterpod.java b/Mage.Sets/src/mage/cards/b/Blisterpod.java index b3644a8392b..217161f196e 100644 --- a/Mage.Sets/src/mage/cards/b/Blisterpod.java +++ b/Mage.Sets/src/mage/cards/b/Blisterpod.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.DevoidAbility; @@ -30,7 +30,7 @@ public final class Blisterpod extends CardImpl { // When Blisterpod dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." Effect effect = new CreateTokenEffect(new EldraziScionToken()); effect.setText("Create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C}.\""); - this.addAbility(new DiesTriggeredAbility(effect, false)); + this.addAbility(new DiesSourceTriggeredAbility(effect, false)); } public Blisterpod(final Blisterpod card) { diff --git a/Mage.Sets/src/mage/cards/b/BodySnatcher.java b/Mage.Sets/src/mage/cards/b/BodySnatcher.java index 2f6e6aeb261..0bdc8fa8556 100644 --- a/Mage.Sets/src/mage/cards/b/BodySnatcher.java +++ b/Mage.Sets/src/mage/cards/b/BodySnatcher.java @@ -4,7 +4,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.Effect; @@ -38,7 +38,7 @@ public final class BodySnatcher extends CardImpl { // When Body Snatcher dies, exile Body Snatcher and return target creature card from your graveyard to the battlefield. Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect(); effect.setText("and return target creature card from your graveyard to the battlefield"); - Ability ability = new DiesTriggeredAbility(new ExileSourceEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new ExileSourceEffect(), false); ability.addEffect(effect); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BogardanFirefiend.java b/Mage.Sets/src/mage/cards/b/BogardanFirefiend.java index dce2d9e9159..9bcf88f9a71 100644 --- a/Mage.Sets/src/mage/cards/b/BogardanFirefiend.java +++ b/Mage.Sets/src/mage/cards/b/BogardanFirefiend.java @@ -4,7 +4,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class BogardanFirefiend extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(2), false); + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(2), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BogardanPhoenix.java b/Mage.Sets/src/mage/cards/b/BogardanPhoenix.java index e56829c19b6..b724e003723 100644 --- a/Mage.Sets/src/mage/cards/b/BogardanPhoenix.java +++ b/Mage.Sets/src/mage/cards/b/BogardanPhoenix.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.constants.SubType; import mage.abilities.keyword.FlyingAbility; @@ -36,7 +36,7 @@ public final class BogardanPhoenix extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Bogardan Phoenix dies, exile it if it had a death counter on it. Otherwise, return it to the battlefield under your control and put a death counter on it. - this.addAbility(new DiesTriggeredAbility(new BogardanPhoenixEffect(), false)); + this.addAbility(new DiesSourceTriggeredAbility(new BogardanPhoenixEffect(), false)); } public BogardanPhoenix(final BogardanPhoenix card) { diff --git a/Mage.Sets/src/mage/cards/b/BrindleShoat.java b/Mage.Sets/src/mage/cards/b/BrindleShoat.java index 95f1ad2db28..5b98c191d6c 100644 --- a/Mage.Sets/src/mage/cards/b/BrindleShoat.java +++ b/Mage.Sets/src/mage/cards/b/BrindleShoat.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class BrindleShoat extends CardImpl { this.toughness = new MageInt(1); // When Brindle Shoat dies, create a 3/3 green Boar creature token. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new BoarToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new BoarToken()))); } public BrindleShoat(final BrindleShoat card) { diff --git a/Mage.Sets/src/mage/cards/b/BrineHag.java b/Mage.Sets/src/mage/cards/b/BrineHag.java index 5050409b69e..608e176fc28 100644 --- a/Mage.Sets/src/mage/cards/b/BrineHag.java +++ b/Mage.Sets/src/mage/cards/b/BrineHag.java @@ -7,7 +7,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.SetPowerToughnessAllEffect; import mage.cards.CardImpl; @@ -36,7 +36,7 @@ public final class BrineHag extends CardImpl { this.toughness = new MageInt(2); // When Brine Hag dies, change the base power and toughness of all creatures that dealt damage to it this turn to 0/2. - this.addAbility(new DiesTriggeredAbility(new BrineHagEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new BrineHagEffect())); } public BrineHag(final BrineHag card) { diff --git a/Mage.Sets/src/mage/cards/b/BronzehideLion.java b/Mage.Sets/src/mage/cards/b/BronzehideLion.java index 737dc12661d..98dd760b607 100644 --- a/Mage.Sets/src/mage/cards/b/BronzehideLion.java +++ b/Mage.Sets/src/mage/cards/b/BronzehideLion.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffectImpl; @@ -45,7 +45,7 @@ public final class BronzehideLion extends CardImpl { // When Bronzehide Lion dies, return it to the battlefield. // It's an Aura enchantment with enchant creature you control and // "{G}{W}: Enchanted creature gains indestructible until end of turn," and it loses all other abilities. - this.addAbility(new DiesTriggeredAbility(new BronzehideLionReturnEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new BronzehideLionReturnEffect())); } private BronzehideLion(final BronzehideLion card) { diff --git a/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java b/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java index e916504a73b..d8d34f9dd0a 100644 --- a/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java +++ b/Mage.Sets/src/mage/cards/b/BurningEyeZubera.java @@ -4,7 +4,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; @@ -31,7 +31,7 @@ public final class BurningEyeZubera extends CardImpl { this.toughness = new MageInt(3); // When Burning-Eye Zubera dies, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to any target. - Ability ability = new ConditionalInterveningIfTriggeredAbility(new DiesTriggeredAbility(new DamageTargetEffect(3)),new SourceGotFourDamage(), + Ability ability = new ConditionalInterveningIfTriggeredAbility(new DiesSourceTriggeredAbility(new DamageTargetEffect(3)),new SourceGotFourDamage(), "When {this} dies, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to any target"); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BywayCourier.java b/Mage.Sets/src/mage/cards/b/BywayCourier.java index 6e66b6a06d2..dbf1f1d5f01 100644 --- a/Mage.Sets/src/mage/cards/b/BywayCourier.java +++ b/Mage.Sets/src/mage/cards/b/BywayCourier.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.keyword.InvestigateEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class BywayCourier extends CardImpl { this.toughness = new MageInt(2); // When Byway Courier dies, investigate. - this.addAbility(new DiesTriggeredAbility(new InvestigateEffect(), false)); + this.addAbility(new DiesSourceTriggeredAbility(new InvestigateEffect(), false)); } public BywayCourier(final BywayCourier card) { diff --git a/Mage.Sets/src/mage/cards/c/CanopyStalker.java b/Mage.Sets/src/mage/cards/c/CanopyStalker.java index 3383889e4b3..6a8c4fd2d47 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyStalker.java +++ b/Mage.Sets/src/mage/cards/c/CanopyStalker.java @@ -1,7 +1,7 @@ package mage.cards.c; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CreaturesDiedThisTurnCount; import mage.abilities.effects.common.GainLifeEffect; @@ -30,7 +30,7 @@ public final class CanopyStalker extends CardImpl { this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAtLeastOneSourceEffect())); // When Canopy Stalker dies, you gain 1 life for each creature that died this turn. - this.addAbility(new DiesTriggeredAbility( + this.addAbility(new DiesSourceTriggeredAbility( new GainLifeEffect(CreaturesDiedThisTurnCount.instance) .setText("you gain 1 life for each creature that died this turn") ), new CreaturesDiedWatcher()); diff --git a/Mage.Sets/src/mage/cards/c/CarelessCelebrant.java b/Mage.Sets/src/mage/cards/c/CarelessCelebrant.java index 6b97dd3bd2f..c2fbb8e0b10 100644 --- a/Mage.Sets/src/mage/cards/c/CarelessCelebrant.java +++ b/Mage.Sets/src/mage/cards/c/CarelessCelebrant.java @@ -2,7 +2,7 @@ package mage.cards.c; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -40,7 +40,7 @@ public final class CarelessCelebrant extends CardImpl { this.toughness = new MageInt(1); // When Careless Celebrant dies, it deals 2 damage to target creature or planeswalker an opponent controls. - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(2, "it")); + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(2, "it")); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CarrierThrall.java b/Mage.Sets/src/mage/cards/c/CarrierThrall.java index d6bc7cea232..94e3bf2813a 100644 --- a/Mage.Sets/src/mage/cards/c/CarrierThrall.java +++ b/Mage.Sets/src/mage/cards/c/CarrierThrall.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class CarrierThrall extends CardImpl { // When Carrier Thrall dies, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature. Add {C}." Effect effect = new CreateTokenEffect(new EldraziScionToken()); effect.setText("create a 1/1 colorless Eldrazi Scion creature token. It has \"Sacrifice this creature: Add {C}.\""); - this.addAbility(new DiesTriggeredAbility(effect, false)); + this.addAbility(new DiesSourceTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/c/CarrionThrash.java b/Mage.Sets/src/mage/cards/c/CarrionThrash.java index 0bc6afc9f8c..62b96da57ef 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionThrash.java +++ b/Mage.Sets/src/mage/cards/c/CarrionThrash.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.ReturnToHandTargetEffect; @@ -36,7 +36,7 @@ public final class CarrionThrash extends CardImpl { this.toughness = new MageInt(4); // When Carrion Thrash dies, you may pay {2}. If you do, return another target creature card from your graveyard to your hand. - DiesTriggeredAbility ability = new DiesTriggeredAbility(new DoIfCostPaid(new ReturnToHandTargetEffect(), new GenericManaCost(2)), false); + DiesSourceTriggeredAbility ability = new DiesSourceTriggeredAbility(new DoIfCostPaid(new ReturnToHandTargetEffect(), new GenericManaCost(2)), false); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/Cathodion.java b/Mage.Sets/src/mage/cards/c/Cathodion.java index 7de6f730f6e..212d3a68727 100644 --- a/Mage.Sets/src/mage/cards/c/Cathodion.java +++ b/Mage.Sets/src/mage/cards/c/Cathodion.java @@ -4,7 +4,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; import mage.Mana; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.mana.BasicManaEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -22,7 +22,7 @@ public final class Cathodion extends CardImpl { this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new DiesTriggeredAbility(new BasicManaEffect(Mana.ColorlessMana(3)), false)); + this.addAbility(new DiesSourceTriggeredAbility(new BasicManaEffect(Mana.ColorlessMana(3)), false)); } public Cathodion(final Cathodion card) { diff --git a/Mage.Sets/src/mage/cards/c/CausticHound.java b/Mage.Sets/src/mage/cards/c/CausticHound.java index 266d106cec3..f01e20fae40 100644 --- a/Mage.Sets/src/mage/cards/c/CausticHound.java +++ b/Mage.Sets/src/mage/cards/c/CausticHound.java @@ -4,7 +4,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class CausticHound extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new DiesTriggeredAbility(new LoseLifeAllPlayersEffect(4))); + this.addAbility(new DiesSourceTriggeredAbility(new LoseLifeAllPlayersEffect(4))); } public CausticHound (final CausticHound card) { diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfDawn.java b/Mage.Sets/src/mage/cards/c/CavalierOfDawn.java index 2eba411769f..a77ae3e3fd2 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfDawn.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfDawn.java @@ -2,7 +2,7 @@ package mage.cards.c; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -51,7 +51,7 @@ public final class CavalierOfDawn extends CardImpl { this.addAbility(ability); // When Cavalier of Dawn dies, return target artifact or enchantment card from your graveyard to your hand. - ability = new DiesTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect()); + ability = new DiesSourceTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java b/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java index 4fbf766bc0e..4de1d6c0877 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfFlame.java @@ -2,7 +2,7 @@ package mage.cards.c; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -61,7 +61,7 @@ public final class CavalierOfFlame extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CavalierOfFlameEffect())); // When Cavalier of Flame dies, it deals X damage to each opponent and each planeswalker they control, where X is the number of land cards in your graveyard. - ability = new DiesTriggeredAbility(new DamagePlayersEffect( + ability = new DiesSourceTriggeredAbility(new DamagePlayersEffect( Outcome.Damage, xValue, TargetController.OPPONENT ).setText("it deals X damage to each opponent")); ability.addEffect(new DamageAllEffect( diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfGales.java b/Mage.Sets/src/mage/cards/c/CavalierOfGales.java index e972f50c393..76f16388fab 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfGales.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfGales.java @@ -2,7 +2,7 @@ package mage.cards.c; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.BrainstormEffect; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect; @@ -35,7 +35,7 @@ public final class CavalierOfGales extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BrainstormEffect())); // When Cavalier of Gales dies, shuffle it into its owner's library, then scry 2. - Ability ability = new DiesTriggeredAbility(new ShuffleIntoLibrarySourceEffect()); + Ability ability = new DiesSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect()); ability.addEffect(new ScryEffect(2).concatBy(", then")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfNight.java b/Mage.Sets/src/mage/cards/c/CavalierOfNight.java index e8776a3ea4f..2020c78e3d8 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfNight.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfNight.java @@ -2,7 +2,7 @@ package mage.cards.c; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.delayed.ReflexiveTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -64,7 +64,7 @@ public final class CavalierOfNight extends CardImpl { ))); // When Cavalier of Night dies, return target creature card with converted mana cost 3 or less from your graveyard to the battlefield. - Ability ability = new DiesTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect()); + Ability ability = new DiesSourceTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect()); ability.addTarget(new TargetCardInYourGraveyard(filter2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java b/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java index eabcf3643db..14b84ac4a13 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java @@ -2,7 +2,7 @@ package mage.cards.c; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.ExileSourceFromGraveCost; import mage.abilities.effects.OneShotEffect; @@ -50,7 +50,7 @@ public final class CavalierOfThorns extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CavalierOfThornsEffect())); // When Cavalier of Thorns dies, you may exile it. If you do, put another target card from your graveyard on top of your library. - Ability ability = new DiesTriggeredAbility(new DoIfCostPaid( + Ability ability = new DiesSourceTriggeredAbility(new DoIfCostPaid( new PutOnLibraryTargetEffect(true), new ExileSourceFromGraveCost() ).setText("you may exile it. If you do, put another target card from your graveyard on top of your library.")); ability.addTarget(new TargetCardInYourGraveyard(filter)); diff --git a/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java b/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java index 4acadb8fc56..4a66a77b389 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java +++ b/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileSourceEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; @@ -47,7 +47,7 @@ public final class CelestialGatekeeper extends CardImpl { // When Celestial Gatekeeper dies, exile it, then return up to two target Bird and/or Cleric permanent cards from your graveyard to the battlefield. Effect effect = new ExileSourceEffect(); effect.setText(""); - DiesTriggeredAbility ability = new DiesTriggeredAbility(effect); + DiesSourceTriggeredAbility ability = new DiesSourceTriggeredAbility(effect); effect = new ReturnFromGraveyardToBattlefieldTargetEffect(); effect.setText("exile it, then return up to two target Bird and/or Cleric permanent cards from your graveyard to the battlefield"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CentaurSafeguard.java b/Mage.Sets/src/mage/cards/c/CentaurSafeguard.java index 1ebeea72090..475abe297b2 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurSafeguard.java +++ b/Mage.Sets/src/mage/cards/c/CentaurSafeguard.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class CentaurSafeguard extends CardImpl { this.toughness = new MageInt(1); // When Centaur Safeguard dies, you may gain 3 life. - this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(3), true)); + this.addAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(3), true)); } public CentaurSafeguard(final CentaurSafeguard card) { diff --git a/Mage.Sets/src/mage/cards/c/ChasmSkulker.java b/Mage.Sets/src/mage/cards/c/ChasmSkulker.java index 880546b17ce..8a86c45285a 100644 --- a/Mage.Sets/src/mage/cards/c/ChasmSkulker.java +++ b/Mage.Sets/src/mage/cards/c/ChasmSkulker.java @@ -4,7 +4,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.DrawCardControllerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -39,7 +39,7 @@ public final class ChasmSkulker extends CardImpl { this.addAbility(new DrawCardControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); // When Chasm Skulker dies, create X 1/1 blue Squid creature tokens with islandwalk, where X is the number of +1/+1 counters on Chasm Skulker. - this.addAbility(new DiesTriggeredAbility(new ChasmSkulkerEffect(), false)); + this.addAbility(new DiesSourceTriggeredAbility(new ChasmSkulkerEffect(), false)); } public ChasmSkulker(final ChasmSkulker card) { diff --git a/Mage.Sets/src/mage/cards/c/CherishedHatchling.java b/Mage.Sets/src/mage/cards/c/CherishedHatchling.java index 81c972d53f3..f8c3c4835eb 100644 --- a/Mage.Sets/src/mage/cards/c/CherishedHatchling.java +++ b/Mage.Sets/src/mage/cards/c/CherishedHatchling.java @@ -3,7 +3,7 @@ package mage.cards.c; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; @@ -45,7 +45,7 @@ public final class CherishedHatchling extends CardImpl { this.toughness = new MageInt(1); // When Cherished Hatchling dies, you may cast Dinosaur spells this turn as though they had flash, and whenever you cast a Dinosaur spell this turn, it gains "When this creature enters the battlefield, you may have it fight another target creature." - Ability ability = new DiesTriggeredAbility(new CastAsThoughItHadFlashAllEffect(Duration.EndOfTurn, filterCard, false)); + Ability ability = new DiesSourceTriggeredAbility(new CastAsThoughItHadFlashAllEffect(Duration.EndOfTurn, filterCard, false)); ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new CherishedHatchlingTriggeredAbility())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/ChildOfAlara.java b/Mage.Sets/src/mage/cards/c/ChildOfAlara.java index d980f243a19..f739ddb60f3 100644 --- a/Mage.Sets/src/mage/cards/c/ChildOfAlara.java +++ b/Mage.Sets/src/mage/cards/c/ChildOfAlara.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; @@ -31,7 +31,7 @@ public final class ChildOfAlara extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // When Child of Alara dies, destroy all nonland permanents. They can't be regenerated. - this.addAbility(new DiesTriggeredAbility(new DestroyAllEffect(new FilterNonlandPermanent("nonland permanents"), true))); + this.addAbility(new DiesSourceTriggeredAbility(new DestroyAllEffect(new FilterNonlandPermanent("nonland permanents"), true))); } diff --git a/Mage.Sets/src/mage/cards/c/ChimneyImp.java b/Mage.Sets/src/mage/cards/c/ChimneyImp.java index 6e9489b290b..455b303dda8 100644 --- a/Mage.Sets/src/mage/cards/c/ChimneyImp.java +++ b/Mage.Sets/src/mage/cards/c/ChimneyImp.java @@ -4,7 +4,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; @@ -35,7 +35,7 @@ public final class ChimneyImp extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Chimney Imp dies, target opponent puts a card from their hand on top of their library. - Ability ability = new DiesTriggeredAbility(new ChimneyImpEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new ChimneyImpEffect(), false); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/Chronozoa.java b/Mage.Sets/src/mage/cards/c/Chronozoa.java index 81a6153913c..2ade15a2fea 100644 --- a/Mage.Sets/src/mage/cards/c/Chronozoa.java +++ b/Mage.Sets/src/mage/cards/c/Chronozoa.java @@ -4,7 +4,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.LastTimeCounterRemovedCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -46,7 +46,7 @@ public final class Chronozoa extends CardImpl { // When Chronozoa is put into a graveyard from play, if it had no time counters on it, create two tokens that are copies of it. Effect effect = new CreateTokenCopySourceEffect(2); effect.setText("create two tokens that are copies of it"); - this.addAbility(new ConditionalInterveningIfTriggeredAbility(new DiesTriggeredAbility(effect, false), + this.addAbility(new ConditionalInterveningIfTriggeredAbility(new DiesSourceTriggeredAbility(effect, false), LastTimeCounterRemovedCondition.instance, "When {this} dies, if it had no time counters on it, create two tokens that are copies of it.")); } diff --git a/Mage.Sets/src/mage/cards/c/CitywatchSphinx.java b/Mage.Sets/src/mage/cards/c/CitywatchSphinx.java index 3bfe96bc8db..0fe4108f9aa 100644 --- a/Mage.Sets/src/mage/cards/c/CitywatchSphinx.java +++ b/Mage.Sets/src/mage/cards/c/CitywatchSphinx.java @@ -2,7 +2,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.keyword.SurveilEffect; import mage.constants.SubType; import mage.abilities.keyword.FlyingAbility; @@ -27,7 +27,7 @@ public final class CitywatchSphinx extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Citywatch Sphinx dies, surveil 2. - this.addAbility(new DiesTriggeredAbility(new SurveilEffect(2))); + this.addAbility(new DiesSourceTriggeredAbility(new SurveilEffect(2))); } public CitywatchSphinx(final CitywatchSphinx card) { diff --git a/Mage.Sets/src/mage/cards/c/CloneShell.java b/Mage.Sets/src/mage/cards/c/CloneShell.java index 84171a085bd..7ce9a397b9b 100644 --- a/Mage.Sets/src/mage/cards/c/CloneShell.java +++ b/Mage.Sets/src/mage/cards/c/CloneShell.java @@ -2,7 +2,7 @@ package mage.cards.c; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.*; @@ -36,7 +36,7 @@ public final class CloneShell extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new CloneShellEffect(), false)); // When Clone Shell dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control. - this.addAbility(new DiesTriggeredAbility(new CloneShellDiesEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new CloneShellDiesEffect())); } public CloneShell(final CloneShell card) { diff --git a/Mage.Sets/src/mage/cards/c/ConclaveCavalier.java b/Mage.Sets/src/mage/cards/c/ConclaveCavalier.java index f8035d718c5..144808dd33c 100644 --- a/Mage.Sets/src/mage/cards/c/ConclaveCavalier.java +++ b/Mage.Sets/src/mage/cards/c/ConclaveCavalier.java @@ -2,7 +2,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.SubType; import mage.abilities.keyword.VigilanceAbility; @@ -29,7 +29,7 @@ public final class ConclaveCavalier extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // When Conclave Cavalier dies, create two green and white 2/2 Elf Knight creature tokens with vigilance. - this.addAbility(new DiesTriggeredAbility( + this.addAbility(new DiesSourceTriggeredAbility( new CreateTokenEffect(new ElfKnightToken(), 2) )); } diff --git a/Mage.Sets/src/mage/cards/c/ConclaveMentor.java b/Mage.Sets/src/mage/cards/c/ConclaveMentor.java index d7ffc919224..28c1f1217a7 100644 --- a/Mage.Sets/src/mage/cards/c/ConclaveMentor.java +++ b/Mage.Sets/src/mage/cards/c/ConclaveMentor.java @@ -2,7 +2,7 @@ package mage.cards.c; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; @@ -40,7 +40,7 @@ public final class ConclaveMentor extends CardImpl { this.addAbility(new SimpleStaticAbility(new ConclaveMentorEffect())); // When Conclave Mentor dies, you gain life equal to its power. - this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(xValue, "you gain life equal to its power"))); + this.addAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(xValue, "you gain life equal to its power"))); } private ConclaveMentor(final ConclaveMentor card) { diff --git a/Mage.Sets/src/mage/cards/c/CoreProwler.java b/Mage.Sets/src/mage/cards/c/CoreProwler.java index 963b642bbe0..708adb93a07 100644 --- a/Mage.Sets/src/mage/cards/c/CoreProwler.java +++ b/Mage.Sets/src/mage/cards/c/CoreProwler.java @@ -1,7 +1,7 @@ package mage.cards.c; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class CoreProwler extends CardImpl { this.addAbility(InfectAbility.getInstance()); // When Core Prowler dies, proliferate. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.) - this.addAbility(new DiesTriggeredAbility(new ProliferateEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new ProliferateEffect())); } public CoreProwler(final CoreProwler card) { diff --git a/Mage.Sets/src/mage/cards/c/CorpseAugur.java b/Mage.Sets/src/mage/cards/c/CorpseAugur.java index 01f0dea7d4f..4cb6722c91e 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseAugur.java +++ b/Mage.Sets/src/mage/cards/c/CorpseAugur.java @@ -4,7 +4,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.CardsInTargetPlayersGraveyardCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -33,7 +33,7 @@ public final class CorpseAugur extends CardImpl { CardsInTargetPlayersGraveyardCount dynamicValue = new CardsInTargetPlayersGraveyardCount(new FilterCreatureCard("the number of creature cards")); Effect effect = new DrawCardSourceControllerEffect(dynamicValue); effect.setText("You draw X cards"); - Ability ability = new DiesTriggeredAbility(effect, false); + Ability ability = new DiesSourceTriggeredAbility(effect, false); effect = new LoseLifeSourceControllerEffect(dynamicValue); effect.setText("and you lose X life, where X is the number of creature cards in target player's graveyard"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CycloneSire.java b/Mage.Sets/src/mage/cards/c/CycloneSire.java index ea97032c91c..10b665840e7 100644 --- a/Mage.Sets/src/mage/cards/c/CycloneSire.java +++ b/Mage.Sets/src/mage/cards/c/CycloneSire.java @@ -4,7 +4,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -34,7 +34,7 @@ public final class CycloneSire extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Cyclone Sire dies, you may put three +1/+1 counters on target land you control. If you do, that land becomes a 0/0 Elemental creature with haste that's still a land. - Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(3)), true); + Ability ability = new DiesSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance(3)), true); Effect effect = new BecomesCreatureTargetEffect(new WallOfResurgenceToken(), false, true, Duration.Custom); effect.setText("If you do, that land becomes a 0/0 Elemental creature with haste that's still a land"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/c/CyclopeanGiant.java b/Mage.Sets/src/mage/cards/c/CyclopeanGiant.java index 1c04cdb2a63..0842dcaa94d 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopeanGiant.java +++ b/Mage.Sets/src/mage/cards/c/CyclopeanGiant.java @@ -2,7 +2,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ExileSourceEffect; import mage.abilities.effects.common.continuous.BecomesBasicLandTargetEffect; import mage.constants.Duration; @@ -27,7 +27,7 @@ public final class CyclopeanGiant extends CardImpl { this.toughness = new MageInt(2); // When Cyclopean Giant dies, target land becomes a Swamp. Exile Cyclopean Giant. - DiesTriggeredAbility ability = new DiesTriggeredAbility(new BecomesBasicLandTargetEffect(Duration.EndOfGame, SubType.SWAMP)); + DiesSourceTriggeredAbility ability = new DiesSourceTriggeredAbility(new BecomesBasicLandTargetEffect(Duration.EndOfGame, SubType.SWAMP)); ability.addEffect(new ExileSourceEffect()); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CyclopeanMummy.java b/Mage.Sets/src/mage/cards/c/CyclopeanMummy.java index aa72a168785..e8f6458b48f 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopeanMummy.java +++ b/Mage.Sets/src/mage/cards/c/CyclopeanMummy.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ExileSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class CyclopeanMummy extends CardImpl { this.toughness = new MageInt(1); // When Cyclopean Mummy dies, exile it. - this.addAbility(new DiesTriggeredAbility(new ExileSourceEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new ExileSourceEffect())); } public CyclopeanMummy(final CyclopeanMummy card) { diff --git a/Mage.Sets/src/mage/cards/d/DarkRevenant.java b/Mage.Sets/src/mage/cards/d/DarkRevenant.java index 8e404392eca..58206923ac7 100644 --- a/Mage.Sets/src/mage/cards/d/DarkRevenant.java +++ b/Mage.Sets/src/mage/cards/d/DarkRevenant.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; @@ -35,7 +35,7 @@ public final class DarkRevenant extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Dark Revenant dies, put it on top of its owner's library. - this.addAbility(new DiesTriggeredAbility(new DarkRevenantEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new DarkRevenantEffect())); } public DarkRevenant(final DarkRevenant card) { diff --git a/Mage.Sets/src/mage/cards/d/DarkslickDrake.java b/Mage.Sets/src/mage/cards/d/DarkslickDrake.java index 33d29cf7df0..a47db43bfc6 100644 --- a/Mage.Sets/src/mage/cards/d/DarkslickDrake.java +++ b/Mage.Sets/src/mage/cards/d/DarkslickDrake.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class DarkslickDrake extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } public DarkslickDrake (final DarkslickDrake card) { diff --git a/Mage.Sets/src/mage/cards/d/DeadbridgeShaman.java b/Mage.Sets/src/mage/cards/d/DeadbridgeShaman.java index 8c8f834a9ba..473fed7dfaa 100644 --- a/Mage.Sets/src/mage/cards/d/DeadbridgeShaman.java +++ b/Mage.Sets/src/mage/cards/d/DeadbridgeShaman.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class DeadbridgeShaman extends CardImpl { this.toughness = new MageInt(1); // When Deadbridge Shaman dies, target opponent discards a card. - Ability ability = new DiesTriggeredAbility(new DiscardTargetEffect(1)); + Ability ability = new DiesSourceTriggeredAbility(new DiscardTargetEffect(1)); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DeadlyGrub.java b/Mage.Sets/src/mage/cards/d/DeadlyGrub.java index ddf8afee2da..1e836e67311 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyGrub.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyGrub.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.common.LastTimeCounterRemovedCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -38,7 +38,7 @@ public final class DeadlyGrub extends CardImpl { this.addAbility(new VanishingUpkeepAbility(3)); this.addAbility(new VanishingSacrificeAbility()); // When Deadly Grub dies, if it had no time counters on it, create a 6/1 green Insect creature token with shroud. - this.addAbility(new ConditionalInterveningIfTriggeredAbility(new DiesTriggeredAbility(new CreateTokenEffect(new DeadlyGrubToken(), 1)), + this.addAbility(new ConditionalInterveningIfTriggeredAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new DeadlyGrubToken(), 1)), LastTimeCounterRemovedCondition.instance, "When {this} dies, if it had no time counters on it, create a 6/1 green Insect creature token with shroud.")); } diff --git a/Mage.Sets/src/mage/cards/d/DeathbloomThallid.java b/Mage.Sets/src/mage/cards/d/DeathbloomThallid.java index 31edb39de01..b8b8a048a1b 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbloomThallid.java +++ b/Mage.Sets/src/mage/cards/d/DeathbloomThallid.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.SubType; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class DeathbloomThallid extends CardImpl { this.toughness = new MageInt(2); // When Deathbloom Thallid dies, create a 1/1 green Saproling creature token. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), false)); } public DeathbloomThallid(final DeathbloomThallid card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathcurseOgre.java b/Mage.Sets/src/mage/cards/d/DeathcurseOgre.java index d6fd4f03702..6d5c1ba31f6 100644 --- a/Mage.Sets/src/mage/cards/d/DeathcurseOgre.java +++ b/Mage.Sets/src/mage/cards/d/DeathcurseOgre.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class DeathcurseOgre extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new DiesTriggeredAbility(new LoseLifeAllPlayersEffect(3))); + this.addAbility(new DiesSourceTriggeredAbility(new LoseLifeAllPlayersEffect(3))); } public DeathcurseOgre (final DeathcurseOgre card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathpactAngel.java b/Mage.Sets/src/mage/cards/d/DeathpactAngel.java index ebcca304eaf..8b6378a8f7f 100644 --- a/Mage.Sets/src/mage/cards/d/DeathpactAngel.java +++ b/Mage.Sets/src/mage/cards/d/DeathpactAngel.java @@ -2,7 +2,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class DeathpactAngel extends CardImpl { //Flying this.addAbility(FlyingAbility.getInstance()); //When Deathpact Angel dies, create a 1/1 white and black Cleric creature token. It has "{3}{W}{B}{B}, {T}, Sacrifice this creature: Return a card named Deathpact Angel from your graveyard to the battlefield." - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new DeathpactAngelToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new DeathpactAngelToken()))); } public DeathpactAngel(final DeathpactAngel card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathsHeadBuzzard.java b/Mage.Sets/src/mage/cards/d/DeathsHeadBuzzard.java index 91f87019c4b..93d6785fece 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsHeadBuzzard.java +++ b/Mage.Sets/src/mage/cards/d/DeathsHeadBuzzard.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class DeathsHeadBuzzard extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Death's-Head Buzzard dies, all creatures get -1/-1 until end of turn. - this.addAbility(new DiesTriggeredAbility(new BoostAllEffect(-1, -1, Duration.EndOfTurn))); + this.addAbility(new DiesSourceTriggeredAbility(new BoostAllEffect(-1, -1, Duration.EndOfTurn))); } public DeathsHeadBuzzard(final DeathsHeadBuzzard card) { diff --git a/Mage.Sets/src/mage/cards/d/DesperateSentry.java b/Mage.Sets/src/mage/cards/d/DesperateSentry.java index 28dc4fe5c5b..0cb69932d46 100644 --- a/Mage.Sets/src/mage/cards/d/DesperateSentry.java +++ b/Mage.Sets/src/mage/cards/d/DesperateSentry.java @@ -4,7 +4,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DeliriumCondition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -32,7 +32,7 @@ public final class DesperateSentry extends CardImpl { this.toughness = new MageInt(2); // When Desperate Sentry dies, create a 3/2 colorless Eldrazi Horror creature token. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new EldraziHorrorToken()), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new EldraziHorrorToken()), false)); // Delirium — Desperate Sentry gets +3/+0 as long as there are four or more card types among cards in your graveyard. ConditionalContinuousEffect effect = new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/d/DestructorDragon.java b/Mage.Sets/src/mage/cards/d/DestructorDragon.java index cb37ba3c4b0..94a3ca7b085 100644 --- a/Mage.Sets/src/mage/cards/d/DestructorDragon.java +++ b/Mage.Sets/src/mage/cards/d/DestructorDragon.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -35,7 +35,7 @@ public final class DestructorDragon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Destructor Dragon dies, destroy target noncreature permanent. - Ability ability = new DiesTriggeredAbility(new DestroyTargetEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new DestroyTargetEffect(), false); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DireFleetHoarder.java b/Mage.Sets/src/mage/cards/d/DireFleetHoarder.java index b23b13831b6..1c40d691392 100644 --- a/Mage.Sets/src/mage/cards/d/DireFleetHoarder.java +++ b/Mage.Sets/src/mage/cards/d/DireFleetHoarder.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.SubType; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class DireFleetHoarder extends CardImpl { this.toughness = new MageInt(1); // When Dire Fleet Hoarder dies, create a colorless Treasure artifact token with "{t}, Sacrifice this artifact: Add one mana of any color." - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new TreasureToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new TreasureToken()))); } public DireFleetHoarder(final DireFleetHoarder card) { diff --git a/Mage.Sets/src/mage/cards/d/DiscordantPiper.java b/Mage.Sets/src/mage/cards/d/DiscordantPiper.java index 2e1a8797da8..ce3d17a0927 100644 --- a/Mage.Sets/src/mage/cards/d/DiscordantPiper.java +++ b/Mage.Sets/src/mage/cards/d/DiscordantPiper.java @@ -1,7 +1,7 @@ package mage.cards.d; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class DiscordantPiper extends CardImpl { this.toughness = new MageInt(1); // When Discordant Piper dies, create a 0/1 white Goat creature token. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new GoatToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new GoatToken()))); } private DiscordantPiper(final DiscordantPiper card) { diff --git a/Mage.Sets/src/mage/cards/d/DiseaseCarriers.java b/Mage.Sets/src/mage/cards/d/DiseaseCarriers.java index 1c94958523a..0e926a6ad84 100644 --- a/Mage.Sets/src/mage/cards/d/DiseaseCarriers.java +++ b/Mage.Sets/src/mage/cards/d/DiseaseCarriers.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class DiseaseCarriers extends CardImpl { this.toughness = new MageInt(2); // When Disease Carriers dies, target creature gets -2/-2 until end of turn. - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), false); + Ability ability = new DiesSourceTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DoomedDissenter.java b/Mage.Sets/src/mage/cards/d/DoomedDissenter.java index 04e3dd2ccef..08c87cbdc90 100644 --- a/Mage.Sets/src/mage/cards/d/DoomedDissenter.java +++ b/Mage.Sets/src/mage/cards/d/DoomedDissenter.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class DoomedDissenter extends CardImpl { this.toughness = new MageInt(1); // When Doomed Dissenter dies, create a 2/2 black Zombie creature token. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new ZombieToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new ZombieToken()))); } public DoomedDissenter(final DoomedDissenter card) { diff --git a/Mage.Sets/src/mage/cards/d/DoomedTraveler.java b/Mage.Sets/src/mage/cards/d/DoomedTraveler.java index d1d89ccfa3f..cbdbfefeafb 100644 --- a/Mage.Sets/src/mage/cards/d/DoomedTraveler.java +++ b/Mage.Sets/src/mage/cards/d/DoomedTraveler.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class DoomedTraveler extends CardImpl { this.toughness = new MageInt(1); // When Doomed Traveler dies, create a 1/1 white Spirit creature token with flying. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()))); } public DoomedTraveler(final DoomedTraveler card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonEgg.java b/Mage.Sets/src/mage/cards/d/DragonEgg.java index 7758179a672..defc2e95f8a 100644 --- a/Mage.Sets/src/mage/cards/d/DragonEgg.java +++ b/Mage.Sets/src/mage/cards/d/DragonEgg.java @@ -2,7 +2,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class DragonEgg extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // When Dragon Egg dies, create a 2/2 red Dragon creature token with flying. It has "{R}: This creature gets +1/+0 until end of turn". - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new DragonEggDragonToken()), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new DragonEggDragonToken()), false)); } diff --git a/Mage.Sets/src/mage/cards/d/DrainpipeVermin.java b/Mage.Sets/src/mage/cards/d/DrainpipeVermin.java index 65991fd0e47..23be4152f1e 100644 --- a/Mage.Sets/src/mage/cards/d/DrainpipeVermin.java +++ b/Mage.Sets/src/mage/cards/d/DrainpipeVermin.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.discard.DiscardTargetEffect; @@ -29,7 +29,7 @@ public final class DrainpipeVermin extends CardImpl { this.toughness = new MageInt(1); // When Drainpipe Vermin dies, you may pay {B}. If you do, target player discards a card. - Ability ability = new DiesTriggeredAbility(new DoIfCostPaid(new DiscardTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)), false); + Ability ability = new DiesSourceTriggeredAbility(new DoIfCostPaid(new DiscardTargetEffect(1), new ColoredManaCost(ColoredManaSymbol.B)), false); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DreadhordeButcher.java b/Mage.Sets/src/mage/cards/d/DreadhordeButcher.java index 6e99a3b55f8..bd8699396c0 100644 --- a/Mage.Sets/src/mage/cards/d/DreadhordeButcher.java +++ b/Mage.Sets/src/mage/cards/d/DreadhordeButcher.java @@ -3,7 +3,7 @@ package mage.cards.d; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -39,7 +39,7 @@ public final class DreadhordeButcher extends CardImpl { ), false).setOrPlaneswalker(true)); // When Dreadhorde Butcher dies, it deals damage equal to its power to any target. - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect( + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect( new SourcePermanentPowerCount() ).setText("it deals damage equal to its power to any target")); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/d/DrippingTongueZubera.java b/Mage.Sets/src/mage/cards/d/DrippingTongueZubera.java index ed36a32932b..ba93772a8b8 100644 --- a/Mage.Sets/src/mage/cards/d/DrippingTongueZubera.java +++ b/Mage.Sets/src/mage/cards/d/DrippingTongueZubera.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class DrippingTongueZubera extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritToken(), ZuberasDiedDynamicValue.instance), false), new ZuberasDiedWatcher()); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new SpiritToken(), ZuberasDiedDynamicValue.instance), false), new ZuberasDiedWatcher()); } public DrippingTongueZubera (final DrippingTongueZubera card) { diff --git a/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java b/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java index 06d477e38b9..debff34c885 100644 --- a/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DriverOfTheDead.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,7 +35,7 @@ public final class DriverOfTheDead extends CardImpl { this.toughness = new MageInt(2); // When Driver of the Dead dies, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield. - Ability ability = new DiesTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), false); Target target = new TargetCardInYourGraveyard(filter); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DroidCommando.java b/Mage.Sets/src/mage/cards/d/DroidCommando.java index 981a61d28a1..2c86fd7f721 100644 --- a/Mage.Sets/src/mage/cards/d/DroidCommando.java +++ b/Mage.Sets/src/mage/cards/d/DroidCommando.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.keyword.RepairAbility; @@ -27,7 +27,7 @@ public final class DroidCommando extends CardImpl { this.toughness = new MageInt(2); // When Droid Commando dies, target player loses 2 life and you gain 2 life. - Ability ability = new DiesTriggeredAbility(new LoseLifeTargetEffect(2)); + Ability ability = new DiesSourceTriggeredAbility(new LoseLifeTargetEffect(2)); ability.addEffect(new GainLifeEffect(2)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DuskUrchins.java b/Mage.Sets/src/mage/cards/d/DuskUrchins.java index 81047b88e24..728636cabf8 100644 --- a/Mage.Sets/src/mage/cards/d/DuskUrchins.java +++ b/Mage.Sets/src/mage/cards/d/DuskUrchins.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.CountersSourceCount; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -31,7 +31,7 @@ public final class DuskUrchins extends CardImpl { this.addAbility(new AttacksOrBlocksTriggeredAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance()), false)); // When Dusk Urchins dies, draw a card for each -1/-1 counter on it. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(new CountersSourceCount(CounterType.M1M1)))); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(new CountersSourceCount(CounterType.M1M1)))); } diff --git a/Mage.Sets/src/mage/cards/d/DutifulAttendant.java b/Mage.Sets/src/mage/cards/d/DutifulAttendant.java index 8262b7050cc..46d73e16dcc 100644 --- a/Mage.Sets/src/mage/cards/d/DutifulAttendant.java +++ b/Mage.Sets/src/mage/cards/d/DutifulAttendant.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -34,7 +34,7 @@ public final class DutifulAttendant extends CardImpl { this.toughness = new MageInt(2); // When Dutiful Ateendant dies, return another target creature card from your graveyard to your hand. - Ability ability = new DiesTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect(), false); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElderCathar.java b/Mage.Sets/src/mage/cards/e/ElderCathar.java index 4a68c92c63b..e285ed05aa6 100644 --- a/Mage.Sets/src/mage/cards/e/ElderCathar.java +++ b/Mage.Sets/src/mage/cards/e/ElderCathar.java @@ -4,7 +4,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -31,7 +31,7 @@ public final class ElderCathar extends CardImpl { this.toughness = new MageInt(2); // When Elder Cathar dies, put a +1/+1 counter on target creature you control. If that creature is a Human, put two +1/+1 counters on it instead. - Ability ability = new DiesTriggeredAbility(new ElderCatharAddCountersTargetEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new ElderCatharAddCountersTargetEffect(), false); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/e/ElendaTheDuskRose.java b/Mage.Sets/src/mage/cards/e/ElendaTheDuskRose.java index f6caea4489d..69b841e09c2 100644 --- a/Mage.Sets/src/mage/cards/e/ElendaTheDuskRose.java +++ b/Mage.Sets/src/mage/cards/e/ElendaTheDuskRose.java @@ -4,7 +4,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; import mage.abilities.common.DiesCreatureTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -38,7 +38,7 @@ public final class ElendaTheDuskRose extends CardImpl { this.addAbility(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, true)); // When Elenda dies, create X 1/1 white Vampire creature tokens with lifelink, where X is Elenda's power. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new IxalanVampireToken(), new SourcePermanentPowerCount()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new IxalanVampireToken(), new SourcePermanentPowerCount()))); } public ElendaTheDuskRose(final ElendaTheDuskRose card) { diff --git a/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java b/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java index 97f1e20c73c..dae094242e3 100644 --- a/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java +++ b/Mage.Sets/src/mage/cards/e/ElgaudInquisitor.java @@ -3,7 +3,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class ElgaudInquisitor extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // When Elgaud Inquisitor dies, create a 1/1 white Spirit creature token with flying. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken()))); } public ElgaudInquisitor(final ElgaudInquisitor card) { diff --git a/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java b/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java index a7153fbaa59..20cd16aa9c2 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java +++ b/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java @@ -6,7 +6,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -34,7 +34,7 @@ public final class ElvishSoultiller extends CardImpl { this.toughness = new MageInt(4); // When Elvish Soultiller dies, choose a creature type. Shuffle all creature cards of that type from your graveyard into your library. - addAbility(new DiesTriggeredAbility(new ElvishSoultillerEffect())); + addAbility(new DiesSourceTriggeredAbility(new ElvishSoultillerEffect())); } diff --git a/Mage.Sets/src/mage/cards/e/EmberFistZubera.java b/Mage.Sets/src/mage/cards/e/EmberFistZubera.java index acfe8a486ca..921ad4e910e 100644 --- a/Mage.Sets/src/mage/cards/e/EmberFistZubera.java +++ b/Mage.Sets/src/mage/cards/e/EmberFistZubera.java @@ -5,7 +5,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class EmberFistZubera extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(ZuberasDiedDynamicValue.instance)); + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(ZuberasDiedDynamicValue.instance)); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new ZuberasDiedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/e/EmielTheBlessed.java b/Mage.Sets/src/mage/cards/e/EmielTheBlessed.java index 8210d4f6aa4..885180ceded 100644 --- a/Mage.Sets/src/mage/cards/e/EmielTheBlessed.java +++ b/Mage.Sets/src/mage/cards/e/EmielTheBlessed.java @@ -23,6 +23,7 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import java.util.UUID; +import mage.abilities.effects.Effect; /** * @author TheElk801 @@ -50,12 +51,13 @@ public final class EmielTheBlessed extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); - // Whenever another creature enters the battlefield under your control, you may pay {G/W}. If you do, put a +1/+1 counter on it. If it's a Unicorn, put two +1/+1 counters on it instead. + // Whenever another creature enters the battlefield under your control, you may pay {G/W}. + // If you do, put a +1/+1 counter on it. If it's a Unicorn, put two +1/+1 counters on it instead. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( Zone.BATTLEFIELD, new DoIfCostPaid(new EmielTheBlessedEffect(), new ManaCostsImpl<>("{G/W}")), StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE, false, SetTargetPointer.PERMANENT, - "Whenever another creature enters the battlefield under your control, you may pay {G/W}. " + - "If you do, put a +1/+1 counter on it. If it's a Unicorn, put two +1/+1 counters on it instead." + "Whenever another creature enters the battlefield under your control, you may pay {G/W}. " + + "If you do, put a +1/+1 counter on it. If it's a Unicorn, put two +1/+1 counters on it instead." )); } diff --git a/Mage.Sets/src/mage/cards/e/EnatuGolem.java b/Mage.Sets/src/mage/cards/e/EnatuGolem.java index aba9da3ec17..b6f6f92caf8 100644 --- a/Mage.Sets/src/mage/cards/e/EnatuGolem.java +++ b/Mage.Sets/src/mage/cards/e/EnatuGolem.java @@ -3,7 +3,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class EnatuGolem extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(5); - this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(4), false)); + this.addAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(4), false)); } public EnatuGolem(final EnatuGolem card) { diff --git a/Mage.Sets/src/mage/cards/e/EndlessCockroaches.java b/Mage.Sets/src/mage/cards/e/EndlessCockroaches.java index ef402fd92dc..97b1e014e30 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessCockroaches.java +++ b/Mage.Sets/src/mage/cards/e/EndlessCockroaches.java @@ -3,7 +3,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class EndlessCockroaches extends CardImpl { this.toughness = new MageInt(1); // When Endless Cockroaches dies, return it to its owner's hand. - this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new ReturnToHandSourceEffect())); } public EndlessCockroaches(final EndlessCockroaches card) { diff --git a/Mage.Sets/src/mage/cards/e/EndlessWhispers.java b/Mage.Sets/src/mage/cards/e/EndlessWhispers.java index 0eab041fecc..4cec197aea4 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessWhispers.java +++ b/Mage.Sets/src/mage/cards/e/EndlessWhispers.java @@ -4,7 +4,7 @@ package mage.cards.e; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.effects.Effect; @@ -36,7 +36,7 @@ public final class EndlessWhispers extends CardImpl { DelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnSourceToBattlefieldEffect()); Effect effect = new CreateDelayedTriggeredAbilityEffect(delayedAbility, true); effect.setText("choose target opponent. That player puts this card from its owner's graveyard onto the battlefield under their control at the beginning of the next end step"); - Ability gainAbility = new DiesTriggeredAbility(effect); + Ability gainAbility = new DiesSourceTriggeredAbility(effect); gainAbility.addTarget(new TargetOpponent()); effect = new GainAbilityAllEffect(gainAbility, Duration.WhileOnBattlefield, new FilterCreaturePermanent("Each creature")); diff --git a/Mage.Sets/src/mage/cards/e/Epochrasite.java b/Mage.Sets/src/mage/cards/e/Epochrasite.java index 96a70cb2b27..f0c0c3cdd09 100644 --- a/Mage.Sets/src/mage/cards/e/Epochrasite.java +++ b/Mage.Sets/src/mage/cards/e/Epochrasite.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.CastFromHandSourcePermanentCondition; @@ -46,7 +46,7 @@ public final class Epochrasite extends CardImpl { new CastFromHandWatcher()); // When Epochrasite dies, exile it with three time counters on it and it gains suspend. - this.addAbility(new DiesTriggeredAbility(new EpochrasiteEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new EpochrasiteEffect())); } public Epochrasite(final Epochrasite card) { diff --git a/Mage.Sets/src/mage/cards/e/EsperSojourners.java b/Mage.Sets/src/mage/cards/e/EsperSojourners.java index ebbaca1dcbc..46f72cfd8f0 100644 --- a/Mage.Sets/src/mage/cards/e/EsperSojourners.java +++ b/Mage.Sets/src/mage/cards/e/EsperSojourners.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.abilities.keyword.CyclingAbility; @@ -34,7 +34,7 @@ public final class EsperSojourners extends CardImpl { // When you cycle Esper Sojourners or it dies, you may tap or untap target permanent. Ability ability1 = new CycleTriggeredAbility(new MayTapOrUntapTargetEffect()); - Ability ability2 = new DiesTriggeredAbility(new MayTapOrUntapTargetEffect()); + Ability ability2 = new DiesSourceTriggeredAbility(new MayTapOrUntapTargetEffect()); ability1.addTarget(new TargetPermanent()); ability2.addTarget(new TargetPermanent()); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/cards/e/ExiledBoggart.java b/Mage.Sets/src/mage/cards/e/ExiledBoggart.java index 3d1703ba0d1..d78998ea279 100644 --- a/Mage.Sets/src/mage/cards/e/ExiledBoggart.java +++ b/Mage.Sets/src/mage/cards/e/ExiledBoggart.java @@ -3,7 +3,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class ExiledBoggart extends CardImpl { this.toughness = new MageInt(2); // When Exiled Boggart dies, discard a card. - this.addAbility(new DiesTriggeredAbility(new DiscardControllerEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DiscardControllerEffect(1), false)); } public ExiledBoggart(final ExiledBoggart card) { diff --git a/Mage.Sets/src/mage/cards/e/ExultantCultist.java b/Mage.Sets/src/mage/cards/e/ExultantCultist.java index 5011b0c40ed..babb9bf1969 100644 --- a/Mage.Sets/src/mage/cards/e/ExultantCultist.java +++ b/Mage.Sets/src/mage/cards/e/ExultantCultist.java @@ -3,7 +3,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class ExultantCultist extends CardImpl { this.toughness = new MageInt(2); // When Exultant Cultist dies, draw a card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } public ExultantCultist(final ExultantCultist card) { diff --git a/Mage.Sets/src/mage/cards/f/FalseProphet.java b/Mage.Sets/src/mage/cards/f/FalseProphet.java index 968b9c34550..6db36bfe8db 100644 --- a/Mage.Sets/src/mage/cards/f/FalseProphet.java +++ b/Mage.Sets/src/mage/cards/f/FalseProphet.java @@ -3,7 +3,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ExileAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class FalseProphet extends CardImpl { this.toughness = new MageInt(2); // When False Prophet dies, exile all creatures. - this.addAbility(new DiesTriggeredAbility(new ExileAllEffect(new FilterCreaturePermanent()))); + this.addAbility(new DiesSourceTriggeredAbility(new ExileAllEffect(new FilterCreaturePermanent()))); } public FalseProphet(final FalseProphet card) { diff --git a/Mage.Sets/src/mage/cards/f/FeralProwler.java b/Mage.Sets/src/mage/cards/f/FeralProwler.java index 35935d2fcbb..5636aa30e89 100644 --- a/Mage.Sets/src/mage/cards/f/FeralProwler.java +++ b/Mage.Sets/src/mage/cards/f/FeralProwler.java @@ -2,7 +2,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -18,7 +18,7 @@ public final class FeralProwler extends CardImpl { power = new MageInt(1); toughness = new MageInt(3); - addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } public FeralProwler(final FeralProwler feralProwler) { diff --git a/Mage.Sets/src/mage/cards/f/FesteringGoblin.java b/Mage.Sets/src/mage/cards/f/FesteringGoblin.java index 846165c4b54..a5d737259b4 100644 --- a/Mage.Sets/src/mage/cards/f/FesteringGoblin.java +++ b/Mage.Sets/src/mage/cards/f/FesteringGoblin.java @@ -4,7 +4,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class FesteringGoblin extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), false); + Ability ability = new DiesSourceTriggeredAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FesteringMummy.java b/Mage.Sets/src/mage/cards/f/FesteringMummy.java index ce2d4cc4baf..9278a6c6a99 100644 --- a/Mage.Sets/src/mage/cards/f/FesteringMummy.java +++ b/Mage.Sets/src/mage/cards/f/FesteringMummy.java @@ -4,7 +4,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -27,7 +27,7 @@ public final class FesteringMummy extends CardImpl { this.toughness = new MageInt(1); // When Festering Mummy dies, you may put a -1/-1 counter on target creature. - Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), true); + Ability ability = new DiesSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FesteringNewt.java b/Mage.Sets/src/mage/cards/f/FesteringNewt.java index d0219fe32cf..21b616b3b6c 100644 --- a/Mage.Sets/src/mage/cards/f/FesteringNewt.java +++ b/Mage.Sets/src/mage/cards/f/FesteringNewt.java @@ -4,7 +4,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.condition.LockedInCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -45,7 +45,7 @@ public final class FesteringNewt extends CardImpl { new BoostTargetEffect(-1,-1, Duration.EndOfTurn), new LockedInCondition(new PermanentsOnTheBattlefieldCondition(filterBogbrewWitch)), "target creature an opponent controls gets -1/-1 until end of turn. That creature gets -4/-4 instead if you control a creature named Bogbrew Witch"); - Ability ability = new DiesTriggeredAbility(effect); + Ability ability = new DiesSourceTriggeredAbility(effect); ability.addTarget(new TargetCreaturePermanent(filterCreature)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FiligreeCrawler.java b/Mage.Sets/src/mage/cards/f/FiligreeCrawler.java index 3edcd09dfa2..c0ab6710dc4 100644 --- a/Mage.Sets/src/mage/cards/f/FiligreeCrawler.java +++ b/Mage.Sets/src/mage/cards/f/FiligreeCrawler.java @@ -3,7 +3,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class FiligreeCrawler extends CardImpl { this.toughness = new MageInt(2); // When Filigree Crawler dies, create a 1/1 colorless Thopter artifact creature token with flying. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken()))); } public FiligreeCrawler(final FiligreeCrawler card) { diff --git a/Mage.Sets/src/mage/cards/f/FiligreeFamiliar.java b/Mage.Sets/src/mage/cards/f/FiligreeFamiliar.java index 854c79187c0..50a977f31ff 100644 --- a/Mage.Sets/src/mage/cards/f/FiligreeFamiliar.java +++ b/Mage.Sets/src/mage/cards/f/FiligreeFamiliar.java @@ -3,7 +3,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -28,7 +28,7 @@ public final class FiligreeFamiliar extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2), false)); // When Filigree Familiar dies, draw a card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } public FiligreeFamiliar(final FiligreeFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/f/FireSnake.java b/Mage.Sets/src/mage/cards/f/FireSnake.java index 2f6dca506d7..1a042533916 100644 --- a/Mage.Sets/src/mage/cards/f/FireSnake.java +++ b/Mage.Sets/src/mage/cards/f/FireSnake.java @@ -4,7 +4,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class FireSnake extends CardImpl { this.toughness = new MageInt(1); // When Fire Snake dies, destroy target land. - Ability ability = new DiesTriggeredAbility(new DestroyTargetEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new DestroyTargetEffect(), false); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FlameWreathedPhoenix.java b/Mage.Sets/src/mage/cards/f/FlameWreathedPhoenix.java index e3a72038456..fda65cb18dc 100644 --- a/Mage.Sets/src/mage/cards/f/FlameWreathedPhoenix.java +++ b/Mage.Sets/src/mage/cards/f/FlameWreathedPhoenix.java @@ -4,7 +4,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.TributeNotPaidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -39,7 +39,7 @@ public final class FlameWreathedPhoenix extends CardImpl { this.addAbility(new TributeAbility(2)); // When Flame-Wreathed Phoenix enters the battlefield, if its tribute wasn't paid, it gains haste and "When this creature dies, return it to its owner's hand." TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield)); - Effect effect = new GainAbilitySourceEffect(new DiesTriggeredAbility(new ReturnToHandSourceEffect())); + Effect effect = new GainAbilitySourceEffect(new DiesSourceTriggeredAbility(new ReturnToHandSourceEffect())); ability.addEffect(effect); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, TributeNotPaidCondition.instance, "When {this} enters the battlefield, if its tribute wasn't paid, it gains haste and \"When this creature dies, return it to its owner's hand.\"")); diff --git a/Mage.Sets/src/mage/cards/f/FleshCarver.java b/Mage.Sets/src/mage/cards/f/FleshCarver.java index 96e7e22f3a4..1ef0f7f28a2 100644 --- a/Mage.Sets/src/mage/cards/f/FleshCarver.java +++ b/Mage.Sets/src/mage/cards/f/FleshCarver.java @@ -4,7 +4,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -63,7 +63,7 @@ public final class FleshCarver extends CardImpl { } } -class FleshCarverAbility extends DiesTriggeredAbility { +class FleshCarverAbility extends DiesSourceTriggeredAbility { public FleshCarverAbility() { super(new FleshCarverEffect(), false); diff --git a/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java b/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java index 2d5368f786d..35162b4f3a0 100644 --- a/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java +++ b/Mage.Sets/src/mage/cards/f/FlightSpellbomb.java @@ -4,7 +4,7 @@ package mage.cards.f; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -32,7 +32,7 @@ public final class FlightSpellbomb extends CardImpl { ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); - this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{U}")), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{U}")), false)); } public FlightSpellbomb (final FlightSpellbomb card) { diff --git a/Mage.Sets/src/mage/cards/f/FloatingDreamZubera.java b/Mage.Sets/src/mage/cards/f/FloatingDreamZubera.java index f2e77e0b509..ad4c7fd2529 100644 --- a/Mage.Sets/src/mage/cards/f/FloatingDreamZubera.java +++ b/Mage.Sets/src/mage/cards/f/FloatingDreamZubera.java @@ -4,7 +4,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.ZuberasDiedDynamicValue; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class FloatingDreamZubera extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(ZuberasDiedDynamicValue.instance)), new ZuberasDiedWatcher()); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(ZuberasDiedDynamicValue.instance)), new ZuberasDiedWatcher()); } public FloatingDreamZubera(final FloatingDreamZubera card) { diff --git a/Mage.Sets/src/mage/cards/f/FootlightFiend.java b/Mage.Sets/src/mage/cards/f/FootlightFiend.java index 6d7d41f9794..08d0071347f 100644 --- a/Mage.Sets/src/mage/cards/f/FootlightFiend.java +++ b/Mage.Sets/src/mage/cards/f/FootlightFiend.java @@ -2,7 +2,7 @@ package mage.cards.f; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class FootlightFiend extends CardImpl { this.toughness = new MageInt(1); // When Footlight Fiend dies, it deals 1 damage to any target. - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(1, "it")); + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(1, "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/ForsakenDrifters.java b/Mage.Sets/src/mage/cards/f/ForsakenDrifters.java index cf624e8dce7..822954776da 100644 --- a/Mage.Sets/src/mage/cards/f/ForsakenDrifters.java +++ b/Mage.Sets/src/mage/cards/f/ForsakenDrifters.java @@ -3,7 +3,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class ForsakenDrifters extends CardImpl { this.toughness = new MageInt(2); // When Forsaken Drifters dies, put the top four cards of your library into your graveyard. - this.addAbility(new DiesTriggeredAbility(new PutTopCardOfLibraryIntoGraveControllerEffect(4))); + this.addAbility(new DiesSourceTriggeredAbility(new PutTopCardOfLibraryIntoGraveControllerEffect(4))); } public ForsakenDrifters(final ForsakenDrifters card) { diff --git a/Mage.Sets/src/mage/cards/f/FyndhornDruid.java b/Mage.Sets/src/mage/cards/f/FyndhornDruid.java index a1b1fb15afa..5c3f7b50cb3 100644 --- a/Mage.Sets/src/mage/cards/f/FyndhornDruid.java +++ b/Mage.Sets/src/mage/cards/f/FyndhornDruid.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -31,7 +31,7 @@ public final class FyndhornDruid extends CardImpl { this.toughness = new MageInt(2); // When Fyndhorn Druid dies, if it was blocked this turn, you gain 4 life. - this.addAbility(new ConditionalInterveningIfTriggeredAbility(new DiesTriggeredAbility(new GainLifeEffect(4)), new SourceWasBlockedThisTurnCondition(), + this.addAbility(new ConditionalInterveningIfTriggeredAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(4)), new SourceWasBlockedThisTurnCondition(), "When {this} dies, if it was blocked this turn, you gain 4 life."), new WasBlockedThisTurnWatcher()); } diff --git a/Mage.Sets/src/mage/cards/g/Gamekeeper.java b/Mage.Sets/src/mage/cards/g/Gamekeeper.java index d3e3ef3ab02..967860a4e2d 100644 --- a/Mage.Sets/src/mage/cards/g/Gamekeeper.java +++ b/Mage.Sets/src/mage/cards/g/Gamekeeper.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.common.ExileSourceFromGraveCost; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.RevealCardsFromLibraryUntilEffect; @@ -27,7 +27,7 @@ public final class Gamekeeper extends CardImpl { this.toughness = new MageInt(2); // When Gamekeeper dies, you may exile it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and put all other cards revealed this way into your graveyard. - Ability ability = new DiesTriggeredAbility(new DoIfCostPaid(new RevealCardsFromLibraryUntilEffect(StaticFilters.FILTER_CARD_CREATURE, Zone.BATTLEFIELD, Zone.GRAVEYARD), new ExileSourceFromGraveCost(), "Exile to reveal cards from the top of your library until you reveal a creature card?"), false); + Ability ability = new DiesSourceTriggeredAbility(new DoIfCostPaid(new RevealCardsFromLibraryUntilEffect(StaticFilters.FILTER_CARD_CREATURE, Zone.BATTLEFIELD, Zone.GRAVEYARD), new ExileSourceFromGraveCost(), "Exile to reveal cards from the top of your library until you reveal a creature card?"), false); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GangOfDevils.java b/Mage.Sets/src/mage/cards/g/GangOfDevils.java index 551c096e7ac..db51d712d77 100644 --- a/Mage.Sets/src/mage/cards/g/GangOfDevils.java +++ b/Mage.Sets/src/mage/cards/g/GangOfDevils.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -27,7 +27,7 @@ public final class GangOfDevils extends CardImpl { this.toughness = new MageInt(3); // When Gang of Devils dies, it deals 3 damage divided as you choose among one, two, or three target creatures and/or players. - Ability ability = new DiesTriggeredAbility(new DamageMultiEffect(3, "it")); + Ability ability = new DiesSourceTriggeredAbility(new DamageMultiEffect(3, "it")); ability.addTarget(new TargetAnyTargetAmount(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GarrisonCat.java b/Mage.Sets/src/mage/cards/g/GarrisonCat.java index cb8a54b5127..5050906846b 100644 --- a/Mage.Sets/src/mage/cards/g/GarrisonCat.java +++ b/Mage.Sets/src/mage/cards/g/GarrisonCat.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class GarrisonCat extends CardImpl { this.toughness = new MageInt(1); // When Garrison Cat dies, create a 1/1 white Human Soldier creature token. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new HumanSoldierToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new HumanSoldierToken()))); } private GarrisonCat(final GarrisonCat card) { diff --git a/Mage.Sets/src/mage/cards/g/GerrardWeatherlightHero.java b/Mage.Sets/src/mage/cards/g/GerrardWeatherlightHero.java index 63374c19733..9e627ba1b4e 100644 --- a/Mage.Sets/src/mage/cards/g/GerrardWeatherlightHero.java +++ b/Mage.Sets/src/mage/cards/g/GerrardWeatherlightHero.java @@ -3,7 +3,7 @@ package mage.cards.g; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSourceEffect; import mage.abilities.keyword.FirstStrikeAbility; @@ -40,7 +40,7 @@ public final class GerrardWeatherlightHero extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // When Gerrard, Weatherlight Hero dies, exile it and return to the battlefield all artifact and creature cards in your graveyard that were put there from the battlefield this turn. - Ability ability = new DiesTriggeredAbility(new ExileSourceEffect().setText("exile it")); + Ability ability = new DiesSourceTriggeredAbility(new ExileSourceEffect().setText("exile it")); ability.addEffect(new GerrardWeatherlightHeroEffect()); this.addAbility(ability, new GerrardWeatherlightHeroWatcher()); } diff --git a/Mage.Sets/src/mage/cards/g/GiantAlbatross.java b/Mage.Sets/src/mage/cards/g/GiantAlbatross.java index e81634de131..ceaa56f5b1f 100644 --- a/Mage.Sets/src/mage/cards/g/GiantAlbatross.java +++ b/Mage.Sets/src/mage/cards/g/GiantAlbatross.java @@ -3,7 +3,7 @@ package mage.cards.g; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,7 +39,7 @@ public final class GiantAlbatross extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Giant Albatross dies, you may pay {1}{U}. If you do, for each creature that dealt damage to Giant Albatross this turn, destroy that creature unless its controller pays 2 life. A creature destroyed this way can't be regenerated. - Ability ability = new DiesTriggeredAbility(new DoIfCostPaid(new GiantAlbatrossEffect(), new ManaCostsImpl("{1}{U}"))); + Ability ability = new DiesSourceTriggeredAbility(new DoIfCostPaid(new GiantAlbatrossEffect(), new ManaCostsImpl("{1}{U}"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GleamingBarrier.java b/Mage.Sets/src/mage/cards/g/GleamingBarrier.java index 8a0c60476a4..fc03735d675 100644 --- a/Mage.Sets/src/mage/cards/g/GleamingBarrier.java +++ b/Mage.Sets/src/mage/cards/g/GleamingBarrier.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; @@ -29,7 +29,7 @@ public final class GleamingBarrier extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // When Gleaming Barrier dies, create a colorless Treasure artifact token with "{t}, Sacrifice this artifact: Add one mana of any color." - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new TreasureToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new TreasureToken()))); } public GleamingBarrier(final GleamingBarrier card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinArsonist.java b/Mage.Sets/src/mage/cards/g/GoblinArsonist.java index df8e6b48d3a..3e6e67a7ff9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinArsonist.java +++ b/Mage.Sets/src/mage/cards/g/GoblinArsonist.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -27,7 +27,7 @@ public final class GoblinArsonist extends CardImpl { this.toughness = new MageInt(1); // When Goblin Arsonist dies, you may have it deal 1 damage to any target. - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(1), true); + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(1), true); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinAssaultTeam.java b/Mage.Sets/src/mage/cards/g/GoblinAssaultTeam.java index 6efdad649ab..119ff344a29 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinAssaultTeam.java +++ b/Mage.Sets/src/mage/cards/g/GoblinAssaultTeam.java @@ -2,7 +2,7 @@ package mage.cards.g; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; @@ -31,7 +31,7 @@ public final class GoblinAssaultTeam extends CardImpl { this.addAbility(HasteAbility.getInstance()); // When Goblin Assault Team dies, put a +1/+1 counter on target creature you control. - Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); + Ability ability = new DiesSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinGardener.java b/Mage.Sets/src/mage/cards/g/GoblinGardener.java index 63f5b185917..ae7e2be66ea 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGardener.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGardener.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class GoblinGardener extends CardImpl { this.toughness = new MageInt(1); // When Goblin Gardener dies, destroy target land. - Ability ability = new DiesTriggeredAbility(new DestroyTargetEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new DestroyTargetEffect(), false); ability.addTarget(new TargetLandPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinMasons.java b/Mage.Sets/src/mage/cards/g/GoblinMasons.java index 7d6fff41006..4afef73b5c7 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMasons.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMasons.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -33,7 +33,7 @@ public final class GoblinMasons extends CardImpl { this.toughness = new MageInt(1); //When Goblin Masons dies, destroy target Wall - DiesTriggeredAbility ability = new DiesTriggeredAbility(new DestroyTargetEffect(), false); + DiesSourceTriggeredAbility ability = new DiesSourceTriggeredAbility(new DestroyTargetEffect(), false); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GolgariThug.java b/Mage.Sets/src/mage/cards/g/GolgariThug.java index 98b5759fed2..2054216b9a7 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariThug.java +++ b/Mage.Sets/src/mage/cards/g/GolgariThug.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.keyword.DredgeAbility; import mage.cards.CardImpl; @@ -35,7 +35,7 @@ public final class GolgariThug extends CardImpl { this.toughness = new MageInt(1); // When Golgari Thug dies, put target creature card from your graveyard on top of your library. - Ability ability = new DiesTriggeredAbility(new PutOnLibraryTargetEffect(true)); + Ability ability = new DiesSourceTriggeredAbility(new PutOnLibraryTargetEffect(true)); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); // Dredge 4 diff --git a/Mage.Sets/src/mage/cards/g/Greedo.java b/Mage.Sets/src/mage/cards/g/Greedo.java index 16bf9f64eb4..199ed4564f0 100644 --- a/Mage.Sets/src/mage/cards/g/Greedo.java +++ b/Mage.Sets/src/mage/cards/g/Greedo.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; @@ -45,7 +45,7 @@ public final class Greedo extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter, "Creatures blocking or blocked by {this} have first strike"))); // When Greedo dies, you may search your library for Hunter or Rogue card, reveal it, and put it into your hand. - this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true), true)); + this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true), true)); } public Greedo(final Greedo card) { diff --git a/Mage.Sets/src/mage/cards/g/GreenwardenOfMurasa.java b/Mage.Sets/src/mage/cards/g/GreenwardenOfMurasa.java index 3a2bdfcaaaf..ab52e220560 100644 --- a/Mage.Sets/src/mage/cards/g/GreenwardenOfMurasa.java +++ b/Mage.Sets/src/mage/cards/g/GreenwardenOfMurasa.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.ExileSourceFromGraveCost; import mage.abilities.effects.common.DoIfCostPaid; @@ -33,7 +33,7 @@ public final class GreenwardenOfMurasa extends CardImpl { this.addAbility(ability); // When Greenwarden of Murasa dies, you may exile it. If you do, return target card from your graveyard to your hand. - ability = new DiesTriggeredAbility(new DoIfCostPaid(new ReturnFromGraveyardToHandTargetEffect(), new ExileSourceFromGraveCost(), + ability = new DiesSourceTriggeredAbility(new DoIfCostPaid(new ReturnFromGraveyardToHandTargetEffect(), new ExileSourceFromGraveCost(), "Exile {this} and return target card from your graveyard to your hand?", true), false); ability.addTarget(new TargetCardInYourGraveyard()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GriefTyrant.java b/Mage.Sets/src/mage/cards/g/GriefTyrant.java index 603df5b9419..c30b52fd2e3 100644 --- a/Mage.Sets/src/mage/cards/g/GriefTyrant.java +++ b/Mage.Sets/src/mage/cards/g/GriefTyrant.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -34,7 +34,7 @@ public final class GriefTyrant extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(4)))); // When Grief Tyrant dies, put a -1/-1 counter on target creature for each -1/-1 counter on Grief Tyrant. - Ability ability = new DiesTriggeredAbility(new GriefTyrantEffect()); + Ability ability = new DiesSourceTriggeredAbility(new GriefTyrantEffect()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GrimInitiate.java b/Mage.Sets/src/mage/cards/g/GrimInitiate.java index ac59582d80f..09e20471ba5 100644 --- a/Mage.Sets/src/mage/cards/g/GrimInitiate.java +++ b/Mage.Sets/src/mage/cards/g/GrimInitiate.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.keyword.AmassEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class GrimInitiate extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // When Grim Initiate dies, amass 1. - this.addAbility(new DiesTriggeredAbility(new AmassEffect(1))); + this.addAbility(new DiesSourceTriggeredAbility(new AmassEffect(1))); } private GrimInitiate(final GrimInitiate card) { diff --git a/Mage.Sets/src/mage/cards/g/GrimPhysician.java b/Mage.Sets/src/mage/cards/g/GrimPhysician.java index 598305c58e8..12daab2dd80 100644 --- a/Mage.Sets/src/mage/cards/g/GrimPhysician.java +++ b/Mage.Sets/src/mage/cards/g/GrimPhysician.java @@ -2,7 +2,7 @@ package mage.cards.g; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class GrimPhysician extends CardImpl { this.toughness = new MageInt(1); // When Grim Physician dies, target creature an opponent controls gets -1/-1 until end of turn. - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-1, -1)); + Ability ability = new DiesSourceTriggeredAbility(new BoostTargetEffect(-1, -1)); ability.addTarget(new TargetOpponentsCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GrixisSojourners.java b/Mage.Sets/src/mage/cards/g/GrixisSojourners.java index 9c8af92701c..1f15137feb9 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisSojourners.java +++ b/Mage.Sets/src/mage/cards/g/GrixisSojourners.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.CyclingAbility; @@ -35,7 +35,7 @@ public final class GrixisSojourners extends CardImpl { // When you cycle Grixis Sojourners or it dies, you may exile target card from a graveyard. Ability ability1 = new CycleTriggeredAbility(new ExileTargetEffect(), true); - Ability ability2 = new DiesTriggeredAbility(new ExileTargetEffect(), true); + Ability ability2 = new DiesSourceTriggeredAbility(new ExileTargetEffect(), true); ability1.addTarget(new TargetCardInASingleGraveyard(1, 1, new FilterCard())); ability2.addTarget(new TargetCardInASingleGraveyard(1, 1, new FilterCard())); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/cards/g/GuanYuSaintedWarrior.java b/Mage.Sets/src/mage/cards/g/GuanYuSaintedWarrior.java index e47a6ea0b88..76b4dd93d75 100644 --- a/Mage.Sets/src/mage/cards/g/GuanYuSaintedWarrior.java +++ b/Mage.Sets/src/mage/cards/g/GuanYuSaintedWarrior.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect; import mage.abilities.keyword.HorsemanshipAbility; import mage.cards.CardImpl; @@ -30,7 +30,7 @@ public final class GuanYuSaintedWarrior extends CardImpl { // Horsemanship this.addAbility(HorsemanshipAbility.getInstance()); // When Guan Yu, Sainted Warrior is put into your graveyard from the battlefield, you may shuffle Guan Yu into your library. - this.addAbility(new DiesTriggeredAbility(new ShuffleIntoLibrarySourceEffect(), true)); + this.addAbility(new DiesSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect(), true)); } public GuanYuSaintedWarrior(final GuanYuSaintedWarrior card) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianAutomaton.java b/Mage.Sets/src/mage/cards/g/GuardianAutomaton.java index 29da03f155a..62bb99b5ba1 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianAutomaton.java +++ b/Mage.Sets/src/mage/cards/g/GuardianAutomaton.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class GuardianAutomaton extends CardImpl { this.toughness = new MageInt(3); // When Guardian Automaton dies, you gain 3 life. - this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(3))); + this.addAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(3))); } public GuardianAutomaton(final GuardianAutomaton card) { diff --git a/Mage.Sets/src/mage/cards/h/HaakonStromgaldScourge.java b/Mage.Sets/src/mage/cards/h/HaakonStromgaldScourge.java index edba324a79d..d9008934517 100644 --- a/Mage.Sets/src/mage/cards/h/HaakonStromgaldScourge.java +++ b/Mage.Sets/src/mage/cards/h/HaakonStromgaldScourge.java @@ -5,7 +5,7 @@ package mage.cards.h; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; @@ -41,7 +41,7 @@ public final class HaakonStromgaldScourge extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new HaakonPlayKnightsFromGraveyardEffect())); // When Haakon dies, you lose 2 life. - this.addAbility(new DiesTriggeredAbility(new LoseLifeSourceControllerEffect(2))); + this.addAbility(new DiesSourceTriggeredAbility(new LoseLifeSourceControllerEffect(2))); } diff --git a/Mage.Sets/src/mage/cards/h/HallowedSpiritkeeper.java b/Mage.Sets/src/mage/cards/h/HallowedSpiritkeeper.java index 99be8546da1..857fe640b90 100644 --- a/Mage.Sets/src/mage/cards/h/HallowedSpiritkeeper.java +++ b/Mage.Sets/src/mage/cards/h/HallowedSpiritkeeper.java @@ -3,7 +3,7 @@ package mage.cards.h; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; @@ -34,7 +34,7 @@ public final class HallowedSpiritkeeper extends CardImpl { // When Hallowed Spiritkeeper dies, create X 1/1 white Spirit creature tokens with flying, where X is the number of creature cards in your graveyard. Effect effect = new CreateTokenEffect(new SpiritWhiteToken(), new CardsInControllerGraveyardCount(new FilterCreatureCard("creature cards"))); effect.setText("create X 1/1 white Spirit creature tokens with flying, where X is the number of creature cards in your graveyard"); - this.addAbility(new DiesTriggeredAbility(effect, false)); + this.addAbility(new DiesSourceTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/h/HangarbackWalker.java b/Mage.Sets/src/mage/cards/h/HangarbackWalker.java index 4570d903760..ce79708ffdd 100644 --- a/Mage.Sets/src/mage/cards/h/HangarbackWalker.java +++ b/Mage.Sets/src/mage/cards/h/HangarbackWalker.java @@ -4,7 +4,7 @@ package mage.cards.h; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -37,7 +37,7 @@ public final class HangarbackWalker extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // When Hangarback Walker dies, create a 1/1 colorless Thopter artifact creature token with flying for each +1/+1 counter on Hangarback Walker. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken(), new CountersSourceCount(CounterType.P1P1)), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new ThopterColorlessToken(), new CountersSourceCount(CounterType.P1P1)), false)); // {1}, {t}: Put a +1/+1 counter on Hangarback Walker. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new GenericManaCost(1)); diff --git a/Mage.Sets/src/mage/cards/h/HarvestHand.java b/Mage.Sets/src/mage/cards/h/HarvestHand.java index 7661170773f..5a888543a5d 100644 --- a/Mage.Sets/src/mage/cards/h/HarvestHand.java +++ b/Mage.Sets/src/mage/cards/h/HarvestHand.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.Card; @@ -34,7 +34,7 @@ public final class HarvestHand extends CardImpl { // When Harvest Hand dies, return it to the battlefield transformed under your control. this.addAbility(new TransformAbility()); - this.addAbility(new DiesTriggeredAbility(new HarvestHandReturnTransformedEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new HarvestHandReturnTransformedEffect())); } public HarvestHand(final HarvestHand card) { diff --git a/Mage.Sets/src/mage/cards/h/HauntedAngel.java b/Mage.Sets/src/mage/cards/h/HauntedAngel.java index 7bdf24ead2a..ff9fe07823f 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedAngel.java +++ b/Mage.Sets/src/mage/cards/h/HauntedAngel.java @@ -4,7 +4,7 @@ package mage.cards.h; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -32,7 +32,7 @@ public final class HauntedAngel extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Haunted Angel dies, exile Haunted Angel and each other player creates a 3/3 black Angel creature token with flying. - Ability ability = new DiesTriggeredAbility(new ExileSourceEffect()); + Ability ability = new DiesSourceTriggeredAbility(new ExileSourceEffect()); ability.addEffect(new HauntedAngelEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HavocDemon.java b/Mage.Sets/src/mage/cards/h/HavocDemon.java index aa285492e90..2be010eca2c 100644 --- a/Mage.Sets/src/mage/cards/h/HavocDemon.java +++ b/Mage.Sets/src/mage/cards/h/HavocDemon.java @@ -3,7 +3,7 @@ package mage.cards.h; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class HavocDemon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Havoc Demon dies, all creatures get -5/-5 until end of turn. - this.addAbility(new DiesTriggeredAbility(new BoostAllEffect(-5, -5, Duration.EndOfTurn), false)); + this.addAbility(new DiesSourceTriggeredAbility(new BoostAllEffect(-5, -5, Duration.EndOfTurn), false)); } public HavocDemon(final HavocDemon card) { diff --git a/Mage.Sets/src/mage/cards/h/Helvault.java b/Mage.Sets/src/mage/cards/h/Helvault.java index 3a02b95c3ae..325e1aadad3 100644 --- a/Mage.Sets/src/mage/cards/h/Helvault.java +++ b/Mage.Sets/src/mage/cards/h/Helvault.java @@ -1,6 +1,6 @@ package mage.cards.h; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -39,7 +39,7 @@ public final class Helvault extends CardImpl { this.addAbility(ability); // When Helvault is put into a graveyard from the battlefield, return all cards exiled with it to the battlefield under their owners' control. - this.addAbility(new DiesTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD))); + this.addAbility(new DiesSourceTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD))); } private Helvault(final Helvault card) { diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfTheDreadhorde.java b/Mage.Sets/src/mage/cards/h/HeraldOfTheDreadhorde.java index ef383f86e43..0538dfcd8b1 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfTheDreadhorde.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfTheDreadhorde.java @@ -1,7 +1,7 @@ package mage.cards.h; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.keyword.AmassEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class HeraldOfTheDreadhorde extends CardImpl { this.toughness = new MageInt(2); // When Herald of the Dreadhorde dies, amass 2. - this.addAbility(new DiesTriggeredAbility(new AmassEffect(2))); + this.addAbility(new DiesSourceTriggeredAbility(new AmassEffect(2))); } private HeraldOfTheDreadhorde(final HeraldOfTheDreadhorde card) { diff --git a/Mage.Sets/src/mage/cards/h/HighlandGame.java b/Mage.Sets/src/mage/cards/h/HighlandGame.java index 27d939079ec..65f04583c0e 100644 --- a/Mage.Sets/src/mage/cards/h/HighlandGame.java +++ b/Mage.Sets/src/mage/cards/h/HighlandGame.java @@ -3,7 +3,7 @@ package mage.cards.h; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class HighlandGame extends CardImpl { this.toughness = new MageInt(1); // When Highland Game dies, you gain 2 life. - this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(2))); + this.addAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(2))); } public HighlandGame(final HighlandGame card) { diff --git a/Mage.Sets/src/mage/cards/h/HoardingDragon.java b/Mage.Sets/src/mage/cards/h/HoardingDragon.java index a5a5b394b64..1a42bc8d5fa 100644 --- a/Mage.Sets/src/mage/cards/h/HoardingDragon.java +++ b/Mage.Sets/src/mage/cards/h/HoardingDragon.java @@ -6,7 +6,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnFromExileEffect; @@ -44,7 +44,7 @@ public final class HoardingDragon extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new HoardingDragonEffect(this.getId()), true)); // When Hoarding Dragon dies, you may put the exiled card into its owner's hand. - this.addAbility(new DiesTriggeredAbility(new ReturnFromExileEffect(this.getId(), Zone.HAND), false)); + this.addAbility(new DiesSourceTriggeredAbility(new ReturnFromExileEffect(this.getId(), Zone.HAND), false)); } public HoardingDragon(final HoardingDragon card) { diff --git a/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java b/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java index 6a06beb23d3..6b9715e047c 100644 --- a/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java +++ b/Mage.Sets/src/mage/cards/h/HomuraHumanAscendant.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CantBlockAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.FlippedCondition; @@ -50,7 +50,7 @@ public final class HomuraHumanAscendant extends CardImpl { // Homura, Human Ascendant can't block. this.addAbility(new CantBlockAbility()); // When Homura dies, return it to the battlefield flipped. - this.addAbility(new DiesTriggeredAbility(new HomuraReturnFlippedSourceEffect(new HomurasEssence2()))); + this.addAbility(new DiesSourceTriggeredAbility(new HomuraReturnFlippedSourceEffect(new HomurasEssence2()))); } public HomuraHumanAscendant(final HomuraHumanAscendant card) { diff --git a/Mage.Sets/src/mage/cards/h/HoodedHydra.java b/Mage.Sets/src/mage/cards/h/HoodedHydra.java index 379d8270aaa..38c59f42d3e 100644 --- a/Mage.Sets/src/mage/cards/h/HoodedHydra.java +++ b/Mage.Sets/src/mage/cards/h/HoodedHydra.java @@ -4,7 +4,7 @@ package mage.cards.h; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,7 +41,7 @@ public final class HoodedHydra extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // When Hooded Hydra dies, create a 1/1 green Snake creature token for each +1/+1 counter on it. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SnakeToken("KTK"), new CountersSourceCount(CounterType.P1P1)), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new SnakeToken("KTK"), new CountersSourceCount(CounterType.P1P1)), false)); // Morph {3}{G}{G} this.addAbility(new MorphAbility(this, new ManaCostsImpl("{3}{G}{G}"))); diff --git a/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java b/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java index 5a2246cb104..d2b560305d7 100644 --- a/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java +++ b/Mage.Sets/src/mage/cards/h/HorizonSpellbomb.java @@ -1,7 +1,7 @@ package mage.cards.h; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -35,7 +35,7 @@ public final class HorizonSpellbomb extends CardImpl { ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); // When Horizon Spellbomb is put into a graveyard from the battlefield, you may pay {G}. If you do, draw a card. - this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{G}")))); + this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{G}")))); } public HorizonSpellbomb(final HorizonSpellbomb card) { diff --git a/Mage.Sets/src/mage/cards/h/HornetHarasser.java b/Mage.Sets/src/mage/cards/h/HornetHarasser.java index b6aa781c473..7cd503d8aff 100644 --- a/Mage.Sets/src/mage/cards/h/HornetHarasser.java +++ b/Mage.Sets/src/mage/cards/h/HornetHarasser.java @@ -4,7 +4,7 @@ package mage.cards.h; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class HornetHarasser extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), false); + Ability ability = new DiesSourceTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HuntedWitness.java b/Mage.Sets/src/mage/cards/h/HuntedWitness.java index 33c60a31772..436b98c9b31 100644 --- a/Mage.Sets/src/mage/cards/h/HuntedWitness.java +++ b/Mage.Sets/src/mage/cards/h/HuntedWitness.java @@ -2,7 +2,7 @@ package mage.cards.h; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.SubType; import mage.cards.CardImpl; @@ -24,7 +24,7 @@ public final class HuntedWitness extends CardImpl { this.toughness = new MageInt(1); // When Hunted Witness dies, create a 1/1 white Soldier creature token with lifelink. - this.addAbility(new DiesTriggeredAbility( + this.addAbility(new DiesSourceTriggeredAbility( new CreateTokenEffect(new SoldierLifelinkToken()) )); } diff --git a/Mage.Sets/src/mage/cards/h/HurloonShaman.java b/Mage.Sets/src/mage/cards/h/HurloonShaman.java index c14aee9699a..0347659da20 100644 --- a/Mage.Sets/src/mage/cards/h/HurloonShaman.java +++ b/Mage.Sets/src/mage/cards/h/HurloonShaman.java @@ -3,7 +3,7 @@ package mage.cards.h; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class HurloonShaman extends CardImpl { this.toughness = new MageInt(3); // When Hurloon Shaman dies, each player sacrifices a land. - this.addAbility(new DiesTriggeredAbility(new SacrificeAllEffect(new FilterControlledLandPermanent("land")))); + this.addAbility(new DiesSourceTriggeredAbility(new SacrificeAllEffect(new FilterControlledLandPermanent("land")))); } public HurloonShaman(final HurloonShaman card) { diff --git a/Mage.Sets/src/mage/cards/i/ImmortalPhoenix.java b/Mage.Sets/src/mage/cards/i/ImmortalPhoenix.java index e43b33376c6..076ea534f27 100644 --- a/Mage.Sets/src/mage/cards/i/ImmortalPhoenix.java +++ b/Mage.Sets/src/mage/cards/i/ImmortalPhoenix.java @@ -1,7 +1,7 @@ package mage.cards.i; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class ImmortalPhoenix extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Immortal Phoenix dies, return it to its owner’s hand. - this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new ReturnToHandSourceEffect())); } public ImmortalPhoenix(final ImmortalPhoenix card) { diff --git a/Mage.Sets/src/mage/cards/i/InameAsOne.java b/Mage.Sets/src/mage/cards/i/InameAsOne.java index 7009a9b60f4..9d81ec065f4 100644 --- a/Mage.Sets/src/mage/cards/i/InameAsOne.java +++ b/Mage.Sets/src/mage/cards/i/InameAsOne.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.CastFromHandSourcePermanentCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -56,7 +56,7 @@ public final class InameAsOne extends CardImpl { new CastFromHandWatcher()); // When Iname as One dies, you may exile it. If you do, return target Spirit permanent card from your graveyard to the battlefield. - Ability ability = new DiesTriggeredAbility(new InameAsOneEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new InameAsOneEffect(), false); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InameLifeAspect.java b/Mage.Sets/src/mage/cards/i/InameLifeAspect.java index 91489ac7b02..4ba6cc586d7 100644 --- a/Mage.Sets/src/mage/cards/i/InameLifeAspect.java +++ b/Mage.Sets/src/mage/cards/i/InameLifeAspect.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSourceEffect; @@ -42,7 +42,7 @@ public final class InameLifeAspect extends CardImpl { this.toughness = new MageInt(4); // When Iname, Life Aspect dies, you may exile it. If you do, return any number of target Spirit cards from your graveyard to your hand. - Ability ability = new DiesTriggeredAbility(new InameLifeAspectEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new InameLifeAspectEffect(), false); ability.addTarget(new TargetCardInYourGraveyard(0, Integer.MAX_VALUE, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InfectiousHost.java b/Mage.Sets/src/mage/cards/i/InfectiousHost.java index 8e352d12875..b8740b2a612 100644 --- a/Mage.Sets/src/mage/cards/i/InfectiousHost.java +++ b/Mage.Sets/src/mage/cards/i/InfectiousHost.java @@ -4,7 +4,7 @@ package mage.cards.i; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class InfectiousHost extends CardImpl { this.toughness = new MageInt(1); // When Infectious Host dies, target player loses 2 life. - Ability ability = new DiesTriggeredAbility(new LoseLifeTargetEffect(2), false); + Ability ability = new DiesSourceTriggeredAbility(new LoseLifeTargetEffect(2), false); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/InfernalScarring.java b/Mage.Sets/src/mage/cards/i/InfernalScarring.java index 10cccb69b0c..95d47bd72e6 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalScarring.java +++ b/Mage.Sets/src/mage/cards/i/InfernalScarring.java @@ -3,7 +3,7 @@ package mage.cards.i; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; @@ -43,7 +43,7 @@ public final class InfernalScarring extends CardImpl { Effect effect = new BoostEnchantedEffect(2, 0, Duration.WhileOnBattlefield); effect.setText("Enchanted creature gets +2/+0"); ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); - effect = new GainAbilityAttachedEffect(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1)), AttachmentType.AURA, Duration.WhileOnBattlefield); + effect = new GainAbilityAttachedEffect(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1)), AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("and has \"When this creature dies, draw a card.\""); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/InsidiousBookworms.java b/Mage.Sets/src/mage/cards/i/InsidiousBookworms.java index 4f6e4b83bec..09e327fa681 100644 --- a/Mage.Sets/src/mage/cards/i/InsidiousBookworms.java +++ b/Mage.Sets/src/mage/cards/i/InsidiousBookworms.java @@ -4,7 +4,7 @@ package mage.cards.i; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.discard.DiscardTargetEffect; @@ -27,7 +27,7 @@ public final class InsidiousBookworms extends CardImpl { this.toughness = new MageInt(1); // When Insidious Bookworms dies, you may pay {1}{B}. If you do, target player discards a card at random. - Ability ability = new DiesTriggeredAbility(new DoIfCostPaid(new DiscardTargetEffect(1, true), new ManaCostsImpl("{1}{B}"))); + Ability ability = new DiesSourceTriggeredAbility(new DoIfCostPaid(new DiscardTargetEffect(1, true), new ManaCostsImpl("{1}{B}"))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IvoryGargoyle.java b/Mage.Sets/src/mage/cards/i/IvoryGargoyle.java index 0cd6c5e37d4..98dcfe26522 100644 --- a/Mage.Sets/src/mage/cards/i/IvoryGargoyle.java +++ b/Mage.Sets/src/mage/cards/i/IvoryGargoyle.java @@ -3,7 +3,7 @@ package mage.cards.i; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -34,7 +34,7 @@ public final class IvoryGargoyle extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Ivory Gargoyle dies, return it to the battlefield under its owner's control at the beginning of the next end step and you skip your next draw step. - Ability ability = new DiesTriggeredAbility(new CreateDelayedTriggeredAbilityEffect( + Ability ability = new DiesSourceTriggeredAbility(new CreateDelayedTriggeredAbilityEffect( new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnSourceFromGraveyardToBattlefieldEffect()))); ability.addEffect(new SkipNextDrawStepControllerEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JeskaiSage.java b/Mage.Sets/src/mage/cards/j/JeskaiSage.java index f5b2c24b155..645dc0bf294 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiSage.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiSage.java @@ -3,7 +3,7 @@ package mage.cards.j; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.ProwessAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class JeskaiSage extends CardImpl { // Prowess this.addAbility(new ProwessAbility()); // When Jeskai Sage dies, draw a card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } diff --git a/Mage.Sets/src/mage/cards/j/JotunOwlKeeper.java b/Mage.Sets/src/mage/cards/j/JotunOwlKeeper.java index 3fa5faf6fd4..0107825f922 100644 --- a/Mage.Sets/src/mage/cards/j/JotunOwlKeeper.java +++ b/Mage.Sets/src/mage/cards/j/JotunOwlKeeper.java @@ -3,7 +3,7 @@ package mage.cards.j; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.OrCost; import mage.constants.SubType; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,7 +37,7 @@ public final class JotunOwlKeeper extends CardImpl { ))); // When Jötun Owl Keeper dies, put a 1/1 white Bird creature token with flying onto the battlefield for each age counter on it. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new BirdToken(), new CountersSourceCount(CounterType.AGE)))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new BirdToken(), new CountersSourceCount(CounterType.AGE)))); } public JotunOwlKeeper(final JotunOwlKeeper card) { diff --git a/Mage.Sets/src/mage/cards/j/JuganTheRisingStar.java b/Mage.Sets/src/mage/cards/j/JuganTheRisingStar.java index e51b970247a..5e5531682b9 100644 --- a/Mage.Sets/src/mage/cards/j/JuganTheRisingStar.java +++ b/Mage.Sets/src/mage/cards/j/JuganTheRisingStar.java @@ -5,7 +5,7 @@ package mage.cards.j; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.DistributeCountersEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -33,7 +33,7 @@ public final class JuganTheRisingStar extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Jugan, the Rising Star dies, you may distribute five +1/+1 counters among any number of target creatures. - Ability ability = new DiesTriggeredAbility(new DistributeCountersEffect(CounterType.P1P1, 5, false, "any number of target creatures"), true); + Ability ability = new DiesSourceTriggeredAbility(new DistributeCountersEffect(CounterType.P1P1, 5, false, "any number of target creatures"), true); ability.addTarget(new TargetCreaturePermanentAmount(5)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JundSojourners.java b/Mage.Sets/src/mage/cards/j/JundSojourners.java index 8a57e5939fb..6c7964133e3 100644 --- a/Mage.Sets/src/mage/cards/j/JundSojourners.java +++ b/Mage.Sets/src/mage/cards/j/JundSojourners.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.CyclingAbility; @@ -34,7 +34,7 @@ public final class JundSojourners extends CardImpl { // When you cycle Jund Sojourners or it dies, you may have it deal 1 damage to any target. Ability ability1 = new CycleTriggeredAbility(new DamageTargetEffect(1)); - Ability ability2 = new DiesTriggeredAbility(new DamageTargetEffect(1)); + Ability ability2 = new DiesSourceTriggeredAbility(new DamageTargetEffect(1)); ability1.addTarget(new TargetAnyTarget()); ability2.addTarget(new TargetAnyTarget()); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/cards/j/JunkDiver.java b/Mage.Sets/src/mage/cards/j/JunkDiver.java index f7b14942e34..9d5d731f6c7 100644 --- a/Mage.Sets/src/mage/cards/j/JunkDiver.java +++ b/Mage.Sets/src/mage/cards/j/JunkDiver.java @@ -4,7 +4,7 @@ package mage.cards.j; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.abilities.keyword.FlyingAbility; @@ -40,7 +40,7 @@ public final class JunkDiver extends CardImpl { // When Junk Diver dies, return another target artifact card from your graveyard to your hand. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); effect.setText("return another target artifact card from your graveyard to your hand"); - Ability ability = new DiesTriggeredAbility(effect); + Ability ability = new DiesSourceTriggeredAbility(effect); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KeigaTheTideStar.java b/Mage.Sets/src/mage/cards/k/KeigaTheTideStar.java index 3ba20234cce..6559e0b608b 100644 --- a/Mage.Sets/src/mage/cards/k/KeigaTheTideStar.java +++ b/Mage.Sets/src/mage/cards/k/KeigaTheTideStar.java @@ -5,7 +5,7 @@ package mage.cards.k; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.continuous.GainControlTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -34,7 +34,7 @@ public final class KeigaTheTideStar extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Keiga, the Tide Star dies, gain control of target creature. - Ability ability = new DiesTriggeredAbility(new GainControlTargetEffect(Duration.Custom)); + Ability ability = new DiesSourceTriggeredAbility(new GainControlTargetEffect(Duration.Custom)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/Kingfisher.java b/Mage.Sets/src/mage/cards/k/Kingfisher.java index 1144f22229e..92ec2a993fe 100644 --- a/Mage.Sets/src/mage/cards/k/Kingfisher.java +++ b/Mage.Sets/src/mage/cards/k/Kingfisher.java @@ -3,7 +3,7 @@ package mage.cards.k; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class Kingfisher extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Kingfisher dies, draw a card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } public Kingfisher(final Kingfisher card) { diff --git a/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java b/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java index d8134ac4387..97feb48727f 100644 --- a/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java +++ b/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java @@ -4,7 +4,7 @@ package mage.cards.k; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -45,7 +45,7 @@ public final class KinsbaileBorderguard extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(0), new PermanentsOnBattlefieldCount(filter), true), "with a +1/+1 counter on it for each other Kithkin you control")); // When Kinsbaile Borderguard dies, create a 1/1 white Kithkin Soldier creature token for each counter on it. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new KithkinToken(), new AllCountersCount()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new KithkinToken(), new AllCountersCount()))); } public KinsbaileBorderguard(final KinsbaileBorderguard card) { diff --git a/Mage.Sets/src/mage/cards/k/KokushoTheEveningStar.java b/Mage.Sets/src/mage/cards/k/KokushoTheEveningStar.java index 0336c4a7295..c1881be2aa1 100644 --- a/Mage.Sets/src/mage/cards/k/KokushoTheEveningStar.java +++ b/Mage.Sets/src/mage/cards/k/KokushoTheEveningStar.java @@ -5,7 +5,7 @@ package mage.cards.k; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -30,7 +30,7 @@ public final class KokushoTheEveningStar extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new DiesTriggeredAbility(new KokushoTheEveningStarEffect(), false)); + this.addAbility(new DiesSourceTriggeredAbility(new KokushoTheEveningStarEffect(), false)); } public KokushoTheEveningStar(final KokushoTheEveningStar card) { diff --git a/Mage.Sets/src/mage/cards/l/LawlessBroker.java b/Mage.Sets/src/mage/cards/l/LawlessBroker.java index 12ebf3c2562..d1ddc1b9290 100644 --- a/Mage.Sets/src/mage/cards/l/LawlessBroker.java +++ b/Mage.Sets/src/mage/cards/l/LawlessBroker.java @@ -4,7 +4,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -27,7 +27,7 @@ public final class LawlessBroker extends CardImpl { this.toughness = new MageInt(2); // When Lawless Broker dies, put a +1/+1 counter on target creature you control. - Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); + Ability ability = new DiesSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LeoninOfTheLostPride.java b/Mage.Sets/src/mage/cards/l/LeoninOfTheLostPride.java index 3d5719900f4..1fb3efdf0e7 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninOfTheLostPride.java +++ b/Mage.Sets/src/mage/cards/l/LeoninOfTheLostPride.java @@ -1,7 +1,7 @@ package mage.cards.l; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -28,7 +28,7 @@ public final class LeoninOfTheLostPride extends CardImpl { this.toughness = new MageInt(1); // When Leonin of the Lost Pride dies, exile target card from an opponent’s graveyard. - DiesTriggeredAbility diesTriggeredAbility = new DiesTriggeredAbility(new ExileTargetEffect()); + DiesSourceTriggeredAbility diesTriggeredAbility = new DiesSourceTriggeredAbility(new ExileTargetEffect()); diesTriggeredAbility.addTarget(new TargetCardInOpponentsGraveyard(new FilterCard("card from an opponent's graveyard"))); this.addAbility(diesTriggeredAbility); } diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfTheHollows.java b/Mage.Sets/src/mage/cards/l/LiegeOfTheHollows.java index 0d95599b09c..60e87dbe340 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfTheHollows.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfTheHollows.java @@ -2,7 +2,7 @@ package mage.cards.l; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenTargetEffect; @@ -33,7 +33,7 @@ public final class LiegeOfTheHollows extends CardImpl { // When Liege of the Hollows dies, each player may pay any amount of mana. // Then each player creates a number of 1/1 green Squirrel creature tokens equal to the amount of mana they paid this way. - this.addAbility(new DiesTriggeredAbility(new LiegeOfTheHollowsEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new LiegeOfTheHollowsEffect())); } public LiegeOfTheHollows(final LiegeOfTheHollows card) { diff --git a/Mage.Sets/src/mage/cards/l/LifebloodHydra.java b/Mage.Sets/src/mage/cards/l/LifebloodHydra.java index 64488b6dadb..7a772125413 100644 --- a/Mage.Sets/src/mage/cards/l/LifebloodHydra.java +++ b/Mage.Sets/src/mage/cards/l/LifebloodHydra.java @@ -4,7 +4,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.EntersBattlefieldWithXCountersEffect; @@ -39,7 +39,7 @@ public final class LifebloodHydra extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // When Lifeblood Hydra dies, you gain life and draw cards equal to its power. - this.addAbility(new DiesTriggeredAbility(new LifebloodHydraEffect(), false)); + this.addAbility(new DiesSourceTriggeredAbility(new LifebloodHydraEffect(), false)); } public LifebloodHydra(final LifebloodHydra card) { diff --git a/Mage.Sets/src/mage/cards/l/LightOfTheLegion.java b/Mage.Sets/src/mage/cards/l/LightOfTheLegion.java index c9581e39495..ebe0aac8bf7 100644 --- a/Mage.Sets/src/mage/cards/l/LightOfTheLegion.java +++ b/Mage.Sets/src/mage/cards/l/LightOfTheLegion.java @@ -3,7 +3,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.constants.SubType; import mage.abilities.keyword.FlyingAbility; @@ -42,7 +42,7 @@ public final class LightOfTheLegion extends CardImpl { this.addAbility(new MentorAbility()); // When Light of the Legion dies, put a +1/+1 counter on each white creature you control. - this.addAbility(new DiesTriggeredAbility(new AddCountersAllEffect( + this.addAbility(new DiesSourceTriggeredAbility(new AddCountersAllEffect( CounterType.P1P1.createInstance(), filter ))); } diff --git a/Mage.Sets/src/mage/cards/l/LivingLightning.java b/Mage.Sets/src/mage/cards/l/LivingLightning.java index 2b887c82c48..d024eb6c2a3 100644 --- a/Mage.Sets/src/mage/cards/l/LivingLightning.java +++ b/Mage.Sets/src/mage/cards/l/LivingLightning.java @@ -2,7 +2,7 @@ package mage.cards.l; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -31,7 +31,7 @@ public final class LivingLightning extends CardImpl { this.toughness = new MageInt(2); // When Living Lightning dies, return target instant or sorcery card from your graveyard to your hand. - Ability ability = new DiesTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect()); + Ability ability = new DiesSourceTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LoathsomeCatoblepas.java b/Mage.Sets/src/mage/cards/l/LoathsomeCatoblepas.java index ad78c80979c..306d696d3a8 100644 --- a/Mage.Sets/src/mage/cards/l/LoathsomeCatoblepas.java +++ b/Mage.Sets/src/mage/cards/l/LoathsomeCatoblepas.java @@ -4,7 +4,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.combat.MustBeBlockedByAtLeastOneSourceEffect; @@ -41,7 +41,7 @@ public final class LoathsomeCatoblepas extends CardImpl { // {2}{G}: Loathsome Catoblepas must be blocked this turn if able. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(), new ManaCostsImpl("{2}{G}"))); // When Loathsome Catoblepas dies, target creature an opponent controls gets -3/-3 until end of turn. - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-3,-3, Duration.EndOfTurn), false); + Ability ability = new DiesSourceTriggeredAbility(new BoostTargetEffect(-3,-3, Duration.EndOfTurn), false); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LockjawSnapper.java b/Mage.Sets/src/mage/cards/l/LockjawSnapper.java index 7fd25e75c72..9ec5b304c26 100644 --- a/Mage.Sets/src/mage/cards/l/LockjawSnapper.java +++ b/Mage.Sets/src/mage/cards/l/LockjawSnapper.java @@ -4,7 +4,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.WitherAbility; import mage.cards.CardImpl; @@ -34,7 +34,7 @@ public final class LockjawSnapper extends CardImpl { this.addAbility(WitherAbility.getInstance()); // When Lockjaw Snapper dies, put a -1/-1 counter on each creature with a -1/-1 counter on it. - this.addAbility(new DiesTriggeredAbility(new LockjawSnapperEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new LockjawSnapperEffect())); } diff --git a/Mage.Sets/src/mage/cards/l/LoyalCathar.java b/Mage.Sets/src/mage/cards/l/LoyalCathar.java index 8282b63392d..8764ce01df9 100644 --- a/Mage.Sets/src/mage/cards/l/LoyalCathar.java +++ b/Mage.Sets/src/mage/cards/l/LoyalCathar.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -42,7 +42,7 @@ public final class LoyalCathar extends CardImpl { // When Loyal Cathar dies, return it to the battlefield transformed under your control at the beginning of the next end step. this.addAbility(new TransformAbility()); - this.addAbility(new DiesTriggeredAbility(new LoyalCatharEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new LoyalCatharEffect())); } public LoyalCathar(final LoyalCathar card) { diff --git a/Mage.Sets/src/mage/cards/m/MaalfeldTwins.java b/Mage.Sets/src/mage/cards/m/MaalfeldTwins.java index 1d080c5ed46..b13f6cb1072 100644 --- a/Mage.Sets/src/mage/cards/m/MaalfeldTwins.java +++ b/Mage.Sets/src/mage/cards/m/MaalfeldTwins.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class MaalfeldTwins extends CardImpl { this.toughness = new MageInt(4); // When Maalfeld Twins dies, create two 2/2 black Zombie creature tokens. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new ZombieToken(), 2))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new ZombieToken(), 2))); } public MaalfeldTwins(final MaalfeldTwins card) { diff --git a/Mage.Sets/src/mage/cards/m/MagmaPhoenix.java b/Mage.Sets/src/mage/cards/m/MagmaPhoenix.java index 06b95eb719a..848673d978a 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaPhoenix.java +++ b/Mage.Sets/src/mage/cards/m/MagmaPhoenix.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageEverythingEffect; @@ -30,7 +30,7 @@ public final class MagmaPhoenix extends CardImpl { this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new DiesTriggeredAbility(new DamageEverythingEffect(3), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DamageEverythingEffect(3), false)); this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{3}{R}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MarkerBeetles.java b/Mage.Sets/src/mage/cards/m/MarkerBeetles.java index 4e4f6b2af89..14c4c857480 100644 --- a/Mage.Sets/src/mage/cards/m/MarkerBeetles.java +++ b/Mage.Sets/src/mage/cards/m/MarkerBeetles.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -31,7 +31,7 @@ public final class MarkerBeetles extends CardImpl { this.toughness = new MageInt(3); // When Marker Beetles dies, target creature gets +1/+1 until end of turn. - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), false); + Ability ability = new DiesSourceTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); // {2}, Sacrifice Marker Beetles: Draw a card. diff --git a/Mage.Sets/src/mage/cards/m/MartyrForTheCause.java b/Mage.Sets/src/mage/cards/m/MartyrForTheCause.java index 19a17d1ec8a..0cf33c2cd76 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrForTheCause.java +++ b/Mage.Sets/src/mage/cards/m/MartyrForTheCause.java @@ -1,7 +1,7 @@ package mage.cards.m; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class MartyrForTheCause extends CardImpl { this.toughness = new MageInt(2); // When Martyr for the Cause dies, proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.) - this.addAbility(new DiesTriggeredAbility(new ProliferateEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new ProliferateEffect())); } private MartyrForTheCause(final MartyrForTheCause card) { diff --git a/Mage.Sets/src/mage/cards/m/MartyrOfDusk.java b/Mage.Sets/src/mage/cards/m/MartyrOfDusk.java index 5e3591429d5..fcbdf48f5d7 100644 --- a/Mage.Sets/src/mage/cards/m/MartyrOfDusk.java +++ b/Mage.Sets/src/mage/cards/m/MartyrOfDusk.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class MartyrOfDusk extends CardImpl { this.toughness = new MageInt(1); // When Martyr of Dusk dies, create a 1/1 white Vampire creature token with lifelink. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new IxalanVampireToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new IxalanVampireToken()))); } public MartyrOfDusk(final MartyrOfDusk card) { diff --git a/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java b/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java index 97ef3aca9a8..e8c020953ce 100644 --- a/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java +++ b/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DrawCardAllEffect; @@ -54,7 +54,7 @@ public final class MathasFiendSeeker extends CardImpl { // At the beginning of your end step, put a bounty counter on target creature an opponent controls. For as long as that creature has a bounty counter on it, it has "When this creature dies, each opponent draws a card and gains 2 life." Ability ability = new BeginningOfYourEndStepTriggeredAbility(new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), false); ability.addTarget(new TargetCreaturePermanent(filter)); - Ability ability2 = new DiesTriggeredAbility(new DrawCardAllEffect(1, TargetController.OPPONENT)); + Ability ability2 = new DiesSourceTriggeredAbility(new DrawCardAllEffect(1, TargetController.OPPONENT)); ability2.addEffect(new OpponentsGainLifeEffect()); Effect effect = new MathasFiendSeekerGainAbilityEffect(ability2, Duration.Custom, rule); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MatterReshaper.java b/Mage.Sets/src/mage/cards/m/MatterReshaper.java index 164315f45e1..5d4455be7ca 100644 --- a/Mage.Sets/src/mage/cards/m/MatterReshaper.java +++ b/Mage.Sets/src/mage/cards/m/MatterReshaper.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -34,7 +34,7 @@ public final class MatterReshaper extends CardImpl { // When Matter Reshaper dies, reveal the top card of your library. You may put that card onto the battlefield // if it's a permanent card with converted mana cost 3 or less. Otherwise, put that card into your hand. - this.addAbility(new DiesTriggeredAbility(new MatterReshaperEffect(), false)); + this.addAbility(new DiesSourceTriggeredAbility(new MatterReshaperEffect(), false)); } public MatterReshaper(final MatterReshaper card) { diff --git a/Mage.Sets/src/mage/cards/m/MausoleumGuard.java b/Mage.Sets/src/mage/cards/m/MausoleumGuard.java index 37cc2384c7d..0d64b008ce7 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumGuard.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumGuard.java @@ -1,7 +1,7 @@ package mage.cards.m; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class MausoleumGuard extends CardImpl { this.toughness = new MageInt(2); // When Mausoleum Guard dies, create two 1/1 white Spirit creature tokens with flying. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken(), 2))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new SpiritWhiteToken(), 2))); } public MausoleumGuard(final MausoleumGuard card) { diff --git a/Mage.Sets/src/mage/cards/m/MerfolkSeer.java b/Mage.Sets/src/mage/cards/m/MerfolkSeer.java index f7eef20f977..66de865d953 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkSeer.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkSeer.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -26,7 +26,7 @@ public final class MerfolkSeer extends CardImpl { this.toughness = new MageInt(2); // When Merfolk Seer dies, you may pay {1}{U}. If you do, draw a card. - this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{1}{U}")))); + this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{1}{U}")))); } public MerfolkSeer(final MerfolkSeer card) { diff --git a/Mage.Sets/src/mage/cards/m/MessengerDrake.java b/Mage.Sets/src/mage/cards/m/MessengerDrake.java index 1c15bcf7b2b..d2b1c1e81a7 100644 --- a/Mage.Sets/src/mage/cards/m/MessengerDrake.java +++ b/Mage.Sets/src/mage/cards/m/MessengerDrake.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class MessengerDrake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Messenger Drake dies, draw a card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1))); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1))); } public MessengerDrake(final MessengerDrake card) { diff --git a/Mage.Sets/src/mage/cards/m/MindeyeDrake.java b/Mage.Sets/src/mage/cards/m/MindeyeDrake.java index a2410f56b87..d693c35d37a 100644 --- a/Mage.Sets/src/mage/cards/m/MindeyeDrake.java +++ b/Mage.Sets/src/mage/cards/m/MindeyeDrake.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -29,7 +29,7 @@ public final class MindeyeDrake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Mindeye Drake dies, target player puts the top five cards of their library into their graveyard. - Ability ability = new DiesTriggeredAbility(new PutLibraryIntoGraveTargetEffect(5)); + Ability ability = new DiesSourceTriggeredAbility(new PutLibraryIntoGraveTargetEffect(5)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/Mindslicer.java b/Mage.Sets/src/mage/cards/m/Mindslicer.java index 3d3bab1a093..160481b70c4 100644 --- a/Mage.Sets/src/mage/cards/m/Mindslicer.java +++ b/Mage.Sets/src/mage/cards/m/Mindslicer.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.discard.DiscardHandAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class Mindslicer extends CardImpl { this.toughness = new MageInt(3); // When Mindslicer dies, each player discards their hand. - this.addAbility(new DiesTriggeredAbility(new DiscardHandAllEffect(),false)); + this.addAbility(new DiesSourceTriggeredAbility(new DiscardHandAllEffect(),false)); } public Mindslicer(final Mindslicer card) { diff --git a/Mage.Sets/src/mage/cards/m/MistmoonGriffin.java b/Mage.Sets/src/mage/cards/m/MistmoonGriffin.java index 471aaa67535..98c2e472014 100644 --- a/Mage.Sets/src/mage/cards/m/MistmoonGriffin.java +++ b/Mage.Sets/src/mage/cards/m/MistmoonGriffin.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -34,7 +34,7 @@ public final class MistmoonGriffin extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Mistmoon Griffin dies, exile Mistmoon Griffin, then return the top creature card of your graveyard to the battlefield. - Ability ability = new DiesTriggeredAbility(new ExileSourceEffect()); + Ability ability = new DiesSourceTriggeredAbility(new ExileSourceEffect()); ability.addEffect(new MistmoonGriffinEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MitoticSlime.java b/Mage.Sets/src/mage/cards/m/MitoticSlime.java index 73b29d2cf01..1118a07e550 100644 --- a/Mage.Sets/src/mage/cards/m/MitoticSlime.java +++ b/Mage.Sets/src/mage/cards/m/MitoticSlime.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class MitoticSlime extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new Ooze2Token(), 2), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new Ooze2Token(), 2), false)); } public MitoticSlime(final MitoticSlime card) { diff --git a/Mage.Sets/src/mage/cards/m/MoldgrafMonstrosity.java b/Mage.Sets/src/mage/cards/m/MoldgrafMonstrosity.java index 8cbb8e42715..90ee145c1c5 100644 --- a/Mage.Sets/src/mage/cards/m/MoldgrafMonstrosity.java +++ b/Mage.Sets/src/mage/cards/m/MoldgrafMonstrosity.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileSourceEffect; @@ -39,7 +39,7 @@ public final class MoldgrafMonstrosity extends CardImpl { // When Moldgraf Monstrosity dies, exile it, then return two creature cards at random from your graveyard to the battlefield. Effect effect = new ExileSourceEffect(); effect.setText(""); - DiesTriggeredAbility ability = new DiesTriggeredAbility(effect); + DiesSourceTriggeredAbility ability = new DiesSourceTriggeredAbility(effect); ability.addEffect(new MoldgrafMonstrosityEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoltenFirebird.java b/Mage.Sets/src/mage/cards/m/MoltenFirebird.java index 81001ce6abc..d89a6837bcc 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenFirebird.java +++ b/Mage.Sets/src/mage/cards/m/MoltenFirebird.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -32,7 +32,7 @@ public final class MoltenFirebird extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Molten Firebird dies, return it to the battlefield under its owner’s control at the beginning of the next end step and you skip your next draw step. - Ability ability = new DiesTriggeredAbility(new CreateDelayedTriggeredAbilityEffect( + Ability ability = new DiesSourceTriggeredAbility(new CreateDelayedTriggeredAbilityEffect( new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnSourceFromGraveyardToBattlefieldEffect()))); ability.addEffect(new SkipNextDrawStepControllerEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MortisDogs.java b/Mage.Sets/src/mage/cards/m/MortisDogs.java index 2f138d7819d..452a6319c59 100644 --- a/Mage.Sets/src/mage/cards/m/MortisDogs.java +++ b/Mage.Sets/src/mage/cards/m/MortisDogs.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -32,7 +32,7 @@ public final class MortisDogs extends CardImpl { // Whenever Mortis Dogs attacks, it gets +2/+0 until end of turn. this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), false)); // When Mortis Dogs dies, target player loses life equal to its power. - Ability ability = new DiesTriggeredAbility(new LoseLifeTargetEffect(new SourcePermanentPowerCount(false))); + Ability ability = new DiesSourceTriggeredAbility(new LoseLifeTargetEffect(new SourcePermanentPowerCount(false))); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MortusStrider.java b/Mage.Sets/src/mage/cards/m/MortusStrider.java index 664bd3ea854..fb7cd29490b 100644 --- a/Mage.Sets/src/mage/cards/m/MortusStrider.java +++ b/Mage.Sets/src/mage/cards/m/MortusStrider.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class MortusStrider extends CardImpl { this.toughness = new MageInt(1); // When Mortus Strider dies, return it to its owner's hand. - this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect(false))); + this.addAbility(new DiesSourceTriggeredAbility(new ReturnToHandSourceEffect(false))); } public MortusStrider(final MortusStrider card) { diff --git a/Mage.Sets/src/mage/cards/m/MouseDroid.java b/Mage.Sets/src/mage/cards/m/MouseDroid.java index 1d911de6687..f3ee4dbd2fe 100644 --- a/Mage.Sets/src/mage/cards/m/MouseDroid.java +++ b/Mage.Sets/src/mage/cards/m/MouseDroid.java @@ -2,7 +2,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.RepairAbility; import mage.constants.SubType; @@ -24,7 +24,7 @@ public final class MouseDroid extends CardImpl { this.toughness = new MageInt(1); // When Mouse Droid dies, draw a card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1))); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1))); // Repair 3 this.addAbility(new RepairAbility(3)); diff --git a/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java b/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java index 577e64980d1..07f76c18f04 100644 --- a/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java +++ b/Mage.Sets/src/mage/cards/m/MudbuttonTorchrunner.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class MudbuttonTorchrunner extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); // When Mudbutton Torchrunner dies, it deals 3 damage to any target. - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(3, "it"), false); + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(3, "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MurderousRider.java b/Mage.Sets/src/mage/cards/m/MurderousRider.java index 7e7864389f9..cc42e69eaa1 100644 --- a/Mage.Sets/src/mage/cards/m/MurderousRider.java +++ b/Mage.Sets/src/mage/cards/m/MurderousRider.java @@ -1,7 +1,7 @@ package mage.cards.m; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.keyword.LifelinkAbility; @@ -30,7 +30,7 @@ public final class MurderousRider extends AdventureCard { this.addAbility(LifelinkAbility.getInstance()); // When Murderous Rider dies, put it on the bottom of its owner's library. - this.addAbility(new DiesTriggeredAbility(new PutOnLibrarySourceEffect( + this.addAbility(new DiesSourceTriggeredAbility(new PutOnLibrarySourceEffect( false, "put it on the bottom of its owner's library" ), false)); diff --git a/Mage.Sets/src/mage/cards/m/MycosynthWellspring.java b/Mage.Sets/src/mage/cards/m/MycosynthWellspring.java index a79e7bf8126..bcf4918447e 100644 --- a/Mage.Sets/src/mage/cards/m/MycosynthWellspring.java +++ b/Mage.Sets/src/mage/cards/m/MycosynthWellspring.java @@ -1,7 +1,7 @@ package mage.cards.m; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; @@ -24,7 +24,7 @@ public final class MycosynthWellspring extends CardImpl { // When Mycosynth Wellspring enters the battlefield or is put into a graveyard from the battlefield, // you may search your library for a basic land card, reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true)); - this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true)); + this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true)); } public MycosynthWellspring(final MycosynthWellspring card) { diff --git a/Mage.Sets/src/mage/cards/m/MyrMoonvessel.java b/Mage.Sets/src/mage/cards/m/MyrMoonvessel.java index b25556c35aa..b31ea7095fd 100644 --- a/Mage.Sets/src/mage/cards/m/MyrMoonvessel.java +++ b/Mage.Sets/src/mage/cards/m/MyrMoonvessel.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.Mana; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.mana.BasicManaEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -21,7 +21,7 @@ public final class MyrMoonvessel extends CardImpl { this.subtype.add(SubType.MYR); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new DiesTriggeredAbility(new BasicManaEffect(Mana.ColorlessMana(1)))); + this.addAbility(new DiesSourceTriggeredAbility(new BasicManaEffect(Mana.ColorlessMana(1)))); } public MyrMoonvessel(final MyrMoonvessel card) { diff --git a/Mage.Sets/src/mage/cards/m/MyrRetriever.java b/Mage.Sets/src/mage/cards/m/MyrRetriever.java index 5d0560a459c..2bb166aa7cc 100644 --- a/Mage.Sets/src/mage/cards/m/MyrRetriever.java +++ b/Mage.Sets/src/mage/cards/m/MyrRetriever.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; @@ -36,7 +36,7 @@ public final class MyrRetriever extends CardImpl { // When Myr Retriever dies, return another target artifact card from your graveyard to your hand. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); effect.setText("return another target artifact card from your graveyard to your hand"); - Ability ability = new DiesTriggeredAbility(effect); + Ability ability = new DiesSourceTriggeredAbility(effect); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MyrSire.java b/Mage.Sets/src/mage/cards/m/MyrSire.java index 2d13b14161c..80b28b593c9 100644 --- a/Mage.Sets/src/mage/cards/m/MyrSire.java +++ b/Mage.Sets/src/mage/cards/m/MyrSire.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class MyrSire extends CardImpl { this.subtype.add(SubType.MYR); this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new MyrToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new MyrToken()))); } public MyrSire (final MyrSire card) { diff --git a/Mage.Sets/src/mage/cards/n/NayaSojourners.java b/Mage.Sets/src/mage/cards/n/NayaSojourners.java index 11b95f9cafc..a3b52564ead 100644 --- a/Mage.Sets/src/mage/cards/n/NayaSojourners.java +++ b/Mage.Sets/src/mage/cards/n/NayaSojourners.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.CycleTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.CyclingAbility; @@ -35,7 +35,7 @@ public final class NayaSojourners extends CardImpl { // When you cycle Naya Sojourners or it dies, you may put a +1/+1 counter on target creature. Ability ability1 = new CycleTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); - Ability ability2 = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); + Ability ability2 = new DiesSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); ability1.addTarget(new TargetCreaturePermanent()); ability2.addTarget(new TargetCreaturePermanent()); this.addAbility(ability1); diff --git a/Mage.Sets/src/mage/cards/n/Necropede.java b/Mage.Sets/src/mage/cards/n/Necropede.java index 8819ff3e5ee..5ec4b67ac1a 100644 --- a/Mage.Sets/src/mage/cards/n/Necropede.java +++ b/Mage.Sets/src/mage/cards/n/Necropede.java @@ -5,7 +5,7 @@ package mage.cards.n; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class Necropede extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(InfectAbility.getInstance()); - Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), true); + Ability ability = new DiesSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NihilSpellbomb.java b/Mage.Sets/src/mage/cards/n/NihilSpellbomb.java index ecc51d332ae..e26f856ce80 100644 --- a/Mage.Sets/src/mage/cards/n/NihilSpellbomb.java +++ b/Mage.Sets/src/mage/cards/n/NihilSpellbomb.java @@ -2,7 +2,7 @@ package mage.cards.n; import java.util.UUID; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -31,7 +31,7 @@ public final class NihilSpellbomb extends CardImpl { ability.addTarget(new TargetPlayer()); this.addAbility(ability); // When Nihil Spellbomb is put into a graveyard from the battlefield, you may pay {B}. If you do, draw a card. - this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{B}")), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{B}")), false)); } public NihilSpellbomb(final NihilSpellbomb card) { diff --git a/Mage.Sets/src/mage/cards/n/NobleBenefactor.java b/Mage.Sets/src/mage/cards/n/NobleBenefactor.java index d223291a3ca..7abb0ccf4bb 100644 --- a/Mage.Sets/src/mage/cards/n/NobleBenefactor.java +++ b/Mage.Sets/src/mage/cards/n/NobleBenefactor.java @@ -3,7 +3,7 @@ package mage.cards.n; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -33,7 +33,7 @@ public final class NobleBenefactor extends CardImpl { this.toughness = new MageInt(2); // When Noble Benefactor dies, each player may search their library for a card and put that card into their hand. Then each player who searched their library this way shuffles it. - this.addAbility(new DiesTriggeredAbility(new NobleBenefactorEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new NobleBenefactorEffect())); } public NobleBenefactor(final NobleBenefactor card) { diff --git a/Mage.Sets/src/mage/cards/n/NocturnalFeeder.java b/Mage.Sets/src/mage/cards/n/NocturnalFeeder.java index 2415335428e..6f1dd06950b 100644 --- a/Mage.Sets/src/mage/cards/n/NocturnalFeeder.java +++ b/Mage.Sets/src/mage/cards/n/NocturnalFeeder.java @@ -2,7 +2,7 @@ package mage.cards.n; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.abilities.keyword.FlyingAbility; @@ -30,7 +30,7 @@ public final class NocturnalFeeder extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Nocturnal Feeder dies, each opponent loses 2 life and you gain 2 life. - Ability ability = new DiesTriggeredAbility(new LoseLifeOpponentsEffect(2)); + Ability ability = new DiesSourceTriggeredAbility(new LoseLifeOpponentsEffect(2)); ability.addEffect(new GainLifeEffect(2).concatBy("and")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NoxiousDragon.java b/Mage.Sets/src/mage/cards/n/NoxiousDragon.java index 0d029e3ad18..eafd0ece77d 100644 --- a/Mage.Sets/src/mage/cards/n/NoxiousDragon.java +++ b/Mage.Sets/src/mage/cards/n/NoxiousDragon.java @@ -4,7 +4,7 @@ package mage.cards.n; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -38,7 +38,7 @@ public final class NoxiousDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Noxious Dragon dies, you may destroy target creature with converted mana cost 3 or less. - Ability ability = new DiesTriggeredAbility(new DestroyTargetEffect(), true); + Ability ability = new DiesSourceTriggeredAbility(new DestroyTargetEffect(), true); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NoxiousToad.java b/Mage.Sets/src/mage/cards/n/NoxiousToad.java index c05adfe612e..cb9c93f5797 100644 --- a/Mage.Sets/src/mage/cards/n/NoxiousToad.java +++ b/Mage.Sets/src/mage/cards/n/NoxiousToad.java @@ -3,7 +3,7 @@ package mage.cards.n; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class NoxiousToad extends CardImpl { this.toughness = new MageInt(1); // When Noxious Toad dies, each opponent discards a card. - this.addAbility(new DiesTriggeredAbility(new DiscardEachPlayerEffect(TargetController.OPPONENT), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DiscardEachPlayerEffect(TargetController.OPPONENT), false)); } public NoxiousToad(final NoxiousToad card) { diff --git a/Mage.Sets/src/mage/cards/o/Oculus.java b/Mage.Sets/src/mage/cards/o/Oculus.java index 77e73712e1e..ee4129d7b93 100644 --- a/Mage.Sets/src/mage/cards/o/Oculus.java +++ b/Mage.Sets/src/mage/cards/o/Oculus.java @@ -4,7 +4,7 @@ package mage.cards.o; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class Oculus extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); } public Oculus (final Oculus card) { diff --git a/Mage.Sets/src/mage/cards/o/Onulet.java b/Mage.Sets/src/mage/cards/o/Onulet.java index 3a58d56823b..ebf562bda7e 100644 --- a/Mage.Sets/src/mage/cards/o/Onulet.java +++ b/Mage.Sets/src/mage/cards/o/Onulet.java @@ -3,7 +3,7 @@ package mage.cards.o; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class Onulet extends CardImpl { this.toughness = new MageInt(2); // When Onulet dies, you gain 2 life. - this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(2))); + this.addAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(2))); } public Onulet(final Onulet card) { diff --git a/Mage.Sets/src/mage/cards/o/OrcishHellraiser.java b/Mage.Sets/src/mage/cards/o/OrcishHellraiser.java index 701bb8d750b..a227b3ab608 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishHellraiser.java +++ b/Mage.Sets/src/mage/cards/o/OrcishHellraiser.java @@ -2,7 +2,7 @@ package mage.cards.o; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; @@ -30,7 +30,7 @@ public final class OrcishHellraiser extends CardImpl { this.addAbility(new EchoAbility("{R}")); // When Orcish Hellraiser dies, it deals 2 damage to target player or planeswalker. - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(2, "it")); + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(2, "it")); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java b/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java index 6b4dc0f0f8b..eec623e9874 100644 --- a/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java +++ b/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java @@ -4,7 +4,7 @@ package mage.cards.o; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; @@ -31,7 +31,7 @@ public final class OriginSpellbomb extends CardImpl { ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); - this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{W}")), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{W}")), false)); } public OriginSpellbomb (final OriginSpellbomb card) { diff --git a/Mage.Sets/src/mage/cards/p/PalaceFamiliar.java b/Mage.Sets/src/mage/cards/p/PalaceFamiliar.java index 50afbd795d3..7bf7245f86b 100644 --- a/Mage.Sets/src/mage/cards/p/PalaceFamiliar.java +++ b/Mage.Sets/src/mage/cards/p/PalaceFamiliar.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class PalaceFamiliar extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Palace Familiar dies, draw a card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } public PalaceFamiliar(final PalaceFamiliar card) { diff --git a/Mage.Sets/src/mage/cards/p/PaladinOfAtonement.java b/Mage.Sets/src/mage/cards/p/PaladinOfAtonement.java index 3b21dd98e74..e0c8ca2b253 100644 --- a/Mage.Sets/src/mage/cards/p/PaladinOfAtonement.java +++ b/Mage.Sets/src/mage/cards/p/PaladinOfAtonement.java @@ -4,7 +4,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.condition.common.LiveLostLastTurnCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.dynamicvalue.common.SourcePermanentToughnessValue; @@ -38,7 +38,7 @@ public final class PaladinOfAtonement extends CardImpl { "At the beginning of each upkeep, if you lost life last turn, put a +1/+1 counter on {this}")); // When Paladin of Atonement dies, you gain life equal to it's toughness. - this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(SourcePermanentToughnessValue.getInstance(), + this.addAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(SourcePermanentToughnessValue.getInstance(), "you gain life equal to it's toughness"))); } diff --git a/Mage.Sets/src/mage/cards/p/PelakkaWurm.java b/Mage.Sets/src/mage/cards/p/PelakkaWurm.java index 0a690d34e8c..3acc2b2a802 100644 --- a/Mage.Sets/src/mage/cards/p/PelakkaWurm.java +++ b/Mage.Sets/src/mage/cards/p/PelakkaWurm.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -28,7 +28,7 @@ public final class PelakkaWurm extends CardImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(7), false)); - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } public PelakkaWurm(final PelakkaWurm card) { diff --git a/Mage.Sets/src/mage/cards/p/PenumbraBobcat.java b/Mage.Sets/src/mage/cards/p/PenumbraBobcat.java index cb352641137..0bf08139230 100644 --- a/Mage.Sets/src/mage/cards/p/PenumbraBobcat.java +++ b/Mage.Sets/src/mage/cards/p/PenumbraBobcat.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class PenumbraBobcat extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraBobcatToken(), 1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new PenumbraBobcatToken(), 1), false)); } public PenumbraBobcat(final PenumbraBobcat card) { diff --git a/Mage.Sets/src/mage/cards/p/PenumbraKavu.java b/Mage.Sets/src/mage/cards/p/PenumbraKavu.java index 62f28bb944f..39c884d8e7b 100644 --- a/Mage.Sets/src/mage/cards/p/PenumbraKavu.java +++ b/Mage.Sets/src/mage/cards/p/PenumbraKavu.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class PenumbraKavu extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraKavuToken(), 1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new PenumbraKavuToken(), 1), false)); } public PenumbraKavu(final PenumbraKavu card) { diff --git a/Mage.Sets/src/mage/cards/p/PenumbraSpider.java b/Mage.Sets/src/mage/cards/p/PenumbraSpider.java index 9761b8f2b4e..34d1aa47ad5 100644 --- a/Mage.Sets/src/mage/cards/p/PenumbraSpider.java +++ b/Mage.Sets/src/mage/cards/p/PenumbraSpider.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class PenumbraSpider extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // When Penumbra Spider dies, create a 2/4 black Spider creature token with reach. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraSpiderToken()), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new PenumbraSpiderToken()), false)); } public PenumbraSpider(final PenumbraSpider card) { diff --git a/Mage.Sets/src/mage/cards/p/PenumbraWurm.java b/Mage.Sets/src/mage/cards/p/PenumbraWurm.java index ca9654f73d0..ac7b100b62a 100644 --- a/Mage.Sets/src/mage/cards/p/PenumbraWurm.java +++ b/Mage.Sets/src/mage/cards/p/PenumbraWurm.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; @@ -29,7 +29,7 @@ public final class PenumbraWurm extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // When Penumbra Wurm dies, create a 6/6 black Wurm creature token with trample. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraWurmToken(), 1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new PenumbraWurmToken(), 1), false)); } public PenumbraWurm(final PenumbraWurm card) { diff --git a/Mage.Sets/src/mage/cards/p/PerilousMyr.java b/Mage.Sets/src/mage/cards/p/PerilousMyr.java index 1ccbe47fad9..1843606d1fa 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousMyr.java +++ b/Mage.Sets/src/mage/cards/p/PerilousMyr.java @@ -4,7 +4,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class PerilousMyr extends CardImpl { this.toughness = new MageInt(1); // When Perilous Myr dies, it deals 2 damage to any target. - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(2, "it"), false); + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(2, "it"), false); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java b/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java index d0c82220e61..c39a4cc0fc8 100644 --- a/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java +++ b/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java @@ -4,7 +4,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; @@ -41,7 +41,7 @@ public final class PersonalIncarnation extends CardImpl { ability.setMayActivate(TargetController.OWNER); this.addAbility(ability); // When Personal Incarnation dies, its owner loses half their life, rounded up. - this.addAbility(new DiesTriggeredAbility(new PersonalIncarnationLoseHalfLifeEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new PersonalIncarnationLoseHalfLifeEffect())); } public PersonalIncarnation(final PersonalIncarnation card) { diff --git a/Mage.Sets/src/mage/cards/p/Phytotitan.java b/Mage.Sets/src/mage/cards/p/Phytotitan.java index 30ca720f792..e8c65913700 100644 --- a/Mage.Sets/src/mage/cards/p/Phytotitan.java +++ b/Mage.Sets/src/mage/cards/p/Phytotitan.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -32,7 +32,7 @@ public final class Phytotitan extends CardImpl { this.toughness = new MageInt(2); // When Phytotitan dies, return it to the battlefield tapped under its owner's control at the beginning of their next upkeep. - this.addAbility(new DiesTriggeredAbility(new PhytotitanEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new PhytotitanEffect())); } public Phytotitan(final Phytotitan card) { diff --git a/Mage.Sets/src/mage/cards/p/PitchburnDevils.java b/Mage.Sets/src/mage/cards/p/PitchburnDevils.java index d715c2eb37e..3f18bbe2110 100644 --- a/Mage.Sets/src/mage/cards/p/PitchburnDevils.java +++ b/Mage.Sets/src/mage/cards/p/PitchburnDevils.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class PitchburnDevils extends CardImpl { this.toughness = new MageInt(3); // When Pitchburn Devils dies, it deals 3 damage to any target. - DiesTriggeredAbility ability = new DiesTriggeredAbility(new DamageTargetEffect(3, "it")); + DiesSourceTriggeredAbility ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(3, "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PlagueDogs.java b/Mage.Sets/src/mage/cards/p/PlagueDogs.java index 4982b290551..f12376dd91a 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueDogs.java +++ b/Mage.Sets/src/mage/cards/p/PlagueDogs.java @@ -4,7 +4,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -31,7 +31,7 @@ public final class PlagueDogs extends CardImpl { this.toughness = new MageInt(3); // When Plague Dogs dies, all creatures get -1/-1 until end of turn. - this.addAbility(new DiesTriggeredAbility(new BoostAllEffect(-1, -1, Duration.EndOfTurn), false)); + this.addAbility(new DiesSourceTriggeredAbility(new BoostAllEffect(-1, -1, Duration.EndOfTurn), false)); // {2}, Sacrifice Plague Dogs: Draw a card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}")); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/p/PlagueSpitter.java b/Mage.Sets/src/mage/cards/p/PlagueSpitter.java index e312b05ab3d..c80ac79d91d 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueSpitter.java +++ b/Mage.Sets/src/mage/cards/p/PlagueSpitter.java @@ -4,7 +4,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageEverythingEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -28,7 +28,7 @@ public final class PlagueSpitter extends CardImpl { // At the beginning of your upkeep, Plague Spitter deals 1 damage to each creature and each player. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DamageEverythingEffect(1), TargetController.YOU, false)); // When Plague Spitter dies, Plague Spitter deals 1 damage to each creature and each player. - this.addAbility(new DiesTriggeredAbility(new DamageEverythingEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DamageEverythingEffect(1), false)); } public PlagueSpitter(final PlagueSpitter card) { diff --git a/Mage.Sets/src/mage/cards/p/PollutedDead.java b/Mage.Sets/src/mage/cards/p/PollutedDead.java index fc70b9d4e14..9bc48539cfe 100644 --- a/Mage.Sets/src/mage/cards/p/PollutedDead.java +++ b/Mage.Sets/src/mage/cards/p/PollutedDead.java @@ -4,7 +4,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class PollutedDead extends CardImpl { this.toughness = new MageInt(3); // When Polluted Dead dies, destroy target land. - Ability ability = new DiesTriggeredAbility(new DestroyTargetEffect()); + Ability ability = new DiesSourceTriggeredAbility(new DestroyTargetEffect()); Target target = new TargetLandPermanent(); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PrimalDruid.java b/Mage.Sets/src/mage/cards/p/PrimalDruid.java index 2a8de813ed2..fcafcea74cc 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalDruid.java +++ b/Mage.Sets/src/mage/cards/p/PrimalDruid.java @@ -2,7 +2,7 @@ package mage.cards.p; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; @@ -30,7 +30,7 @@ public final class PrimalDruid extends CardImpl { // When Primal Druid dies, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true); effect.setText("you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library"); - this.addAbility(new DiesTriggeredAbility(effect, true)); + this.addAbility(new DiesSourceTriggeredAbility(effect, true)); } diff --git a/Mage.Sets/src/mage/cards/p/ProteanHulk.java b/Mage.Sets/src/mage/cards/p/ProteanHulk.java index 50a43b2da69..30a2df42057 100644 --- a/Mage.Sets/src/mage/cards/p/ProteanHulk.java +++ b/Mage.Sets/src/mage/cards/p/ProteanHulk.java @@ -4,7 +4,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.*; import mage.constants.CardType; @@ -34,7 +34,7 @@ public final class ProteanHulk extends CardImpl { this.toughness = new MageInt(6); // When Protean Hulk dies, search your library for any number of creature cards with total converted mana cost 6 or less and put them onto the battlefield. Then shuffle your library. - this.addAbility(new DiesTriggeredAbility(new ProteanHulkEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new ProteanHulkEffect())); } public ProteanHulk(final ProteanHulk card) { diff --git a/Mage.Sets/src/mage/cards/p/PurpleCrystalCrab.java b/Mage.Sets/src/mage/cards/p/PurpleCrystalCrab.java index 43dbbc267b0..6a896a5d4c8 100644 --- a/Mage.Sets/src/mage/cards/p/PurpleCrystalCrab.java +++ b/Mage.Sets/src/mage/cards/p/PurpleCrystalCrab.java @@ -2,7 +2,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.constants.SubType; import mage.cards.CardImpl; @@ -23,7 +23,7 @@ public final class PurpleCrystalCrab extends CardImpl { this.toughness = new MageInt(1); // When Purple-Crystal Crab dies, draw card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } public PurpleCrystalCrab(final PurpleCrystalCrab card) { diff --git a/Mage.Sets/src/mage/cards/r/RebornHero.java b/Mage.Sets/src/mage/cards/r/RebornHero.java index eafb801ffa6..c0f824c082f 100644 --- a/Mage.Sets/src/mage/cards/r/RebornHero.java +++ b/Mage.Sets/src/mage/cards/r/RebornHero.java @@ -4,7 +4,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,7 +41,7 @@ public final class RebornHero extends CardImpl { Ability ability = new SimpleStaticAbility( Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new GainAbilitySourceEffect(new DiesTriggeredAbility(new DoIfCostPaid( + new GainAbilitySourceEffect(new DiesSourceTriggeredAbility(new DoIfCostPaid( new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl("{W}{W}") ))), new CardsInControllerGraveCondition(7), diff --git a/Mage.Sets/src/mage/cards/r/ReefWorm.java b/Mage.Sets/src/mage/cards/r/ReefWorm.java index 07707cac536..b54fed6a464 100644 --- a/Mage.Sets/src/mage/cards/r/ReefWorm.java +++ b/Mage.Sets/src/mage/cards/r/ReefWorm.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class ReefWorm extends CardImpl { this.toughness = new MageInt(1); // When Reef Worm dies, create a 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."" - addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new ReefWormFishToken()))); + addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new ReefWormFishToken()))); } public ReefWorm(final ReefWorm card) { diff --git a/Mage.Sets/src/mage/cards/r/RekindlingPhoenix.java b/Mage.Sets/src/mage/cards/r/RekindlingPhoenix.java index 3eac6457e96..6528f7ae011 100644 --- a/Mage.Sets/src/mage/cards/r/RekindlingPhoenix.java +++ b/Mage.Sets/src/mage/cards/r/RekindlingPhoenix.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -29,7 +29,7 @@ public final class RekindlingPhoenix extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Rekindling Phoenix dies, create a 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." - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new RekindlingPhoenixToken()), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new RekindlingPhoenixToken()), false)); } public RekindlingPhoenix(final RekindlingPhoenix card) { diff --git a/Mage.Sets/src/mage/cards/r/RelentlessDead.java b/Mage.Sets/src/mage/cards/r/RelentlessDead.java index 063fd464b51..d9567943bab 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessDead.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessDead.java @@ -2,7 +2,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DoIfCostPaid; @@ -37,10 +37,10 @@ public final class RelentlessDead extends CardImpl { this.addAbility(new MenaceAbility()); // When Relentless Dead dies, you may pay {B}. If you do, return it to its owner's hand. - this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new ReturnToHandSourceEffect(), new ManaCostsImpl("{B}")))); + this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new ReturnToHandSourceEffect(), new ManaCostsImpl("{B}")))); // When Relentless Dead dies, you may pay {X}. If you do, return another target Zombie creature card with converted mana cost X from your graveyard to the battlefield. - this.addAbility(new DiesTriggeredAbility(new RelentlessDeadEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new RelentlessDeadEffect())); } public RelentlessDead(final RelentlessDead card) { diff --git a/Mage.Sets/src/mage/cards/r/ReliquaryMonk.java b/Mage.Sets/src/mage/cards/r/ReliquaryMonk.java index 2e3e3ff0449..5b254a277b7 100644 --- a/Mage.Sets/src/mage/cards/r/ReliquaryMonk.java +++ b/Mage.Sets/src/mage/cards/r/ReliquaryMonk.java @@ -3,7 +3,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -29,7 +29,7 @@ public final class ReliquaryMonk extends CardImpl { this.toughness = new MageInt(2); // When Reliquary Monk dies, destroy target artifact or enchantment. - Ability ability = new DiesTriggeredAbility(new DestroyTargetEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new DestroyTargetEffect(), false); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/ReturnedReveler.java b/Mage.Sets/src/mage/cards/r/ReturnedReveler.java index e0a10efc985..34a34083ae9 100644 --- a/Mage.Sets/src/mage/cards/r/ReturnedReveler.java +++ b/Mage.Sets/src/mage/cards/r/ReturnedReveler.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveEachPlayerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class ReturnedReveler extends CardImpl { this.toughness = new MageInt(3); // When Returned Reveler dies, each player puts the top three cards of their library into their graveyard. - this.addAbility(new DiesTriggeredAbility(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(3, TargetController.ANY))); + this.addAbility(new DiesSourceTriggeredAbility(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(3, TargetController.ANY))); } public ReturnedReveler(final ReturnedReveler card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideCrab.java b/Mage.Sets/src/mage/cards/r/RiptideCrab.java index c0ce13fec5a..2bfcc369a58 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideCrab.java +++ b/Mage.Sets/src/mage/cards/r/RiptideCrab.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class RiptideCrab extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // When Riptide Crab dies, draw a card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } public RiptideCrab(final RiptideCrab card) { diff --git a/Mage.Sets/src/mage/cards/r/RoaleskApexHybrid.java b/Mage.Sets/src/mage/cards/r/RoaleskApexHybrid.java index 6c77689b4a1..29cd3f704ae 100644 --- a/Mage.Sets/src/mage/cards/r/RoaleskApexHybrid.java +++ b/Mage.Sets/src/mage/cards/r/RoaleskApexHybrid.java @@ -2,7 +2,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.effects.common.counter.ProliferateEffect; @@ -56,7 +56,7 @@ public final class RoaleskApexHybrid extends CardImpl { this.addAbility(ability); // When Roalsk dies, proliferate, then proliferate again. (Choose any number of permanents and/or players, then give each another counter of each kind already there. Then do it again.) - ability = new DiesTriggeredAbility(new ProliferateEffect(false)); + ability = new DiesSourceTriggeredAbility(new ProliferateEffect(false)); ability.addEffect(new ProliferateEffect(" again", true).concatBy(", then")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RocEgg.java b/Mage.Sets/src/mage/cards/r/RocEgg.java index 126df90a82a..e5e5797ee9b 100644 --- a/Mage.Sets/src/mage/cards/r/RocEgg.java +++ b/Mage.Sets/src/mage/cards/r/RocEgg.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class RocEgg extends CardImpl { this.toughness = new MageInt(3); this.addAbility(DefenderAbility.getInstance()); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(rocEggToken, 1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(rocEggToken, 1), false)); } public RocEgg(final RocEgg card) { diff --git a/Mage.Sets/src/mage/cards/r/RootingKavu.java b/Mage.Sets/src/mage/cards/r/RootingKavu.java index 7e0fc263db1..8e34a334943 100644 --- a/Mage.Sets/src/mage/cards/r/RootingKavu.java +++ b/Mage.Sets/src/mage/cards/r/RootingKavu.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.common.ExileSourceFromGraveCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DoIfCostPaid; @@ -31,7 +31,7 @@ public final class RootingKavu extends CardImpl { this.toughness = new MageInt(3); // When Rooting Kavu dies, you may exile it. If you do, shuffle all creature cards from your graveyard into your library. - this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new RootingKavuEffect(), new ExileSourceFromGraveCost()))); + this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new RootingKavuEffect(), new ExileSourceFromGraveCost()))); } public RootingKavu(final RootingKavu card) { diff --git a/Mage.Sets/src/mage/cards/r/RotcrownGhoul.java b/Mage.Sets/src/mage/cards/r/RotcrownGhoul.java index bb979190f92..5591fd73a1c 100644 --- a/Mage.Sets/src/mage/cards/r/RotcrownGhoul.java +++ b/Mage.Sets/src/mage/cards/r/RotcrownGhoul.java @@ -4,7 +4,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class RotcrownGhoul extends CardImpl { this.toughness = new MageInt(3); // When Rotcrown Ghoul dies, target player puts the top five cards of their library into their graveyard. - Ability ability = new DiesTriggeredAbility(new PutLibraryIntoGraveTargetEffect(5)); + Ability ability = new DiesSourceTriggeredAbility(new PutLibraryIntoGraveTargetEffect(5)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RottenheartGhoul.java b/Mage.Sets/src/mage/cards/r/RottenheartGhoul.java index a3ae6504fac..8a71bd7a30a 100644 --- a/Mage.Sets/src/mage/cards/r/RottenheartGhoul.java +++ b/Mage.Sets/src/mage/cards/r/RottenheartGhoul.java @@ -4,7 +4,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class RottenheartGhoul extends CardImpl { this.toughness = new MageInt(4); // When Rottenheart Ghoul dies, target player discards a card. - Ability ability = new DiesTriggeredAbility(new DiscardTargetEffect(1)); + Ability ability = new DiesSourceTriggeredAbility(new DiscardTargetEffect(1)); ability.addTarget(new TargetPlayer()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RuinRat.java b/Mage.Sets/src/mage/cards/r/RuinRat.java index 513b1372190..86ce487b074 100644 --- a/Mage.Sets/src/mage/cards/r/RuinRat.java +++ b/Mage.Sets/src/mage/cards/r/RuinRat.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; @@ -30,7 +30,7 @@ public final class RuinRat extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // When Ruin Rat dies, exile target card from an opponent's graveyard. - DiesTriggeredAbility ability = new DiesTriggeredAbility(new ExileTargetEffect()); + DiesSourceTriggeredAbility ability = new DiesSourceTriggeredAbility(new ExileTargetEffect()); ability.addTarget(new TargetCardInOpponentsGraveyard(new FilterCard("card from an opponent's graveyard"))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RuinationRioter.java b/Mage.Sets/src/mage/cards/r/RuinationRioter.java index dace98732cc..00af5f37cf5 100644 --- a/Mage.Sets/src/mage/cards/r/RuinationRioter.java +++ b/Mage.Sets/src/mage/cards/r/RuinationRioter.java @@ -2,7 +2,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.DamageTargetEffect; @@ -31,7 +31,7 @@ public final class RuinationRioter extends CardImpl { this.toughness = new MageInt(2); // When Ruination Rioter dies, you may have it deal damage to any target equal to the number of land cards in your graveyard. - Ability ability = new DiesTriggeredAbility( + Ability ability = new DiesSourceTriggeredAbility( new DamageTargetEffect(xValue).setText("you may have it deal damage to any target " + "equal to the number of land cards in your graveyard."), true ); diff --git a/Mage.Sets/src/mage/cards/r/RukhEgg.java b/Mage.Sets/src/mage/cards/r/RukhEgg.java index 6cb6036d6ea..7889f9206f4 100644 --- a/Mage.Sets/src/mage/cards/r/RukhEgg.java +++ b/Mage.Sets/src/mage/cards/r/RukhEgg.java @@ -4,7 +4,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; @@ -31,7 +31,7 @@ public final class RukhEgg extends CardImpl { // When Rukh Egg dies, create a 4/4 red Bird creature token with flying at the beginning of the next end step. Effect effect = new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new CreateTokenEffect(new RukhEggBirdToken()))); effect.setText("create a 4/4 red Bird creature token with flying at the beginning of the next end step"); - Ability ability = new DiesTriggeredAbility(effect); + Ability ability = new DiesSourceTriggeredAbility(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RunedServitor.java b/Mage.Sets/src/mage/cards/r/RunedServitor.java index 80651aab251..0f8e979d4ad 100644 --- a/Mage.Sets/src/mage/cards/r/RunedServitor.java +++ b/Mage.Sets/src/mage/cards/r/RunedServitor.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -21,7 +21,7 @@ public final class RunedServitor extends CardImpl { this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new DiesTriggeredAbility(new DrawCardAllEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardAllEffect(1), false)); } public RunedServitor(final RunedServitor card) { diff --git a/Mage.Sets/src/mage/cards/r/Runewing.java b/Mage.Sets/src/mage/cards/r/Runewing.java index 4532e36b6d9..f5a329d2bcb 100644 --- a/Mage.Sets/src/mage/cards/r/Runewing.java +++ b/Mage.Sets/src/mage/cards/r/Runewing.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; @@ -37,7 +37,7 @@ public final class Runewing extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Runewing dies, draw a card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); } public Runewing(final Runewing card) { diff --git a/Mage.Sets/src/mage/cards/r/RushingTideZubera.java b/Mage.Sets/src/mage/cards/r/RushingTideZubera.java index f80c8015a46..fb8920811be 100644 --- a/Mage.Sets/src/mage/cards/r/RushingTideZubera.java +++ b/Mage.Sets/src/mage/cards/r/RushingTideZubera.java @@ -4,7 +4,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -31,7 +31,7 @@ public final class RushingTideZubera extends CardImpl { this.toughness = new MageInt(3); // When Rushing-Tide Zubera dies, if 4 or more damage was dealt to it this turn, draw three cards. - Ability ability = new ConditionalInterveningIfTriggeredAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(3)), new RushingTideZuberaCondition(), + Ability ability = new ConditionalInterveningIfTriggeredAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(3)), new RushingTideZuberaCondition(), "When {this} dies, if 4 or more damage was dealt to it this turn, draw three cards."); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RyuseiTheFallingStar.java b/Mage.Sets/src/mage/cards/r/RyuseiTheFallingStar.java index 08a62c7fd6f..58b9630ef62 100644 --- a/Mage.Sets/src/mage/cards/r/RyuseiTheFallingStar.java +++ b/Mage.Sets/src/mage/cards/r/RyuseiTheFallingStar.java @@ -4,7 +4,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -36,7 +36,7 @@ public final class RyuseiTheFallingStar extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(5); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new DiesTriggeredAbility(new DamageAllEffect(5, filter))); + this.addAbility(new DiesSourceTriggeredAbility(new DamageAllEffect(5, filter))); } public RyuseiTheFallingStar(final RyuseiTheFallingStar card) { diff --git a/Mage.Sets/src/mage/cards/s/SadisticAugermage.java b/Mage.Sets/src/mage/cards/s/SadisticAugermage.java index f6b2d9d83f3..dfbd3d36f51 100644 --- a/Mage.Sets/src/mage/cards/s/SadisticAugermage.java +++ b/Mage.Sets/src/mage/cards/s/SadisticAugermage.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -32,7 +32,7 @@ public final class SadisticAugermage extends CardImpl { this.toughness = new MageInt(1); // When Sadistic Augermage dies, each player puts a card from their hand on top of their library. - this.addAbility(new DiesTriggeredAbility(new WidespreadPanicEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new WidespreadPanicEffect())); } public SadisticAugermage(final SadisticAugermage card) { diff --git a/Mage.Sets/src/mage/cards/s/SalvageDrone.java b/Mage.Sets/src/mage/cards/s/SalvageDrone.java index 66e0942638d..e8944e482ff 100644 --- a/Mage.Sets/src/mage/cards/s/SalvageDrone.java +++ b/Mage.Sets/src/mage/cards/s/SalvageDrone.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.abilities.keyword.DevoidAbility; import mage.abilities.keyword.IngestAbility; @@ -30,7 +30,7 @@ public final class SalvageDrone extends CardImpl { // Ingest (Whenever this creature deals combat damage to a player, that player exiles the top card of their library.) this.addAbility(new IngestAbility()); // When Salvage Drone dies, you may draw a card. If you do, discard a card. - this.addAbility(new DiesTriggeredAbility(new DrawDiscardControllerEffect(1, 1, true), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawDiscardControllerEffect(1, 1, true), false)); } diff --git a/Mage.Sets/src/mage/cards/s/ScreechingBuzzard.java b/Mage.Sets/src/mage/cards/s/ScreechingBuzzard.java index 0c4e2296165..a3424b3e168 100644 --- a/Mage.Sets/src/mage/cards/s/ScreechingBuzzard.java +++ b/Mage.Sets/src/mage/cards/s/ScreechingBuzzard.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class ScreechingBuzzard extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Screeching Buzzard dies, each opponent discards a card. - this.addAbility(new DiesTriggeredAbility(new DiscardEachPlayerEffect(TargetController.OPPONENT), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DiscardEachPlayerEffect(TargetController.OPPONENT), false)); } public ScreechingBuzzard(final ScreechingBuzzard card) { diff --git a/Mage.Sets/src/mage/cards/s/ScuttlingDoomEngine.java b/Mage.Sets/src/mage/cards/s/ScuttlingDoomEngine.java index acb9f784d43..52469546ce5 100644 --- a/Mage.Sets/src/mage/cards/s/ScuttlingDoomEngine.java +++ b/Mage.Sets/src/mage/cards/s/ScuttlingDoomEngine.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; @@ -41,7 +41,7 @@ public final class ScuttlingDoomEngine extends CardImpl { // Scuttling Doom Engine can't be blocked by creatures with power 2 or less. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesSourceEffect(filter, Duration.WhileOnBattlefield))); // When Scuttling Doom Engine dies, it deals 6 damage to target opponnent - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(6, "it"), false); + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(6, "it"), false); ability.addTarget(new TargetOpponentOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SeedGuardian.java b/Mage.Sets/src/mage/cards/s/SeedGuardian.java index ade4624f249..c268d4e1762 100644 --- a/Mage.Sets/src/mage/cards/s/SeedGuardian.java +++ b/Mage.Sets/src/mage/cards/s/SeedGuardian.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.ReachAbility; @@ -32,7 +32,7 @@ public final class SeedGuardian extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // When Seed Guardian dies, create an X/X green Elemental creature token, where X is the number of creature cards in your graveyard. - this.addAbility(new DiesTriggeredAbility(new SeedGuardianEffect(), false)); + this.addAbility(new DiesSourceTriggeredAbility(new SeedGuardianEffect(), false)); } public SeedGuardian(final SeedGuardian card) { diff --git a/Mage.Sets/src/mage/cards/s/SeedguideAsh.java b/Mage.Sets/src/mage/cards/s/SeedguideAsh.java index 660b6695dc9..cdb05821090 100644 --- a/Mage.Sets/src/mage/cards/s/SeedguideAsh.java +++ b/Mage.Sets/src/mage/cards/s/SeedguideAsh.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -33,7 +33,7 @@ public final class SeedguideAsh extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); // When Seedguide Ash dies, you may search your library for up to three Forest cards and put them onto the battlefield tapped. If you do, shuffle your library. - this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 3, filter), true, false, Outcome.PutLandInPlay), true)); + this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 3, filter), true, false, Outcome.PutLandInPlay), true)); } public SeedguideAsh(final SeedguideAsh card) { diff --git a/Mage.Sets/src/mage/cards/s/SellSwordBrute.java b/Mage.Sets/src/mage/cards/s/SellSwordBrute.java index 3048cc10ae0..bdf0bae886f 100644 --- a/Mage.Sets/src/mage/cards/s/SellSwordBrute.java +++ b/Mage.Sets/src/mage/cards/s/SellSwordBrute.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class SellSwordBrute extends CardImpl { this.toughness = new MageInt(2); // When Sell-Sword Brute dies, it deals 2 damage to you. - this.addAbility(new DiesTriggeredAbility(new DamageControllerEffect(2, "it"), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DamageControllerEffect(2, "it"), false)); } public SellSwordBrute(final SellSwordBrute card) { diff --git a/Mage.Sets/src/mage/cards/s/SerratedScorpion.java b/Mage.Sets/src/mage/cards/s/SerratedScorpion.java index 425cc67965d..f95e3077efa 100644 --- a/Mage.Sets/src/mage/cards/s/SerratedScorpion.java +++ b/Mage.Sets/src/mage/cards/s/SerratedScorpion.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamagePlayersEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class SerratedScorpion extends CardImpl { this.toughness = new MageInt(2); // When Serrated Scorpion dies, it deals 2 damage to each opponent and you gain 2 life. - Ability ability = new DiesTriggeredAbility(new DamagePlayersEffect( + Ability ability = new DiesSourceTriggeredAbility(new DamagePlayersEffect( 2, TargetController.OPPONENT, "it" )); ability.addEffect(new GainLifeEffect(2).concatBy("and")); diff --git a/Mage.Sets/src/mage/cards/s/SerumRaker.java b/Mage.Sets/src/mage/cards/s/SerumRaker.java index 2ccbb515931..9055a92de9e 100644 --- a/Mage.Sets/src/mage/cards/s/SerumRaker.java +++ b/Mage.Sets/src/mage/cards/s/SerumRaker.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class SerumRaker extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new DiesTriggeredAbility(new DiscardEachPlayerEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new DiscardEachPlayerEffect())); } public SerumRaker (final SerumRaker card) { diff --git a/Mage.Sets/src/mage/cards/s/ServantOfTheScale.java b/Mage.Sets/src/mage/cards/s/ServantOfTheScale.java index 32aaf50a85a..f6454d2975c 100644 --- a/Mage.Sets/src/mage/cards/s/ServantOfTheScale.java +++ b/Mage.Sets/src/mage/cards/s/ServantOfTheScale.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -40,7 +40,7 @@ public final class ServantOfTheScale extends CardImpl { "with a +1/+1 counter on it")); // When Servant of the Scale dies, put X +1/+1 counters on target creature you control, where X is the number of +1/+1 counter on Servant of the Scale. - Ability ability = new DiesTriggeredAbility(new ServantOfTheScaleEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new ServantOfTheScaleEffect(), false); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShaakHerd.java b/Mage.Sets/src/mage/cards/s/ShaakHerd.java index 96f3933057f..16852ebec07 100644 --- a/Mage.Sets/src/mage/cards/s/ShaakHerd.java +++ b/Mage.Sets/src/mage/cards/s/ShaakHerd.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -33,7 +33,7 @@ public final class ShaakHerd extends CardImpl { this.toughness = new MageInt(2); // When Shaak Herd dies, you may return another target creature card from your graveyard to your hand. - Ability ability = new DiesTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect(), true); + Ability ability = new DiesSourceTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect(), true); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShamblingGoblin.java b/Mage.Sets/src/mage/cards/s/ShamblingGoblin.java index ed512bf60f0..83fdf692a4a 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingGoblin.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingGoblin.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -35,7 +35,7 @@ public final class ShamblingGoblin extends CardImpl { this.toughness = new MageInt(1); // When Shambling Goblin dies, target creature an opponent controls gets -1/-1 until end of turn. - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-1,-1, Duration.EndOfTurn)); + Ability ability = new DiesSourceTriggeredAbility(new BoostTargetEffect(-1,-1, Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent(filterOpponentCreature)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShamblingSwarm.java b/Mage.Sets/src/mage/cards/s/ShamblingSwarm.java index 84d5681765e..c6f445e9ec6 100644 --- a/Mage.Sets/src/mage/cards/s/ShamblingSwarm.java +++ b/Mage.Sets/src/mage/cards/s/ShamblingSwarm.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.DistributeCountersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -26,7 +26,7 @@ public final class ShamblingSwarm extends CardImpl { this.toughness = new MageInt(3); // When Shambling Swarm dies, distribute three -1/-1 counters among one, two, or three target creatures. For each -1/-1 counter you put on a creature this way, remove a -1/-1 counter from that creature at the beginning of the next end step. - Ability ability = new DiesTriggeredAbility(new DistributeCountersEffect(CounterType.M1M1, 3, true, "one, two, or three target creatures"), false); + Ability ability = new DiesSourceTriggeredAbility(new DistributeCountersEffect(CounterType.M1M1, 3, true, "one, two, or three target creatures"), false); ability.addTarget(new TargetCreaturePermanentAmount(3)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ShivanPhoenix.java b/Mage.Sets/src/mage/cards/s/ShivanPhoenix.java index 33d1dca830b..80425ea158f 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanPhoenix.java +++ b/Mage.Sets/src/mage/cards/s/ShivanPhoenix.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class ShivanPhoenix extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Shivan Phoenix dies, return Shivan Phoenix to its owner's hand. - this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new ReturnToHandSourceEffect())); } public ShivanPhoenix(final ShivanPhoenix card) { diff --git a/Mage.Sets/src/mage/cards/s/Showstopper.java b/Mage.Sets/src/mage/cards/s/Showstopper.java index c8b70747a2e..8fbc3a3f4ba 100644 --- a/Mage.Sets/src/mage/cards/s/Showstopper.java +++ b/Mage.Sets/src/mage/cards/s/Showstopper.java @@ -2,7 +2,7 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.TriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -34,7 +34,7 @@ public final class Showstopper extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{B}{R}"); // Until end of turn, creatures you control gain "When this creature dies, it deals 2 damage to target creature an opponent controls." - TriggeredAbility ability = new DiesTriggeredAbility(new DamageTargetEffect(2, "it"), false); + TriggeredAbility ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(2, "it"), false); Target target = new TargetCreaturePermanent(filter2); ability.addTarget(target); Effect effect = new GainAbilityControlledEffect(ability, Duration.EndOfTurn, filter); diff --git a/Mage.Sets/src/mage/cards/s/SilentChantZubera.java b/Mage.Sets/src/mage/cards/s/SilentChantZubera.java index b2d0ec1e0bc..b3d36bc8428 100644 --- a/Mage.Sets/src/mage/cards/s/SilentChantZubera.java +++ b/Mage.Sets/src/mage/cards/s/SilentChantZubera.java @@ -5,7 +5,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.GainLifeEffect; @@ -29,7 +29,7 @@ public final class SilentChantZubera extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(2); - Ability ability = new DiesTriggeredAbility(new GainLifeEffect(new SilentChantZuberaDynamicValue())); + Ability ability = new DiesSourceTriggeredAbility(new GainLifeEffect(new SilentChantZuberaDynamicValue())); this.addAbility(ability, new ZuberasDiedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/SilverbackShaman.java b/Mage.Sets/src/mage/cards/s/SilverbackShaman.java index d33b3e2867e..794d0a67e70 100644 --- a/Mage.Sets/src/mage/cards/s/SilverbackShaman.java +++ b/Mage.Sets/src/mage/cards/s/SilverbackShaman.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class SilverbackShaman extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // When Silverback Shaman dies, draw a card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1))); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1))); } private SilverbackShaman(final SilverbackShaman card) { diff --git a/Mage.Sets/src/mage/cards/s/SlaughterhouseBouncer.java b/Mage.Sets/src/mage/cards/s/SlaughterhouseBouncer.java index b68d8d3a68e..5a687fed346 100644 --- a/Mage.Sets/src/mage/cards/s/SlaughterhouseBouncer.java +++ b/Mage.Sets/src/mage/cards/s/SlaughterhouseBouncer.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.condition.common.HellbentCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -32,7 +32,7 @@ public final class SlaughterhouseBouncer extends CardImpl { // Hellbent - When Slaughterhouse Bouncer dies, if you have no cards in hand, target creature gets -3/-3 until end of turn. Ability ability = new ConditionalInterveningIfTriggeredAbility( - new DiesTriggeredAbility(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)), + new DiesSourceTriggeredAbility(new BoostTargetEffect(-3, -3, Duration.EndOfTurn)), HellbentCondition.instance, "When {this} dies, if you have no cards in hand, target creature gets -3/-3 until end of turn." ); diff --git a/Mage.Sets/src/mage/cards/s/SmolderingEfreet.java b/Mage.Sets/src/mage/cards/s/SmolderingEfreet.java index 56fed80827b..642e6020317 100644 --- a/Mage.Sets/src/mage/cards/s/SmolderingEfreet.java +++ b/Mage.Sets/src/mage/cards/s/SmolderingEfreet.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DamageControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class SmolderingEfreet extends CardImpl { this.toughness = new MageInt(2); // When Smoldering Efreet dies, it deals 2 damage to you. - this.addAbility(new DiesTriggeredAbility(new DamageControllerEffect(2, "it"), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DamageControllerEffect(2, "it"), false)); } public SmolderingEfreet(final SmolderingEfreet card) { diff --git a/Mage.Sets/src/mage/cards/s/SolemnSimulacrum.java b/Mage.Sets/src/mage/cards/s/SolemnSimulacrum.java index e80c292346b..2783e4d2e37 100644 --- a/Mage.Sets/src/mage/cards/s/SolemnSimulacrum.java +++ b/Mage.Sets/src/mage/cards/s/SolemnSimulacrum.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; @@ -26,7 +26,7 @@ public final class SolemnSimulacrum extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); } public SolemnSimulacrum(final SolemnSimulacrum card) { diff --git a/Mage.Sets/src/mage/cards/s/SoulcageFiend.java b/Mage.Sets/src/mage/cards/s/SoulcageFiend.java index 669c4cacf30..71c179f86d9 100644 --- a/Mage.Sets/src/mage/cards/s/SoulcageFiend.java +++ b/Mage.Sets/src/mage/cards/s/SoulcageFiend.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class SoulcageFiend extends CardImpl { this.toughness = new MageInt(2); // When Soulcage Fiend dies, each player loses 3 life. - this.addAbility(new DiesTriggeredAbility(new LoseLifeAllPlayersEffect(3))); + this.addAbility(new DiesSourceTriggeredAbility(new LoseLifeAllPlayersEffect(3))); } public SoulcageFiend(final SoulcageFiend card) { diff --git a/Mage.Sets/src/mage/cards/s/Soulstinger.java b/Mage.Sets/src/mage/cards/s/Soulstinger.java index 955da0d7cdf..56204981e3a 100644 --- a/Mage.Sets/src/mage/cards/s/Soulstinger.java +++ b/Mage.Sets/src/mage/cards/s/Soulstinger.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.CountersSourceCount; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -43,7 +43,7 @@ public final class Soulstinger extends CardImpl { new CountersSourceCount(CounterType.M1M1), Outcome.Detriment); effect.setText("you may put a -1/-1 counter on target creature for each -1/-1 counter on {this}"); - ability = new DiesTriggeredAbility(effect, true); + ability = new DiesSourceTriggeredAbility(effect, true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SparringConstruct.java b/Mage.Sets/src/mage/cards/s/SparringConstruct.java index fd9626d107e..18022974cd0 100644 --- a/Mage.Sets/src/mage/cards/s/SparringConstruct.java +++ b/Mage.Sets/src/mage/cards/s/SparringConstruct.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.constants.SubType; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class SparringConstruct extends CardImpl { this.toughness = new MageInt(1); // When Sparring Construct dies, put a +1/+1 counter on target creature you control. - Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); + Ability ability = new DiesSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpinalCentipede.java b/Mage.Sets/src/mage/cards/s/SpinalCentipede.java index 9d5073b48bf..7e8c8347a93 100644 --- a/Mage.Sets/src/mage/cards/s/SpinalCentipede.java +++ b/Mage.Sets/src/mage/cards/s/SpinalCentipede.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.constants.SubType; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class SpinalCentipede extends CardImpl { this.toughness = new MageInt(2); // When Spinal Centipede dies, put a +1/+1 counter on target creature you control. - Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect( + Ability ability = new DiesSourceTriggeredAbility(new AddCountersTargetEffect( CounterType.P1P1.createInstance() ), false); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SpiritOfMalevolence.java b/Mage.Sets/src/mage/cards/s/SpiritOfMalevolence.java index 946050840c1..bd49a418710 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritOfMalevolence.java +++ b/Mage.Sets/src/mage/cards/s/SpiritOfMalevolence.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class SpiritOfMalevolence extends CardImpl { this.toughness = new MageInt(1); // When Spirit of Malevolence dies, each opponent loses 1 life and you gain 1 life. - Ability ability = new DiesTriggeredAbility(new LoseLifeOpponentsEffect(1)); + Ability ability = new DiesSourceTriggeredAbility(new LoseLifeOpponentsEffect(1)); ability.addEffect(new GainLifeEffect(1).concatBy("and")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SproutingThrinax.java b/Mage.Sets/src/mage/cards/s/SproutingThrinax.java index fd5fe9af5d2..a5b5f5d2314 100644 --- a/Mage.Sets/src/mage/cards/s/SproutingThrinax.java +++ b/Mage.Sets/src/mage/cards/s/SproutingThrinax.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -28,7 +28,7 @@ public final class SproutingThrinax extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(saprolingToken, 3), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(saprolingToken, 3), false)); } public SproutingThrinax(final SproutingThrinax card) { diff --git a/Mage.Sets/src/mage/cards/s/SteadfastSentry.java b/Mage.Sets/src/mage/cards/s/SteadfastSentry.java index e118f863b54..8d5ecc10936 100644 --- a/Mage.Sets/src/mage/cards/s/SteadfastSentry.java +++ b/Mage.Sets/src/mage/cards/s/SteadfastSentry.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; @@ -31,7 +31,7 @@ public final class SteadfastSentry extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // When Steadfast Sentry dies, put a +1/+1 counter on target creature you control. - Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); + Ability ability = new DiesSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SuChi.java b/Mage.Sets/src/mage/cards/s/SuChi.java index b8c58ef91c0..d59bc7e0491 100644 --- a/Mage.Sets/src/mage/cards/s/SuChi.java +++ b/Mage.Sets/src/mage/cards/s/SuChi.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.Mana; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.mana.BasicManaEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class SuChi extends CardImpl { this.toughness = new MageInt(4); // When Su-Chi dies, add {C}{C}{C}{C}. - this.addAbility(new DiesTriggeredAbility(new BasicManaEffect(Mana.ColorlessMana(4)), false)); + this.addAbility(new DiesSourceTriggeredAbility(new BasicManaEffect(Mana.ColorlessMana(4)), false)); } public SuChi(final SuChi card) { diff --git a/Mage.Sets/src/mage/cards/s/SultaiEmissary.java b/Mage.Sets/src/mage/cards/s/SultaiEmissary.java index cb615a363b5..29c91953fd4 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiEmissary.java +++ b/Mage.Sets/src/mage/cards/s/SultaiEmissary.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.keyword.ManifestEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class SultaiEmissary extends CardImpl { this.toughness = new MageInt(1); // When Sultai Emissary dies, manifest the top card of your library. - this.addAbility(new DiesTriggeredAbility(new ManifestEffect(1))); + this.addAbility(new DiesSourceTriggeredAbility(new ManifestEffect(1))); } public SultaiEmissary(final SultaiEmissary card) { diff --git a/Mage.Sets/src/mage/cards/s/SummonersEgg.java b/Mage.Sets/src/mage/cards/s/SummonersEgg.java index 055eb812370..d4d249ec2c0 100644 --- a/Mage.Sets/src/mage/cards/s/SummonersEgg.java +++ b/Mage.Sets/src/mage/cards/s/SummonersEgg.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -36,7 +36,7 @@ public final class SummonersEgg extends CardImpl { // Imprint - When Summoner's Egg enters the battlefield, you may exile a card from your hand face down. this.addAbility(new EntersBattlefieldTriggeredAbility(new SummonersEggImprintEffect(), true, "Imprint — ")); // When Summoner's Egg dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control. - this.addAbility(new DiesTriggeredAbility(new SummonersEggPutOntoBattlefieldEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new SummonersEggPutOntoBattlefieldEffect())); } public SummonersEgg(final SummonersEgg card) { diff --git a/Mage.Sets/src/mage/cards/s/SupernaturalStamina.java b/Mage.Sets/src/mage/cards/s/SupernaturalStamina.java index 3f67103eff5..b4667f2ab7a 100644 --- a/Mage.Sets/src/mage/cards/s/SupernaturalStamina.java +++ b/Mage.Sets/src/mage/cards/s/SupernaturalStamina.java @@ -1,7 +1,7 @@ package mage.cards.s; import java.util.UUID; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -26,7 +26,7 @@ public final class SupernaturalStamina extends CardImpl { .setText("Until end of turn, target creature gets +2/+0") ); getSpellAbility().addEffect(new GainAbilityTargetEffect( - new DiesTriggeredAbility( + new DiesSourceTriggeredAbility( new ReturnSourceFromGraveyardToBattlefieldEffect(true, true), false), Duration.EndOfTurn, diff --git a/Mage.Sets/src/mage/cards/s/SurveillingSprite.java b/Mage.Sets/src/mage/cards/s/SurveillingSprite.java index 988c83be6f7..b27d88f50ec 100644 --- a/Mage.Sets/src/mage/cards/s/SurveillingSprite.java +++ b/Mage.Sets/src/mage/cards/s/SurveillingSprite.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class SurveillingSprite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Surveilling Sprite dies, you may draw a card. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); } public SurveillingSprite(final SurveillingSprite card) { diff --git a/Mage.Sets/src/mage/cards/s/SylvanHierophant.java b/Mage.Sets/src/mage/cards/s/SylvanHierophant.java index 80555a1adcf..ea72e04e610 100644 --- a/Mage.Sets/src/mage/cards/s/SylvanHierophant.java +++ b/Mage.Sets/src/mage/cards/s/SylvanHierophant.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileSourceEffect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; @@ -40,7 +40,7 @@ public final class SylvanHierophant extends CardImpl { // When Sylvan Hierophant dies, exile Sylvan Hierophant, then return another target creature card from your graveyard to your hand. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); - Ability ability = new DiesTriggeredAbility(new ExileSourceEffect(), false); + Ability ability = new DiesSourceTriggeredAbility(new ExileSourceEffect(), false); ability.addEffect(effect); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SymbioticBeast.java b/Mage.Sets/src/mage/cards/s/SymbioticBeast.java index df9de72dce2..4f2d1b0cc00 100644 --- a/Mage.Sets/src/mage/cards/s/SymbioticBeast.java +++ b/Mage.Sets/src/mage/cards/s/SymbioticBeast.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class SymbioticBeast extends CardImpl { this.toughness = new MageInt(4); // When Symbiotic Beast dies, create four 1/1 green Insect creature tokens. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new InsectToken(), 4))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new InsectToken(), 4))); } public SymbioticBeast(final SymbioticBeast card) { diff --git a/Mage.Sets/src/mage/cards/s/SymbioticElf.java b/Mage.Sets/src/mage/cards/s/SymbioticElf.java index b2f3b8d408c..a40b1937672 100644 --- a/Mage.Sets/src/mage/cards/s/SymbioticElf.java +++ b/Mage.Sets/src/mage/cards/s/SymbioticElf.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class SymbioticElf extends CardImpl { this.toughness = new MageInt(2); // When Symbiotic Elf dies, create two 1/1 green Insect creature tokens. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new InsectToken(), 2))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new InsectToken(), 2))); } public SymbioticElf(final SymbioticElf card) { diff --git a/Mage.Sets/src/mage/cards/s/SymbioticWurm.java b/Mage.Sets/src/mage/cards/s/SymbioticWurm.java index 0cca8ae6d8f..45df2721dab 100644 --- a/Mage.Sets/src/mage/cards/s/SymbioticWurm.java +++ b/Mage.Sets/src/mage/cards/s/SymbioticWurm.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class SymbioticWurm extends CardImpl { this.toughness = new MageInt(7); // When Symbiotic Wurm dies, create seven 1/1 green Insect creature tokens. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new InsectToken(), 7))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new InsectToken(), 7))); } diff --git a/Mage.Sets/src/mage/cards/t/Tarpan.java b/Mage.Sets/src/mage/cards/t/Tarpan.java index 5529e42b62a..c3a83c1d78c 100644 --- a/Mage.Sets/src/mage/cards/t/Tarpan.java +++ b/Mage.Sets/src/mage/cards/t/Tarpan.java @@ -3,7 +3,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class Tarpan extends CardImpl { this.toughness = new MageInt(1); // When Tarpan dies, you gain 1 life. - this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(1), false)); + this.addAbility(new DiesSourceTriggeredAbility(new GainLifeEffect(1), false)); } public Tarpan(final Tarpan card) { diff --git a/Mage.Sets/src/mage/cards/t/TatteredMummy.java b/Mage.Sets/src/mage/cards/t/TatteredMummy.java index 92d4daecc1a..7dd0951593b 100644 --- a/Mage.Sets/src/mage/cards/t/TatteredMummy.java +++ b/Mage.Sets/src/mage/cards/t/TatteredMummy.java @@ -3,7 +3,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class TatteredMummy extends CardImpl { this.toughness = new MageInt(2); // When Tattered Mummy dies, each opponent loses 2 life. - this.addAbility(new DiesTriggeredAbility(new LoseLifeOpponentsEffect(2))); + this.addAbility(new DiesSourceTriggeredAbility(new LoseLifeOpponentsEffect(2))); } public TatteredMummy(final TatteredMummy card) { diff --git a/Mage.Sets/src/mage/cards/t/TenaciousDead.java b/Mage.Sets/src/mage/cards/t/TenaciousDead.java index a9f9a1e0e21..54c980379d5 100644 --- a/Mage.Sets/src/mage/cards/t/TenaciousDead.java +++ b/Mage.Sets/src/mage/cards/t/TenaciousDead.java @@ -3,7 +3,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DoIfCostPaid; @@ -29,7 +29,7 @@ public final class TenaciousDead extends CardImpl { // When Tenacious Dead dies, you may pay {1}{B}. If you do, return it to the battlefield tapped under its owner's control. Effect effect = new DoIfCostPaid(new ReturnToBattlefieldUnderOwnerControlSourceEffect(true), new ManaCostsImpl("{1}{B}")); - this.addAbility(new DiesTriggeredAbility(effect, false)); + this.addAbility(new DiesSourceTriggeredAbility(effect, false)); } diff --git a/Mage.Sets/src/mage/cards/t/TheLocustGod.java b/Mage.Sets/src/mage/cards/t/TheLocustGod.java index 752b438e496..0e3c4852e26 100644 --- a/Mage.Sets/src/mage/cards/t/TheLocustGod.java +++ b/Mage.Sets/src/mage/cards/t/TheLocustGod.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.DrawCardControllerTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; @@ -52,7 +52,7 @@ public final class TheLocustGod extends CardImpl { this.addAbility(ability); // When The Locust God dies, return it to its owner's hand at the beginning of the next end step. - this.addAbility(new DiesTriggeredAbility(new TheLocustGodEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new TheLocustGodEffect())); } public TheLocustGod(final TheLocustGod card) { diff --git a/Mage.Sets/src/mage/cards/t/TheScarabGod.java b/Mage.Sets/src/mage/cards/t/TheScarabGod.java index 7a7f4fbf4c6..e8d7e44ae05 100644 --- a/Mage.Sets/src/mage/cards/t/TheScarabGod.java +++ b/Mage.Sets/src/mage/cards/t/TheScarabGod.java @@ -7,7 +7,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -54,7 +54,7 @@ public final class TheScarabGod extends CardImpl { this.addAbility(ability); // When The Scarab God dies, return it to its owner's hand at the beginning of the next end step. - this.addAbility(new DiesTriggeredAbility(new TheScarabGodEffect3())); + this.addAbility(new DiesSourceTriggeredAbility(new TheScarabGodEffect3())); } public TheScarabGod(final TheScarabGod card) { diff --git a/Mage.Sets/src/mage/cards/t/TheScorpionGod.java b/Mage.Sets/src/mage/cards/t/TheScorpionGod.java index b973513f0e4..b912a6d28ef 100644 --- a/Mage.Sets/src/mage/cards/t/TheScorpionGod.java +++ b/Mage.Sets/src/mage/cards/t/TheScorpionGod.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -63,7 +63,7 @@ public final class TheScorpionGod extends CardImpl { this.addAbility(ability); // When The Scorpion God dies, return it to its owner's hand at the beginning of the next end step. - this.addAbility(new DiesTriggeredAbility(new TheScorpionGodEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new TheScorpionGodEffect())); } public TheScorpionGod(final TheScorpionGod card) { diff --git a/Mage.Sets/src/mage/cards/t/ThoughtSponge.java b/Mage.Sets/src/mage/cards/t/ThoughtSponge.java index 6721f81d766..da1d3a75f02 100644 --- a/Mage.Sets/src/mage/cards/t/ThoughtSponge.java +++ b/Mage.Sets/src/mage/cards/t/ThoughtSponge.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; @@ -45,7 +45,7 @@ public final class ThoughtSponge extends CardImpl { ), new CardsDrawnThisTurnWatcher()); // When Thought Sponge dies, draw cards equal to its power. - this.addAbility(new DiesTriggeredAbility( + this.addAbility(new DiesSourceTriggeredAbility( new DrawCardSourceControllerEffect(xValue).setText("draw cards equal to its power") )); } diff --git a/Mage.Sets/src/mage/cards/t/TibaltsRager.java b/Mage.Sets/src/mage/cards/t/TibaltsRager.java index 26d32825714..8599f5a0700 100644 --- a/Mage.Sets/src/mage/cards/t/TibaltsRager.java +++ b/Mage.Sets/src/mage/cards/t/TibaltsRager.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageTargetEffect; @@ -29,7 +29,7 @@ public final class TibaltsRager extends CardImpl { this.toughness = new MageInt(2); // When Tibalt's Rager dies, it deals 1 damage to any target. - Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(1, "it")); + Ability ability = new DiesSourceTriggeredAbility(new DamageTargetEffect(1, "it")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/TreacherousVampire.java b/Mage.Sets/src/mage/cards/t/TreacherousVampire.java index b95c66a613e..59d0625cc4f 100644 --- a/Mage.Sets/src/mage/cards/t/TreacherousVampire.java +++ b/Mage.Sets/src/mage/cards/t/TreacherousVampire.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.costs.common.ExileFromGraveCost; @@ -55,7 +55,7 @@ public final class TreacherousVampire extends CardImpl { new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +2/+2")); Effect effect = new ConditionalContinuousEffect( - new GainAbilitySourceEffect(new DiesTriggeredAbility(new LoseLifeSourceControllerEffect(6))), + new GainAbilitySourceEffect(new DiesSourceTriggeredAbility(new LoseLifeSourceControllerEffect(6))), new CardsInControllerGraveCondition(7), "and has \"When {this} dies, you lose 6 life.\"" ); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TreacherousWerewolf.java b/Mage.Sets/src/mage/cards/t/TreacherousWerewolf.java index 1f565dea599..4d980d39d1f 100644 --- a/Mage.Sets/src/mage/cards/t/TreacherousWerewolf.java +++ b/Mage.Sets/src/mage/cards/t/TreacherousWerewolf.java @@ -4,7 +4,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -39,7 +39,7 @@ public final class TreacherousWerewolf extends CardImpl { new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +2/+2")); Effect effect = new ConditionalContinuousEffect( - new GainAbilitySourceEffect(new DiesTriggeredAbility(new LoseLifeSourceControllerEffect(4))), + new GainAbilitySourceEffect(new DiesSourceTriggeredAbility(new LoseLifeSourceControllerEffect(4))), new CardsInControllerGraveCondition(7), "and has \"When {this} dies, you lose 4 life.\"" ); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TreasureKeeper.java b/Mage.Sets/src/mage/cards/t/TreasureKeeper.java index a8752827b03..cd6019caeed 100644 --- a/Mage.Sets/src/mage/cards/t/TreasureKeeper.java +++ b/Mage.Sets/src/mage/cards/t/TreasureKeeper.java @@ -3,7 +3,7 @@ package mage.cards.t; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -32,7 +32,7 @@ public final class TreasureKeeper extends CardImpl { // When Treasure Keeper dies, reveal cards from the top of your library until you reveal a nonland card with converted mana cost 3 or less. // You may cast that card without paying its mana cost. Put all revealed cards not cast this way on the bottom of your library in a random order. - this.addAbility(new DiesTriggeredAbility(new TreasureKeeperEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new TreasureKeeperEffect())); } public TreasureKeeper(final TreasureKeeper card) { diff --git a/Mage.Sets/src/mage/cards/t/TreeshakerChimera.java b/Mage.Sets/src/mage/cards/t/TreeshakerChimera.java index d9f9476d45b..d61b3b66bdb 100644 --- a/Mage.Sets/src/mage/cards/t/TreeshakerChimera.java +++ b/Mage.Sets/src/mage/cards/t/TreeshakerChimera.java @@ -1,7 +1,7 @@ package mage.cards.t; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.combat.MustBeBlockedByAllSourceEffect; @@ -28,7 +28,7 @@ public final class TreeshakerChimera extends CardImpl { this.addAbility(new SimpleStaticAbility(new MustBeBlockedByAllSourceEffect())); // When Treeshaker Chimera dies, draw three cards. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(3))); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(3))); } private TreeshakerChimera(final TreeshakerChimera card) { diff --git a/Mage.Sets/src/mage/cards/t/TukatongueThallid.java b/Mage.Sets/src/mage/cards/t/TukatongueThallid.java index 4d87a9caf80..ba0779473a3 100644 --- a/Mage.Sets/src/mage/cards/t/TukatongueThallid.java +++ b/Mage.Sets/src/mage/cards/t/TukatongueThallid.java @@ -4,7 +4,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class TukatongueThallid extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), false)); } public TukatongueThallid(final TukatongueThallid card) { diff --git a/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java b/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java index 29eb1f246bb..b6a67f4bd46 100644 --- a/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java +++ b/Mage.Sets/src/mage/cards/t/TuktukTheExplorer.java @@ -3,7 +3,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class TuktukTheExplorer extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new TuktukTheReturnedToken(expansionSetCode)))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new TuktukTheReturnedToken(expansionSetCode)))); } public TuktukTheExplorer(final TuktukTheExplorer card) { diff --git a/Mage.Sets/src/mage/cards/u/UndeadExecutioner.java b/Mage.Sets/src/mage/cards/u/UndeadExecutioner.java index 51f086068f9..681b7247021 100644 --- a/Mage.Sets/src/mage/cards/u/UndeadExecutioner.java +++ b/Mage.Sets/src/mage/cards/u/UndeadExecutioner.java @@ -4,7 +4,7 @@ package mage.cards.u; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -28,7 +28,7 @@ public final class UndeadExecutioner extends CardImpl { this.toughness = new MageInt(2); // When Undead Executioner dies, you may have target creature get -2/-2 until end of turn. - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), true); + Ability ability = new DiesSourceTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn), true); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java b/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java index 85f0a72e52b..e648342fc35 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java @@ -4,7 +4,7 @@ package mage.cards.u; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CantBeTargetedCardsGraveyardsEffect; import mage.abilities.effects.common.ExileSourceEffect; @@ -37,7 +37,7 @@ public final class UnderworldCerberus extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedCardsGraveyardsEffect())); // When Underworld Cerberus dies, exile it and each player returns all creature cards from their graveyard to their hand. - Ability ability = new DiesTriggeredAbility(new ExileSourceEffect()); + Ability ability = new DiesSourceTriggeredAbility(new ExileSourceEffect()); ability.addEffect(new ReturnToHandFromGraveyardAllEffect(new FilterCreatureCard("creature cards"))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/u/UnderworldSentinel.java b/Mage.Sets/src/mage/cards/u/UnderworldSentinel.java index 1ad813bb1a1..40db7ee5970 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldSentinel.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldSentinel.java @@ -3,7 +3,7 @@ package mage.cards.u; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetForSourceEffect; import mage.cards.CardImpl; @@ -40,7 +40,7 @@ public final class UnderworldSentinel extends CardImpl { this.addAbility(ability); // When Underworld Sentinel dies, put all cards exiled with it onto the battlefield. - this.addAbility(new DiesTriggeredAbility(new UnderworldSentinelEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new UnderworldSentinelEffect())); } private UnderworldSentinel(final UnderworldSentinel card) { diff --git a/Mage.Sets/src/mage/cards/u/UndyingBeast.java b/Mage.Sets/src/mage/cards/u/UndyingBeast.java index 8dad549bf4d..201f45d8b4c 100644 --- a/Mage.Sets/src/mage/cards/u/UndyingBeast.java +++ b/Mage.Sets/src/mage/cards/u/UndyingBeast.java @@ -4,7 +4,7 @@ package mage.cards.u; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -29,7 +29,7 @@ public final class UndyingBeast extends CardImpl { this.toughness = new MageInt(2); // When Undying Beast dies, put it on top of its owner's library. - this.addAbility(new DiesTriggeredAbility(new UndyingBeastEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new UndyingBeastEffect())); } public UndyingBeast(final UndyingBeast card) { diff --git a/Mage.Sets/src/mage/cards/v/VastwoodHydra.java b/Mage.Sets/src/mage/cards/v/VastwoodHydra.java index 0aaed1b5521..eea7f827e34 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodHydra.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodHydra.java @@ -4,7 +4,7 @@ package mage.cards.v; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.common.CountersSourceCount; import mage.abilities.effects.OneShotEffect; @@ -45,7 +45,7 @@ public final class VastwoodHydra extends CardImpl { this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.P1P1.createInstance()))); // When Vastwood Hydra dies, you may distribute a number of +1/+1 counters equal to the number of +1/+1 counters on Vastwood Hydra among any number of creatures you control. - Ability ability = new DiesTriggeredAbility(new VastwoodHydraDistributeEffect(), true); + Ability ability = new DiesSourceTriggeredAbility(new VastwoodHydraDistributeEffect(), true); ability.addTarget(new TargetCreaturePermanentAmount(new CountersSourceCount(CounterType.P1P1), filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VenerableKnight.java b/Mage.Sets/src/mage/cards/v/VenerableKnight.java index dc14f248f35..475806ee621 100644 --- a/Mage.Sets/src/mage/cards/v/VenerableKnight.java +++ b/Mage.Sets/src/mage/cards/v/VenerableKnight.java @@ -2,7 +2,7 @@ package mage.cards.v; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -31,7 +31,7 @@ public final class VenerableKnight extends CardImpl { this.toughness = new MageInt(1); // When Venerable Knight dies, put a +1/+1 counter on target Knight you control. - Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); + Ability ability = new DiesSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VengeantVampire.java b/Mage.Sets/src/mage/cards/v/VengeantVampire.java index 5e15e894da5..b8b89d0249c 100644 --- a/Mage.Sets/src/mage/cards/v/VengeantVampire.java +++ b/Mage.Sets/src/mage/cards/v/VengeantVampire.java @@ -2,7 +2,7 @@ package mage.cards.v; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.LifelinkAbility; @@ -32,7 +32,7 @@ public final class VengeantVampire extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // When Vengeant Vampire dies, destroy target creature an opponent controls and you gain 4 life. - Ability ability = new DiesTriggeredAbility(new DestroyTargetEffect()); + Ability ability = new DiesSourceTriggeredAbility(new DestroyTargetEffect()); ability.addEffect(new GainLifeEffect(4).concatBy("and")); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VerdantRebirth.java b/Mage.Sets/src/mage/cards/v/VerdantRebirth.java index db3c9e55dc4..6197df23554 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantRebirth.java +++ b/Mage.Sets/src/mage/cards/v/VerdantRebirth.java @@ -3,7 +3,7 @@ package mage.cards.v; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; @@ -24,7 +24,7 @@ public final class VerdantRebirth extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}"); // Until end of turn, target creature gains "When this creature dies, return it to its owner's hand." - Ability gainedAbility = new DiesTriggeredAbility(new ReturnToHandSourceEffect(), false); + Ability gainedAbility = new DiesSourceTriggeredAbility(new ReturnToHandSourceEffect(), false); Effect effect = new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn); effect.setText("Until end of turn, target creature gains \"When this creature dies, return it to its owner's hand.\""); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/v/VeteranExplorer.java b/Mage.Sets/src/mage/cards/v/VeteranExplorer.java index 0e34e7fb8c5..a77af3879e4 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranExplorer.java +++ b/Mage.Sets/src/mage/cards/v/VeteranExplorer.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -36,7 +36,7 @@ public final class VeteranExplorer extends CardImpl { this.toughness = new MageInt(1); // When Veteran Explorer dies, each player may search their library for up to two basic land cards and put them onto the battlefield. Then each player who searched their library this way shuffles it. - this.addAbility(new DiesTriggeredAbility(new VeteranExplorerEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new VeteranExplorerEffect())); } public VeteranExplorer(final VeteranExplorer card) { diff --git a/Mage.Sets/src/mage/cards/v/VexingSphinx.java b/Mage.Sets/src/mage/cards/v/VexingSphinx.java index a7c10ca324b..7e98531098b 100644 --- a/Mage.Sets/src/mage/cards/v/VexingSphinx.java +++ b/Mage.Sets/src/mage/cards/v/VexingSphinx.java @@ -3,7 +3,7 @@ package mage.cards.v; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.keyword.FlyingAbility; import mage.abilities.dynamicvalue.common.CountersSourceCount; @@ -35,7 +35,7 @@ public final class VexingSphinx extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new DiscardCardCost())); // When Vexing Sphinx dies, draw a card for each age counter on it. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(new CountersSourceCount(CounterType.AGE)))); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(new CountersSourceCount(CounterType.AGE)))); } diff --git a/Mage.Sets/src/mage/cards/v/VindictiveLich.java b/Mage.Sets/src/mage/cards/v/VindictiveLich.java index 281345c0308..1ffd56cfa85 100644 --- a/Mage.Sets/src/mage/cards/v/VindictiveLich.java +++ b/Mage.Sets/src/mage/cards/v/VindictiveLich.java @@ -3,7 +3,7 @@ package mage.cards.v; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.effects.common.discard.DiscardTargetEffect; @@ -34,7 +34,7 @@ public final class VindictiveLich extends CardImpl { // When Vindictive Lich dies, choose one or more. Each mode must target a different player. // * Target opponent sacrifices a creature. - Ability ability = new DiesTriggeredAbility(new SacrificeEffect(StaticFilters.FILTER_PERMANENT_CREATURE, 1, "target opponent")); + Ability ability = new DiesSourceTriggeredAbility(new SacrificeEffect(StaticFilters.FILTER_PERMANENT_CREATURE, 1, "target opponent")); ability.getModes().setMinModes(1); ability.getModes().setMaxModes(3); ability.getModes().setEachModeOnlyOnce(true); diff --git a/Mage.Sets/src/mage/cards/v/ViridianEmissary.java b/Mage.Sets/src/mage/cards/v/ViridianEmissary.java index 9b4dc18c0a0..5e5c53710d4 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianEmissary.java +++ b/Mage.Sets/src/mage/cards/v/ViridianEmissary.java @@ -2,7 +2,7 @@ package mage.cards.v; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -28,7 +28,7 @@ public final class ViridianEmissary extends CardImpl { this.toughness = new MageInt(1); // When Viridian Emissary dies, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. - this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); + this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); } public ViridianEmissary(final ViridianEmissary card) { diff --git a/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java b/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java index 9cfe01d0dfd..eaa0fb74249 100644 --- a/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java +++ b/Mage.Sets/src/mage/cards/v/VodalianWarMachine.java @@ -9,7 +9,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.TapTargetCost; @@ -80,7 +80,7 @@ public final class VodalianWarMachine extends CardImpl { } } -class VodalianWarMachineTriggeredAbility extends DiesTriggeredAbility { +class VodalianWarMachineTriggeredAbility extends DiesSourceTriggeredAbility { public VodalianWarMachineTriggeredAbility() { super(new VodalianWarMachineEffect(), false); diff --git a/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java b/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java index dcdecac26ee..265a2b732e0 100644 --- a/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java +++ b/Mage.Sets/src/mage/cards/v/VoiceOfResurgence.java @@ -1,7 +1,7 @@ package mage.cards.v; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SpellCastOpponentTriggeredAbility; import mage.abilities.condition.common.MyTurnCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; @@ -37,7 +37,7 @@ public final class VoiceOfResurgence extends CardImpl { new SpellCastOpponentTriggeredAbility(null, new FilterSpell("a spell"), false), MyTurnCondition.instance, "Whenever an opponent casts a spell during your turn, "), - new DiesTriggeredAbility(null, false)); + new DiesSourceTriggeredAbility(null, false)); ability.setLeavesTheBattlefieldTrigger(true); ability.addHint(MyTurnHint.instance); ability.addHint(CreaturesYouControlHint.instance); diff --git a/Mage.Sets/src/mage/cards/v/VolatileRig.java b/Mage.Sets/src/mage/cards/v/VolatileRig.java index a3091c63a47..cd5be00e171 100644 --- a/Mage.Sets/src/mage/cards/v/VolatileRig.java +++ b/Mage.Sets/src/mage/cards/v/VolatileRig.java @@ -4,7 +4,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.AttacksEachCombatStaticAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; @@ -42,7 +42,7 @@ public final class VolatileRig extends CardImpl { this.addAbility(new VolatileRigTriggeredAbility()); // When Volatile Rig dies, flip a coin. If you lose the flip, it deals 4 damage to each creature and each player. - this.addAbility(new DiesTriggeredAbility(new VolatileRigEffect2())); + this.addAbility(new DiesSourceTriggeredAbility(new VolatileRigEffect2())); } diff --git a/Mage.Sets/src/mage/cards/w/WantedScoundrels.java b/Mage.Sets/src/mage/cards/w/WantedScoundrels.java index 3c55abe0651..df8e00ce747 100644 --- a/Mage.Sets/src/mage/cards/w/WantedScoundrels.java +++ b/Mage.Sets/src/mage/cards/w/WantedScoundrels.java @@ -4,7 +4,7 @@ package mage.cards.w; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -28,7 +28,7 @@ public final class WantedScoundrels extends CardImpl { this.toughness = new MageInt(3); // When Wanted Scoundrels dies, target opponent creates two colorless Treasure artifact tokens with "T, Sacrifice this artifact: Add one mana of any color." - Ability ability = new DiesTriggeredAbility(new CreateTokenTargetEffect(new TreasureToken(), 2), false); + Ability ability = new DiesSourceTriggeredAbility(new CreateTokenTargetEffect(new TreasureToken(), 2), false); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WeatherseedTreefolk.java b/Mage.Sets/src/mage/cards/w/WeatherseedTreefolk.java index 491122aa0e9..8e70080ca50 100644 --- a/Mage.Sets/src/mage/cards/w/WeatherseedTreefolk.java +++ b/Mage.Sets/src/mage/cards/w/WeatherseedTreefolk.java @@ -3,7 +3,7 @@ package mage.cards.w; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class WeatherseedTreefolk extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // When Weatherseed Treefolk dies, return it to its owner's hand. - this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect())); + this.addAbility(new DiesSourceTriggeredAbility(new ReturnToHandSourceEffect())); } public WeatherseedTreefolk(final WeatherseedTreefolk card) { diff --git a/Mage.Sets/src/mage/cards/w/WelkinHawk.java b/Mage.Sets/src/mage/cards/w/WelkinHawk.java index 2cbd7fb5b2c..6228cc3c940 100644 --- a/Mage.Sets/src/mage/cards/w/WelkinHawk.java +++ b/Mage.Sets/src/mage/cards/w/WelkinHawk.java @@ -3,7 +3,7 @@ package mage.cards.w; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -37,7 +37,7 @@ public final class WelkinHawk extends CardImpl { // When Welkin Hawk dies, you may search your library for a card named Welkin Hawk, reveal that card, put it into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter); - this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); } public WelkinHawk(final WelkinHawk card) { diff --git a/Mage.Sets/src/mage/cards/w/WhirlpoolDrake.java b/Mage.Sets/src/mage/cards/w/WhirlpoolDrake.java index 35f578eccf5..73d9dea2ddb 100644 --- a/Mage.Sets/src/mage/cards/w/WhirlpoolDrake.java +++ b/Mage.Sets/src/mage/cards/w/WhirlpoolDrake.java @@ -3,7 +3,7 @@ package mage.cards.w; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.ShuffleHandIntoLibraryDrawThatManySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -31,7 +31,7 @@ public final class WhirlpoolDrake extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new ShuffleHandIntoLibraryDrawThatManySourceEffect(), false)); // When Whirlpool Drake dies, shuffle the cards from your hand into your library, then draw that many cards. - this.addAbility(new DiesTriggeredAbility(new ShuffleHandIntoLibraryDrawThatManySourceEffect(), false)); + this.addAbility(new DiesSourceTriggeredAbility(new ShuffleHandIntoLibraryDrawThatManySourceEffect(), false)); } public WhirlpoolDrake(final WhirlpoolDrake card) { diff --git a/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java b/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java index 52b1ca830c1..fd8ff5063b8 100644 --- a/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java +++ b/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.Effect; @@ -46,7 +46,7 @@ public final class WhisperwoodElemental extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(new ManifestEffect(1), TargetController.YOU, false)); // Sacrifice Whisperwood Elemental: Until end of turn, face-up, nontoken creatures you control gain "When this creature dies, manifest the top card of your library." - Ability abilityToGain = new DiesTriggeredAbility(new ManifestEffect(1)); + Ability abilityToGain = new DiesSourceTriggeredAbility(new ManifestEffect(1)); Effect effect = new GainAbilityControlledEffect(abilityToGain, Duration.EndOfTurn, filter); effect.setText("Until end of turn, face-up, nontoken creatures you control gain \"When this creature dies, manifest the top card of your library.\""); this.addAbility(new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/w/WirewoodHerald.java b/Mage.Sets/src/mage/cards/w/WirewoodHerald.java index c55fdbfb257..b0300130b05 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodHerald.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodHerald.java @@ -3,7 +3,7 @@ package mage.cards.w; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -32,7 +32,7 @@ public final class WirewoodHerald extends CardImpl { this.toughness = new MageInt(1); // When Wirewood Herald dies, you may search your library for an Elf card, reveal that card, put it into your hand, then shuffle your library. - this.addAbility(new DiesTriggeredAbility( + this.addAbility(new DiesSourceTriggeredAbility( new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), true)); } diff --git a/Mage.Sets/src/mage/cards/w/WorkshopAssistant.java b/Mage.Sets/src/mage/cards/w/WorkshopAssistant.java index 9adc768912a..9b2bf29ef38 100644 --- a/Mage.Sets/src/mage/cards/w/WorkshopAssistant.java +++ b/Mage.Sets/src/mage/cards/w/WorkshopAssistant.java @@ -4,7 +4,7 @@ package mage.cards.w; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; @@ -36,7 +36,7 @@ public final class WorkshopAssistant extends CardImpl { // When Workshop Assistant dies, return another target artifact card from your graveyard to your hand. Effect effect = new ReturnFromGraveyardToHandTargetEffect(); effect.setText("return another target artifact card from your graveyard to your hand"); - Ability ability = new DiesTriggeredAbility(effect); + Ability ability = new DiesSourceTriggeredAbility(effect); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WorldShaper.java b/Mage.Sets/src/mage/cards/w/WorldShaper.java index e134a44a4f4..ce75ae985e5 100644 --- a/Mage.Sets/src/mage/cards/w/WorldShaper.java +++ b/Mage.Sets/src/mage/cards/w/WorldShaper.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect; import mage.cards.CardImpl; @@ -36,7 +36,7 @@ public final class WorldShaper extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new PutTopCardOfLibraryIntoGraveControllerEffect(3), true)); // When World Shaper dies, put all land cards from your graveyard onto the battlefield tapped. - this.addAbility(new DiesTriggeredAbility(new WorldShaperEffect(), false)); + this.addAbility(new DiesSourceTriggeredAbility(new WorldShaperEffect(), false)); } public WorldShaper(final WorldShaper card) { diff --git a/Mage.Sets/src/mage/cards/w/WorldspineWurm.java b/Mage.Sets/src/mage/cards/w/WorldspineWurm.java index db6cafe74a1..ebd27a0ebea 100644 --- a/Mage.Sets/src/mage/cards/w/WorldspineWurm.java +++ b/Mage.Sets/src/mage/cards/w/WorldspineWurm.java @@ -1,7 +1,7 @@ package mage.cards.w; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.PutIntoGraveFromAnywhereSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect; @@ -30,7 +30,7 @@ public final class WorldspineWurm extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // When Worldspine Wurm dies, create three 5/5 green Wurm creature tokens with trample. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new WurmWithTrampleToken(), 3))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new WurmWithTrampleToken(), 3))); // When Worldspine Wurm is put into a graveyard from anywhere, shuffle it into its owner's library. this.addAbility(new PutIntoGraveFromAnywhereSourceTriggeredAbility(new ShuffleIntoLibrarySourceEffect())); diff --git a/Mage.Sets/src/mage/cards/w/WretchedCamel.java b/Mage.Sets/src/mage/cards/w/WretchedCamel.java index 195f091fa01..c5d2d7e2c02 100644 --- a/Mage.Sets/src/mage/cards/w/WretchedCamel.java +++ b/Mage.Sets/src/mage/cards/w/WretchedCamel.java @@ -4,7 +4,7 @@ package mage.cards.w; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.condition.OrCondition; import mage.abilities.condition.common.CardsInControllerGraveCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -42,7 +42,7 @@ public final class WretchedCamel extends CardImpl { // When Wretched Camel dies, if you control a Desert or there is a Desert card in your graveyard, target player discards a card. Ability ability = new ConditionalInterveningIfTriggeredAbility( - new DiesTriggeredAbility(new DiscardTargetEffect(1)), + new DiesSourceTriggeredAbility(new DiscardTargetEffect(1)), new OrCondition( new PermanentsOnTheBattlefieldCondition(new FilterControlledPermanent(filterDesertPermanent)), new CardsInControllerGraveCondition(1, filterDesertCard)), diff --git a/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java b/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java index 76e82878d3b..f73a0a73480 100644 --- a/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java +++ b/Mage.Sets/src/mage/cards/w/WurmcoilEngine.java @@ -2,7 +2,7 @@ package mage.cards.w; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.LifelinkAbility; @@ -31,7 +31,7 @@ public final class WurmcoilEngine extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // When Wurmcoil Engine dies, create a 3/3 colorless Wurm artifact creature token with deathtouch and a 3/3 colorless Wurm artifact creature token with lifelink. - Ability ability = new DiesTriggeredAbility(new CreateTokenEffect(new WurmWithDeathtouchToken()), false); + Ability ability = new DiesSourceTriggeredAbility(new CreateTokenEffect(new WurmWithDeathtouchToken()), false); ability.addEffect(new CreateTokenEffect(new WurmWithLifelinkToken())); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/y/YavimayaElder.java b/Mage.Sets/src/mage/cards/y/YavimayaElder.java index 33687685e8e..bc46c0636ac 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayaElder.java +++ b/Mage.Sets/src/mage/cards/y/YavimayaElder.java @@ -3,7 +3,7 @@ package mage.cards.y; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -34,7 +34,7 @@ public final class YavimayaElder extends CardImpl { this.toughness = new MageInt(1); // When Yavimaya Elder dies, you may search your library for up to two basic land cards, reveal them, and put them into your hand. If you do, shuffle your library. - this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); + this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); // {2}, Sacrifice Yavimaya Elder: Draw a card. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java b/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java index 1eed365c5ab..32c1b591a12 100644 --- a/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java +++ b/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SkipNextPlayerUntapStepEffect; import mage.abilities.keyword.FlyingAbility; @@ -44,7 +44,7 @@ public final class YoseiTheMorningStar extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Yosei, the Morning Star dies, target player skips their next untap step. Tap up to five target permanents that player controls. - Ability ability = new DiesTriggeredAbility(new SkipNextPlayerUntapStepEffect("target")); + Ability ability = new DiesSourceTriggeredAbility(new SkipNextPlayerUntapStepEffect("target")); ability.addTarget(new TargetPlayer()); ability.addTarget(new YoseiTheMorningStarTarget()); ability.addEffect(new YoseiTheMorningStarTapEffect()); diff --git a/Mage.Sets/src/mage/cards/y/YouthfulScholar.java b/Mage.Sets/src/mage/cards/y/YouthfulScholar.java index ed3422bd95e..dda5ec2eaa3 100644 --- a/Mage.Sets/src/mage/cards/y/YouthfulScholar.java +++ b/Mage.Sets/src/mage/cards/y/YouthfulScholar.java @@ -3,7 +3,7 @@ package mage.cards.y; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class YouthfulScholar extends CardImpl { this.toughness = new MageInt(2); // When Youthful Scholar dies, draw two cards. - this.addAbility(new DiesTriggeredAbility(new DrawCardSourceControllerEffect(2), false)); + this.addAbility(new DiesSourceTriggeredAbility(new DrawCardSourceControllerEffect(2), false)); } public YouthfulScholar(final YouthfulScholar card) { diff --git a/Mage.Sets/src/mage/cards/z/ZodiacDragon.java b/Mage.Sets/src/mage/cards/z/ZodiacDragon.java index e9b40d218c6..5a862db7330 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacDragon.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacDragon.java @@ -3,7 +3,7 @@ package mage.cards.z; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class ZodiacDragon extends CardImpl { this.toughness = new MageInt(8); // When Zodiac Dragon is put into your graveyard from the battlefield, you may return it to your hand. - this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect(), true)); + this.addAbility(new DiesSourceTriggeredAbility(new ReturnToHandSourceEffect(), true)); } public ZodiacDragon(final ZodiacDragon card) { diff --git a/Mage/src/main/java/mage/abilities/common/DiesSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesSourceTriggeredAbility.java new file mode 100644 index 00000000000..9a9d219669a --- /dev/null +++ b/Mage/src/main/java/mage/abilities/common/DiesSourceTriggeredAbility.java @@ -0,0 +1,79 @@ +package mage.abilities.common; + +import mage.MageObject; +import mage.abilities.effects.Effect; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.ZoneChangeEvent; +import mage.game.permanent.Permanent; +import mage.game.permanent.PermanentToken; + +/** + * @author BetaSteward_at_googlemail.com + */ +public class DiesSourceTriggeredAbility extends ZoneChangeTriggeredAbility { + + public DiesSourceTriggeredAbility(Effect effect, boolean optional) { + super(Zone.BATTLEFIELD, Zone.GRAVEYARD, effect, "When {this} dies, ", optional); + } + + public DiesSourceTriggeredAbility(Effect effect) { + this(effect, false); + } + + public DiesSourceTriggeredAbility(DiesSourceTriggeredAbility ability) { + super(ability); + } + + @Override + public boolean isInUseableZone(Game game, MageObject source, GameEvent event) { + // check it was previously on battlefield + Permanent before = ((ZoneChangeEvent) event).getTarget(); + if (before == null) { + return false; + } + if (!this.hasSourceObjectAbility(game, before, event)) { // the permanent does not have the ability so no trigger + return false; + } + // check now it is in graveyard if it is no token + if (!(before instanceof PermanentToken) && before.getZoneChangeCounter(game) + 1 == game.getState().getZoneChangeCounter(sourceId)) { + Zone after = game.getState().getZone(sourceId); + return after != null && Zone.GRAVEYARD.match(after); + } else { + // Already moved to another zone, so guess it's ok + return true; + } + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + if (super.checkEventType(event, game)) { + return ((ZoneChangeEvent) event).getFromZone() == Zone.BATTLEFIELD && ((ZoneChangeEvent) event).getToZone() == Zone.GRAVEYARD; + } + return false; + } + + @Override + public DiesSourceTriggeredAbility copy() { + return new DiesSourceTriggeredAbility(this); + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + if (super.checkTrigger(event, game)) { + ZoneChangeEvent zEvent = (ZoneChangeEvent) event; + if (zEvent.getTarget().isTransformable()) { + if (!zEvent.getTarget().getAbilities().contains(this)) { + return false; + } + } + for (Effect effect : getEffects()) { + effect.setValue("permanentLeftBattlefield", zEvent.getTarget()); + } + return true; + } + return false; + } + +} diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java index db66028de22..a801160d0f1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToBattlefieldUnderOwnerControlTargetEffect.java @@ -52,7 +52,7 @@ public class ReturnToBattlefieldUnderOwnerControlTargetEffect extends OneShotEff } private void updateText() { - this.staticText = "return " + this.returnName + this.staticText = "then return " + this.returnName + " to the battlefield" + (tapped ? " tapped" : "") + " under " + this.returnUnderControlName + " control"; } diff --git a/Mage/src/main/java/mage/abilities/keyword/AfflictAbility.java b/Mage/src/main/java/mage/abilities/keyword/AfflictAbility.java index 2e8feb1ceef..0bf16153323 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AfflictAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AfflictAbility.java @@ -1,13 +1,13 @@ package mage.abilities.keyword; import java.util.UUID; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.targetpointer.FixedTarget; -public class AfflictAbility extends BecomesBlockedTriggeredAbility { +public class AfflictAbility extends BecomesBlockedSourceTriggeredAbility { private final int lifeLoss; diff --git a/Mage/src/main/java/mage/abilities/keyword/AfterlifeAbility.java b/Mage/src/main/java/mage/abilities/keyword/AfterlifeAbility.java index 2fa1c7ecf36..9f87d2039bd 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AfterlifeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AfterlifeAbility.java @@ -1,11 +1,11 @@ package mage.abilities.keyword; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.game.permanent.token.WhiteBlackSpiritToken; import mage.util.CardUtil; -public class AfterlifeAbility extends DiesTriggeredAbility { +public class AfterlifeAbility extends DiesSourceTriggeredAbility { private final int tokenCount; diff --git a/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java b/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java index 546de34cf26..6436544db8a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CumulativeUpkeepAbility.java @@ -1,4 +1,3 @@ - package mage.abilities.keyword; import mage.abilities.Ability; diff --git a/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java b/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java index 70c22a44847..f0155b945af 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ModularAbility.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.StaticAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.EntersBattlefieldEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -38,7 +38,7 @@ import mage.util.CardUtil; * * @author Loki, LevelX2 */ -public class ModularAbility extends DiesTriggeredAbility { +public class ModularAbility extends DiesSourceTriggeredAbility { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact creature"); diff --git a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java index e6482cc92e8..203e7686ed1 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java @@ -126,7 +126,8 @@ public class MorphAbility extends StaticAbility implements AlternativeSourceCost ruleText = sb.toString(); - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesFaceDownCreatureEffect(morphCosts, (megamorph ? FaceDownType.MEGAMORPHED : FaceDownType.MORPHED))); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesFaceDownCreatureEffect( + morphCosts, (megamorph ? FaceDownType.MEGAMORPHED : FaceDownType.MORPHED))); ability.setWorksFaceDown(true); ability.setRuleVisible(false); addSubAbility(ability); diff --git a/Mage/src/main/java/mage/abilities/keyword/PersistAbility.java b/Mage/src/main/java/mage/abilities/keyword/PersistAbility.java index 43aa4bea329..adf31aceaf7 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PersistAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PersistAbility.java @@ -2,7 +2,7 @@ package mage.abilities.keyword; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; import mage.constants.Outcome; @@ -13,7 +13,7 @@ import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; -public class PersistAbility extends DiesTriggeredAbility { +public class PersistAbility extends DiesSourceTriggeredAbility { public PersistAbility() { super(new PersistEffect()); diff --git a/Mage/src/main/java/mage/abilities/keyword/RampageAbility.java b/Mage/src/main/java/mage/abilities/keyword/RampageAbility.java index 00b7bf47bea..a7c95e2c1fd 100644 --- a/Mage/src/main/java/mage/abilities/keyword/RampageAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/RampageAbility.java @@ -1,7 +1,7 @@ package mage.abilities.keyword; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -13,7 +13,7 @@ import mage.game.combat.CombatGroup; * * @author LoneFox */ -public class RampageAbility extends BecomesBlockedTriggeredAbility { +public class RampageAbility extends BecomesBlockedSourceTriggeredAbility { private final String rule; diff --git a/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java b/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java index 9bde3078e55..9b9ee84a88a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/RepairAbility.java @@ -9,7 +9,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.condition.common.SourceHasCounterCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; @@ -30,7 +30,7 @@ import mage.game.events.GameEvent; * * @author Styxo */ -public class RepairAbility extends DiesTriggeredAbility { +public class RepairAbility extends DiesSourceTriggeredAbility { private String ruleText; diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java index 0ccefbb9147..fd5ff1e9df1 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java @@ -3,7 +3,7 @@ package mage.abilities.keyword; import mage.constants.ComparisonType; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.ReturnToHandTargetEffect; @@ -27,7 +27,7 @@ import java.util.UUID; * * @author Loki, LevelX2 */ -public class SoulshiftAbility extends DiesTriggeredAbility { +public class SoulshiftAbility extends DiesSourceTriggeredAbility { private final DynamicValue amount; @@ -57,7 +57,7 @@ public class SoulshiftAbility extends DiesTriggeredAbility { } @Override - public DiesTriggeredAbility copy() { + public DiesSourceTriggeredAbility copy() { return new SoulshiftAbility(this); } diff --git a/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java b/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java index 66df34d1fb0..c5c31546ec2 100644 --- a/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/UndyingAbility.java @@ -1,7 +1,7 @@ package mage.abilities.keyword; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect; import mage.constants.Outcome; @@ -15,7 +15,7 @@ import mage.game.permanent.Permanent; /** * @author Loki */ -public class UndyingAbility extends DiesTriggeredAbility { +public class UndyingAbility extends DiesSourceTriggeredAbility { public UndyingAbility() { super(new UndyingEffect()); @@ -27,7 +27,7 @@ public class UndyingAbility extends DiesTriggeredAbility { } @Override - public DiesTriggeredAbility copy() { + public DiesSourceTriggeredAbility copy() { return new UndyingAbility(this); } 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 f2d7c93246e..e58cb29e90b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ATATToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ATATToken.java @@ -4,7 +4,7 @@ package mage.game.permanent.token; import mage.constants.CardType; import mage.constants.SubType; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; /** @@ -19,7 +19,7 @@ public final class ATATToken extends TokenImpl { cardType.add(CardType.CREATURE); cardType.add(CardType.ARTIFACT); color.setWhite(true); - addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new TrooperToken(), 2))); + addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new TrooperToken(), 2))); subtype.add(SubType.ATAT); } 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 bb7da534fe4..9e30bee9556 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DevilToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DevilToken.java @@ -5,7 +5,7 @@ import java.util.Collections; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.constants.CardType; @@ -29,7 +29,7 @@ public final class DevilToken extends TokenImpl { toughness = new MageInt(1); Effect effect = new DamageTargetEffect(1); effect.setText("it deals 1 damage to any target"); - Ability ability = new DiesTriggeredAbility(effect); + Ability ability = new DiesSourceTriggeredAbility(effect); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } 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 fa5a9797d57..5629aad50c6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/FesteringGoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/FesteringGoblinToken.java @@ -5,7 +5,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.constants.Duration; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +26,7 @@ public final class FesteringGoblinToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), false); + Ability ability = new DiesSourceTriggeredAbility(new BoostTargetEffect(-1, -1, Duration.EndOfTurn), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/game/permanent/token/GarrukCursedHuntsmanToken.java b/Mage/src/main/java/mage/game/permanent/token/GarrukCursedHuntsmanToken.java index fd5b1f0c084..2fb450d53e5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GarrukCursedHuntsmanToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GarrukCursedHuntsmanToken.java @@ -1,7 +1,7 @@ package mage.game.permanent.token; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.constants.CardType; import mage.constants.SubType; @@ -26,7 +26,7 @@ public final class GarrukCursedHuntsmanToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); - this.addAbility(new DiesTriggeredAbility(new AddCountersAllEffect(CounterType.LOYALTY.createInstance(), filter))); + this.addAbility(new DiesSourceTriggeredAbility(new AddCountersAllEffect(CounterType.LOYALTY.createInstance(), filter))); } public GarrukCursedHuntsmanToken(final GarrukCursedHuntsmanToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/NestingDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/NestingDragonToken.java index e33ce893297..b2b640913c3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/NestingDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/NestingDragonToken.java @@ -1,7 +1,7 @@ package mage.game.permanent.token; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.DefenderAbility; import mage.constants.CardType; @@ -30,7 +30,7 @@ public final class NestingDragonToken extends TokenImpl { power = new MageInt(0); toughness = new MageInt(2); addAbility(DefenderAbility.getInstance()); - this.addAbility(new DiesTriggeredAbility( + this.addAbility(new DiesSourceTriggeredAbility( new CreateTokenEffect(new DragonEggDragonToken()), false )); } 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 42736bec1ea..513573d97fb 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Ooze2Token.java @@ -4,7 +4,7 @@ package mage.game.permanent.token; import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; /** @@ -20,7 +20,7 @@ public final class Ooze2Token extends TokenImpl { color.setGreen(true); power = new MageInt(2); toughness = new MageInt(2); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new OozeToken(1, 1), 2), false)); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new OozeToken(1, 1), 2), false)); } public Ooze2Token(final Ooze2Token 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 1ac90fc567c..70c9cad3491 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java @@ -4,7 +4,7 @@ package mage.game.permanent.token; import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; /** @@ -22,7 +22,7 @@ public final class ReefWormFishToken extends TokenImpl { power = new MageInt(3); toughness = new MageInt(3); - addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new ReefWormWhaleToken()))); + addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new ReefWormWhaleToken()))); } public ReefWormFishToken(final ReefWormFishToken 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 634a8a8b593..02b9f7d19f0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java @@ -4,7 +4,7 @@ package mage.game.permanent.token; import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; /** @@ -22,7 +22,7 @@ public final class ReefWormWhaleToken extends TokenImpl { power = new MageInt(6); toughness = new MageInt(6); - addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new ReefWormKrakenToken()))); + addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new ReefWormKrakenToken()))); } public ReefWormWhaleToken(final ReefWormWhaleToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfsQuarryToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfsQuarryToken.java index 60f4b9f96d0..889e46a3d7d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolfsQuarryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolfsQuarryToken.java @@ -1,7 +1,7 @@ package mage.game.permanent.token; import mage.MageInt; -import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.CardType; import mage.constants.SubType; @@ -19,7 +19,7 @@ public final class WolfsQuarryToken extends TokenImpl { power = new MageInt(1); toughness = new MageInt(1); - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new FoodToken()))); + this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new FoodToken()))); } private WolfsQuarryToken(final WolfsQuarryToken token) {