replace all instances of ConditionalActivatedAbility with ActivateIfConditionActivatedAbility

Mage.Sets/src/mage/cards/a/AcidicDagger.java

@@ -5,7 +5,7 @@ import mage.abilities.DelayedTriggeredAbility;
 import mage.abilities.condition.common.BeforeBlockersAreDeclaredCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
 import mage.abilities.effects.common.DestroyTargetEffect;
@@ -39,7 +39,7 @@ public final class AcidicDagger extends CardImpl {
         // {4}, {tap}: Whenever target creature deals combat damage to a non-Wall creature this turn,
         // destroy that non-Wall creature. When the targeted creature leaves the battlefield this turn,
         // sacrifice Acidic Dagger. Activate this ability only before blockers are declared.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new CreateDelayedTriggeredAbilityEffect(new AcidicDaggerDestroyNonWallAbility()),
                 new GenericManaCost(4),
                 BeforeBlockersAreDeclaredCondition.instance);

Mage.Sets/src/mage/cards/a/AncientHellkite.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.condition.common.SourceAttackingCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
@@ -40,7 +40,7 @@ public final class AncientHellkite extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // {R}: Ancient Hellkite deals 1 damage to target creature defending player controls. Activate this ability only if Ancient Hellkite is attacking.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new DamageTargetEffect(1), new ManaCostsImpl<>("{R}"), SourceAttackingCondition.instance
         );
         ability.addTarget(new TargetPermanent(filter));

Mage.Sets/src/mage/cards/a/ArchOfOrazca.java

@@ -4,7 +4,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.common.CitysBlessingCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.hint.common.CitysBlessingHint;
 import mage.abilities.keyword.AscendAbility;
@@ -30,7 +30,7 @@ public final class ArchOfOrazca extends CardImpl {
         this.addAbility(new ColorlessManaAbility());
 
         // {5}, {T}: Draw a card. Activate this ability only if you have the city's blessing.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new DrawCardSourceControllerEffect(1), new GenericManaCost(5), CitysBlessingCondition.instance
         );
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/a/ArcumsSleigh.java

@@ -8,7 +8,7 @@ import mage.abilities.condition.common.DefendingPlayerControlsNoSourceCondition;
 import mage.abilities.condition.common.IsPhaseCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
 import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
@@ -41,7 +41,7 @@ public final class ArcumsSleigh extends CardImpl {
                 new DefendingPlayerControlsNoSourceCondition(filter) // Only if defending player controls a snow land
         );
 
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new GainAbilityTargetEffect(VigilanceAbility.getInstance()), new GenericManaCost(2), condition);
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/cards/a/ArmageddonClock.java

@@ -3,7 +3,7 @@ package mage.cards.a;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.dynamicvalue.common.CountersSourceCount;
 import mage.abilities.effects.common.DamagePlayersEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@@ -40,7 +40,7 @@ public final class ArmageddonClock extends CardImpl {
         ));
 
         // {4}: Remove a doom counter from Armageddon Clock. Any player may activate this ability but only during any upkeep step.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new RemoveCounterSourceEffect(CounterType.DOOM.createInstance()), new GenericManaCost(4), condition
         ).withConditionText("any player may activate this ability but only during any upkeep step").setMayActivate(TargetController.ANY));
     }

Mage.Sets/src/mage/cards/a/AshenGhoul.java

@@ -6,7 +6,7 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
 import mage.abilities.keyword.HasteAbility;
 import mage.cards.Card;
@@ -36,7 +36,7 @@ public final class AshenGhoul extends CardImpl {
         this.addAbility(HasteAbility.getInstance());
 
         // {B}: Return Ashen Ghoul from your graveyard to the battlefield. Activate this ability only during your upkeep and only if three or more creature cards are above Ashen Ghoul.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 Zone.GRAVEYARD,
                 new ReturnSourceFromGraveyardToBattlefieldEffect(),
                 new ManaCostsImpl<>("{B}"),

Mage.Sets/src/mage/cards/a/AugurIlVec.java

@@ -3,7 +3,7 @@ package mage.cards.a;
 import mage.MageInt;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.keyword.ShadowAbility;
 import mage.cards.CardImpl;
@@ -29,7 +29,7 @@ public final class AugurIlVec extends CardImpl {
         this.addAbility(ShadowAbility.getInstance());
 
         // Sacrifice Augur il-Vec: You gain 4 life. Activate this ability only during your upkeep.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new GainLifeEffect(4), new SacrificeSourceCost(), IsStepCondition.getMyUpkeep()
         ));
     }

Mage.Sets/src/mage/cards/a/AugurOfSkulls.java

@@ -6,7 +6,7 @@ import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.RegenerateSourceEffect;
 import mage.abilities.effects.common.discard.DiscardTargetEffect;
 import mage.cards.CardImpl;
@@ -33,7 +33,7 @@ public final class AugurOfSkulls extends CardImpl {
         this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B}")));
 
         // Sacrifice Augur of Skulls: Target player discards two cards. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new DiscardTargetEffect(2), new SacrificeSourceCost(), IsStepCondition.getMyUpkeep()
         );
         ability.addTarget(new TargetPlayer());

Mage.Sets/src/mage/cards/a/AvenAugur.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
@@ -31,7 +31,7 @@ public final class AvenAugur extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Sacrifice Aven Augur: Return up to two target creatures to their owners' hands. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new ReturnToHandTargetEffect(), new SacrificeSourceCost(), IsStepCondition.getMyUpkeep()
         );
         ability.addTarget(new TargetCreaturePermanent(0, 2));

Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java

@@ -7,7 +7,7 @@ import mage.abilities.condition.common.MoreThanStartingLifeTotalCondition;
 import mage.abilities.costs.common.SacrificeTargetCost;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.dynamicvalue.common.SacrificeCostCreaturesToughness;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.ExileTargetEffect;
@@ -46,7 +46,7 @@ public final class AyliEternalPilgrim extends CardImpl {
         this.addAbility(ability);
 
         // {1}{W}{B}, Sacrifice another creature: Exile target nonland permanent. Activate only if you have at least 10 life more than your starting life total.
-        ability = new ConditionalActivatedAbility(
+        ability = new ActivateIfConditionActivatedAbility(
                 new ExileTargetEffect(), new ManaCostsImpl<>("{1}{W}{B}"), MoreThanStartingLifeTotalCondition.TEN
         );
         ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE));

Mage.Sets/src/mage/cards/b/BalduvianHydra.java

@@ -6,7 +6,7 @@ import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.EntersBattlefieldWithXCountersEffect;
 import mage.abilities.effects.common.PreventDamageToSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@@ -41,7 +41,7 @@ public final class BalduvianHydra extends CardImpl {
         ));
 
         // {R}{R}{R}: Put a +1/+0 counter on Balduvian Hydra. Activate this ability only during your upkeep.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new AddCountersSourceEffect(CounterType.P1P0.createInstance(1)),
                 new ManaCostsImpl<>("{R}{R}{R}"), IsStepCondition.getMyUpkeep()
         ));

Mage.Sets/src/mage/cards/b/BalduvianWarlord.java

@@ -5,7 +5,7 @@ import mage.MageObjectReference;
 import mage.abilities.Ability;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.RemoveFromCombatTargetEffect;
@@ -41,7 +41,7 @@ public final class BalduvianWarlord extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {T}: Remove target blocking creature from combat. Creatures it was blocking that hadn't become blocked by another creature this combat become unblocked, then it blocks an attacking creature of your choice. Activate this ability only during the declare blockers step.
-        Ability ability = new ConditionalActivatedAbility(new BalduvianWarlordUnblockEffect(), new TapSourceCost(), new IsStepCondition(PhaseStep.DECLARE_BLOCKERS, false));
+        Ability ability = new ActivateIfConditionActivatedAbility(new BalduvianWarlordUnblockEffect(), new TapSourceCost(), new IsStepCondition(PhaseStep.DECLARE_BLOCKERS, false));
         ability.addTarget(new TargetPermanent(new FilterBlockingCreature()));
         this.addAbility(ability, new BlockedByOnlyOneCreatureThisCombatWatcher());
     }

Mage.Sets/src/mage/cards/b/BarbarianRing.java

