diff --git a/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java b/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java index 6dd61ca85e0..dbb8fc51dec 100644 --- a/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java +++ b/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java @@ -35,7 +35,7 @@ public final class AbominationOfGudul extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(effect, true)); // Morph 2BGU - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{B}{G}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{B}{G}{U}"))); } private AbominationOfGudul(final AbominationOfGudul card) { diff --git a/Mage.Sets/src/mage/cards/a/AbzanGuide.java b/Mage.Sets/src/mage/cards/a/AbzanGuide.java index 7ea85c0b362..032f72f98dc 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanGuide.java +++ b/Mage.Sets/src/mage/cards/a/AbzanGuide.java @@ -28,7 +28,7 @@ public final class AbzanGuide extends CardImpl { // Lifelink this.addAbility(LifelinkAbility.getInstance()); // Morph {2}{W}{B}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{W}{B}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{W}{B}{G}"))); } private AbzanGuide(final AbzanGuide card) { diff --git a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java index a1c3acd22a9..59506f8a6cd 100644 --- a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java +++ b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java @@ -43,7 +43,7 @@ public final class AcidSpewerDragon extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Megamorph {5}{B}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{B}{B}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{B}{B}"), true)); // When Acid-Spewer Dragon is turned face up, put a +1/+1 counter on each other Dragon creature you control. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false)); diff --git a/Mage.Sets/src/mage/cards/a/AerieBowmasters.java b/Mage.Sets/src/mage/cards/a/AerieBowmasters.java index 2974c599e00..87059e1bcb2 100644 --- a/Mage.Sets/src/mage/cards/a/AerieBowmasters.java +++ b/Mage.Sets/src/mage/cards/a/AerieBowmasters.java @@ -28,7 +28,7 @@ public final class AerieBowmasters extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Megamorph {5}{G} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up at any time for its megamorph cost and put a +1/+1 counter on it.)) - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{G}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{G}"), true)); } diff --git a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java index 5bd90d4a037..686b35850a7 100644 --- a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java +++ b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java @@ -37,7 +37,7 @@ public final class AinokSurvivalist extends CardImpl { this.toughness = new MageInt(1); // Megamorph {1}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{G}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{G}"), true)); // When Ainok Survivalist is turned face up, destroy target artifact or enchantment an opponent controls. Effect effect = new DestroyTargetEffect(); diff --git a/Mage.Sets/src/mage/cards/a/AinokTracker.java b/Mage.Sets/src/mage/cards/a/AinokTracker.java index 49e46b7ee23..05d2f6f26e2 100644 --- a/Mage.Sets/src/mage/cards/a/AinokTracker.java +++ b/Mage.Sets/src/mage/cards/a/AinokTracker.java @@ -28,7 +28,7 @@ public final class AinokTracker extends CardImpl { // First Strike this.addAbility(FirstStrikeAbility.getInstance()); // Morph 4R - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{R}"))); } private AinokTracker(final AinokTracker card) { diff --git a/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java b/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java index b59f541f47d..c11d159b774 100644 --- a/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java +++ b/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java @@ -41,7 +41,7 @@ public final class AkromaAngelOfFury extends CardImpl { // {R}: Akroma, Angel of Fury gets +1/+0 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}"))); // Morph {3}{R}{R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{R}{R}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{R}{R}{R}"))); } private AkromaAngelOfFury(final AkromaAngelOfFury card) { diff --git a/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java b/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java index 65a501c0392..9354278b290 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java +++ b/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java @@ -45,7 +45,7 @@ public final class AphettoAlchemist extends CardImpl { this.addAbility(ability); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"))); } private AphettoAlchemist(final AphettoAlchemist card) { diff --git a/Mage.Sets/src/mage/cards/a/AphettoExterminator.java b/Mage.Sets/src/mage/cards/a/AphettoExterminator.java index 8185548195d..ebb397b41a1 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoExterminator.java +++ b/Mage.Sets/src/mage/cards/a/AphettoExterminator.java @@ -30,7 +30,7 @@ public final class AphettoExterminator extends CardImpl { this.toughness = new MageInt(1); // Morph {3}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{B}"))); // When Aphetto Exterminator is turned face up, target creature gets -3/-3 until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new BoostTargetEffect(-3,-3,Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java index b4075b0fe3f..bab93c72206 100644 --- a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java +++ b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java @@ -38,7 +38,7 @@ public final class AquamorphEntity extends CardImpl { this.addAbility(ability); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); } private AquamorphEntity(final AquamorphEntity card) { diff --git a/Mage.Sets/src/mage/cards/a/AscendingAven.java b/Mage.Sets/src/mage/cards/a/AscendingAven.java index a05231d03ee..12ed19675e6 100644 --- a/Mage.Sets/src/mage/cards/a/AscendingAven.java +++ b/Mage.Sets/src/mage/cards/a/AscendingAven.java @@ -30,7 +30,7 @@ public final class AscendingAven extends CardImpl { // Ascending Aven can block only creatures with flying. this.addAbility(new CanBlockOnlyFlyingAbility()); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); } private AscendingAven(final AscendingAven card) { diff --git a/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java b/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java index 2eff5551692..63f338ce07a 100644 --- a/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java +++ b/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java @@ -39,7 +39,7 @@ public final class AshcloudPhoenix extends CardImpl { this.addAbility(new DiesSourceTriggeredAbility(new AshcloudPhoenixEffect())); // Morph {4}{R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{R}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{R}{R}"))); // When Ashcloud Phoenix is turned face up, it deals 2 damage to each player. Effect effect = new DamagePlayersEffect(2, TargetController.ANY); diff --git a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java index 03819557126..dc654494ca2 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java @@ -29,7 +29,7 @@ public final class AtarkaEfreet extends CardImpl { this.toughness = new MageInt(1); // Megamorph {2}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{R}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{R}"), true)); // When Atarka Efreet is turned face up, it deals 1 damage to any target. Effect effect = new DamageTargetEffect(1, "it"); diff --git a/Mage.Sets/src/mage/cards/a/AvenLiberator.java b/Mage.Sets/src/mage/cards/a/AvenLiberator.java index c61f2d1ed78..69de055a7bb 100644 --- a/Mage.Sets/src/mage/cards/a/AvenLiberator.java +++ b/Mage.Sets/src/mage/cards/a/AvenLiberator.java @@ -32,7 +32,7 @@ public final class AvenLiberator extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {3}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{W}"))); // When Aven Liberator is turned face up, target creature you control gains protection from the color of your choice until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn)); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/a/AvenSunstriker.java b/Mage.Sets/src/mage/cards/a/AvenSunstriker.java index 91ce73b0f08..a3d8b79d447 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSunstriker.java +++ b/Mage.Sets/src/mage/cards/a/AvenSunstriker.java @@ -30,7 +30,7 @@ public final class AvenSunstriker extends CardImpl { // Double strike this.addAbility(DoubleStrikeAbility.getInstance()); // Megamorph {4}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{W}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{W}"), true)); } private AvenSunstriker(final AvenSunstriker card) { diff --git a/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java b/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java index 319c5a976a3..87636858b54 100644 --- a/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java +++ b/Mage.Sets/src/mage/cards/b/BaneOfTheLiving.java @@ -31,7 +31,7 @@ public final class BaneOfTheLiving extends CardImpl { this.toughness = new MageInt(3); // Morph {X}{B}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{X}{B}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{X}{B}{B}"))); // When Bane of the Living is turned face up, all creatures get -X/-X until end of turn. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostAllEffect(morphX, morphX, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_ALL_CREATURES, false, null))); diff --git a/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java b/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java index 458d341982b..6d011454100 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java +++ b/Mage.Sets/src/mage/cards/b/BatteringCraghorn.java @@ -27,7 +27,7 @@ public final class BatteringCraghorn extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Morph {1}{R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{R}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{R}{R}"))); } private BatteringCraghorn(final BatteringCraghorn card) { diff --git a/Mage.Sets/src/mage/cards/b/BelltollDragon.java b/Mage.Sets/src/mage/cards/b/BelltollDragon.java index a8bbb7aebed..eed8a545ed9 100644 --- a/Mage.Sets/src/mage/cards/b/BelltollDragon.java +++ b/Mage.Sets/src/mage/cards/b/BelltollDragon.java @@ -41,7 +41,7 @@ public final class BelltollDragon extends CardImpl { // Hexproof this.addAbility(HexproofAbility.getInstance()); // Megamorph {5}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{U}{U}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{U}{U}"), true)); // When Belltoll Dragon is turned face up, put a +1/+1 counter on each other Dragon creature you control. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false)); diff --git a/Mage.Sets/src/mage/cards/b/BirchloreRangers.java b/Mage.Sets/src/mage/cards/b/BirchloreRangers.java index 45a7dc96ae9..0ef117efbe6 100644 --- a/Mage.Sets/src/mage/cards/b/BirchloreRangers.java +++ b/Mage.Sets/src/mage/cards/b/BirchloreRangers.java @@ -45,7 +45,7 @@ public final class BirchloreRangers extends CardImpl { new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false)))); // Morph {G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{G}"))); } private BirchloreRangers(final BirchloreRangers card) { diff --git a/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java b/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java index 70db093376a..a614548fed7 100644 --- a/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java +++ b/Mage.Sets/src/mage/cards/b/BlisteringFirecat.java @@ -35,7 +35,7 @@ public final class BlisteringFirecat extends CardImpl { // At the beginning of the end step, sacrifice Blistering Firecat. this.addAbility(new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of the end step", true, new SacrificeSourceEffect())); // Morph {R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{R}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{R}{R}"))); } private BlisteringFirecat(final BlisteringFirecat card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java b/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java index 748d0b75137..d049480eb81 100644 --- a/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java +++ b/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java @@ -30,7 +30,7 @@ public final class BloodstokeHowler extends CardImpl { this.toughness = new MageInt(4); // Morph {6}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{6}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{6}{R}"))); // When Bloodstoke Howler is turned face up, Beast creatures you control get +3/+0 until end of turn. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostControlledEffect(3, 0, Duration.EndOfTurn, filter))); diff --git a/Mage.Sets/src/mage/cards/b/Boneknitter.java b/Mage.Sets/src/mage/cards/b/Boneknitter.java index 5bf935c3353..a3136c60f97 100644 --- a/Mage.Sets/src/mage/cards/b/Boneknitter.java +++ b/Mage.Sets/src/mage/cards/b/Boneknitter.java @@ -40,7 +40,7 @@ public final class Boneknitter extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); // Morph {2}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{B}"))); } private Boneknitter(final Boneknitter card) { diff --git a/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java b/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java index 7f04dd442e0..54f21bed30a 100644 --- a/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java +++ b/Mage.Sets/src/mage/cards/b/BranchsnapLorian.java @@ -26,7 +26,7 @@ public final class BranchsnapLorian extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Morph {G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{G}"))); } private BranchsnapLorian(final BranchsnapLorian card) { diff --git a/Mage.Sets/src/mage/cards/b/BrineElemental.java b/Mage.Sets/src/mage/cards/b/BrineElemental.java index 61ca466a154..ad503122366 100644 --- a/Mage.Sets/src/mage/cards/b/BrineElemental.java +++ b/Mage.Sets/src/mage/cards/b/BrineElemental.java @@ -32,7 +32,7 @@ public final class BrineElemental extends CardImpl { this.toughness = new MageInt(4); // Morph {5}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{U}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{U}{U}"))); // When Brine Elemental is turned face up, each opponent skips their next untap step. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BrineElementalEffect())); diff --git a/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java b/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java index 44c86ea0107..4bf877e1617 100644 --- a/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java +++ b/Mage.Sets/src/mage/cards/b/BroodhatchNantuko.java @@ -30,7 +30,7 @@ public final class BroodhatchNantuko extends CardImpl { new CreateTokenEffect(new InsectToken(), SavedDamageValue.MANY), true)); // Morph {2}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{G}"))); } private BroodhatchNantuko(final BroodhatchNantuko card) { diff --git a/Mage.Sets/src/mage/cards/c/CabalExecutioner.java b/Mage.Sets/src/mage/cards/c/CabalExecutioner.java index da362ef4cf5..f70b2370cc2 100644 --- a/Mage.Sets/src/mage/cards/c/CabalExecutioner.java +++ b/Mage.Sets/src/mage/cards/c/CabalExecutioner.java @@ -29,7 +29,7 @@ public final class CabalExecutioner extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new SacrificeEffect(StaticFilters.FILTER_PERMANENT_A_CREATURE, 1, "that player"), false, true)); // Morph {3}{B}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{B}{B}"))); } private CabalExecutioner(final CabalExecutioner card) { diff --git a/Mage.Sets/src/mage/cards/c/CanyonLurkers.java b/Mage.Sets/src/mage/cards/c/CanyonLurkers.java index e9cc2c3b097..f1d265583a9 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonLurkers.java +++ b/Mage.Sets/src/mage/cards/c/CanyonLurkers.java @@ -25,7 +25,7 @@ public final class CanyonLurkers extends CardImpl { this.toughness = new MageInt(2); // Morph 3R - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{R}"))); } private CanyonLurkers(final CanyonLurkers card) { diff --git a/Mage.Sets/src/mage/cards/c/ChargingSlateback.java b/Mage.Sets/src/mage/cards/c/ChargingSlateback.java index 1b047d14eae..546e8f54a8e 100644 --- a/Mage.Sets/src/mage/cards/c/ChargingSlateback.java +++ b/Mage.Sets/src/mage/cards/c/ChargingSlateback.java @@ -26,7 +26,7 @@ public final class ChargingSlateback extends CardImpl { // Charging Slateback can't block. this.addAbility(new CantBlockAbility()); // Morph {4}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{R}"))); } private ChargingSlateback(final ChargingSlateback card) { diff --git a/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java b/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java index 1670257145d..582981243d5 100644 --- a/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java +++ b/Mage.Sets/src/mage/cards/c/ChromeshellCrab.java @@ -34,7 +34,7 @@ public final class ChromeshellCrab extends CardImpl { this.toughness = new MageInt(3); // Morph {4}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{U}"))); // When Chromeshell Crab is turned face up, you may exchange control of target creature you control and target creature an opponent controls. Effect effect = new ExchangeControlTargetEffect(Duration.EndOfGame, rule, false, true); diff --git a/Mage.Sets/src/mage/cards/c/CoralTrickster.java b/Mage.Sets/src/mage/cards/c/CoralTrickster.java index f6b755b0a91..3330fe93efc 100644 --- a/Mage.Sets/src/mage/cards/c/CoralTrickster.java +++ b/Mage.Sets/src/mage/cards/c/CoralTrickster.java @@ -28,7 +28,7 @@ public final class CoralTrickster extends CardImpl { this.toughness = new MageInt(1); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"))); // When Coral Trickster is turned face up, you may tap or untap target permanent. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new MayTapOrUntapTargetEffect()); ability.addTarget(new TargetPermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CrudeRampart.java b/Mage.Sets/src/mage/cards/c/CrudeRampart.java index 49a2a970f36..7c6854caf92 100644 --- a/Mage.Sets/src/mage/cards/c/CrudeRampart.java +++ b/Mage.Sets/src/mage/cards/c/CrudeRampart.java @@ -26,7 +26,7 @@ public final class CrudeRampart extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Morph {4}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{W}"))); } private CrudeRampart(final CrudeRampart card) { diff --git a/Mage.Sets/src/mage/cards/d/DaruHealer.java b/Mage.Sets/src/mage/cards/d/DaruHealer.java index 3a332154317..7bb3a53d17a 100644 --- a/Mage.Sets/src/mage/cards/d/DaruHealer.java +++ b/Mage.Sets/src/mage/cards/d/DaruHealer.java @@ -37,7 +37,7 @@ public final class DaruHealer extends CardImpl { this.addAbility(ability); // Morph {W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{W}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DaruLancer.java b/Mage.Sets/src/mage/cards/d/DaruLancer.java index aa9019e52b7..ccea07396ee 100644 --- a/Mage.Sets/src/mage/cards/d/DaruLancer.java +++ b/Mage.Sets/src/mage/cards/d/DaruLancer.java @@ -27,7 +27,7 @@ public final class DaruLancer extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); // Morph {2}{W}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{W}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{W}{W}"))); } private DaruLancer(final DaruLancer card) { diff --git a/Mage.Sets/src/mage/cards/d/DaruMender.java b/Mage.Sets/src/mage/cards/d/DaruMender.java index f2b1cc6b190..56b44548486 100644 --- a/Mage.Sets/src/mage/cards/d/DaruMender.java +++ b/Mage.Sets/src/mage/cards/d/DaruMender.java @@ -28,7 +28,7 @@ public final class DaruMender extends CardImpl { this.toughness = new MageInt(1); // Morph {W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{W}"))); // When Daru Mender is turned face up, regenerate target creature. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new RegenerateTargetEffect()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DaruSanctifier.java b/Mage.Sets/src/mage/cards/d/DaruSanctifier.java index ced12ea8c33..f97d846e7db 100644 --- a/Mage.Sets/src/mage/cards/d/DaruSanctifier.java +++ b/Mage.Sets/src/mage/cards/d/DaruSanctifier.java @@ -28,7 +28,7 @@ public final class DaruSanctifier extends CardImpl { this.toughness = new MageInt(4); // Morph {1}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{W}"))); // When Daru Sanctifier is turned face up, destroy target enchantment. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect()); ability.addTarget(new TargetEnchantmentPermanent()); diff --git a/Mage.Sets/src/mage/cards/d/DawningPurist.java b/Mage.Sets/src/mage/cards/d/DawningPurist.java index 0b5b6da3aeb..5c3e9bde32f 100644 --- a/Mage.Sets/src/mage/cards/d/DawningPurist.java +++ b/Mage.Sets/src/mage/cards/d/DawningPurist.java @@ -37,7 +37,7 @@ public final class DawningPurist extends CardImpl { this.addAbility(new DawningPuristTriggeredAbility()); // Morph {1}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{W}"))); } private DawningPurist(final DawningPurist card) { diff --git a/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java b/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java index 2e0a5c7eba0..9b6fc27f257 100644 --- a/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java +++ b/Mage.Sets/src/mage/cards/d/DeathmistRaptor.java @@ -41,7 +41,7 @@ public final class DeathmistRaptor extends CardImpl { this.addAbility(new TurnedFaceUpAllTriggeredAbility(Zone.GRAVEYARD, new DeathmistRaptorEffect(), new FilterControlledPermanent("a permanent you control"), false, true)); // Megamorph {4}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{G}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{G}"), true)); } private DeathmistRaptor(final DeathmistRaptor card) { diff --git a/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java b/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java index e71bd86a121..20983c3f45e 100644 --- a/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java +++ b/Mage.Sets/src/mage/cards/d/DefenderOfTheOrder.java @@ -27,7 +27,7 @@ public final class DefenderOfTheOrder extends CardImpl { this.toughness = new MageInt(4); // Morph {W}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{W}{W}"))); // When Defender of the Order is turned face up, creatures you control get +0/+2 until end of turn. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostControlledEffect(0, 2, Duration.EndOfTurn))); } diff --git a/Mage.Sets/src/mage/cards/d/DenProtector.java b/Mage.Sets/src/mage/cards/d/DenProtector.java index 33c9a8ac8b2..943c41c0ff1 100644 --- a/Mage.Sets/src/mage/cards/d/DenProtector.java +++ b/Mage.Sets/src/mage/cards/d/DenProtector.java @@ -34,7 +34,7 @@ public final class DenProtector extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithLessPowerEffect())); // Megamorph {1}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{G}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{G}"), true)); // When Den Protector is turned face up, return target card from your graveyard to your hand. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/d/Dermoplasm.java b/Mage.Sets/src/mage/cards/d/Dermoplasm.java index a3a39c505e3..fe6646612c9 100644 --- a/Mage.Sets/src/mage/cards/d/Dermoplasm.java +++ b/Mage.Sets/src/mage/cards/d/Dermoplasm.java @@ -39,7 +39,7 @@ public final class Dermoplasm extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Morph {2}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}{U}"))); // When Dermoplasm is turned face up, you may put a creature card with a morph ability from your hand onto the battlefield face up. If you do, return Dermoplasm to its owner's hand. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new DermoplasmEffect())); diff --git a/Mage.Sets/src/mage/cards/d/DirgurNemesis.java b/Mage.Sets/src/mage/cards/d/DirgurNemesis.java index d6c0be95587..053e9ff8daa 100644 --- a/Mage.Sets/src/mage/cards/d/DirgurNemesis.java +++ b/Mage.Sets/src/mage/cards/d/DirgurNemesis.java @@ -26,7 +26,7 @@ public final class DirgurNemesis extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); // Megamorph {6}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{6}{U}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{6}{U}"), true)); } private DirgurNemesis(final DirgurNemesis card) { diff --git a/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java b/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java index cd3bcf90823..ef73896f1f6 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java +++ b/Mage.Sets/src/mage/cards/d/DisruptivePitmage.java @@ -36,7 +36,7 @@ public final class DisruptivePitmage extends CardImpl { this.addAbility(ability); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"))); } private DisruptivePitmage(final DisruptivePitmage card) { diff --git a/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java b/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java index dfbb6bcaca8..c853373c86a 100644 --- a/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java +++ b/Mage.Sets/src/mage/cards/d/DragonsEyeSavants.java @@ -39,7 +39,7 @@ public final class DragonsEyeSavants extends CardImpl { this.toughness = new MageInt(6); // Morph - Reveal a blue card in your hand. - this.addAbility(new MorphAbility(new RevealTargetFromHandCost(new TargetCardInHand(filter)))); + this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter)))); // When Dragon's Eye Savants is turned face up, look at target opponent's hand. Effect effect = new LookAtTargetPlayerHandEffect(); diff --git a/Mage.Sets/src/mage/cards/d/DulcetSirens.java b/Mage.Sets/src/mage/cards/d/DulcetSirens.java index 376dd7dd065..14f4f81d78c 100644 --- a/Mage.Sets/src/mage/cards/d/DulcetSirens.java +++ b/Mage.Sets/src/mage/cards/d/DulcetSirens.java @@ -38,7 +38,7 @@ public final class DulcetSirens extends CardImpl { this.addAbility(ability); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"))); } private DulcetSirens(final DulcetSirens card) { diff --git a/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java b/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java index 96378d4592f..b4ca46394d8 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenBlastminer.java @@ -34,7 +34,7 @@ public final class DwarvenBlastminer extends CardImpl { this.addAbility(ability); // Morph {R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{R}"))); } private DwarvenBlastminer(final DwarvenBlastminer card) { diff --git a/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java b/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java index 7d7f9e225e7..318ec6de4ee 100644 --- a/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java +++ b/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java @@ -34,7 +34,7 @@ public final class EbonbladeReaper extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new LoseHalfLifeTargetEffect(), false, true)); //Morph {3}{B}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{B}{B}"))); } private EbonbladeReaper(final EbonbladeReaper card) { diff --git a/Mage.Sets/src/mage/cards/e/EchoTracer.java b/Mage.Sets/src/mage/cards/e/EchoTracer.java index ef459dbb95c..473bae2116e 100644 --- a/Mage.Sets/src/mage/cards/e/EchoTracer.java +++ b/Mage.Sets/src/mage/cards/e/EchoTracer.java @@ -28,7 +28,7 @@ public final class EchoTracer extends CardImpl { this.toughness = new MageInt(2); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); // When Echo Tracer is turned face up, return target creature to its owner's hand. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ReturnToHandTargetEffect()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java index 39263bf2cec..7fcb7cd103b 100644 --- a/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java +++ b/Mage.Sets/src/mage/cards/e/EfreetWeaponmaster.java @@ -40,7 +40,7 @@ public final class EfreetWeaponmaster extends CardImpl { this.addAbility(new EfreetWeaponmasterAbility()); // Morph {2}{U}{R}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}{R}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}{R}{W}"))); } private EfreetWeaponmaster(final EfreetWeaponmaster card) { diff --git a/Mage.Sets/src/mage/cards/e/ExaltedAngel.java b/Mage.Sets/src/mage/cards/e/ExaltedAngel.java index 7361dd70a11..1722ba88b63 100644 --- a/Mage.Sets/src/mage/cards/e/ExaltedAngel.java +++ b/Mage.Sets/src/mage/cards/e/ExaltedAngel.java @@ -30,7 +30,7 @@ public final class ExaltedAngel extends CardImpl { // Whenever Exalted Angel deals damage, you gain that much life. this.addAbility(new DealsDamageGainLifeSourceTriggeredAbility()); // Morph {2}{W}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{W}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{W}{W}"))); } private ExaltedAngel(final ExaltedAngel card) { diff --git a/Mage.Sets/src/mage/cards/f/FallenCleric.java b/Mage.Sets/src/mage/cards/f/FallenCleric.java index c8016792426..09e5a7c374a 100644 --- a/Mage.Sets/src/mage/cards/f/FallenCleric.java +++ b/Mage.Sets/src/mage/cards/f/FallenCleric.java @@ -34,7 +34,7 @@ public final class FallenCleric extends CardImpl { // Protection from Clerics this.addAbility(new ProtectionAbility(filter)); // Morph {4}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{B}"))); } private FallenCleric(final FallenCleric card) { diff --git a/Mage.Sets/src/mage/cards/f/FathomSeer.java b/Mage.Sets/src/mage/cards/f/FathomSeer.java index 6daec04409f..bb4b72d591c 100644 --- a/Mage.Sets/src/mage/cards/f/FathomSeer.java +++ b/Mage.Sets/src/mage/cards/f/FathomSeer.java @@ -33,7 +33,7 @@ public final class FathomSeer extends CardImpl { this.toughness = new MageInt(3); // Morph-Return two Islands you control to their owner's hand. - this.addAbility(new MorphAbility(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(2,2, filter, true)))); + this.addAbility(new MorphAbility(this, new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(2,2, filter, true)))); // When Fathom Seer is turned face up, draw two cards. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new DrawCardSourceControllerEffect(2))); } diff --git a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java index d7163898667..40534c951c3 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingMawcor.java +++ b/Mage.Sets/src/mage/cards/f/FledglingMawcor.java @@ -38,7 +38,7 @@ public final class FledglingMawcor extends CardImpl { this.addAbility(ability); // Morph {U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}{U}"))); } private FledglingMawcor(final FledglingMawcor card) { diff --git a/Mage.Sets/src/mage/cards/f/FoothillGuide.java b/Mage.Sets/src/mage/cards/f/FoothillGuide.java index efc97cc25fe..b131bb0f4a3 100644 --- a/Mage.Sets/src/mage/cards/f/FoothillGuide.java +++ b/Mage.Sets/src/mage/cards/f/FoothillGuide.java @@ -34,7 +34,7 @@ public final class FoothillGuide extends CardImpl { // Protection from Goblins this.addAbility(new ProtectionAbility(filter)); // Morph {W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{W}"))); } private FoothillGuide(final FoothillGuide card) { diff --git a/Mage.Sets/src/mage/cards/f/FortuneThief.java b/Mage.Sets/src/mage/cards/f/FortuneThief.java index ba3bd056fe0..743274fd6bb 100644 --- a/Mage.Sets/src/mage/cards/f/FortuneThief.java +++ b/Mage.Sets/src/mage/cards/f/FortuneThief.java @@ -37,7 +37,7 @@ public final class FortuneThief extends CardImpl { // Damage that would reduce your life total to less than 1 reduces it to 1 instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new FortuneThiefReplacementEffect())); // Morph {R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{R}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{R}{R}"))); } private FortuneThief(final FortuneThief card) { diff --git a/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java b/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java index ed852f8cd61..673bdc88a75 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java @@ -35,7 +35,7 @@ public final class FrontlineStrategist extends CardImpl { this.toughness = new MageInt(1); // Morph {W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{W}"))); // When Frontline Strategist is turned face up, prevent all combat damage non-Soldier creatures would deal this turn. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new PreventAllDamageByAllPermanentsEffect(filter, Duration.EndOfTurn, true).setText("prevent all combat damage non-Soldier creatures would deal this turn"))); } diff --git a/Mage.Sets/src/mage/cards/g/GathanRaiders.java b/Mage.Sets/src/mage/cards/g/GathanRaiders.java index 7436c391235..c5e1678b598 100644 --- a/Mage.Sets/src/mage/cards/g/GathanRaiders.java +++ b/Mage.Sets/src/mage/cards/g/GathanRaiders.java @@ -35,7 +35,7 @@ public final class GathanRaiders extends CardImpl { new BoostSourceEffect(2,2,Duration.WhileOnBattlefield), HellbentCondition.instance, "Hellbent — {this} gets +2/+2 as long as you have no cards in hand"))); // Morph-Discard a card. - this.addAbility(new MorphAbility(new DiscardCardCost())); + this.addAbility(new MorphAbility(this, new DiscardCardCost())); } private GathanRaiders(final GathanRaiders card) { diff --git a/Mage.Sets/src/mage/cards/g/GiftOfDoom.java b/Mage.Sets/src/mage/cards/g/GiftOfDoom.java index 758f280ef50..498551ad311 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfDoom.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfDoom.java @@ -56,7 +56,7 @@ public final class GiftOfDoom extends CardImpl { this.addAbility(ability2); // Morph—Sacrifice another creature. - this.addAbility(new MorphAbility(new SacrificeTargetCost( + this.addAbility(new MorphAbility(this, new SacrificeTargetCost( new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE) ))); diff --git a/Mage.Sets/src/mage/cards/g/GlacialStalker.java b/Mage.Sets/src/mage/cards/g/GlacialStalker.java index 180885fe1a8..ba0eb9810dc 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialStalker.java +++ b/Mage.Sets/src/mage/cards/g/GlacialStalker.java @@ -24,7 +24,7 @@ public final class GlacialStalker extends CardImpl { this.toughness = new MageInt(5); // Morph {4}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{U}"))); } private GlacialStalker(final GlacialStalker card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java b/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java index e4d0dd54bd5..6e10b260be6 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java @@ -41,7 +41,7 @@ public final class GoblinTaskmaster extends CardImpl { this.addAbility(ability); // Morph {R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{R}"))); } private GoblinTaskmaster(final GoblinTaskmaster card) { diff --git a/Mage.Sets/src/mage/cards/g/GravelSlinger.java b/Mage.Sets/src/mage/cards/g/GravelSlinger.java index f3f562e83f2..fbb8f00d1bc 100644 --- a/Mage.Sets/src/mage/cards/g/GravelSlinger.java +++ b/Mage.Sets/src/mage/cards/g/GravelSlinger.java @@ -35,7 +35,7 @@ public final class GravelSlinger extends CardImpl { ability.addTarget(new TargetCreaturePermanent(new FilterAttackingOrBlockingCreature())); this.addAbility(ability); // Morph {1}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{W}"))); } private GravelSlinger(final GravelSlinger card) { diff --git a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java index 4edec729c6a..02d74b1d658 100644 --- a/Mage.Sets/src/mage/cards/g/GrimHaruspex.java +++ b/Mage.Sets/src/mage/cards/g/GrimHaruspex.java @@ -39,7 +39,7 @@ public final class GrimHaruspex extends CardImpl { this.toughness = new MageInt(2); // Morph {B} - this.addAbility(new MorphAbility(new ColoredManaCost(ColoredManaSymbol.B))); + this.addAbility(new MorphAbility(this, new ColoredManaCost(ColoredManaSymbol.B))); // Whenever another nontoken creature you control dies, draw a card. this.addAbility(new DiesCreatureTriggeredAbility(new DrawCardSourceControllerEffect(1), false, filter)); diff --git a/Mage.Sets/src/mage/cards/g/GrinningDemon.java b/Mage.Sets/src/mage/cards/g/GrinningDemon.java index 60abbce6cb5..d0a4489e1b4 100644 --- a/Mage.Sets/src/mage/cards/g/GrinningDemon.java +++ b/Mage.Sets/src/mage/cards/g/GrinningDemon.java @@ -28,7 +28,7 @@ public final class GrinningDemon extends CardImpl { // At the beginning of your upkeep, you lose 2 life. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(2), TargetController.YOU, false)); // Morph {2}{B}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{B}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{B}{B}"))); } private GrinningDemon(final GrinningDemon card) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java b/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java index 60f273d1ca0..949b4d244a8 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java +++ b/Mage.Sets/src/mage/cards/g/GuardianShieldBearer.java @@ -29,7 +29,7 @@ public final class GuardianShieldBearer extends CardImpl { this.toughness = new MageInt(1); // Megamorph {3}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{G}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{G}"), true)); // When Guardian Shield-Bearer is turned face up, put a +1/+1 counter on another target creature you control. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); diff --git a/Mage.Sets/src/mage/cards/g/GudulLurker.java b/Mage.Sets/src/mage/cards/g/GudulLurker.java index 183dab44bb4..7c6438e38f0 100644 --- a/Mage.Sets/src/mage/cards/g/GudulLurker.java +++ b/Mage.Sets/src/mage/cards/g/GudulLurker.java @@ -27,7 +27,7 @@ public final class GudulLurker extends CardImpl { this.addAbility(new CantBeBlockedSourceAbility()); // Megamorph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"), true)); } private GudulLurker(final GudulLurker card) { diff --git a/Mage.Sets/src/mage/cards/h/HauntedCadaver.java b/Mage.Sets/src/mage/cards/h/HauntedCadaver.java index 5bef7ac7521..bb978f99f45 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedCadaver.java +++ b/Mage.Sets/src/mage/cards/h/HauntedCadaver.java @@ -31,7 +31,7 @@ public final class HauntedCadaver extends CardImpl { ability.addEffect( new DiscardTargetEffect(3)); this.addAbility(ability); // Morph {1}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{B}"))); } private HauntedCadaver(final HauntedCadaver card) { diff --git a/Mage.Sets/src/mage/cards/h/Headhunter.java b/Mage.Sets/src/mage/cards/h/Headhunter.java index 60437f803cf..f0adab255b1 100644 --- a/Mage.Sets/src/mage/cards/h/Headhunter.java +++ b/Mage.Sets/src/mage/cards/h/Headhunter.java @@ -31,7 +31,7 @@ public final class Headhunter extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true)); // Morph {B} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.) - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{B}"))); } diff --git a/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java b/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java index 5ba9a572a06..bc0e2e6e524 100644 --- a/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java +++ b/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java @@ -43,7 +43,7 @@ public final class HerdchaserDragon extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Megamorph {5}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{G}{G}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{G}{G}"), true)); // When Herdchaser Dragon is turned face up, put a +1/+1 counter on each other Dragon creature you control. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false)); diff --git a/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java b/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java index 21c4a45e286..075c3fe919d 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java +++ b/Mage.Sets/src/mage/cards/h/HiddenDragonslayer.java @@ -43,7 +43,7 @@ public final class HiddenDragonslayer extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Megamorph {2}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{W}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{W}"), true)); // When Hidden Dragonslayer is turned face up, destroy target creature with power 4 or greater an opponent controls. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect(), false, false); diff --git a/Mage.Sets/src/mage/cards/h/HoodedHydra.java b/Mage.Sets/src/mage/cards/h/HoodedHydra.java index dcec75ed421..8483de178c7 100644 --- a/Mage.Sets/src/mage/cards/h/HoodedHydra.java +++ b/Mage.Sets/src/mage/cards/h/HoodedHydra.java @@ -44,7 +44,7 @@ public final class HoodedHydra extends CardImpl { this.addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new SnakeToken(), new CountersSourceCount(CounterType.P1P1)), false)); // Morph {3}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{G}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{G}{G}"))); // As Hooded Hydra is turned face up, put five +1/+1 counters on it. Effect effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)); diff --git a/Mage.Sets/src/mage/cards/h/HordeAmbusher.java b/Mage.Sets/src/mage/cards/h/HordeAmbusher.java index ca49ae33106..760a0a24d1c 100644 --- a/Mage.Sets/src/mage/cards/h/HordeAmbusher.java +++ b/Mage.Sets/src/mage/cards/h/HordeAmbusher.java @@ -43,7 +43,7 @@ public final class HordeAmbusher extends CardImpl { this.addAbility(new BlocksSourceTriggeredAbility(new DamageControllerEffect(1, "it"))); // Morph - Reveal a red card in your hand. - this.addAbility(new MorphAbility(new RevealTargetFromHandCost(new TargetCardInHand(filter)))); + this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter)))); // When Horde Ambusher is turned face up, target creature can't block this turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/h/Hystrodon.java b/Mage.Sets/src/mage/cards/h/Hystrodon.java index 9e98d691b19..99e7668a12c 100644 --- a/Mage.Sets/src/mage/cards/h/Hystrodon.java +++ b/Mage.Sets/src/mage/cards/h/Hystrodon.java @@ -31,7 +31,7 @@ public final class Hystrodon extends CardImpl { // Whenever Hystrodon deals combat damage to a player, you may draw a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); // Morph {1}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{G}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{G}{G}"))); } private Hystrodon(final Hystrodon card) { diff --git a/Mage.Sets/src/mage/cards/i/IcefeatherAven.java b/Mage.Sets/src/mage/cards/i/IcefeatherAven.java index b3a1a6cb921..17026022fb1 100644 --- a/Mage.Sets/src/mage/cards/i/IcefeatherAven.java +++ b/Mage.Sets/src/mage/cards/i/IcefeatherAven.java @@ -33,7 +33,7 @@ public final class IcefeatherAven extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {1}{G}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{G}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{G}{U}"))); // When Icefeather Aven is turned face up, you may return another target creature to its owner's hand. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ReturnToHandTargetEffect(), false, true); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/i/ImperialHellkite.java b/Mage.Sets/src/mage/cards/i/ImperialHellkite.java index d4dbbd9d431..c4582594bff 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialHellkite.java +++ b/Mage.Sets/src/mage/cards/i/ImperialHellkite.java @@ -32,7 +32,7 @@ public final class ImperialHellkite extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Morph {6}{R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{6}{R}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{6}{R}{R}"))); // When Imperial Hellkite is turned face up, you may search your library for a Dragon card, reveal it, and put it into your hand. If you do, shuffle your library. Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, new FilterBySubtypeCard(SubType.DRAGON)), true); diff --git a/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java b/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java index 80f40d24cc7..550e2064979 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java +++ b/Mage.Sets/src/mage/cards/i/InfernalCaretaker.java @@ -31,7 +31,7 @@ public final class InfernalCaretaker extends CardImpl { this.toughness = new MageInt(2); // Morph {3}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{B}"))); // When Infernal Caretaker is turned face up, return all Zombie cards from all graveyards to their owners' hands. Effect effect = new ReturnToHandFromGraveyardAllEffect(zombieCard); diff --git a/Mage.Sets/src/mage/cards/i/IreShaman.java b/Mage.Sets/src/mage/cards/i/IreShaman.java index 73cce4c1e3f..812e4c6278d 100644 --- a/Mage.Sets/src/mage/cards/i/IreShaman.java +++ b/Mage.Sets/src/mage/cards/i/IreShaman.java @@ -30,7 +30,7 @@ public final class IreShaman extends CardImpl { this.addAbility(new MenaceAbility()); // Megamorph {R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{R}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{R}"), true)); // When Ire Shaman is turned face up, exile the top card of your library. Until end of turn, you may play that card. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new ExileTopXMayPlayUntilEndOfTurnEffect(1), false)); diff --git a/Mage.Sets/src/mage/cards/i/IronfistCrusher.java b/Mage.Sets/src/mage/cards/i/IronfistCrusher.java index 5a4c2c4f118..38481b81afb 100644 --- a/Mage.Sets/src/mage/cards/i/IronfistCrusher.java +++ b/Mage.Sets/src/mage/cards/i/IronfistCrusher.java @@ -30,7 +30,7 @@ public final class IronfistCrusher extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); // Morph {3}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{W}"))); } private IronfistCrusher(final IronfistCrusher card) { diff --git a/Mage.Sets/src/mage/cards/j/JeeringInstigator.java b/Mage.Sets/src/mage/cards/j/JeeringInstigator.java index 0801a0884f6..61beb4fa0ec 100644 --- a/Mage.Sets/src/mage/cards/j/JeeringInstigator.java +++ b/Mage.Sets/src/mage/cards/j/JeeringInstigator.java @@ -44,7 +44,7 @@ public final class JeeringInstigator extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{R}"))); // When Jeering Instigator is turned face up, if it's your turn, gain control of another target creature until end of turn. Untap it. That creature gains haste until end of turn. Ability ability = new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/k/KadenasSilencer.java b/Mage.Sets/src/mage/cards/k/KadenasSilencer.java index 23a99425ae1..e0435e70804 100644 --- a/Mage.Sets/src/mage/cards/k/KadenasSilencer.java +++ b/Mage.Sets/src/mage/cards/k/KadenasSilencer.java @@ -33,7 +33,7 @@ public final class KadenasSilencer extends CardImpl { this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new KadenasSilencerEffect())); // Megamorph {1}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{U}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{U}"), true)); } private KadenasSilencer(final KadenasSilencer card) { diff --git a/Mage.Sets/src/mage/cards/k/KaronasZealot.java b/Mage.Sets/src/mage/cards/k/KaronasZealot.java index ab7fac0f35e..ce4b4c09396 100644 --- a/Mage.Sets/src/mage/cards/k/KaronasZealot.java +++ b/Mage.Sets/src/mage/cards/k/KaronasZealot.java @@ -30,7 +30,7 @@ public final class KaronasZealot extends CardImpl { this.toughness = new MageInt(5); // Morph {3}{W}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{W}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{W}{W}"))); // When Karona's Zealot is turned face up, all damage that would be dealt to it this turn is dealt to target creature instead. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new RedirectDamageFromSourceToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE, RedirectionEffect.UsageType.ACCORDING_DURATION) diff --git a/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java b/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java index f7b763cd521..98c6be1f7b6 100644 --- a/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java +++ b/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java @@ -32,7 +32,7 @@ public final class KheruSpellsnatcher extends CardImpl { this.toughness = new MageInt(3); // Morph {4}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{U}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{U}{U}"))); // When Kheru Spellthief is turned face up, counter target spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. You may cast that card without paying its mana cost as long as it remains exiled. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new KheruSpellsnatcherEffect()); diff --git a/Mage.Sets/src/mage/cards/k/KinTreeWarden.java b/Mage.Sets/src/mage/cards/k/KinTreeWarden.java index cd4ad65358a..eb1daf227bf 100644 --- a/Mage.Sets/src/mage/cards/k/KinTreeWarden.java +++ b/Mage.Sets/src/mage/cards/k/KinTreeWarden.java @@ -31,7 +31,7 @@ public final class KinTreeWarden extends CardImpl { // {2}: Regenerate Kin-Tree Warden this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2))); // Morph {G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{G}"))); } private KinTreeWarden(final KinTreeWarden card) { diff --git a/Mage.Sets/src/mage/cards/k/KolaghanStormsinger.java b/Mage.Sets/src/mage/cards/k/KolaghanStormsinger.java index 66eb63f2daa..c6b5b3beec1 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghanStormsinger.java +++ b/Mage.Sets/src/mage/cards/k/KolaghanStormsinger.java @@ -32,7 +32,7 @@ public final class KolaghanStormsinger extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // Megamorph {R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{R}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{R}"), true)); // When Kolaghan Stormsinger is turned face up, target creature gains haste until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), false); diff --git a/Mage.Sets/src/mage/cards/k/KrosanCloudscraper.java b/Mage.Sets/src/mage/cards/k/KrosanCloudscraper.java index 89039a94e74..b871c4b1f59 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanCloudscraper.java +++ b/Mage.Sets/src/mage/cards/k/KrosanCloudscraper.java @@ -31,7 +31,7 @@ public final class KrosanCloudscraper extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{G}{G}")), TargetController.YOU, false)); // Morph {7}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{7}{G}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{7}{G}{G}"))); } private KrosanCloudscraper(final KrosanCloudscraper card) { diff --git a/Mage.Sets/src/mage/cards/k/KrosanColossus.java b/Mage.Sets/src/mage/cards/k/KrosanColossus.java index 6286022a97e..b3377399d09 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanColossus.java +++ b/Mage.Sets/src/mage/cards/k/KrosanColossus.java @@ -23,7 +23,7 @@ public final class KrosanColossus extends CardImpl { this.toughness = new MageInt(9); // Morph {6}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{6}{G}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{6}{G}{G}"))); } private KrosanColossus(final KrosanColossus card) { diff --git a/Mage.Sets/src/mage/cards/k/KrumarBondKin.java b/Mage.Sets/src/mage/cards/k/KrumarBondKin.java index b4a880e7f37..e22173e9617 100644 --- a/Mage.Sets/src/mage/cards/k/KrumarBondKin.java +++ b/Mage.Sets/src/mage/cards/k/KrumarBondKin.java @@ -25,7 +25,7 @@ public final class KrumarBondKin extends CardImpl { this.toughness = new MageInt(3); // Morph {4}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{B}"))); } private KrumarBondKin(final KrumarBondKin card) { diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfTheAxe.java b/Mage.Sets/src/mage/cards/l/LiegeOfTheAxe.java index 62ff09684ab..6f2df9e0168 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfTheAxe.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfTheAxe.java @@ -29,7 +29,7 @@ public final class LiegeOfTheAxe extends CardImpl { // Vigilance this.addAbility(VigilanceAbility.getInstance()); // Morph {1}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{W}"))); // When Liege of the Axe is turned face up, untap it. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new UntapSourceEffect().setText("untap it"))); } diff --git a/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java b/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java index 8b1cbea8b51..04649dab75d 100644 --- a/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java +++ b/Mage.Sets/src/mage/cards/l/LiegeOfThePit.java @@ -39,7 +39,7 @@ public final class LiegeOfThePit extends CardImpl { // At the beginning of your upkeep, sacrifice a creature other than Liege of the Pit. If you can't, Liege of the Pit deals 7 damage to you. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LiegeOfThePitEffect(), TargetController.YOU, false)); // Morph {B}{B}{B}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{B}{B}{B}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{B}{B}{B}{B}"))); } private LiegeOfThePit(final LiegeOfThePit card) { diff --git a/Mage.Sets/src/mage/cards/l/LumithreadField.java b/Mage.Sets/src/mage/cards/l/LumithreadField.java index 4df5634ea69..b5868a8c5bd 100644 --- a/Mage.Sets/src/mage/cards/l/LumithreadField.java +++ b/Mage.Sets/src/mage/cards/l/LumithreadField.java @@ -25,7 +25,7 @@ public final class LumithreadField extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield))); // Morph {1}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{W}"))); } private LumithreadField(final LumithreadField card) { diff --git a/Mage.Sets/src/mage/cards/m/MaelstromDjinn.java b/Mage.Sets/src/mage/cards/m/MaelstromDjinn.java index 764d3f7406e..3f9d5583e3b 100644 --- a/Mage.Sets/src/mage/cards/m/MaelstromDjinn.java +++ b/Mage.Sets/src/mage/cards/m/MaelstromDjinn.java @@ -35,7 +35,7 @@ public final class MaelstromDjinn extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); // When Maelstrom Djinn is turned face up, put two time counters on it and it gains vanishing. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new AddCountersSourceEffect(CounterType.TIME.createInstance(2))); Effect effect = new GainAbilitySourceEffect(new VanishingUpkeepAbility(0), Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java b/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java index e6eb6efd954..a0172a29d9d 100644 --- a/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java +++ b/Mage.Sets/src/mage/cards/m/MarangRiverSkeleton.java @@ -29,7 +29,7 @@ public final class MarangRiverSkeleton extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}"))); // Megamorph {3}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{B}"), true)); } private MarangRiverSkeleton(final MarangRiverSkeleton card) { diff --git a/Mage.Sets/src/mage/cards/m/MarshHulk.java b/Mage.Sets/src/mage/cards/m/MarshHulk.java index e9cd2f32441..240638026cc 100644 --- a/Mage.Sets/src/mage/cards/m/MarshHulk.java +++ b/Mage.Sets/src/mage/cards/m/MarshHulk.java @@ -24,7 +24,7 @@ public final class MarshHulk extends CardImpl { this.toughness = new MageInt(6); // Megamorph {6}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{6}{B}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{6}{B}"), true)); } private MarshHulk(final MarshHulk card) { diff --git a/Mage.Sets/src/mage/cards/m/MasterOfPearls.java b/Mage.Sets/src/mage/cards/m/MasterOfPearls.java index 56cb3da50e8..95e8e4271b2 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfPearls.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfPearls.java @@ -28,7 +28,7 @@ public final class MasterOfPearls extends CardImpl { this.toughness = new MageInt(2); // Morph {3}{W}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{W}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{W}{W}"))); // When Master of Pearls is turned face up, creatures you control get +2/+2 until end of turn. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BoostControlledEffect(2, 2, Duration.EndOfTurn))); } diff --git a/Mage.Sets/src/mage/cards/m/MasterOfTheVeil.java b/Mage.Sets/src/mage/cards/m/MasterOfTheVeil.java index be64deda183..583aef98668 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfTheVeil.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfTheVeil.java @@ -44,7 +44,7 @@ public final class MasterOfTheVeil extends CardImpl { this.toughness = new MageInt(3); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); // When Master of the Veil is turned face up, you may turn target creature with a morph ability face down. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new MasterOfTheVeilEffect(), false, true); diff --git a/Mage.Sets/src/mage/cards/m/MischievousQuanar.java b/Mage.Sets/src/mage/cards/m/MischievousQuanar.java index 1d8ffccb779..8401d7d74a6 100644 --- a/Mage.Sets/src/mage/cards/m/MischievousQuanar.java +++ b/Mage.Sets/src/mage/cards/m/MischievousQuanar.java @@ -38,7 +38,7 @@ public final class MischievousQuanar extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{3}{U}{U}"))); // Morph {1}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{U}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{U}{U}"))); // When Mischievous Quanar is turned face up, copy target instant or sorcery spell. You may choose new targets for that copy. Effect effect2 = new CopyTargetSpellEffect(); diff --git a/Mage.Sets/src/mage/cards/m/MistfireWeaver.java b/Mage.Sets/src/mage/cards/m/MistfireWeaver.java index fc32d61d874..b7abf8876cb 100644 --- a/Mage.Sets/src/mage/cards/m/MistfireWeaver.java +++ b/Mage.Sets/src/mage/cards/m/MistfireWeaver.java @@ -35,7 +35,7 @@ public final class MistfireWeaver extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); // When Misfire Weaver is turned face up, target creature you control gains hexproof until end of turn Effect effect = new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn); Ability ability = new TurnedFaceUpSourceTriggeredAbility(effect); diff --git a/Mage.Sets/src/mage/cards/m/MistformSeaswift.java b/Mage.Sets/src/mage/cards/m/MistformSeaswift.java index 59f183f4eb0..5bae3c3cc17 100644 --- a/Mage.Sets/src/mage/cards/m/MistformSeaswift.java +++ b/Mage.Sets/src/mage/cards/m/MistformSeaswift.java @@ -34,7 +34,7 @@ public final class MistformSeaswift extends CardImpl { this.addAbility(new SimpleActivatedAbility(new BecomesChosenCreatureTypeSourceEffect(), new GenericManaCost(1))); // Morph {1}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MistformShrieker.java b/Mage.Sets/src/mage/cards/m/MistformShrieker.java index aa259907fbb..9036916c663 100644 --- a/Mage.Sets/src/mage/cards/m/MistformShrieker.java +++ b/Mage.Sets/src/mage/cards/m/MistformShrieker.java @@ -35,7 +35,7 @@ public final class MistformShrieker extends CardImpl { this.addAbility(new SimpleActivatedAbility(new BecomesChosenCreatureTypeSourceEffect(), new GenericManaCost(1))); // Morph {3}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{U}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{U}{U}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MisthoofKirin.java b/Mage.Sets/src/mage/cards/m/MisthoofKirin.java index ca20a2e8a34..4c488f24ac5 100644 --- a/Mage.Sets/src/mage/cards/m/MisthoofKirin.java +++ b/Mage.Sets/src/mage/cards/m/MisthoofKirin.java @@ -31,7 +31,7 @@ public final class MisthoofKirin extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Megamorph {1}{W} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its megamorph cost and put a +1/+1 counter on it.) - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{W}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{W}"), true)); } private MisthoofKirin(final MisthoofKirin card) { diff --git a/Mage.Sets/src/mage/cards/m/MonasteryFlock.java b/Mage.Sets/src/mage/cards/m/MonasteryFlock.java index a69d5848801..f0917620d60 100644 --- a/Mage.Sets/src/mage/cards/m/MonasteryFlock.java +++ b/Mage.Sets/src/mage/cards/m/MonasteryFlock.java @@ -30,7 +30,7 @@ public final class MonasteryFlock extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"))); } private MonasteryFlock(final MonasteryFlock card) { diff --git a/Mage.Sets/src/mage/cards/m/MonasteryLoremaster.java b/Mage.Sets/src/mage/cards/m/MonasteryLoremaster.java index ddcc26bab0d..cae8834c790 100644 --- a/Mage.Sets/src/mage/cards/m/MonasteryLoremaster.java +++ b/Mage.Sets/src/mage/cards/m/MonasteryLoremaster.java @@ -37,7 +37,7 @@ public final class MonasteryLoremaster extends CardImpl { this.toughness = new MageInt(2); // Megamorph {5}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{U}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{U}"), true)); // When Monastery Loremaster is turned face up, return target noncreature, nonland card from your graveyard to your hand. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/m/MysticOfTheHiddenWay.java b/Mage.Sets/src/mage/cards/m/MysticOfTheHiddenWay.java index 8f3ef96ffd8..908048c2a1b 100644 --- a/Mage.Sets/src/mage/cards/m/MysticOfTheHiddenWay.java +++ b/Mage.Sets/src/mage/cards/m/MysticOfTheHiddenWay.java @@ -28,7 +28,7 @@ public final class MysticOfTheHiddenWay extends CardImpl { // Mystic of the Hidden Way can't be blocked. this.addAbility(new CantBeBlockedSourceAbility()); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); } private MysticOfTheHiddenWay(final MysticOfTheHiddenWay card) { diff --git a/Mage.Sets/src/mage/cards/n/NamelessOne.java b/Mage.Sets/src/mage/cards/n/NamelessOne.java index 98323e393fe..487895bfea7 100644 --- a/Mage.Sets/src/mage/cards/n/NamelessOne.java +++ b/Mage.Sets/src/mage/cards/n/NamelessOne.java @@ -37,7 +37,7 @@ public final class NamelessOne extends CardImpl { // Nameless One's power and toughness are each equal to the number of Wizards on the battlefield. this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetBasePowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter)))); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); } private NamelessOne(final NamelessOne card) { diff --git a/Mage.Sets/src/mage/cards/n/NantukoVigilante.java b/Mage.Sets/src/mage/cards/n/NantukoVigilante.java index 3bf4b4da79f..148f0108484 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoVigilante.java +++ b/Mage.Sets/src/mage/cards/n/NantukoVigilante.java @@ -32,7 +32,7 @@ public final class NantukoVigilante extends CardImpl { this.toughness = new MageInt(2); // Morph {1}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{G}"))); // When Nantuko Vigilante is turned face up, destroy target artifact or enchantment. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); diff --git a/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java b/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java index 65f5264a008..5506d260bf3 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java +++ b/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java @@ -28,7 +28,7 @@ public final class OjutaiInterceptor extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Megamorph {3}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{U}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{U}"), true)); } diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java b/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java index 1fbcbef3f51..60082ba3c18 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheWild.java @@ -28,7 +28,7 @@ public final class PatronOfTheWild extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{G}"))); // When Patron of the Wild is turned face up, target creature gets +3/+3 until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new BoostTargetEffect(3, 3, Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/p/PineWalker.java b/Mage.Sets/src/mage/cards/p/PineWalker.java index 6357d5cf7eb..1a80aee7bf5 100644 --- a/Mage.Sets/src/mage/cards/p/PineWalker.java +++ b/Mage.Sets/src/mage/cards/p/PineWalker.java @@ -28,7 +28,7 @@ public final class PineWalker extends CardImpl { this.toughness = new MageInt(5); // Morph {4}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{G}"))); // Whenever Pine Walker or another creature you control is turned face up, untap that creature. Effect effect = new UntapTargetEffect(); effect.setText("untap that creature"); diff --git a/Mage.Sets/src/mage/cards/p/PonybackBrigade.java b/Mage.Sets/src/mage/cards/p/PonybackBrigade.java index a6f85c24f0a..b5b7708843b 100644 --- a/Mage.Sets/src/mage/cards/p/PonybackBrigade.java +++ b/Mage.Sets/src/mage/cards/p/PonybackBrigade.java @@ -36,7 +36,7 @@ public final class PonybackBrigade extends CardImpl { this.addAbility(new PonybackBrigadeAbility(new GoblinToken())); // Morph {2}{R}{W}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{R}{W}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{R}{W}{B}"))); } private PonybackBrigade(final PonybackBrigade card) { diff --git a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java index 669552b58b1..22d59d5f5bd 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java +++ b/Mage.Sets/src/mage/cards/p/PrimalWhisperer.java @@ -40,7 +40,7 @@ public final class PrimalWhisperer extends CardImpl { PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filter, 2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(amount, amount, Duration.WhileOnBattlefield))); // Morph {3}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{G}"))); } private PrimalWhisperer(final PrimalWhisperer card) { diff --git a/Mage.Sets/src/mage/cards/p/ProteusMachine.java b/Mage.Sets/src/mage/cards/p/ProteusMachine.java index 9c55605dc46..01dbef07295 100644 --- a/Mage.Sets/src/mage/cards/p/ProteusMachine.java +++ b/Mage.Sets/src/mage/cards/p/ProteusMachine.java @@ -26,7 +26,7 @@ public final class ProteusMachine extends CardImpl { this.toughness = new MageInt(2); // Morph {0} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{0}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{0}"))); // When Proteus Machine is turned face up, it becomes the creature type of your choice. (This effect lasts indefinitely.) this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BecomesChosenCreatureTypeSourceEffect(false, Duration.Custom))); diff --git a/Mage.Sets/src/mage/cards/p/PutridRaptor.java b/Mage.Sets/src/mage/cards/p/PutridRaptor.java index bac4f725919..effdc56764f 100644 --- a/Mage.Sets/src/mage/cards/p/PutridRaptor.java +++ b/Mage.Sets/src/mage/cards/p/PutridRaptor.java @@ -32,7 +32,7 @@ public final class PutridRaptor extends CardImpl { this.toughness = new MageInt(4); // Morph-Discard a Zombie card. - this.addAbility(new MorphAbility(new DiscardCardCost(filter))); + this.addAbility(new MorphAbility(this, new DiscardCardCost(filter))); } private PutridRaptor(final PutridRaptor card) { diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java b/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java index 1663c3e9469..610782b724f 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverDragon.java @@ -43,7 +43,7 @@ public final class QuicksilverDragon extends CardImpl { this.addAbility(ability); // Morph {4}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{U}"))); } private QuicksilverDragon(final QuicksilverDragon card) { diff --git a/Mage.Sets/src/mage/cards/r/RattleclawMystic.java b/Mage.Sets/src/mage/cards/r/RattleclawMystic.java index 6c33b7ac8b9..d8ed75e0f44 100644 --- a/Mage.Sets/src/mage/cards/r/RattleclawMystic.java +++ b/Mage.Sets/src/mage/cards/r/RattleclawMystic.java @@ -36,7 +36,7 @@ public final class RattleclawMystic extends CardImpl { this.addAbility(new RedManaAbility()); // Morph {2} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}"))); // When Rattleclaw Mystic is turned face up, add {G}{U}{R}. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddManaToManaPoolSourceControllerEffect(new Mana(0, 1, 0, 1,1, 0,0, 0)))); diff --git a/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java b/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java index c098c694c7b..9825c9f5475 100644 --- a/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java +++ b/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java @@ -33,7 +33,7 @@ public final class RavenGuildInitiate extends CardImpl { this.toughness = new MageInt(4); // Morph-Return a Bird you control to its owner's hand. - this.addAbility(new MorphAbility(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter)))); + this.addAbility(new MorphAbility(this, new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter)))); } diff --git a/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java b/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java index bc30ea28a14..a57e1d6dab4 100644 --- a/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java +++ b/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java @@ -30,7 +30,7 @@ public final class RavenGuildMaster extends CardImpl { this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ExileCardsFromTopOfLibraryTargetEffect(10), false, true)); // Morph {2}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}{U}"))); } private RavenGuildMaster(final RavenGuildMaster card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideBiologist.java b/Mage.Sets/src/mage/cards/r/RiptideBiologist.java index cffcd81a23c..6ccae2f4e9d 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideBiologist.java +++ b/Mage.Sets/src/mage/cards/r/RiptideBiologist.java @@ -34,7 +34,7 @@ public final class RiptideBiologist extends CardImpl { // Protection from Beasts this.addAbility(new ProtectionAbility(filter)); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); } private RiptideBiologist(final RiptideBiologist card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java b/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java index c3109f8a47e..d4be40d10c4 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java +++ b/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java @@ -39,7 +39,7 @@ public final class RiptideEntrancer extends CardImpl { this.addAbility(new RiptideEntrancerTriggeredAbility()); // Morph {U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}{U}"))); } private RiptideEntrancer(final RiptideEntrancer card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptidePilferer.java b/Mage.Sets/src/mage/cards/r/RiptidePilferer.java index 5b6def861e0..c9009eb557b 100644 --- a/Mage.Sets/src/mage/cards/r/RiptidePilferer.java +++ b/Mage.Sets/src/mage/cards/r/RiptidePilferer.java @@ -27,7 +27,7 @@ public final class RiptidePilferer extends CardImpl { // Whenever Riptide Pilferer deals combat damage to a player, that player discards a card. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(1), false, true)); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"))); } private RiptidePilferer(final RiptidePilferer card) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java b/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java index 2fab17cfd20..a10c38247fc 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java +++ b/Mage.Sets/src/mage/cards/r/RiptideSurvivor.java @@ -30,7 +30,7 @@ public final class RiptideSurvivor extends CardImpl { this.toughness = new MageInt(1); // Morph {1}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{U}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{U}{U}"))); // When Riptide Survivor is turned face up, discard two cards, then draw three cards. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DiscardControllerEffect(2)); Effect effect = new DrawCardSourceControllerEffect(3); diff --git a/Mage.Sets/src/mage/cards/r/RockshardElemental.java b/Mage.Sets/src/mage/cards/r/RockshardElemental.java index e4b52516354..9271e572851 100644 --- a/Mage.Sets/src/mage/cards/r/RockshardElemental.java +++ b/Mage.Sets/src/mage/cards/r/RockshardElemental.java @@ -26,7 +26,7 @@ public final class RockshardElemental extends CardImpl { // Double strike this.addAbility(DoubleStrikeAbility.getInstance()); // Morph {4}{R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{R}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{R}{R}"))); } private RockshardElemental(final RockshardElemental card) { diff --git a/Mage.Sets/src/mage/cards/r/RootElemental.java b/Mage.Sets/src/mage/cards/r/RootElemental.java index 6f4af3d31af..41bd1c65f77 100644 --- a/Mage.Sets/src/mage/cards/r/RootElemental.java +++ b/Mage.Sets/src/mage/cards/r/RootElemental.java @@ -26,7 +26,7 @@ public final class RootElemental extends CardImpl { this.toughness = new MageInt(5); // Morph {5}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{G}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{G}{G}"))); // When Root Elemental is turned face up, you may put a creature card from your hand onto the battlefield. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A))); } diff --git a/Mage.Sets/src/mage/cards/r/RuthlessRipper.java b/Mage.Sets/src/mage/cards/r/RuthlessRipper.java index efd680cf517..01f4da08f5a 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessRipper.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessRipper.java @@ -43,7 +43,7 @@ public final class RuthlessRipper extends CardImpl { this.addAbility(DeathtouchAbility.getInstance()); // Morph - Reveal a black card in your hand. - this.addAbility(new MorphAbility(new RevealTargetFromHandCost(new TargetCardInHand(filter)))); + this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter)))); // When Ruthless Ripper is turned face up, target player loses 2 life. Effect effect = new LoseLifeTargetEffect(2); diff --git a/Mage.Sets/src/mage/cards/s/SageEyeHarrier.java b/Mage.Sets/src/mage/cards/s/SageEyeHarrier.java index 6e709e39393..d3dd96f0ecc 100644 --- a/Mage.Sets/src/mage/cards/s/SageEyeHarrier.java +++ b/Mage.Sets/src/mage/cards/s/SageEyeHarrier.java @@ -28,7 +28,7 @@ public final class SageEyeHarrier extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {3}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{W}"))); } private SageEyeHarrier(final SageEyeHarrier card) { diff --git a/Mage.Sets/src/mage/cards/s/SaguArcher.java b/Mage.Sets/src/mage/cards/s/SaguArcher.java index 7837e61f10e..10ba311b274 100644 --- a/Mage.Sets/src/mage/cards/s/SaguArcher.java +++ b/Mage.Sets/src/mage/cards/s/SaguArcher.java @@ -28,7 +28,7 @@ public final class SaguArcher extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // Morph {4}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{G}"))); } private SaguArcher(final SaguArcher card) { diff --git a/Mage.Sets/src/mage/cards/s/SaguMauler.java b/Mage.Sets/src/mage/cards/s/SaguMauler.java index 7994e4a2934..177a8682509 100644 --- a/Mage.Sets/src/mage/cards/s/SaguMauler.java +++ b/Mage.Sets/src/mage/cards/s/SaguMauler.java @@ -30,7 +30,7 @@ public final class SaguMauler extends CardImpl { // Hexproof this.addAbility(HexproofAbility.getInstance()); // Morph {3}{G}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{G}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{G}{U}"))); } private SaguMauler(final SaguMauler card) { diff --git a/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java b/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java index a174228a2e2..44332a5de6d 100644 --- a/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java +++ b/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java @@ -32,7 +32,7 @@ public final class SaltRoadAmbushers extends CardImpl { this.addAbility(new SaltRoadAmbushersTriggeredAbility()); // Megamorph {3}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{G}{G}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{G}{G}"), true)); } private SaltRoadAmbushers(final SaltRoadAmbushers card) { diff --git a/Mage.Sets/src/mage/cards/s/SandstormCharger.java b/Mage.Sets/src/mage/cards/s/SandstormCharger.java index c3f645b9254..00d9442e215 100644 --- a/Mage.Sets/src/mage/cards/s/SandstormCharger.java +++ b/Mage.Sets/src/mage/cards/s/SandstormCharger.java @@ -23,7 +23,7 @@ public final class SandstormCharger extends CardImpl { this.toughness = new MageInt(4); // Megamorph {4}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{W}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{W}"), true)); } private SandstormCharger(final SandstormCharger card) { diff --git a/Mage.Sets/src/mage/cards/s/ScornfulEgotist.java b/Mage.Sets/src/mage/cards/s/ScornfulEgotist.java index d14005ffc1f..582d7ccacc3 100644 --- a/Mage.Sets/src/mage/cards/s/ScornfulEgotist.java +++ b/Mage.Sets/src/mage/cards/s/ScornfulEgotist.java @@ -24,7 +24,7 @@ public final class ScornfulEgotist extends CardImpl { this.toughness = new MageInt(1); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"))); } private ScornfulEgotist(final ScornfulEgotist card) { diff --git a/Mage.Sets/src/mage/cards/s/SegmentedKrotiq.java b/Mage.Sets/src/mage/cards/s/SegmentedKrotiq.java index 9b12b9e15bd..3322876e018 100644 --- a/Mage.Sets/src/mage/cards/s/SegmentedKrotiq.java +++ b/Mage.Sets/src/mage/cards/s/SegmentedKrotiq.java @@ -23,7 +23,7 @@ public final class SegmentedKrotiq extends CardImpl { this.toughness = new MageInt(5); // Megamorph {6}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{6}{G}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{6}{G}"), true)); } private SegmentedKrotiq(final SegmentedKrotiq card) { diff --git a/Mage.Sets/src/mage/cards/s/SerpentineBasilisk.java b/Mage.Sets/src/mage/cards/s/SerpentineBasilisk.java index 81cf312cc80..0706d12f851 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentineBasilisk.java +++ b/Mage.Sets/src/mage/cards/s/SerpentineBasilisk.java @@ -32,7 +32,7 @@ public final class SerpentineBasilisk extends CardImpl { new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect("destroy that creature at end of combat")) .setTriggerPhrase(""), true), false, true)); // Morph {1}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{G}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{G}{G}"))); } private SerpentineBasilisk(final SerpentineBasilisk card) { diff --git a/Mage.Sets/src/mage/cards/s/ShaleskinPlower.java b/Mage.Sets/src/mage/cards/s/ShaleskinPlower.java index 1ab4a6cfcda..3b29e025758 100644 --- a/Mage.Sets/src/mage/cards/s/ShaleskinPlower.java +++ b/Mage.Sets/src/mage/cards/s/ShaleskinPlower.java @@ -27,7 +27,7 @@ public final class ShaleskinPlower extends CardImpl { this.toughness = new MageInt(2); // Morph {4}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{R}"))); // When Shaleskin Plower is turned face up, destroy target land. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect()); ability.addTarget(new TargetLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/s/ShaperParasite.java b/Mage.Sets/src/mage/cards/s/ShaperParasite.java index 7b28e2087ad..badad55be97 100644 --- a/Mage.Sets/src/mage/cards/s/ShaperParasite.java +++ b/Mage.Sets/src/mage/cards/s/ShaperParasite.java @@ -35,7 +35,7 @@ public final class ShaperParasite extends CardImpl { this.toughness = new MageInt(3); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); // When Shaper Parasite is turned face up, target creature gets +2/-2 or -2/+2 until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ShaperParasiteEffect()); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java b/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java index 9c7aeb4518d..68bfffe49b5 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java +++ b/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java @@ -43,7 +43,7 @@ public final class ShieldhideDragon extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Megamorph {5}{W}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{W}{W}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{W}{W}"), true)); // When Shieldhide Dragon is turned face up, put a +1/+1 counter on each other Dragon you control. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false)); diff --git a/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java b/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java index c3af682d542..819ceb3470c 100644 --- a/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java +++ b/Mage.Sets/src/mage/cards/s/ShorecrasherElemental.java @@ -44,7 +44,7 @@ public final class ShorecrasherElemental extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShorecrasherElementalBoostEffect(), new ManaCostsImpl<>("{1}"))); // Megamorph {4}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{U}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{U}"), true)); } diff --git a/Mage.Sets/src/mage/cards/s/SidisisPet.java b/Mage.Sets/src/mage/cards/s/SidisisPet.java index 7872976acc9..3785073bc27 100644 --- a/Mage.Sets/src/mage/cards/s/SidisisPet.java +++ b/Mage.Sets/src/mage/cards/s/SidisisPet.java @@ -29,7 +29,7 @@ public final class SidisisPet extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // Morph {1}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{B}"))); } private SidisisPet(final SidisisPet card) { diff --git a/Mage.Sets/src/mage/cards/s/SilentSpecter.java b/Mage.Sets/src/mage/cards/s/SilentSpecter.java index 17640647106..23f63fcc71d 100644 --- a/Mage.Sets/src/mage/cards/s/SilentSpecter.java +++ b/Mage.Sets/src/mage/cards/s/SilentSpecter.java @@ -31,7 +31,7 @@ public final class SilentSpecter extends CardImpl { // Whenever Silent Specter deals combat damage to a player, that player discards two cards. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardTargetEffect(2), false, true)); // Morph {3}{B}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{B}{B}"))); } private SilentSpecter(final SilentSpecter card) { diff --git a/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java b/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java index eb84761c0b3..a91b3a7d476 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarAssassin.java @@ -45,7 +45,7 @@ public final class SilumgarAssassin extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedByCreaturesWithGreaterPowerEffect())); // Megamorph {2}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{B}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{B}"), true)); // When Silumgar Assassin is turned face up, destroy target creature with power 3 or less an opponent controls. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect(), false); diff --git a/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java b/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java index ea5b361c521..baf1fb84642 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java @@ -29,7 +29,7 @@ public final class SilumgarSpellEater extends CardImpl { this.toughness = new MageInt(3); // Megamorph {4}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{U}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{U}"), true)); // When Silumgar Spell-Eater is turned face up, counter target spell unless its controller pays {3}. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new CounterUnlessPaysEffect(new GenericManaCost(3)), false, false); diff --git a/Mage.Sets/src/mage/cards/s/Skinthinner.java b/Mage.Sets/src/mage/cards/s/Skinthinner.java index ce738b65b9f..dda8978f95e 100644 --- a/Mage.Sets/src/mage/cards/s/Skinthinner.java +++ b/Mage.Sets/src/mage/cards/s/Skinthinner.java @@ -27,7 +27,7 @@ public final class Skinthinner extends CardImpl { this.toughness = new MageInt(1); // Morph {3}{B}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{B}{B}"))); // When Skinthinner is turned face up, destroy target nonblack creature. It can't be regenerated. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DestroyTargetEffect(true)); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK)); diff --git a/Mage.Sets/src/mage/cards/s/SkirkCommando.java b/Mage.Sets/src/mage/cards/s/SkirkCommando.java index f3369764f97..335dd0893e1 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkCommando.java +++ b/Mage.Sets/src/mage/cards/s/SkirkCommando.java @@ -35,7 +35,7 @@ public final class SkirkCommando extends CardImpl { this.addAbility(new SkirkCommandoTriggeredAbility()); //Morph {2}{R} (You may cast this card face down as a 2/2 creature for 3. Turn it face up any time for its morph cost.) - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SkirkMarauder.java b/Mage.Sets/src/mage/cards/s/SkirkMarauder.java index a86dcb65afb..0cbe4d84474 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkMarauder.java +++ b/Mage.Sets/src/mage/cards/s/SkirkMarauder.java @@ -27,7 +27,7 @@ public final class SkirkMarauder extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{R}"))); // When Skirk Marauder is turned face up, it deals 2 damage to any target. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DamageTargetEffect(2, "it")); diff --git a/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java b/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java index 0d9c5b13e97..d130eeb8114 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java +++ b/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java @@ -34,7 +34,7 @@ public final class SkirkVolcanist extends CardImpl { this.toughness = new MageInt(1); // Morph-Sacrifice two Mountains. - this.addAbility(new MorphAbility(new SacrificeTargetCost(new TargetControlledPermanent(2, filter)))); + this.addAbility(new MorphAbility(this, new SacrificeTargetCost(new TargetControlledPermanent(2, filter)))); // When Skirk Volcanist is turned face up, it deals 3 damage divided as you choose among one, two, or three target creatures. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new DamageMultiEffect(3, "it")); diff --git a/Mage.Sets/src/mage/cards/s/SkittishValesk.java b/Mage.Sets/src/mage/cards/s/SkittishValesk.java index 492388fe66d..1e60bbb01fd 100644 --- a/Mage.Sets/src/mage/cards/s/SkittishValesk.java +++ b/Mage.Sets/src/mage/cards/s/SkittishValesk.java @@ -35,7 +35,7 @@ public final class SkittishValesk extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SkittishValeskEffect(), TargetController.YOU, false)); // Morph {5}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{R}"))); } private SkittishValesk(final SkittishValesk card) { diff --git a/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java b/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java index ef4bbffbf85..a4d53e0547d 100644 --- a/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java +++ b/Mage.Sets/src/mage/cards/s/SlipstreamSerpent.java @@ -38,7 +38,7 @@ public final class SlipstreamSerpent extends CardImpl { new SacrificeSourceEffect())); // Morph {5}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{U}"))); } private SlipstreamSerpent(final SlipstreamSerpent card) { diff --git a/Mage.Sets/src/mage/cards/s/SnappingThragg.java b/Mage.Sets/src/mage/cards/s/SnappingThragg.java index b044c1d33b1..5809d6322e7 100644 --- a/Mage.Sets/src/mage/cards/s/SnappingThragg.java +++ b/Mage.Sets/src/mage/cards/s/SnappingThragg.java @@ -36,7 +36,7 @@ public final class SnappingThragg extends CardImpl { this.addAbility(new SnappingThraggTriggeredAbility()); // Morph {4}{R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{R}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{R}{R}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java b/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java index 41bc9c0c150..4d7d511583d 100644 --- a/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java +++ b/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java @@ -40,7 +40,7 @@ public final class SnarlingUndorak extends CardImpl { ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Morph {1}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{G}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{G}{G}"))); } private SnarlingUndorak(final SnarlingUndorak card) { diff --git a/Mage.Sets/src/mage/cards/s/SnowhornRider.java b/Mage.Sets/src/mage/cards/s/SnowhornRider.java index b0071652449..400d94e9bd9 100644 --- a/Mage.Sets/src/mage/cards/s/SnowhornRider.java +++ b/Mage.Sets/src/mage/cards/s/SnowhornRider.java @@ -28,7 +28,7 @@ public final class SnowhornRider extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Morph {2}{G}{U}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{G}{U}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{G}{U}{R}"))); } private SnowhornRider(final SnowhornRider card) { diff --git a/Mage.Sets/src/mage/cards/s/SootfeatherFlock.java b/Mage.Sets/src/mage/cards/s/SootfeatherFlock.java index 2da0499f1b7..a3b9bae19cf 100644 --- a/Mage.Sets/src/mage/cards/s/SootfeatherFlock.java +++ b/Mage.Sets/src/mage/cards/s/SootfeatherFlock.java @@ -26,7 +26,7 @@ public final class SootfeatherFlock extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {3}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{B}"))); } private SootfeatherFlock(final SootfeatherFlock card) { diff --git a/Mage.Sets/src/mage/cards/s/SoulCollector.java b/Mage.Sets/src/mage/cards/s/SoulCollector.java index 713fc03f0c1..1905e04f15e 100644 --- a/Mage.Sets/src/mage/cards/s/SoulCollector.java +++ b/Mage.Sets/src/mage/cards/s/SoulCollector.java @@ -31,7 +31,7 @@ public final class SoulCollector extends CardImpl { this.addAbility(new DealtDamageAndDiedTriggeredAbility(new ReturnToBattlefieldUnderYourControlTargetEffect())); // Morph {B}{B}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{B}{B}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{B}{B}{B}"))); } private SoulCollector(final SoulCollector card) { diff --git a/Mage.Sets/src/mage/cards/s/SpinedBasher.java b/Mage.Sets/src/mage/cards/s/SpinedBasher.java index c550136e792..63e1fe5b22c 100644 --- a/Mage.Sets/src/mage/cards/s/SpinedBasher.java +++ b/Mage.Sets/src/mage/cards/s/SpinedBasher.java @@ -24,7 +24,7 @@ public final class SpinedBasher extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{B}"))); } private SpinedBasher(final SpinedBasher card) { diff --git a/Mage.Sets/src/mage/cards/s/SpittingGourna.java b/Mage.Sets/src/mage/cards/s/SpittingGourna.java index fd491fcb8bd..846dc38c1cc 100644 --- a/Mage.Sets/src/mage/cards/s/SpittingGourna.java +++ b/Mage.Sets/src/mage/cards/s/SpittingGourna.java @@ -26,7 +26,7 @@ public final class SpittingGourna extends CardImpl { // Reach this.addAbility(ReachAbility.getInstance()); // Morph {4}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{G}"))); } private SpittingGourna(final SpittingGourna card) { diff --git a/Mage.Sets/src/mage/cards/s/StormcragElemental.java b/Mage.Sets/src/mage/cards/s/StormcragElemental.java index 717b6b270f8..24644b7b221 100644 --- a/Mage.Sets/src/mage/cards/s/StormcragElemental.java +++ b/Mage.Sets/src/mage/cards/s/StormcragElemental.java @@ -27,7 +27,7 @@ public final class StormcragElemental extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Megamorph {4}{R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{R}{R}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{R}{R}"), true)); } private StormcragElemental(final StormcragElemental card) { diff --git a/Mage.Sets/src/mage/cards/s/StormwingDragon.java b/Mage.Sets/src/mage/cards/s/StormwingDragon.java index 4d39ce2588e..bf694645749 100644 --- a/Mage.Sets/src/mage/cards/s/StormwingDragon.java +++ b/Mage.Sets/src/mage/cards/s/StormwingDragon.java @@ -43,7 +43,7 @@ public final class StormwingDragon extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Megamorph {5}{R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{R}{R}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{R}{R}"), true)); // When Stormwing Dragon is turned face up, put a +1/+1 counter on each other Dragon creature you control. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), false, false)); diff --git a/Mage.Sets/src/mage/cards/s/StratusDancer.java b/Mage.Sets/src/mage/cards/s/StratusDancer.java index a32d05dd07a..422e1ce0938 100644 --- a/Mage.Sets/src/mage/cards/s/StratusDancer.java +++ b/Mage.Sets/src/mage/cards/s/StratusDancer.java @@ -34,7 +34,7 @@ public final class StratusDancer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Megamorph {1}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{U}"), true)); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{U}"), true)); // When Stratus Dancer is turned face up, counter target instant or sorcery spell Effect effect = new CounterTargetEffect(); diff --git a/Mage.Sets/src/mage/cards/t/TemurCharger.java b/Mage.Sets/src/mage/cards/t/TemurCharger.java index 764118f0bd7..d0df7b38439 100644 --- a/Mage.Sets/src/mage/cards/t/TemurCharger.java +++ b/Mage.Sets/src/mage/cards/t/TemurCharger.java @@ -40,7 +40,7 @@ public final class TemurCharger extends CardImpl { this.toughness = new MageInt(1); // Morph - Reveal a green card in your hand. - this.addAbility(new MorphAbility(new RevealTargetFromHandCost(new TargetCardInHand(filter)))); + this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter)))); // When Temur Charger is turned face up, target creature gains trample until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/t/TheloniteHermit.java b/Mage.Sets/src/mage/cards/t/TheloniteHermit.java index e9eb5dbaaa6..e80cf2ccb2d 100644 --- a/Mage.Sets/src/mage/cards/t/TheloniteHermit.java +++ b/Mage.Sets/src/mage/cards/t/TheloniteHermit.java @@ -42,7 +42,7 @@ public final class TheloniteHermit extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false))); // Morph {3}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{G}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{G}{G}"))); // When Thelonite Hermit is turned face up, create four 1/1 green Saproling creature tokens. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new CreateTokenEffect(new SaprolingToken(), 4))); diff --git a/Mage.Sets/src/mage/cards/t/ThousandWinds.java b/Mage.Sets/src/mage/cards/t/ThousandWinds.java index 239d7c14a9c..9c9be8b641f 100644 --- a/Mage.Sets/src/mage/cards/t/ThousandWinds.java +++ b/Mage.Sets/src/mage/cards/t/ThousandWinds.java @@ -39,7 +39,7 @@ public final class ThousandWinds extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {5}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{U}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{U}{U}"))); // When Thousand Winds is turned face up, return all other tapped creatures to their owners' hands. this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new ReturnToHandFromBattlefieldAllEffect(filter))); } diff --git a/Mage.Sets/src/mage/cards/t/ThrashingMudspawn.java b/Mage.Sets/src/mage/cards/t/ThrashingMudspawn.java index d3d13cb81f9..81124930134 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashingMudspawn.java +++ b/Mage.Sets/src/mage/cards/t/ThrashingMudspawn.java @@ -35,7 +35,7 @@ public final class ThrashingMudspawn extends CardImpl { this.addAbility(ability); // Morph {1}{B}{B} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{B}{B}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{B}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/t/Timebender.java b/Mage.Sets/src/mage/cards/t/Timebender.java index 88d9b6aa4b1..73efd25a823 100644 --- a/Mage.Sets/src/mage/cards/t/Timebender.java +++ b/Mage.Sets/src/mage/cards/t/Timebender.java @@ -41,7 +41,7 @@ public final class Timebender extends CardImpl { this.toughness = new MageInt(1); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"))); // When Timebender is turned face up, choose one — // Remove two time counters from target permanent or suspended card. diff --git a/Mage.Sets/src/mage/cards/t/TitanicBulvox.java b/Mage.Sets/src/mage/cards/t/TitanicBulvox.java index 2e81c03d267..4c1124576e5 100644 --- a/Mage.Sets/src/mage/cards/t/TitanicBulvox.java +++ b/Mage.Sets/src/mage/cards/t/TitanicBulvox.java @@ -26,7 +26,7 @@ public final class TitanicBulvox extends CardImpl { // Trample this.addAbility(TrampleAbility.getInstance()); // Morph {4}{G}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{G}{G}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{G}{G}{G}"))); } private TitanicBulvox(final TitanicBulvox card) { diff --git a/Mage.Sets/src/mage/cards/t/ToweringBaloth.java b/Mage.Sets/src/mage/cards/t/ToweringBaloth.java index 9562dff86a5..f46339d4068 100644 --- a/Mage.Sets/src/mage/cards/t/ToweringBaloth.java +++ b/Mage.Sets/src/mage/cards/t/ToweringBaloth.java @@ -23,7 +23,7 @@ public final class ToweringBaloth extends CardImpl { this.toughness = new MageInt(6); // Morph {6}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{6}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{6}{G}"))); } private ToweringBaloth(final ToweringBaloth card) { diff --git a/Mage.Sets/src/mage/cards/t/TreespringLorian.java b/Mage.Sets/src/mage/cards/t/TreespringLorian.java index f7643496c25..ab7e2c882c2 100644 --- a/Mage.Sets/src/mage/cards/t/TreespringLorian.java +++ b/Mage.Sets/src/mage/cards/t/TreespringLorian.java @@ -23,7 +23,7 @@ public final class TreespringLorian extends CardImpl { this.toughness = new MageInt(4); // Morph {5}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{G}"))); } private TreespringLorian(final TreespringLorian card) { diff --git a/Mage.Sets/src/mage/cards/t/TribalForcemage.java b/Mage.Sets/src/mage/cards/t/TribalForcemage.java index f94bf85abb6..f927109a976 100644 --- a/Mage.Sets/src/mage/cards/t/TribalForcemage.java +++ b/Mage.Sets/src/mage/cards/t/TribalForcemage.java @@ -34,7 +34,7 @@ public final class TribalForcemage extends CardImpl { this.toughness = new MageInt(1); // Morph {1}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{G}"))); // When Tribal Forcemage is turned face up, creatures of the creature type of your choice get +2/+2 and gain trample until end of turn. Effect effect = new ChooseCreatureTypeEffect(Outcome.BoostCreature); diff --git a/Mage.Sets/src/mage/cards/u/UnblinkingBleb.java b/Mage.Sets/src/mage/cards/u/UnblinkingBleb.java index f63c1b7624b..f4c08a3002b 100644 --- a/Mage.Sets/src/mage/cards/u/UnblinkingBleb.java +++ b/Mage.Sets/src/mage/cards/u/UnblinkingBleb.java @@ -28,7 +28,7 @@ public final class UnblinkingBleb extends CardImpl { this.toughness = new MageInt(3); // Morph {2}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}"))); // Whenever Unblinking Bleb or another permanent is turned face up, you may scry 2. this.addAbility(new TurnedFaceUpAllTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/u/UnstableHulk.java b/Mage.Sets/src/mage/cards/u/UnstableHulk.java index a8d47702898..d0f8606ab4a 100644 --- a/Mage.Sets/src/mage/cards/u/UnstableHulk.java +++ b/Mage.Sets/src/mage/cards/u/UnstableHulk.java @@ -31,7 +31,7 @@ public final class UnstableHulk extends CardImpl { this.toughness = new MageInt(2); // Morph {3}{R}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{R}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{R}{R}"))); // When Unstable Hulk is turned face up, it gets +6/+6 and gains trample until end of turn. You skip your next turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new BoostSourceEffect(6,6,Duration.EndOfTurn) diff --git a/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java b/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java index e314803ec5f..4d9d81ba768 100644 --- a/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java +++ b/Mage.Sets/src/mage/cards/v/VenomspoutBrackus.java @@ -45,7 +45,7 @@ public final class VenomspoutBrackus extends CardImpl { ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); // Morph {3}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{G}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{G}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java b/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java index a5126f8a320..93d43cca6a9 100644 --- a/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java +++ b/Mage.Sets/src/mage/cards/v/VesuvanShapeshifter.java @@ -58,7 +58,7 @@ public final class VesuvanShapeshifter extends CardImpl { this.addAbility(ability); // Morph {1}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{U}"))); } private VesuvanShapeshifter(final VesuvanShapeshifter card) { diff --git a/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java b/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java index ee13db0676d..f10a23879e6 100644 --- a/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java +++ b/Mage.Sets/src/mage/cards/v/VoidmageApprentice.java @@ -28,7 +28,7 @@ public final class VoidmageApprentice extends CardImpl { this.toughness = new MageInt(1); // Morph {2}{U}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{U}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{U}{U}"))); // When Voidmage Apprentice is turned face up, counter target spell. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new CounterTargetEffect(), false); diff --git a/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java b/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java index adab7d5df9c..4596bea3968 100644 --- a/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java +++ b/Mage.Sets/src/mage/cards/v/VoidmageProdigy.java @@ -47,7 +47,7 @@ public final class VoidmageProdigy extends CardImpl { this.addAbility(ability); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"))); } private VoidmageProdigy(final VoidmageProdigy card) { diff --git a/Mage.Sets/src/mage/cards/w/WallOfDeceit.java b/Mage.Sets/src/mage/cards/w/WallOfDeceit.java index 92cfa24f77f..45ce228ea82 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfDeceit.java +++ b/Mage.Sets/src/mage/cards/w/WallOfDeceit.java @@ -37,7 +37,7 @@ public final class WallOfDeceit extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WallOfDeceitEffect(), new ManaCostsImpl<>("{3}"))); // Morph {U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{U}"))); } private WallOfDeceit(final WallOfDeceit card) { diff --git a/Mage.Sets/src/mage/cards/w/WarBehemoth.java b/Mage.Sets/src/mage/cards/w/WarBehemoth.java index 185faa4c3da..ce6a6dd9369 100644 --- a/Mage.Sets/src/mage/cards/w/WarBehemoth.java +++ b/Mage.Sets/src/mage/cards/w/WarBehemoth.java @@ -24,7 +24,7 @@ public final class WarBehemoth extends CardImpl { this.toughness = new MageInt(6); // Morph {4}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{W}"))); } private WarBehemoth(final WarBehemoth card) { diff --git a/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java b/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java index 12edcdfe4be..e87a0b9c617 100644 --- a/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java +++ b/Mage.Sets/src/mage/cards/w/WarbreakTrumpeter.java @@ -28,7 +28,7 @@ public final class WarbreakTrumpeter extends CardImpl { this.toughness = new MageInt(1); // Morph {X}{X}{R} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{X}{X}{R}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{X}{X}{R}"))); // When Warbreak Trumpeter is turned face up, create X 1/1 red Goblin creature tokens. DynamicValue morphX = MorphManacostVariableValue.instance; diff --git a/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java b/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java index 306b7903b71..d4b25d76769 100644 --- a/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java +++ b/Mage.Sets/src/mage/cards/w/WatcherOfTheRoost.java @@ -41,7 +41,7 @@ public final class WatcherOfTheRoost extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Morph - Reveal a white card in your hand - this.addAbility(new MorphAbility(new RevealTargetFromHandCost(new TargetCardInHand(filter)))); + this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter)))); // When Watcher of the Roost is turned face up, you gain 2 life. Effect effect = new GainLifeEffect(2); diff --git a/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java b/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java index 3914b5607ab..06e1f51e339 100644 --- a/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java +++ b/Mage.Sets/src/mage/cards/w/WeatheredBodyguards.java @@ -38,7 +38,7 @@ public final class WeatheredBodyguards extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WeatheredBodyguardsEffect())); // Morph {3}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WeaverOfLies.java b/Mage.Sets/src/mage/cards/w/WeaverOfLies.java index 8da27492686..e52eacded1b 100644 --- a/Mage.Sets/src/mage/cards/w/WeaverOfLies.java +++ b/Mage.Sets/src/mage/cards/w/WeaverOfLies.java @@ -45,7 +45,7 @@ public final class WeaverOfLies extends CardImpl { this.toughness = new MageInt(4); // Morph {4}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{4}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{4}{U}"))); // When Weaver of Lies is turned face up, turn any number of target creatures with a morph ability other than Weaver of Lies face down. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new WeaverOfLiesEffect(), false, false); diff --git a/Mage.Sets/src/mage/cards/w/Whetwheel.java b/Mage.Sets/src/mage/cards/w/Whetwheel.java index 22d5c0ec047..4766cdaef8f 100644 --- a/Mage.Sets/src/mage/cards/w/Whetwheel.java +++ b/Mage.Sets/src/mage/cards/w/Whetwheel.java @@ -31,7 +31,7 @@ public final class Whetwheel extends CardImpl { ability.addTarget(new TargetPlayer()); this.addAbility(ability); // Morph {3} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{3}"))); } private Whetwheel(final Whetwheel card) { diff --git a/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java b/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java index a09150b317b..517d96a4fb1 100644 --- a/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java +++ b/Mage.Sets/src/mage/cards/w/WhipSpineDrake.java @@ -26,7 +26,7 @@ public final class WhipSpineDrake extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {2}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{W}"))); } private WhipSpineDrake(final WhipSpineDrake card) { diff --git a/Mage.Sets/src/mage/cards/w/Whipcorder.java b/Mage.Sets/src/mage/cards/w/Whipcorder.java index df11de17584..a6cac85c4dd 100644 --- a/Mage.Sets/src/mage/cards/w/Whipcorder.java +++ b/Mage.Sets/src/mage/cards/w/Whipcorder.java @@ -37,7 +37,7 @@ public final class Whipcorder extends CardImpl { ability.addCost(new TapSourceCost()); this.addAbility(ability); // Morph {W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{W}"))); } private Whipcorder(final Whipcorder card) { diff --git a/Mage.Sets/src/mage/cards/w/Willbender.java b/Mage.Sets/src/mage/cards/w/Willbender.java index 957c1c58c90..0324c150183 100644 --- a/Mage.Sets/src/mage/cards/w/Willbender.java +++ b/Mage.Sets/src/mage/cards/w/Willbender.java @@ -37,7 +37,7 @@ public final class Willbender extends CardImpl { this.toughness = new MageInt(2); // Morph {1}{U} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{1}{U}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{1}{U}"))); // When Willbender is turned face up, change the target of target spell or ability with a single target. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ChooseNewTargetsTargetEffect(true, true)); ability.addTarget(new TargetStackObject(FILTER)); diff --git a/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java b/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java index cad31785b89..840d3e759fb 100644 --- a/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java +++ b/Mage.Sets/src/mage/cards/w/WingbeatWarrior.java @@ -34,7 +34,7 @@ public final class WingbeatWarrior extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // Morph {2}{W} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{W}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{W}"))); // When Wingbeat Warrior is turned face up, target creature gains first strike until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java b/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java index 08d0589cb8f..07615c14280 100644 --- a/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java +++ b/Mage.Sets/src/mage/cards/w/WitnessOfTheAges.java @@ -24,7 +24,7 @@ public final class WitnessOfTheAges extends CardImpl { this.toughness = new MageInt(4); // Morph {5} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}"))); } private WitnessOfTheAges(final WitnessOfTheAges card) { diff --git a/Mage.Sets/src/mage/cards/w/Woodcloaker.java b/Mage.Sets/src/mage/cards/w/Woodcloaker.java index 273de715124..654658f3ba3 100644 --- a/Mage.Sets/src/mage/cards/w/Woodcloaker.java +++ b/Mage.Sets/src/mage/cards/w/Woodcloaker.java @@ -29,7 +29,7 @@ public final class Woodcloaker extends CardImpl { this.toughness = new MageInt(3); // Morph {2}{G}{G} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}{G}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}{G}{G}"))); // When Woodcloaker is turned face up, target creature gains trample until end of turn. Ability ability = new TurnedFaceUpSourceTriggeredAbility(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java b/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java index 0dbcc5e71d3..2d03bca0c33 100644 --- a/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java +++ b/Mage.Sets/src/mage/cards/w/WoollyLoxodon.java @@ -25,7 +25,7 @@ public final class WoollyLoxodon extends CardImpl { this.toughness = new MageInt(7); // Morph 5G - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{5}{G}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{5}{G}"))); } private WoollyLoxodon(final WoollyLoxodon card) { diff --git a/Mage.Sets/src/mage/cards/z/ZoeticCavern.java b/Mage.Sets/src/mage/cards/z/ZoeticCavern.java index d35e2c416c8..ede5506cc96 100644 --- a/Mage.Sets/src/mage/cards/z/ZoeticCavern.java +++ b/Mage.Sets/src/mage/cards/z/ZoeticCavern.java @@ -21,7 +21,7 @@ public final class ZoeticCavern extends CardImpl { // {T}: Add {C}. this.addAbility(new ColorlessManaAbility()); // Morph {2} - this.addAbility(new MorphAbility(new ManaCostsImpl<>("{2}"))); + this.addAbility(new MorphAbility(this, new ManaCostsImpl<>("{2}"))); } private ZoeticCavern(final ZoeticCavern card) { diff --git a/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java b/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java index b78968b5c5e..03e263e2b80 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java +++ b/Mage.Sets/src/mage/cards/z/ZombieCutthroat.java @@ -23,7 +23,7 @@ public final class ZombieCutthroat extends CardImpl { this.toughness = new MageInt(4); // Morph-Pay 5 life. - this.addAbility(new MorphAbility(new PayLifeCost(5))); + this.addAbility(new MorphAbility(this, new PayLifeCost(5))); } private ZombieCutthroat(final ZombieCutthroat card) {