@@ -5,7 +5,7 @@ import mage.abilities.condition.common.ThresholdCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageControllerEffect;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.mana.RedManaAbility;
@@ -31,7 +31,7 @@ public final class BarbarianRing extends CardImpl {
         this.addAbility(redManaAbility);
 
         // Threshold - {R}, {T}, Sacrifice Barbarian Ring: Barbarian Ring deals 2 damage to any target. Activate this ability only if seven or more cards are in your graveyard.
-        Ability thresholdAbility = new ConditionalActivatedAbility(
+        Ability thresholdAbility = new ActivateIfConditionActivatedAbility(
                 new DamageTargetEffect(2, "it"),
                 new ManaCostsImpl<>("{R}"), ThresholdCondition.instance
         );

Mage.Sets/src/mage/cards/b/BilboBirthdayCelebrant.java

@@ -7,7 +7,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.costs.common.ExileSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.replacement.GainPlusOneLifeReplacementEffect;
 import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
 import mage.cards.CardImpl;
@@ -39,7 +39,7 @@ public final class BilboBirthdayCelebrant extends CardImpl {
         this.addAbility(new SimpleStaticAbility(new GainPlusOneLifeReplacementEffect()));
 
         // {2}{W}{B}{G}, {T}, Exile Bilbo, Birthday Celebrant: Search your library for any number of creature cards, put them onto the battlefield, then shuffle. Activate only if you have 111 or more life.
-        Ability ability = new ConditionalActivatedAbility(new SearchLibraryPutInPlayEffect(
+        Ability ability = new ActivateIfConditionActivatedAbility(new SearchLibraryPutInPlayEffect(
                 new TargetCardInLibrary(0, Integer.MAX_VALUE, StaticFilters.FILTER_CARD_CREATURES)
         ), new ManaCostsImpl<>("{2}{W}{B}{G}"), BilboBirthdayCelebrantCondition.instance);
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/b/BlackCarriage.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeTargetCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DontUntapInControllersUntapStepSourceEffect;
 import mage.abilities.effects.common.UntapSourceEffect;
 import mage.abilities.keyword.TrampleAbility;
@@ -34,7 +34,7 @@ public final class BlackCarriage extends CardImpl {
         this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect()));
 
         // Sacrifice a creature: Untap Black Carriage. Activate this ability only during your upkeep.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new UntapSourceEffect(), new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE),
                 IsStepCondition.getMyUpkeep()
         ));

Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.common.CantBlockAbility;
 import mage.abilities.condition.common.RaidCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
 import mage.abilities.hint.common.RaidHint;
 import mage.cards.CardImpl;
@@ -33,7 +33,7 @@ public final class BloodsoakedChampion extends CardImpl {
         this.addAbility(new CantBlockAbility());
 
         // <i>Raid</i> &mdash; {1}{B}: Return Bloodstained Brave from your graveyard to the battlefield. Activate this ability only if you attacked this turn.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(),
                 new ManaCostsImpl<>("{1}{B}"), RaidCondition.instance
         ).setAbilityWord(AbilityWord.RAID).addHint(RaidHint.instance), new PlayerAttackedWatcher());

Mage.Sets/src/mage/cards/b/BoxingRing.java

@@ -6,7 +6,7 @@ import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.cards.CardImpl;
@@ -56,7 +56,7 @@ public final class BoxingRing extends CardImpl {
         this.addAbility(ability);
 
         // {T}: Create a Treasure token. Activate only if you control a creature that fought this turn.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new CreateTokenEffect(new TreasureToken()), new TapSourceCost(), BoxingRingCondition.instance
         ), new BoxingRingWatcher());
     }

Mage.Sets/src/mage/cards/b/BrotherhoodScribe.java

@@ -7,7 +7,7 @@ import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.condition.common.MetalcraftCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.continuous.BoostControlledEffect;
 import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect;
 import mage.abilities.hint.common.MetalcraftHint;
@@ -32,7 +32,7 @@ public final class BrotherhoodScribe extends CardImpl {
         this.toughness = new MageInt(3);
 
         // Metalcraft -- {T}: You get {E}. Activate only if you control three or more artifacts.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new GetEnergyCountersControllerEffect(1),
                 new TapSourceCost(),
                 MetalcraftCondition.instance)

Mage.Sets/src/mage/cards/b/BuzzingWhackADoodle.java

@@ -5,7 +5,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.condition.IntCompareCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.common.GainLifeEffect;
@@ -36,20 +36,20 @@ public final class BuzzingWhackADoodle extends CardImpl {
         this.addAbility(new EntersBattlefieldTriggeredAbility(new BuzzingWhackADoodleEffect(), false));
 
         // *Whack - T: Target player loses 2 life.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new LoseLifeTargetEffect(2), new TapSourceCost(), new WhackCondition()
         );
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
 
         // *Doodle - T: You gain 3 life.
-        Ability ability2 = new ConditionalActivatedAbility(
+        Ability ability2 = new ActivateIfConditionActivatedAbility(
                 new GainLifeEffect(3), new TapSourceCost(), new DoodleCondition()
         );
         this.addAbility(ability2);
 
         // *Buzz - 2, T: Draw a card.
-        Ability ability3 = new ConditionalActivatedAbility(
+        Ability ability3 = new ActivateIfConditionActivatedAbility(
                 new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}"), new BuzzCondition()
         );
         ability3.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/c/CabalInquisitor.java

@@ -6,7 +6,7 @@ import mage.abilities.condition.common.ThresholdCondition;
 import mage.abilities.costs.common.ExileFromGraveCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.discard.DiscardTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -34,7 +34,7 @@ public final class CabalInquisitor extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Threshold - {1}{B}, {T}, Exile two cards from your graveyard: Target player discards a card. Activate this ability only any time you could cast a sorcery, and only if seven or more cards are in your graveyard.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new DiscardTargetEffect(1), new ManaCostsImpl<>("{1}{B}"), ThresholdCondition.instance
         ).setTiming(TimingRule.SORCERY);
         ability.addTarget(new TargetPlayer());

Mage.Sets/src/mage/cards/c/CabalPit.java

@@ -5,7 +5,7 @@ import mage.abilities.condition.common.ThresholdCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageControllerEffect;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
 import mage.abilities.mana.BlackManaAbility;
@@ -32,7 +32,7 @@ public final class CabalPit extends CardImpl {
         this.addAbility(manaAbility);
 
         // Threshold - {B}, {T}, Sacrifice Cabal Pit: Target creature gets -2/-2 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
-        Ability thresholdAbility = new ConditionalActivatedAbility(
+        Ability thresholdAbility = new ActivateIfConditionActivatedAbility(
                 new BoostTargetEffect(-2, -2, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{B}"), ThresholdCondition.instance
         );

Mage.Sets/src/mage/cards/c/CabalTorturer.java

@@ -6,7 +6,7 @@ import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.common.ThresholdCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -37,7 +37,7 @@ public final class CabalTorturer extends CardImpl {
         this.addAbility(ability);
 
         // Threshold - {3}{B}{B}, {tap}: Target creature gets -2/-2 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
-        ability = new ConditionalActivatedAbility(
+        ability = new ActivateIfConditionActivatedAbility(
                 new BoostTargetEffect(-2, -2, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{3}{B}{B}"), ThresholdCondition.instance
         );

Mage.Sets/src/mage/cards/c/CaseOfTheBurningMasks.java

@@ -7,7 +7,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.SolvedSourceCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.ExileTopXMayPlayUntilEffect;
 import mage.abilities.hint.common.CaseSolvedHint;
@@ -45,7 +45,7 @@ public final class CaseOfTheBurningMasks extends CardImpl {
         initialAbility.addTarget(new TargetOpponentsCreaturePermanent());
         // To solve -- Three or more sources you controlled dealt damage this turn.
         // Solved -- Sacrifice this Case: Exile the top three cards of your library. Choose one of them. You may play that card this turn.
-        Ability solvedAbility = new ConditionalActivatedAbility(
+        Ability solvedAbility = new ActivateIfConditionActivatedAbility(
                 new ExileTopXMayPlayUntilEffect(3, true, Duration.EndOfTurn),
                 new SacrificeSourceCost().setText("sacrifice this Case"), SolvedSourceCondition.SOLVED
         );

Mage.Sets/src/mage/cards/c/CaseOfTheFilchedFalcon.java

@@ -11,7 +11,7 @@ import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
 import mage.abilities.condition.common.SolvedSourceCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect;
 import mage.abilities.effects.common.counter.AddCountersTargetEffect;
 import mage.abilities.effects.keyword.InvestigateEffect;
@@ -50,7 +50,7 @@ public final class CaseOfTheFilchedFalcon extends CardImpl {
         Condition toSolveCondition = new PermanentsOnTheBattlefieldCondition(
                 filter, ComparisonType.MORE_THAN, 2, true);
         // Solved -- {2}{U}, Sacrifice this Case: Put four +1/+1 counters on target noncreature artifact. It becomes a 0/0 Bird creature with flying in addition to its other types.
-        Ability solvedAbility = new ConditionalActivatedAbility(
+        Ability solvedAbility = new ActivateIfConditionActivatedAbility(
                 new AddCountersTargetEffect(CounterType.P1P1.createInstance(4)),
                 new ManaCostsImpl<>("{2}{U}"), SolvedSourceCondition.SOLVED);
         solvedAbility.addEffect(new BecomesCreatureTargetEffect(new CaseOfTheFilchedFalconToken(),

Mage.Sets/src/mage/cards/c/CaseOfTheStashedSkeleton.java

@@ -10,7 +10,7 @@ import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
 import mage.abilities.condition.common.SolvedSourceCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
 import mage.abilities.hint.common.CaseSolvedHint;
@@ -52,7 +52,7 @@ public final class CaseOfTheStashedSkeleton extends CardImpl {
         Condition toSolveCondition = new PermanentsOnTheBattlefieldCondition(
                 filter, ComparisonType.EQUAL_TO, 0, true);
         // Solved -- {1}{B}, Sacrifice this Case: Search your library for a card, put it into your hand, then shuffle. Activate only as a sorcery.
-        Ability solvedAbility = new ConditionalActivatedAbility(
+        Ability solvedAbility = new ActivateIfConditionActivatedAbility(
                 new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false)
                         .setText("Search your library for a card, put it into your hand, then shuffle. Activate only as a sorcery."),
                 new ManaCostsImpl<>("{1}{B}"),

Mage.Sets/src/mage/cards/c/CaseOfTheUneatenFeast.java

@@ -9,7 +9,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.SolvedSourceCondition;
 import mage.abilities.condition.common.YouGainedLifeCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.ContinuousEffectImpl;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.hint.common.CaseSolvedHint;
@@ -47,7 +47,7 @@ public final class CaseOfTheUneatenFeast extends CardImpl {
                 new GainLifeEffect(1), StaticFilters.FILTER_PERMANENT_CREATURE);
         // To solve -- You've gained 5 or more life this turn.
         // Solved -- Sacrifice this Case: Creature cards in your graveyard gain "You may cast this card from your graveyard" until end of turn.
-        Ability solvedAbility = new ConditionalActivatedAbility(
+        Ability solvedAbility = new ActivateIfConditionActivatedAbility(
                 new CaseOfTheUneatenFeastEffect(),
                 new SacrificeSourceCost().setText("sacrifice this Case"),
                 SolvedSourceCondition.SOLVED);

Mage.Sets/src/mage/cards/c/CavernousMaw.java

@@ -3,7 +3,7 @@ package mage.cards.c;
 import mage.abilities.Ability;
 import mage.abilities.condition.IntCompareCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.dynamicvalue.AdditiveDynamicValue;
 import mage.abilities.dynamicvalue.DynamicValue;
 import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount;
@@ -41,7 +41,7 @@ public final class CavernousMaw extends CardImpl {
         this.addAbility(new ColorlessManaAbility());
 
         // {2}: Cavernous Maw becomes a 3/3 Elemental creature until end of turn. It's still a Cave land. Activate only if the number of other Caves you control plus the number of Cave cards in your graveyard is three or greater.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new BecomesCreatureSourceEffect(
                         new CreatureToken(3, 3, "3/3 Elemental creature")
                                 .withSubType(SubType.ELEMENTAL),

Mage.Sets/src/mage/cards/c/CentaurGarden.java

@@ -5,7 +5,7 @@ import mage.abilities.condition.common.ThresholdCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageControllerEffect;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
 import mage.abilities.mana.GreenManaAbility;
@@ -32,7 +32,7 @@ public final class CentaurGarden extends CardImpl {
         this.addAbility(manaAbility);
 
         // Threshold - {G}, {tap}, Sacrifice Centaur Garden: Target creature gets +3/+3 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
-        Ability thresholdAbility = new ConditionalActivatedAbility(
+        Ability thresholdAbility = new ActivateIfConditionActivatedAbility(
                 new BoostTargetEffect(3, 3, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{G}"), ThresholdCondition.instance
         );

Mage.Sets/src/mage/cards/c/CephalidColiseum.java

@@ -5,7 +5,7 @@ import mage.abilities.condition.common.ThresholdCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageControllerEffect;
 import mage.abilities.effects.common.DrawDiscardTargetEffect;
 import mage.abilities.mana.BlueManaAbility;
@@ -31,7 +31,7 @@ public final class CephalidColiseum extends CardImpl {
         this.addAbility(manaAbility);
 
         // Threshold - {U}, {tap}, Sacrifice Cephalid Coliseum: Target player draws three cards, then discards three cards. Activate this ability only if seven or more cards are in your graveyard.
-        Ability thresholdAbility = new ConditionalActivatedAbility(
+        Ability thresholdAbility = new ActivateIfConditionActivatedAbility(
                 new DrawDiscardTargetEffect(3, 3),
                 new ManaCostsImpl<>("{U}"), ThresholdCondition.instance
         );

Mage.Sets/src/mage/cards/c/Chainflinger.java

@@ -6,7 +6,7 @@ import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.common.ThresholdCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -36,7 +36,7 @@ public final class Chainflinger extends CardImpl {
         this.addAbility(ability);
 
         // Threshold - {2}{R}, {tap}: Chainflinger deals 2 damage to any target. Activate this ability only if seven or more cards are in your graveyard.
-        Ability thresholdAbility = new ConditionalActivatedAbility(
+        Ability thresholdAbility = new ActivateIfConditionActivatedAbility(
                 new DamageTargetEffect(2), new ManaCostsImpl<>("{2}{R}"), ThresholdCondition.instance
         );
         thresholdAbility.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/c/CinderCrawler.java

@@ -3,7 +3,7 @@ package mage.cards.c;
 import mage.MageInt;
 import mage.abilities.condition.common.SourceBlockedCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -26,7 +26,7 @@ public final class CinderCrawler extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {R}: Cinder Crawler gets +1/+0 until end of turn. Activate this ability only if Cinder Crawler is blocked.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new BoostSourceEffect(1, 0, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{R}"), SourceBlockedCondition.instance
         ));

Mage.Sets/src/mage/cards/c/ClockworkAvian.java

@@ -8,7 +8,7 @@ import mage.abilities.condition.common.AttackedOrBlockedThisCombatSourceConditio
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.effects.common.counter.RemoveCounterSourceEffect;
@@ -53,7 +53,7 @@ public final class ClockworkAvian extends CardImpl {
         ).withInterveningIf(AttackedOrBlockedThisCombatSourceCondition.instance), new AttackedOrBlockedThisCombatWatcher());
 
         // {X}, {tap}: Put up to X +1/+0 counters on Clockwork Avian. This ability can't cause the total number of +1/+0 counters on Clockwork Avian to be greater than four. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new ClockworkAvianEffect(), new ManaCostsImpl<>("{X}"), IsStepCondition.getMyUpkeep()
         );
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/c/ClockworkBeast.java

@@ -9,7 +9,7 @@ import mage.abilities.condition.common.AttackedOrBlockedThisCombatSourceConditio
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.effects.common.counter.RemoveCounterSourceEffect;
@@ -50,7 +50,7 @@ public final class ClockworkBeast extends CardImpl {
         ).withInterveningIf(AttackedOrBlockedThisCombatSourceCondition.instance), new AttackedOrBlockedThisCombatWatcher());
 
         // {X}, {tap}: Put up to X +1/+0 counters on Clockwork Beast. This ability can't cause the total number of +1/+0 counters on Clockwork Beast to be greater than seven. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new ClockworkBeastEffect(), new ManaCostsImpl<>("{X}"), IsStepCondition.getMyUpkeep()
         );
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/c/ClockworkSteed.java

@@ -9,7 +9,7 @@ import mage.abilities.condition.common.AttackedOrBlockedThisCombatSourceConditio
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@@ -59,7 +59,7 @@ public final class ClockworkSteed extends CardImpl {
         ).withInterveningIf(AttackedOrBlockedThisCombatSourceCondition.instance), new AttackedOrBlockedThisCombatWatcher());
 
         // {X}, {tap}: Put up to X +1/+0 counters on Clockwork Steed. This ability can't cause the total number of +1/+0 counters on Clockwork Steed to be greater than four. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new ClockworkSteedEffect(), new ManaCostsImpl<>("{X}"), IsStepCondition.getMyUpkeep()
         );
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/c/ClockworkSwarm.java

@@ -9,7 +9,7 @@ import mage.abilities.condition.common.AttackedOrBlockedThisCombatSourceConditio
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@@ -63,7 +63,7 @@ public final class ClockworkSwarm extends CardImpl {
         ).withInterveningIf(AttackedOrBlockedThisCombatSourceCondition.instance), new AttackedOrBlockedThisCombatWatcher());
 
         // {X}, {tap}: Put up to X +1/+0 counters on Clockwork Swarm. This ability can't cause the total number of +1/+0 counters on Clockwork Swarm to be greater than four. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new ClockworkSwarmEffect(), new ManaCostsImpl<>("{X}"), IsStepCondition.getMyUpkeep()
         );
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/c/ColossusOfSardia.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DontUntapInControllersUntapStepSourceEffect;
 import mage.abilities.effects.common.UntapSourceEffect;
 import mage.abilities.keyword.TrampleAbility;
@@ -34,7 +34,7 @@ public final class ColossusOfSardia extends CardImpl {
         this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect()));
 
         // {9}: Untap Colossus of Sardia. Activate this ability only during your upkeep.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new UntapSourceEffect(), new GenericManaCost(9), IsStepCondition.getMyUpkeep()
         ));
     }

Mage.Sets/src/mage/cards/c/CropSigil.java

@@ -4,7 +4,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.common.DeliriumCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.dynamicvalue.common.CardTypesInGraveyardCount;
 import mage.abilities.effects.common.MillCardsControllerEffect;
 import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect;
@@ -32,7 +32,7 @@ public final class CropSigil extends CardImpl {
 
         // <i>Delirium</i> &mdash; {2}{G}, Sacrifice Crop Sigil: Return up to one target creature card and up to one target land card from your graveyard to your hand.
         // Activate this ability only if there are four or more card types among cards in your graveyard.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new ReturnFromGraveyardToHandTargetEffect().setTargetPointer(new EachTargetPointer()),
                 new ManaCostsImpl<>("{2}{G}"), DeliriumCondition.instance
         );

Mage.Sets/src/mage/cards/c/Cryptex.java

@@ -4,7 +4,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.common.SourceHasCounterCondition;
 import mage.abilities.costs.common.CollectEvidenceCost;
 import mage.abilities.costs.common.SacrificeSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.effects.keyword.SurveilEffect;
@@ -31,7 +31,7 @@ public final class Cryptex extends CardImpl {
         this.addAbility(ability);
 
         // Sacrifice Cryptex: Surveil 3, then draw three cards. Activate only if Cryptex has five or more unlock counters on it.
-        Ability sacAbility = new ConditionalActivatedAbility(new SurveilEffect(3, false), new SacrificeSourceCost(),
+        Ability sacAbility = new ActivateIfConditionActivatedAbility(new SurveilEffect(3, false), new SacrificeSourceCost(),
                 new SourceHasCounterCondition(CounterType.UNLOCK, 5));
         sacAbility.addEffect(new DrawCardSourceControllerEffect(3).concatBy(", then"));
         this.addAbility(sacAbility);

Mage.Sets/src/mage/cards/c/CultConscript.java

@@ -7,7 +7,7 @@ import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
 import mage.constants.SubType;
 import mage.cards.CardImpl;
@@ -39,7 +39,7 @@ public final class CultConscript extends CardImpl {
         this.addAbility(new EntersBattlefieldTappedAbility());
 
         // {1}{B}: Return Cult Conscript from your graveyard to the battlefield. Activate only if a non-Skeleton creature died under your control this turn.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 Zone.GRAVEYARD,
                 new ReturnSourceFromGraveyardToBattlefieldEffect(false, false),
                 new ManaCostsImpl<>("{1}{B}"),

Mage.Sets/src/mage/cards/c/CyclopeanTomb.java

@@ -8,7 +8,7 @@ import mage.abilities.common.delayed.AtTheBeginOfYourNextUpkeepDelayedTriggeredA
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.continuous.BecomesBasicLandTargetEffect;
@@ -47,7 +47,7 @@ public final class CyclopeanTomb extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
 
         // {2}, {tap}: Put a mire counter on target non-Swamp land. That land is a Swamp for as long as it has a mire counter on it. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new AddCountersTargetEffect(CounterType.MIRE.createInstance()),
                 new GenericManaCost(2), IsStepCondition.getMyUpkeep()
         );

Mage.Sets/src/mage/cards/d/Desert.java

@@ -4,7 +4,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
@@ -39,7 +39,7 @@ public final class Desert extends CardImpl {
         this.addAbility(new ColorlessManaAbility());
 
         // {tap}: Desert deals 1 damage to target attacking creature. Activate this ability only during the end of combat step.
-        Ability ability = new ConditionalActivatedAbility(new DamageTargetEffect(1), new TapSourceCost(), condition);
+        Ability ability = new ActivateIfConditionActivatedAbility(new DamageTargetEffect(1), new TapSourceCost(), condition);
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }

Mage.Sets/src/mage/cards/d/DetectivesSatchel.java

@@ -3,7 +3,7 @@ package mage.cards.d;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.condition.common.SacrificedArtifactThisTurnCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.keyword.InvestigateEffect;
 import mage.cards.CardImpl;
@@ -26,7 +26,7 @@ public final class DetectivesSatchel extends CardImpl {
         this.addAbility(new EntersBattlefieldTriggeredAbility(new InvestigateEffect(2)));
 
         // {T}: Create a 1/1 colorless Thopter artifact creature token with flying. Activate only if you've sacrificed an artifact this turn.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new CreateTokenEffect(new ThopterColorlessToken()), new TapSourceCost(),
                 SacrificedArtifactThisTurnCondition.instance
         ).addHint(SacrificedArtifactThisTurnCondition.getHint()), new PermanentsSacrificedWatcher());

Mage.Sets/src/mage/cards/d/DiamondCity.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.dynamicvalue.DynamicValue;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@@ -44,7 +44,7 @@ public final class DiamondCity extends CardImpl {
         this.addAbility(new ColorlessManaAbility());
 
         // {T}: Move a shield counter from Diamond City onto target creature. Activate only if two or more creatures entered the battlefield under your control this turn.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new MoveCountersFromSourceToTargetEffect(CounterType.SHIELD),
                 new TapSourceCost(), DiamondCityCondition.instance
         );

Mage.Sets/src/mage/cards/d/DreadWanderer.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.condition.common.HeckbentCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -33,7 +33,7 @@ public final class DreadWanderer extends CardImpl {
 
         // {2}{B}: Return Dread Wanderer from your graveyard to the battlefield.
         // Activate this ability only any time you could cast a sorcery and only if you have one or fewer cards in hand.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(),
                 new ManaCostsImpl<>("{2}{B}"), HeckbentCondition.instance
         ).setTiming(TimingRule.SORCERY));

Mage.Sets/src/mage/cards/d/DwarvenArmory.java

@@ -6,7 +6,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeTargetCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.counter.AddCountersTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -29,7 +29,7 @@ public final class DwarvenArmory extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}");
 
         // {2}, Sacrifice a land: Put a +2/+2 counter on target creature. Activate this ability only during any upkeep step.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new AddCountersTargetEffect(CounterType.P2P2.createInstance()),
                 new ManaCostsImpl<>("{2}"), condition
         );

Mage.Sets/src/mage/cards/d/DwarvenWeaponsmith.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeTargetCost;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.counter.AddCountersTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -30,7 +30,7 @@ public final class DwarvenWeaponsmith extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {tap}, Sacrifice an artifact: Put a +1/+1 counter on target creature. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new AddCountersTargetEffect(CounterType.P1P1.createInstance()),
                 new TapSourceCost(), IsStepCondition.getMyUpkeep()
         );

Mage.Sets/src/mage/cards/e/EdificeOfAuthority.java

@@ -7,7 +7,7 @@ import mage.abilities.condition.common.SourceHasCounterCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.RestrictionEffect;
 import mage.abilities.effects.common.combat.CantAttackTargetEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@@ -40,7 +40,7 @@ public final class EdificeOfAuthority extends CardImpl {
         this.addAbility(ability);
 
         // {1}, {T}: Until your next turn, target creature can't attack or block and its activated abilities can't be activated. Activate this ability only if there are three or more brick counter on Edifice of Authority.
-        Ability ability2 = new ConditionalActivatedAbility(new EdificeOfAuthorityEffect(), new GenericManaCost(1), condition);
+        Ability ability2 = new ActivateIfConditionActivatedAbility(new EdificeOfAuthorityEffect(), new GenericManaCost(1), condition);
         ability2.addCost(new TapSourceCost());
         ability2.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability2);

Mage.Sets/src/mage/cards/e/EternalDragon.java

@@ -3,7 +3,7 @@ package mage.cards.e;
 import mage.MageInt;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.PlainscyclingAbility;
@@ -32,7 +32,7 @@ public final class EternalDragon extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // {3}{W}{W}: Return Eternal Dragon from your graveyard to your hand. Activate this ability only during your upkeep.        
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(),
                 new ManaCostsImpl<>("{3}{W}{W}"), IsStepCondition.getMyUpkeep()
         ));

Mage.Sets/src/mage/cards/e/EverythingamajigB.java

@@ -6,7 +6,7 @@ import mage.abilities.condition.common.HellbentCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect;
@@ -41,7 +41,7 @@ public final class EverythingamajigB extends CardImpl {
 
         // Fool's Tome
         // 2, T: Draw a card. Activate this ability only if you have no cards in hand.
-        Ability ability1 = new ConditionalActivatedAbility(
+        Ability ability1 = new ActivateIfConditionActivatedAbility(
                 new DrawCardSourceControllerEffect(1), new GenericManaCost(2), HellbentCondition.instance
         );
         ability1.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/f/FiremaneAngel.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
 import mage.abilities.keyword.FirstStrikeAbility;
@@ -45,7 +45,7 @@ public final class FiremaneAngel extends CardImpl {
         ).withInterveningIf(FiremaneAngelCondition.instance));
 
         // {6}{R}{R}{W}{W}: Return Firemane Angel from your graveyard to the battlefield. Activate this ability only during your upkeep.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(false, false),
                 new ManaCostsImpl<>("{6}{R}{R}{W}{W}"), IsStepCondition.getMyUpkeep()
         ));

Mage.Sets/src/mage/cards/f/FleshlessGladiator.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.condition.common.CorruptedCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.LoseLifeSourceControllerEffect;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
 import mage.cards.CardImpl;
@@ -30,7 +30,7 @@ public final class FleshlessGladiator extends CardImpl {
         this.toughness = new MageInt(2);
 
         // Corrupted -- {2}{B}: Return Fleshless Gladiator from your graveyard to the battlefield tapped. You lose 1 life. Activate only if an opponent has three or more poison counters.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true, false),
                 new ManaCostsImpl<>("{2}{B}"), CorruptedCondition.instance
         );

Mage.Sets/src/mage/cards/f/FoolsTome.java

@@ -4,7 +4,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.common.HellbentCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -21,7 +21,7 @@ public final class FoolsTome extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
 
         // {2}, {tap}: Draw a card. Activate this ability only if you have no cards in hand.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new DrawCardSourceControllerEffect(1), new GenericManaCost(2), HellbentCondition.instance
         );
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/f/FungusElemental.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.common.SourceEnteredThisTurnCondition;
 import mage.abilities.costs.common.SacrificeTargetCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -32,7 +32,7 @@ public final class FungusElemental extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {G}, Sacrifice a Forest: Put a +2/+2 counter on Fungus Elemental. Activate this ability only if Fungus Elemental entered the battlefield this turn.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new AddCountersSourceEffect(CounterType.P2P2.createInstance()),
                 new ManaCostsImpl<>("{G}"), SourceEnteredThisTurnCondition.DID
         );

Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java

@@ -7,7 +7,7 @@ import mage.abilities.condition.common.CardsInControllerGraveyardCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.DrawDiscardControllerEffect;
 import mage.abilities.effects.common.GainLifeEffect;
@@ -48,7 +48,7 @@ public final class GateToTheAfterlife extends CardImpl {
         this.addAbility(ability);
 
         // {2}, {T}, Sacrifice Gate to the Afterlife: Search your graveyard, hand, and/or library for a card named God-Pharaoh's Gift and put it onto the battlefield. If you seearch your library this way, shuffle it. Activate this ability only if there are six or more creature cards in your graveyard.
-        ability = new ConditionalActivatedAbility(
+        ability = new ActivateIfConditionActivatedAbility(
                 new GateToTheAfterlifeEffect(), new GenericManaCost(2), condition
         );
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/g/GeneralJarkeld.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -37,7 +37,7 @@ public final class GeneralJarkeld extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {T}: Switch the blocking creatures of two target attacking creatures. Activate this ability only during the declare blockers step.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new GeneralJarkeldSwitchBlockersEffect(), new TapSourceCost(), condition
         );
         ability.addTarget(new TargetAttackingCreature(2));

Mage.Sets/src/mage/cards/g/GlintHornBuccaneer.java

@@ -6,7 +6,7 @@ import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.condition.common.SourceAttackingCondition;
 import mage.abilities.costs.common.DiscardCardCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamagePlayersEffect;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.keyword.HasteAbility;
@@ -41,7 +41,7 @@ public final class GlintHornBuccaneer extends CardImpl {
         this.addAbility(new GlintHornBuccaneerTriggeredAbility());
 
         // {1}{R}, Discard a card: Draw a card. Activate this ability only if Glint-Horn Buccaneer is attacking.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{1}{R}"), SourceAttackingCondition.instance
         );
         ability.addCost(new DiscardCardCost());

Mage.Sets/src/mage/cards/g/GoblinBirdGrabber.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
@@ -40,7 +40,7 @@ public final class GoblinBirdGrabber extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {R}: Goblin Bird-Grabber gains flying until end of turn. Activate this ability only if you control a creature with flying.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn),
                 new ManaCostsImpl<>("{R}"), condition
         ));

Mage.Sets/src/mage/cards/g/GoroGoroDiscipleOfRyusei.java

@@ -5,7 +5,7 @@ import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
 import mage.abilities.hint.ConditionHint;
@@ -58,7 +58,7 @@ public final class GoroGoroDiscipleOfRyusei extends CardImpl {
         ), new ManaCostsImpl<>("{R}")));
 
         // {3}{R}{R}: Create a 5/5 red Dragon Spirit creature token with flying. Activate only if you control an attacking modified creature.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new CreateTokenEffect(new DragonSpiritToken()),
                 new ManaCostsImpl<>("{3}{R}{R}"), condition
         ).addHint(hint));

Mage.Sets/src/mage/cards/g/GrimReminder.java

@@ -4,7 +4,7 @@ import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect;
 import mage.cards.*;
@@ -34,7 +34,7 @@ public final class GrimReminder extends CardImpl {
         this.getSpellAbility().addWatcher(new GrimReminderWatcher());
 
         // {B}{B}: Return Grim Reminder from your graveyard to your hand. Activate this ability only during your upkeep.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(),
                 new ManaCostsImpl<>("{B}{B}"), IsStepCondition.getMyUpkeep()
         ));

Mage.Sets/src/mage/cards/g/Gutterbones.java

@@ -7,7 +7,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.MyTurnCondition;
 import mage.abilities.condition.common.OpponentsLostLifeCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect;
 import mage.abilities.hint.common.OpponentsLostLifeHint;
 import mage.cards.CardImpl;
@@ -40,7 +40,7 @@ public final class Gutterbones extends CardImpl {
         this.addAbility(new EntersBattlefieldTappedAbility());
 
         // {1}{B}: Return Gutterbones from your graveyard to your hand. Activate this ability only during your turn and only if an opponent lost life this turn.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(),
                 new ManaCostsImpl<>("{1}{B}"), condition
         ).addHint(OpponentsLostLifeHint.instance));

Mage.Sets/src/mage/cards/h/HakimLoreweaver.java

@@ -6,7 +6,7 @@ import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.DestroyAllEffect;
 import mage.abilities.keyword.FlyingAbility;
@@ -53,7 +53,7 @@ public final class HakimLoreweaver extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // {U}{U}: Return target Aura card from your graveyard to the battlefield attached to Hakim, Loreweaver. Activate this ability only during your upkeep and only if Hakim isn't enchanted.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new HakimLoreweaverEffect(), new ManaCostsImpl<>("{U}{U}"), HakimLoreweaverCondition.instance
         );
         ability.addTarget(new TargetCardInYourGraveyard(filter));

Mage.Sets/src/mage/cards/h/HallOfOracles.java

@@ -5,7 +5,7 @@ import mage.abilities.ActivatedAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.counter.AddCountersTargetEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.ColorlessManaAbility;
@@ -38,7 +38,7 @@ public final class HallOfOracles extends CardImpl {
         this.addAbility(ability);
 
         // {T}: Put a +1/+1 counter on target creature. Activate only as a sorcery and only if you've cast an instant or sorcery spell this turn.
-        ability = new ConditionalActivatedAbility(
+        ability = new ActivateIfConditionActivatedAbility(
                 new AddCountersTargetEffect(CounterType.P1P1.createInstance()),
                 new TapSourceCost(), HallOfOraclesCondition.instance
         ).setTiming(TimingRule.SORCERY);

Mage.Sets/src/mage/cards/h/HallowedHealer.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.common.ThresholdCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.PreventDamageToTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -37,7 +37,7 @@ public final class HallowedHealer extends CardImpl {
         this.addAbility(ability);
 
         // Threshold - {tap}: Prevent the next 4 damage that would be dealt to any target this turn. Activate this ability only if seven or more cards are in your graveyard.
-        Ability thresholdAbility = new ConditionalActivatedAbility(
+        Ability thresholdAbility = new ActivateIfConditionActivatedAbility(
                 new PreventDamageToTargetEffect(Duration.EndOfTurn, 4),
                 new TapSourceCost(), ThresholdCondition.instance
         );

Mage.Sets/src/mage/cards/h/HammerOfBogardan.java

@@ -2,7 +2,7 @@ package mage.cards.h;
 
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect;
 import mage.cards.CardImpl;
@@ -26,7 +26,7 @@ public final class HammerOfBogardan extends CardImpl {
         this.getSpellAbility().addTarget(new TargetAnyTarget());
 
         // {2}{R}{R}{R}: Return Hammer of Bogardan from your graveyard to your hand. Activate this ability only during your upkeep.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(),
                 new ManaCostsImpl<>("{2}{R}{R}{R}"), IsStepCondition.getMyUpkeep()
         ));

Mage.Sets/src/mage/cards/h/HauntOfTheDeadMarshes.java

@@ -5,7 +5,7 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
 import mage.abilities.effects.keyword.ScryEffect;
 import mage.abilities.hint.ConditionHint;
@@ -48,7 +48,7 @@ public final class HauntOfTheDeadMarshes extends CardImpl {
         this.addAbility(new EntersBattlefieldTriggeredAbility(new ScryEffect(1, false)));
 
         // {2}{B}: Return Haunt of the Dead Marshes from your graveyard to the battlefield tapped. Activate only if you control a legendary creature.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true, false),
                 new ManaCostsImpl<>("{2}{B}"), condition
         ).addHint(hint));

Mage.Sets/src/mage/cards/h/HauntedPlateMail.java

@@ -5,7 +5,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
 import mage.abilities.effects.common.continuous.BoostEquippedEffect;
 import mage.abilities.keyword.EquipAbility;
@@ -34,7 +34,7 @@ public final class HauntedPlateMail extends CardImpl {
         this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(4, 4)));
 
         // {0}: Until end of turn, Haunted Plate Mail becomes a 4/4 Spirit artifact creature that's no longer an Equipment. Activate this ability only if you control no creatures.
-        this.addAbility(new ConditionalActivatedAbility(new BecomesCreatureSourceEffect(
+        this.addAbility(new ActivateIfConditionActivatedAbility(new BecomesCreatureSourceEffect(
                 new CreatureToken(
                         4, 4, "4/4 Spirit artifact " +
                         "creature that's no longer an Equipment", SubType.SPIRIT

Mage.Sets/src/mage/cards/h/HeartWolf.java

@@ -6,7 +6,7 @@ import mage.abilities.DelayedTriggeredAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.IsPhaseCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
 import mage.abilities.effects.common.SacrificeSourceEffect;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
@@ -47,7 +47,7 @@ public final class HeartWolf extends CardImpl {
         this.addAbility(FirstStrikeAbility.getInstance());
 
         // {tap}: Target Dwarf creature gets +2/+0 and gains first strike until end of turn. When that creature leaves the battlefield this turn, sacrifice Heart Wolf. Activate this ability only during combat.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new BoostTargetEffect(2, 0, Duration.EndOfTurn)
                         .setText("Target Dwarf creature gets +2/+0"),
                 new TapSourceCost(), condition

Mage.Sets/src/mage/cards/h/HellsCaretaker.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeTargetCost;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -28,7 +28,7 @@ public final class HellsCaretaker extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {tap}, Sacrifice a creature: Return target creature card from your graveyard to the battlefield. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new ReturnFromGraveyardToBattlefieldTargetEffect(),
                 new TapSourceCost(), IsStepCondition.getMyUpkeep()
         );

Mage.Sets/src/mage/cards/i/IcatianMoneychanger.java

@@ -5,7 +5,7 @@ import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.dynamicvalue.common.CountersSourceCount;
 import mage.abilities.effects.common.DamageControllerEffect;
 import mage.abilities.effects.common.GainLifeEffect;
@@ -43,7 +43,7 @@ public final class IcatianMoneychanger extends CardImpl {
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.CREDIT.createInstance())));
 
         // Sacrifice Icatian Moneychanger: You gain 1 life for each credit counter on Icatian Moneychanger. Activate this ability only during your upkeep.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new GainLifeEffect(new CountersSourceCount(CounterType.CREDIT)),
                 new SacrificeSourceCost(), IsStepCondition.getMyUpkeep()
         ));

Mage.Sets/src/mage/cards/i/IceCauldron.java

@@ -10,7 +10,7 @@ import mage.abilities.condition.common.SourceHasCounterCondition;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.AsThoughEffect;
 import mage.abilities.effects.AsThoughEffectImpl;
 import mage.abilities.effects.OneShotEffect;
@@ -44,7 +44,7 @@ public final class IceCauldron extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
 
         // {X}, {T}: Put a charge counter on Ice Cauldron and exile a nonland card from your hand. You may cast that card for as long as it remains exiled. Note the type and amount of mana spent to pay this activation cost. Activate this ability only if there are no charge counters on Ice Cauldron.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new IceCauldronExileEffect(), new ManaCostsImpl<>("{X}"), condition
         );
         ability.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true));

Mage.Sets/src/mage/cards/i/InfectedVermin.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.common.ThresholdCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageEverythingEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -30,7 +30,7 @@ public final class InfectedVermin extends CardImpl {
         this.addAbility(new SimpleActivatedAbility(new DamageEverythingEffect(1), new ManaCostsImpl<>("{2}{B}")));
 
         // Threshold - {3}{B}: Infected Vermin deals 3 damage to each creature and each player. Activate this ability only if seven or more cards are in your graveyard.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new DamageEverythingEffect(3), new ManaCostsImpl<>("{3}{B}"), ThresholdCondition.instance
         ).setAbilityWord(AbilityWord.THRESHOLD));
     }

Mage.Sets/src/mage/cards/i/IsolatedWatchtower.java

@@ -4,7 +4,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.Card;
@@ -32,7 +32,7 @@ public final class IsolatedWatchtower extends CardImpl {
         this.addAbility(new ColorlessManaAbility());
 
         // {2}, {T}: Scry 1, then you may reveal the top card of your library. If a basic land card is revealed this way, put it onto the battlefield tapped. Activate this ability only if an opponent controls at least two more lands than you.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new IsolatedWatchtowerEffect(), new GenericManaCost(2), IsolatedWatchtowerCondition.instance
         );
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/j/JadeStatue.java

@@ -3,7 +3,7 @@ package mage.cards.j;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.IsPhaseCondition;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -26,7 +26,7 @@ public final class JadeStatue extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
 
         // {2}: Jade Statue becomes a 3/6 Golem artifact creature until end of combat. Activate this ability only during combat.
-        this.addAbility(new ConditionalActivatedAbility(new BecomesCreatureSourceEffect(
+        this.addAbility(new ActivateIfConditionActivatedAbility(new BecomesCreatureSourceEffect(
                 new CreatureToken(3, 6, "3/6 Golem artifact creature", SubType.GOLEM)
                         .withType(CardType.ARTIFACT), CardType.ARTIFACT, Duration.EndOfCombat
         ), new GenericManaCost(2), condition));

Mage.Sets/src/mage/cards/j/JeweledAmulet.java

@@ -2,12 +2,12 @@ package mage.cards.j;
 
 import mage.Mana;
 import mage.abilities.Ability;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.SourceHasCounterCondition;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.effects.mana.ManaEffect;
@@ -37,7 +37,7 @@ public final class JeweledAmulet extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{0}");
 
         // {1}, {tap}: Put a charge counter on Jeweled Amulet. Note the type of mana spent to pay this activation cost. Activate this ability only if there are no charge counters on Jeweled Amulet.
-        ConditionalActivatedAbility ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new AddCountersSourceEffect(CounterType.CHARGE.createInstance(), true), new GenericManaCost(1), condition
         );
         ability.addEffect(new JeweledAmuletAddCounterEffect());

Mage.Sets/src/mage/cards/j/JinGitaxias.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.common.SpellCastControllerTriggeredAbility;
 import mage.abilities.condition.common.CardsInHandCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.common.ExileAndReturnSourceEffect;
 import mage.abilities.keyword.TransformAbility;
@@ -48,7 +48,7 @@ public class JinGitaxias extends CardImpl {
         //{3}{U}: Exile Jin-Gitaxias, then return it to the battlefield transformed under its owner’s control. Activate
         //only as a sorcery and only if you have seven or more cards in hand.
         this.addAbility(new TransformAbility());
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new ExileAndReturnSourceEffect(PutCards.BATTLEFIELD_TRANSFORMED),
                 new ManaCostsImpl<>("{3}{U}"),
                 new CardsInHandCondition(ComparisonType.MORE_THAN, 6)

Mage.Sets/src/mage/cards/k/KeeperOfTheMind.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -36,7 +36,7 @@ public class KeeperOfTheMind extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {U}, {tap}: Choose target opponent who had at least two more cards in hand than you did as you activated this ability. Draw a card.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new DrawCardSourceControllerEffect(1)
                         .setText("choose target opponent who has at least two more cards " +
                                 "in hand than you do as you activate this ability. Draw a card"),

Mage.Sets/src/mage/cards/k/KeldonMegaliths.java

@@ -5,7 +5,7 @@ import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.condition.common.HellbentCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.mana.RedManaAbility;
 import mage.cards.CardImpl;
@@ -31,7 +31,7 @@ public final class KeldonMegaliths extends CardImpl {
         this.addAbility(new RedManaAbility());
 
         // Hellbent - {1}{R}, {tap}: Keldon Megaliths deals 1 damage to any target. Activate this ability only if you have no cards in hand.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new DamageTargetEffect(1), new ManaCostsImpl<>("{1}{R}"), HellbentCondition.instance
         );
         ability.setAbilityWord(AbilityWord.HELLBENT);

Mage.Sets/src/mage/cards/k/KindlyStranger.java

@@ -3,7 +3,7 @@ package mage.cards.k;
 import mage.MageInt;
 import mage.abilities.condition.common.DeliriumCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.dynamicvalue.common.CardTypesInGraveyardCount;
 import mage.abilities.effects.common.TransformSourceEffect;
 import mage.abilities.keyword.TransformAbility;
@@ -30,7 +30,7 @@ public final class KindlyStranger extends CardImpl {
 
         // <i>Delirium</i> &mdash; {2}{B}: Transform Kindly Stranger. Activate this ability only if there are four or more card types among cards in your graveyard.
         this.addAbility(new TransformAbility());
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new TransformSourceEffect(), new ManaCostsImpl<>("{2}{B}"), DeliriumCondition.instance
         ).setAbilityWord(AbilityWord.DELIRIUM).addHint(CardTypesInGraveyardCount.YOU.getHint()));
     }

Mage.Sets/src/mage/cards/k/KitsuneBonesetter.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.condition.common.MoreCardsInHandThanOpponentsCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.PreventDamageToTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -29,7 +29,7 @@ public final class KitsuneBonesetter extends CardImpl {
 
 
         // {tap}: Prevent the next 3 damage that would be dealt to target creature this turn. Activate this ability only if you have more cards in hand than each opponent.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new PreventDamageToTargetEffect(Duration.EndOfTurn, 3), new TapSourceCost(),
                 MoreCardsInHandThanOpponentsCondition.instance
         );

Mage.Sets/src/mage/cards/k/KjeldoranEliteGuard.java

@@ -6,7 +6,7 @@ import mage.abilities.DelayedTriggeredAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.IsPhaseCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.SacrificeSourceEffect;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
@@ -37,7 +37,7 @@ public final class KjeldoranEliteGuard extends CardImpl {
         // Target creature gets +2/+2 until end of turn.
         // When that creature leaves the battlefield this turn, sacrifice Kjeldoran Elite Guard.
         // Activate only during combat.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new KjeldoranEliteGuardEffect(), new TapSourceCost(), condition
         );
         ability.addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/cards/k/KjeldoranGuard.java

@@ -10,7 +10,7 @@ import mage.abilities.condition.InvertCondition;
 import mage.abilities.condition.common.DefendingPlayerControlsNoSourceCondition;
 import mage.abilities.condition.common.IsPhaseCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.SacrificeTargetEffect;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
@@ -52,7 +52,7 @@ public final class KjeldoranGuard extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {T}: Target creature gets +1/+1 until end of turn. When that creature leaves the battlefield this turn, sacrifice Kjeldoran Guard. Activate only during combat and only if defending player controls no snow lands.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new KjeldoranGuardEffect(), new TapSourceCost(), condition
         );
         ability.addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/cards/k/KongmingsContraptions.java

@@ -7,7 +7,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.AttackedThisStepCondition;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -38,7 +38,7 @@ public final class KongmingsContraptions extends CardImpl {
         this.toughness = new MageInt(4);
 
         // {T}: Kongming's Contraptions deals 2 damage to target attacking creature. Activate this ability only during the declare attackers step and only if you've been attacked this step.
-        Ability ability = new ConditionalActivatedAbility(new DamageTargetEffect(2), new TapSourceCost(), condition);
+        Ability ability = new ActivateIfConditionActivatedAbility(new DamageTargetEffect(2), new TapSourceCost(), condition);
         ability.addTarget(new TargetAttackingCreature());
         this.addAbility(ability, new PlayerAttackedStepWatcher());
     }

Mage.Sets/src/mage/cards/k/KrosanAvenger.java

@@ -3,7 +3,7 @@ package mage.cards.k;
 import mage.MageInt;
 import mage.abilities.condition.common.ThresholdCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.RegenerateSourceEffect;
 import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
@@ -31,7 +31,7 @@ public final class KrosanAvenger extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
 
         // Threshold - {1}{G}: Regenerate Krosan Avenger. Activate this ability only if seven or more cards are in your graveyard.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{G}"), ThresholdCondition.instance
         ).setAbilityWord(AbilityWord.THRESHOLD));
     }

Mage.Sets/src/mage/cards/k/KrosanRestorer.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.common.ThresholdCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.UntapTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -34,7 +34,7 @@ public final class KrosanRestorer extends CardImpl {
         this.addAbility(ability);
 
         // Threshold - {tap}: Untap up to three target lands. Activate this ability only if seven or more cards are in your graveyard.
-        ability = new ConditionalActivatedAbility(new UntapTargetEffect(), new TapSourceCost(), ThresholdCondition.instance);
+        ability = new ActivateIfConditionActivatedAbility(new UntapTargetEffect(), new TapSourceCost(), ThresholdCondition.instance);
         ability.addTarget(new TargetLandPermanent(0, 3));
         ability.setAbilityWord(AbilityWord.THRESHOLD);
         this.addAbility(ability);

Mage.Sets/src/mage/cards/k/KuldothaPhoenix.java

@@ -7,7 +7,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.condition.common.MetalcraftCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
 import mage.abilities.hint.common.MetalcraftHint;
 import mage.abilities.keyword.FlyingAbility;
@@ -44,7 +44,7 @@ public final class KuldothaPhoenix extends CardImpl {
 
         // <i>Metalcraft</i> &mdash; {4}: Return Kuldotha Phoenix from your graveyard to the battlefield.
         // Activate this ability only during your upkeep and only if you control three or more artifacts.        
-        Ability ability = new ConditionalActivatedAbility(Zone.GRAVEYARD,
+        Ability ability = new ActivateIfConditionActivatedAbility(Zone.GRAVEYARD,
                 new ReturnSourceFromGraveyardToBattlefieldEffect(false, false),
                 new ManaCostsImpl<>("{4}"), condition
         );

Mage.Sets/src/mage/cards/l/LagomosHandOfHatred.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.SacrificeTargetEffect;
 import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
@@ -44,7 +44,7 @@ public final class LagomosHandOfHatred extends CardImpl {
         this.addAbility(new BeginningOfCombatTriggeredAbility(new LagomosHandOfHatredEffect()));
 
         // {T}: Search your library for a card, put it into your hand, then shuffle. Activate only if five or more creatures died this turn.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false),
                 new TapSourceCost(), LagomosHandOfHatredCondition.instance
         ));

Mage.Sets/src/mage/cards/l/LesserWerewolf.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersTargetEffect;
@@ -44,7 +44,7 @@ public final class LesserWerewolf extends CardImpl {
         this.toughness = new MageInt(4);
 
         // {B}: If Lesser Werewolf’s power is 1 or more, it gets -1/-0 until end of turn and put a -0/-1 counter on target creature blocking or blocked by Lesser Werewolf. Activate this ability only during the declare blockers step.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new LesserWerewolfEffect(), new ManaCostsImpl<>("{B}"), condition
         );
         ability.addTarget(new TargetPermanent(filter));

Mage.Sets/src/mage/cards/l/LibraryOfAlexandria.java

@@ -3,7 +3,7 @@ package mage.cards.l;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.CardsInHandCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
@@ -27,7 +27,7 @@ public final class LibraryOfAlexandria extends CardImpl {
         this.addAbility(new ColorlessManaAbility());
 
         // {tap}: Draw a card. Activate this ability only if you have exactly seven cards in hand.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new DrawCardSourceControllerEffect(1), new TapSourceCost(), condition
         ));
     }

Mage.Sets/src/mage/cards/l/LifeChisel.java

@@ -2,7 +2,7 @@ package mage.cards.l;
 
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeTargetCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.dynamicvalue.common.SacrificeCostCreaturesToughness;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.cards.CardImpl;
@@ -21,7 +21,7 @@ public final class LifeChisel extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
 
         // Sacrifice a creature: You gain life equal to the sacrificed creature's toughness. Activate this ability only during your upkeep.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new GainLifeEffect(SacrificeCostCreaturesToughness.instance)
                         .setText("you gain life equal to the sacrificed creature's toughness"),
                 new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE),

Mage.Sets/src/mage/cards/l/LifeMatrix.java

@@ -6,7 +6,7 @@ import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.RegenerateSourceEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
 import mage.abilities.effects.common.counter.AddCountersTargetEffect;
@@ -30,7 +30,7 @@ public final class LifeMatrix extends CardImpl {
         // {4}, {T}: Put a matrix counter on target creature and that creature gains 
         // “Remove a matrix counter from this creature: Regenerate this creature.” 
         // Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new AddCountersTargetEffect(CounterType.MATRIX.createInstance()),
                 new GenericManaCost(4), IsStepCondition.getMyUpkeep()
         );

Mage.Sets/src/mage/cards/l/LlanowarAugur.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
 import mage.abilities.keyword.TrampleAbility;
@@ -32,7 +32,7 @@ public final class LlanowarAugur extends CardImpl {
 
         // Sacrifice Llanowar Augur: Target creature gets +3/+3 and gains trample until end of turn.
         // Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new BoostTargetEffect(3, 3).setText("Target creature gets +3/+3"),
                 new SacrificeSourceCost(), IsStepCondition.getMyUpkeep()
         );

Mage.Sets/src/mage/cards/l/LuxaRiverShrine.java

@@ -6,7 +6,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.SourceHasCounterCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.GainLifeEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.cards.CardImpl;
@@ -33,7 +33,7 @@ public final class LuxaRiverShrine extends CardImpl {
         this.addAbility(ability);
 
         // {T}: You gain 2 life. Activate this ability only if there are three or more brick counters on Luxa River Shrine.
-        this.addAbility(new ConditionalActivatedAbility(new GainLifeEffect(2), new TapSourceCost(), condition));
+        this.addAbility(new ActivateIfConditionActivatedAbility(new GainLifeEffect(2), new TapSourceCost(), condition));
     }
 
     private LuxaRiverShrine(final LuxaRiverShrine card) {

Mage.Sets/src/mage/cards/m/MadblindMountain.java

@@ -7,7 +7,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ShuffleLibrarySourceEffect;
 import mage.abilities.mana.RedManaAbility;
 import mage.cards.CardImpl;
@@ -44,7 +44,7 @@ public final class MadblindMountain extends CardImpl {
         this.addAbility(new EntersBattlefieldTappedAbility());
 
         // {R}, {tap}: Shuffle your library. Activate this ability only if you control two or more red permanents.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new ShuffleLibrarySourceEffect(), new ManaCostsImpl<>("{R}"), condition
         );
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/m/MaddeningImp.java

@@ -9,7 +9,7 @@ import mage.abilities.condition.InvertCondition;
 import mage.abilities.condition.common.OpponentsTurnCondition;
 import mage.abilities.condition.common.TargetAttackedThisTurnCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.combat.AttacksIfAbleAllEffect;
 import mage.abilities.keyword.FlyingAbility;
@@ -49,7 +49,7 @@ public final class MaddeningImp extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // {T}: Non-Wall creatures the active player controls attack this turn if able. At the beginning of the next end step, destroy each of those creatures that didn't attack this turn. Activate this ability only during an opponent's turn and only before combat.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new AttacksIfAbleAllEffect(filter, Duration.EndOfTurn),
                 new TapSourceCost(), MaddeningImpTurnCondition.instance
         );

Mage.Sets/src/mage/cards/m/MagusOfTheLibrary.java

@@ -4,7 +4,7 @@ import mage.MageInt;
 import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.CardsInHandCondition;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
@@ -33,7 +33,7 @@ public final class MagusOfTheLibrary extends CardImpl {
         this.addAbility(new ColorlessManaAbility());
 
         // {tap}: Draw a card. Activate this ability only if you have exactly seven cards in hand.
-        this.addAbility(new ConditionalActivatedAbility(
+        this.addAbility(new ActivateIfConditionActivatedAbility(
                 new DrawCardSourceControllerEffect(1), new TapSourceCost(), condition
         ));
     }

Mage.Sets/src/mage/cards/m/MagusOfTheMirror.java

@@ -5,7 +5,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ExchangeLifeControllerTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -28,7 +28,7 @@ public final class MagusOfTheMirror extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {tap}, Sacrifice Magus of the Mirror: Exchange life totals with target opponent. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new ExchangeLifeControllerTargetEffect(),
                 new TapSourceCost(), IsStepCondition.getMyUpkeep()
         );

Mage.Sets/src/mage/cards/m/Marjhan.java

@@ -8,7 +8,7 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeTargetCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.DontUntapInControllersUntapStepSourceEffect;
 import mage.abilities.effects.common.SacrificeSourceEffect;
@@ -52,7 +52,7 @@ public final class Marjhan extends CardImpl {
         this.addAbility(new SimpleStaticAbility(new DontUntapInControllersUntapStepSourceEffect()));
 
         // {U}{U}, Sacrifice a creature: Untap Marjhan. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new UntapSourceEffect(), new ManaCostsImpl<>("{U}{U}"), IsStepCondition.getMyUpkeep()
         );
         ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE));

Mage.Sets/src/mage/cards/m/MatzalantliTheGreatDoor.java

@@ -5,7 +5,7 @@ import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.IntCompareCondition;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.dynamicvalue.DynamicValue;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DrawDiscardControllerEffect;
@@ -43,7 +43,7 @@ public final class MatzalantliTheGreatDoor extends CardImpl {
 
         // {4}, {T}: Transform Matzalantli, the Great Door. Activate only if there are four or more permanent types among cards in your graveyard.
         this.addAbility(new TransformAbility());
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new TransformSourceEffect(),
                 new GenericManaCost(4),
                 new MatzalantliTheGreatDoorCondition()

Mage.Sets/src/mage/cards/m/MetallurgicSummonings.java

@@ -6,7 +6,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
 import mage.abilities.costs.common.ExileSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -43,7 +43,7 @@ public final class MetallurgicSummonings extends CardImpl {
         ));
 
         // {3}{U}{U}, Exile Metallurgic Summons: Return all instant and sorcery cards from your graveyard to your hand. Activate this ability only if you control six or more artifacts.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new MetallurgicSummoningsReturnEffect(), new ManaCostsImpl<>("{3}{U}{U}"), condition
         );
         ability.addCost(new ExileSourceCost());

Mage.Sets/src/mage/cards/m/MirrorUniverse.java

@@ -4,7 +4,7 @@ import mage.abilities.Ability;
 import mage.abilities.condition.common.IsStepCondition;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.decorator.ConditionalActivatedAbility;
+import mage.abilities.common.ActivateIfConditionActivatedAbility;
 import mage.abilities.effects.common.ExchangeLifeControllerTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -22,7 +22,7 @@ public final class MirrorUniverse extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}");
 
         // {tap}, Sacrifice Mirror Universe: Exchange life totals with target opponent. Activate this ability only during your upkeep.
-        Ability ability = new ConditionalActivatedAbility(
+        Ability ability = new ActivateIfConditionActivatedAbility(
                 new ExchangeLifeControllerTargetEffect(),
                 new TapSourceCost(), IsStepCondition.getMyUpkeep()
         );