diff --git a/Mage.Sets/src/mage/cards/a/AbidingGrace.java b/Mage.Sets/src/mage/cards/a/AbidingGrace.java index 00af3e4dbb9..7f1f4302e55 100644 --- a/Mage.Sets/src/mage/cards/a/AbidingGrace.java +++ b/Mage.Sets/src/mage/cards/a/AbidingGrace.java @@ -4,7 +4,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.cards.CardImpl; @@ -33,7 +33,7 @@ public final class AbidingGrace extends CardImpl { // At the beginning of your end step, choose one — // • You gain 1 life. - Ability ability = new BeginningOfYourEndStepTriggeredAbility(new GainLifeEffect(1), false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new GainLifeEffect(1)); // • Return target creature card with mana value 1 from your graveyard to the battlefield. Mode mode = new Mode(new ReturnFromGraveyardToBattlefieldTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/a/AdherentOfHope.java b/Mage.Sets/src/mage/cards/a/AdherentOfHope.java index e05ffa80a1b..df3e76f6db4 100644 --- a/Mage.Sets/src/mage/cards/a/AdherentOfHope.java +++ b/Mage.Sets/src/mage/cards/a/AdherentOfHope.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; @@ -38,7 +37,7 @@ public final class AdherentOfHope extends CardImpl { // At the beginning of combat on your turn, if you control a Basri planeswalker, put a +1/+1 counter on Adherent of Hope. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfCombatTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false), + new BeginningOfCombatTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance())), new PermanentsOnTheBattlefieldCondition(filter), "At the beginning of combat on your turn, if you control a Basri planeswalker, put a +1/+1 counter on {this}.")); } diff --git a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java index ce32a347848..33ab01435ff 100644 --- a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java +++ b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.*; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; @@ -49,7 +49,7 @@ public final class AdmiralBeckettBrass extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, true))); // At the beginning of your end step, gain control of target nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn. - Ability ability = new BeginningOfEndStepTriggeredAbility(new GainControlTargetEffect(Duration.Custom, true), TargetController.YOU, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new GainControlTargetEffect(Duration.Custom, true)); ability.addTarget(new TargetNonlandPermanent(filter2)); this.addAbility(ability, new DamagedByPiratesWatcher()); } diff --git a/Mage.Sets/src/mage/cards/a/AdmiralBrassUnsinkable.java b/Mage.Sets/src/mage/cards/a/AdmiralBrassUnsinkable.java index d314e7eede2..db84b9fd5d3 100644 --- a/Mage.Sets/src/mage/cards/a/AdmiralBrassUnsinkable.java +++ b/Mage.Sets/src/mage/cards/a/AdmiralBrassUnsinkable.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; @@ -52,8 +51,7 @@ public final class AdmiralBrassUnsinkable extends CardImpl { // It gains haste until end of turn. (If a creature with a finality counter on it would die, exile it instead.) Effect returnFromGraveyardEffect = new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.FINALITY.createInstance()); BeginningOfCombatTriggeredAbility ability = new BeginningOfCombatTriggeredAbility( - returnFromGraveyardEffect, - true + returnFromGraveyardEffect, true ); ability.addEffect(new SetBasePowerToughnessTargetEffect(4, 4, Duration.WhileOnBattlefield).setText("It has base power and toughness 4/4.")); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("It gains haste until end of turn. (If a creature with a finality counter on it would die, exile it instead.)")); diff --git a/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java b/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java index 35303ffb485..a72aa079675 100644 --- a/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java +++ b/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -37,7 +37,7 @@ public final class AdvocateOfTheBeast extends CardImpl { this.toughness = new MageInt(3); // At the beginning of your end step, put a +1/+1 counter on target Beast creature you control. - Ability ability = new BeginningOfEndStepTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), TargetController.YOU, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); Target target = new TargetCreaturePermanent(filter); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AethermagesTouch.java b/Mage.Sets/src/mage/cards/a/AethermagesTouch.java index 90a1e7c67e9..76784a34140 100644 --- a/Mage.Sets/src/mage/cards/a/AethermagesTouch.java +++ b/Mage.Sets/src/mage/cards/a/AethermagesTouch.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; @@ -75,7 +75,7 @@ class AethermagesTouchEffect extends OneShotEffect { // It gains \"At the beginning of your end step, return this creature to its owner's hand.\" Permanent permanent = game.getPermanent(card.getId()); if (permanent != null) { - Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true), TargetController.YOU, null, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new ReturnToHandSourceEffect(true), false, null); ContinuousEffect effect = new GainAbilityTargetEffect(ability, Duration.Custom); effect.setTargetPointer(new FixedTarget(permanent, game)); game.addEffect(effect, source); diff --git a/Mage.Sets/src/mage/cards/a/AethershieldArtificer.java b/Mage.Sets/src/mage/cards/a/AethershieldArtificer.java index c46a9e4fd5a..834f30d8126 100644 --- a/Mage.Sets/src/mage/cards/a/AethershieldArtificer.java +++ b/Mage.Sets/src/mage/cards/a/AethershieldArtificer.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -40,8 +39,7 @@ public final class AethershieldArtificer extends CardImpl { // At the beginning of combat on your turn, target artifact creature you control gets +2/+2 and gains indestructible until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new BoostTargetEffect(2, 2, Duration.EndOfTurn) - .setText("target artifact creature you control gets +2/+2"), - false + .setText("target artifact creature you control gets +2/+2") ); ability.addEffect(new GainAbilityTargetEffect( IndestructibleAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/a/AgentOfTreachery.java b/Mage.Sets/src/mage/cards/a/AgentOfTreachery.java index eaa52c0a900..4931519eaac 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfTreachery.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfTreachery.java @@ -2,7 +2,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -46,8 +46,7 @@ public final class AgentOfTreachery extends CardImpl { // At the beginning of your end step, if you control three or more permanents you don't own, draw three cards. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(3), - TargetController.YOU, false + new DrawCardSourceControllerEffect(3) ), new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 2), "At the beginning of your end step, " + "if you control three or more permanents you don't own, draw three cards." ).addHint(new ValueHint("Permanents you control but don't own", new PermanentsOnBattlefieldCount(filter)))); diff --git a/Mage.Sets/src/mage/cards/a/AgitatorAnt.java b/Mage.Sets/src/mage/cards/a/AgitatorAnt.java index 1604478f548..01254ee57d8 100644 --- a/Mage.Sets/src/mage/cards/a/AgitatorAnt.java +++ b/Mage.Sets/src/mage/cards/a/AgitatorAnt.java @@ -2,7 +2,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.combat.GoadTargetEffect; import mage.cards.CardImpl; @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.Game; @@ -38,7 +37,7 @@ public final class AgitatorAnt extends CardImpl { // At the beginning of your end step, each player may put two +1/+1 counters on a creature they control. Goad each creature that had counters put on it this way. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new AgitatorAntEffect(), TargetController.YOU, false + new AgitatorAntEffect() )); } diff --git a/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java b/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java index 9f9278c3691..81879be5107 100644 --- a/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java +++ b/Mage.Sets/src/mage/cards/a/AidFromTheCowl.java @@ -4,7 +4,7 @@ import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -31,7 +31,7 @@ public final class AidFromTheCowl extends CardImpl { // Revolt — At the beginning of your end step, if a permanent you controlled left the battlefield this turn, // reveal the top card of your library. If it is a permanent card, you may put it onto the battlefield. Otherwise, put it on the bottom of your library. - TriggeredAbility ability = new BeginningOfYourEndStepTriggeredAbility(new AidFromTheCowlEffect(), false); + TriggeredAbility ability = new BeginningOfEndStepTriggeredAbility(new AidFromTheCowlEffect()); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, RevoltCondition.instance, ruleText).addHint(RevoltCondition.getHint()), new RevoltWatcher()); } diff --git a/Mage.Sets/src/mage/cards/a/AjanisComrade.java b/Mage.Sets/src/mage/cards/a/AjanisComrade.java index 223105559eb..fa08f8af6f3 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisComrade.java +++ b/Mage.Sets/src/mage/cards/a/AjanisComrade.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; @@ -42,7 +41,7 @@ public final class AjanisComrade extends CardImpl { // At the beginning of combat on your turn, if you control an Ajani planeswalker, put a +1/+1 counter on Ajani's Comrade. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfCombatTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false), + new BeginningOfCombatTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance())), new PermanentsOnTheBattlefieldCondition(filter), "At the beginning of combat on your turn, if you control an Ajani planeswalker, put a +1/+1 counter on {this}.")); } diff --git a/Mage.Sets/src/mage/cards/a/AkalPakalFirstAmongEquals.java b/Mage.Sets/src/mage/cards/a/AkalPakalFirstAmongEquals.java index 26ca39644a0..cb055f62b8c 100644 --- a/Mage.Sets/src/mage/cards/a/AkalPakalFirstAmongEquals.java +++ b/Mage.Sets/src/mage/cards/a/AkalPakalFirstAmongEquals.java @@ -2,7 +2,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.ArtifactEnteredUnderYourControlCondition; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.abilities.hint.ConditionHint; @@ -29,10 +29,8 @@ public final class AkalPakalFirstAmongEquals extends CardImpl { // At the beginning of each player's end step, if an artifact entered the battlefield under your control this turn, look at the top two cards of your library. Put one of them into your hand and the other into your graveyard. Ability ability = new BeginningOfEndStepTriggeredAbility( - new LookLibraryAndPickControllerEffect(2, 1, PutCards.HAND, PutCards.GRAVEYARD), - TargetController.EACH_PLAYER, - ArtifactEnteredUnderYourControlCondition.instance, - false + TargetController.EACH_PLAYER, new LookLibraryAndPickControllerEffect(2, 1, PutCards.HAND, PutCards.GRAVEYARD), + false, ArtifactEnteredUnderYourControlCondition.instance ); ability.addHint(new ConditionHint(ArtifactEnteredUnderYourControlCondition.instance)); this.addAbility(ability, new ArtifactEnteredControllerWatcher()); diff --git a/Mage.Sets/src/mage/cards/a/AlertHeedbonder.java b/Mage.Sets/src/mage/cards/a/AlertHeedbonder.java index 02eb1bdb7cf..1055eb691e8 100644 --- a/Mage.Sets/src/mage/cards/a/AlertHeedbonder.java +++ b/Mage.Sets/src/mage/cards/a/AlertHeedbonder.java @@ -1,7 +1,7 @@ package mage.cards.a; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -45,8 +44,7 @@ public final class AlertHeedbonder extends CardImpl { // At the beginning of your end step, you gain 1 life for each creature you control with vigilance. this.addAbility(new BeginningOfEndStepTriggeredAbility( new GainLifeEffect(xValue) - .setText("you gain 1 life for each creature you control with vigilance"), - TargetController.YOU, false + .setText("you gain 1 life for each creature you control with vigilance") )); } diff --git a/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java b/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java index 6b243ea17f1..d12d7b77f1b 100644 --- a/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java +++ b/Mage.Sets/src/mage/cards/a/AlrundGodOfTheCosmos.java @@ -2,7 +2,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; @@ -53,7 +53,7 @@ public final class AlrundGodOfTheCosmos extends ModalDoubleFacedCard { this.getLeftHalfCard().addAbility(ability); // At the beginning of your end step, choose a card type, then reveal the top two cards of your library. Put all cards of the chosen type into your hand and the rest on the bottom of your library in any order. - Ability ability2 = new BeginningOfYourEndStepTriggeredAbility(new ChooseCardTypeEffect(Outcome.Neutral), false); + Ability ability2 = new BeginningOfEndStepTriggeredAbility(new ChooseCardTypeEffect(Outcome.Neutral)); ability2.addEffect(new AlrundGodOfTheCosmosEffect()); this.getLeftHalfCard().addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/a/AltarOfShadows.java b/Mage.Sets/src/mage/cards/a/AltarOfShadows.java index 1932326a46b..0862944a6d5 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfShadows.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfShadows.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -33,7 +32,7 @@ public final class AltarOfShadows extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{7}"); // At the beginning of your precombat main phase, add {B} for each charge counter on Altar of Shadows. - this.addAbility(new BeginningOfFirstMainTriggeredAbility(new AltarOfShadowsEffect(), false)); + this.addAbility(new BeginningOfFirstMainTriggeredAbility(new AltarOfShadowsEffect())); // {7}, {tap}: Destroy target creature. Then put a charge counter on Altar of Shadows. Ability destroyAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new GenericManaCost(7)); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfDestiny.java b/Mage.Sets/src/mage/cards/a/AngelOfDestiny.java index 5061084b4f2..c1c14a34957 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfDestiny.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfDestiny.java @@ -3,7 +3,7 @@ package mage.cards.a; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DealsDamageToAPlayerAllTriggeredAbility; import mage.abilities.condition.common.MoreThanStartingLifeTotalCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -49,7 +49,7 @@ public final class AngelOfDestiny extends CardImpl { // At the beginning of your end step, if you have at least 15 life more than your starting life total, each player Angel of Destiny attacked this turn loses the game. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new AngelOfDestinyLoseEffect(), TargetController.YOU, false + new AngelOfDestinyLoseEffect() ), MoreThanStartingLifeTotalCondition.FIFTEEN, "At the beginning of your end step, " + "if you have at least 15 life more than your starting life total, " + "each player {this} attacked this turn loses the game." diff --git a/Mage.Sets/src/mage/cards/a/AngelicAccord.java b/Mage.Sets/src/mage/cards/a/AngelicAccord.java index a39861906ab..8d8118a16d3 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicAccord.java +++ b/Mage.Sets/src/mage/cards/a/AngelicAccord.java @@ -1,6 +1,6 @@ package mage.cards.a; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.dynamicvalue.common.ControllerGainedLifeCount; import mage.abilities.effects.common.CreateTokenEffect; @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.game.permanent.token.AngelToken; import mage.watchers.common.PlayerGainedLifeWatcher; @@ -25,8 +24,8 @@ public final class AngelicAccord extends CardImpl { // At the beginning of each end step, if you gained 4 or more life this turn, create a 4/4 white Angel creature token with flying. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new AngelToken()), TargetController.ANY, - new YouGainedLifeCondition(ComparisonType.MORE_THAN, 3), false + TargetController.ANY, new CreateTokenEffect(new AngelToken()), + false, new YouGainedLifeCondition(ComparisonType.MORE_THAN, 3) ).addHint(ControllerGainedLifeCount.getHint()), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java b/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java index f0858261980..bdaa033fa4b 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java +++ b/Mage.Sets/src/mage/cards/a/AngelsTrumpet.java @@ -2,7 +2,7 @@ package mage.cards.a; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -30,7 +30,7 @@ public final class AngelsTrumpet extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_ALL_CREATURES))); // At the beginning of each player's end step, tap all untapped creatures that player controls that didn't attack this turn. Angel's Trumpet deals damage to the player equal to the number of creatures tapped this way. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new AngelsTrumpetTapEffect(), TargetController.EACH_PLAYER, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.EACH_PLAYER, new AngelsTrumpetTapEffect(), false)); } private AngelsTrumpet(final AngelsTrumpet card) { diff --git a/Mage.Sets/src/mage/cards/a/AnointedDeacon.java b/Mage.Sets/src/mage/cards/a/AnointedDeacon.java index f16dc117cd4..139850bd6ad 100644 --- a/Mage.Sets/src/mage/cards/a/AnointedDeacon.java +++ b/Mage.Sets/src/mage/cards/a/AnointedDeacon.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/a/Antagonism.java b/Mage.Sets/src/mage/cards/a/Antagonism.java index 081acc91a4b..4d836cf8088 100644 --- a/Mage.Sets/src/mage/cards/a/Antagonism.java +++ b/Mage.Sets/src/mage/cards/a/Antagonism.java @@ -2,7 +2,7 @@ package mage.cards.a; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -25,8 +25,8 @@ public final class Antagonism extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // At the beginning of each player's end step, Antagonism deals 2 damage to that player unless one of their opponents was dealt damage this turn. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ConditionalOneShotEffect(new DamageTargetEffect(2), - AntagonismCondition.instance, rule), TargetController.EACH_PLAYER, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.EACH_PLAYER, new ConditionalOneShotEffect(new DamageTargetEffect(2), + AntagonismCondition.instance, rule), false)); } diff --git a/Mage.Sets/src/mage/cards/a/AphemiaTheCacophony.java b/Mage.Sets/src/mage/cards/a/AphemiaTheCacophony.java index 85e96d22f32..816ea7b6f54 100644 --- a/Mage.Sets/src/mage/cards/a/AphemiaTheCacophony.java +++ b/Mage.Sets/src/mage/cards/a/AphemiaTheCacophony.java @@ -1,7 +1,7 @@ package mage.cards.a; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DoIfCostPaid; @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.common.FilterEnchantmentCard; import mage.game.permanent.token.ZombieToken; @@ -41,7 +40,7 @@ public final class AphemiaTheCacophony extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(new DoIfCostPaid( new CreateTokenEffect(new ZombieToken()), new ExileFromGraveCost(new TargetCardInYourGraveyard(filter)) - ), TargetController.YOU, false)); + ))); } private AphemiaTheCacophony(final AphemiaTheCacophony card) { diff --git a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java index da10563e4a3..5a488b8cecd 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.AttachedToMatchesFilterCondition; import mage.abilities.effects.common.AttachEffect; @@ -40,9 +40,9 @@ public final class ArachnusWeb extends CardImpl { // At the beginning of the end step, if enchanted creature's power is 4 or greater, destroy Arachnus Web. FilterPermanent filter = new FilterPermanent("if enchanted creature's power is 4 or greater"); filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 3)); - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, - new DestroySourceEffect(), TargetController.NEXT, - new AttachedToMatchesFilterCondition(filter), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility( + TargetController.NEXT, new DestroySourceEffect(), + false, new AttachedToMatchesFilterCondition(filter))); } private ArachnusWeb(final ArachnusWeb card) { diff --git a/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java b/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java index 651cea1e0b5..f6ce09439b6 100644 --- a/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java +++ b/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -37,7 +37,7 @@ public final class ArchfiendOfDepravity extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of each opponent's end step, that player chooses up to two creatures they control, then sacrifices the rest. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ArchfiendOfDepravityEffect(), TargetController.OPPONENT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.OPPONENT, new ArchfiendOfDepravityEffect(), false)); } private ArchfiendOfDepravity(final ArchfiendOfDepravity card) { diff --git a/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java b/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java index 35ed4be2189..835f80563ed 100644 --- a/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java +++ b/Mage.Sets/src/mage/cards/a/ArchfiendOfDespair.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.CantGainLifeAllEffect; @@ -47,7 +47,7 @@ public final class ArchfiendOfDespair extends CardImpl { )); // At the beginning of each end step, each opponent loses life equal to the life that player lost this turn. (Damage causes loss of life.) - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ArchfiendOfDespairEffect(), TargetController.ANY, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new ArchfiendOfDespairEffect(), false)); } private ArchfiendOfDespair(final ArchfiendOfDespair card) { diff --git a/Mage.Sets/src/mage/cards/a/ArchivistOfGondor.java b/Mage.Sets/src/mage/cards/a/ArchivistOfGondor.java index f71bd25f7ae..dc042152bab 100644 --- a/Mage.Sets/src/mage/cards/a/ArchivistOfGondor.java +++ b/Mage.Sets/src/mage/cards/a/ArchivistOfGondor.java @@ -1,7 +1,7 @@ package mage.cards.a; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DealsDamageToAPlayerAllTriggeredAbility; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.BecomesMonarchSourceEffect; @@ -49,7 +49,7 @@ public final class ArchivistOfGondor extends CardImpl { // At the beginning of the monarch's end step, that player draws a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new DrawCardTargetEffect(1), TargetController.MONARCH, false + TargetController.MONARCH, new DrawCardTargetEffect(1), false )); } diff --git a/Mage.Sets/src/mage/cards/a/ArchmageAscension.java b/Mage.Sets/src/mage/cards/a/ArchmageAscension.java index 93b4ecaf7c6..76c4e4c2f31 100644 --- a/Mage.Sets/src/mage/cards/a/ArchmageAscension.java +++ b/Mage.Sets/src/mage/cards/a/ArchmageAscension.java @@ -1,7 +1,7 @@ package mage.cards.a; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -32,8 +32,8 @@ public final class ArchmageAscension extends CardImpl { // At the beginning of each end step, if you drew two or more cards this turn, you may put a quest counter on Archmage Ascension. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.QUEST.createInstance(1)), - TargetController.EACH_PLAYER, true + TargetController.EACH_PLAYER, new AddCountersSourceEffect(CounterType.QUEST.createInstance(1)), + true ), ArchmageAscensionCondition.instance, "At the beginning of each end step, " + "if you drew two or more cards this turn, you may put a quest counter on {this}." ), new CardsAmountDrawnThisTurnWatcher()); diff --git a/Mage.Sets/src/mage/cards/a/ArchpriestOfIona.java b/Mage.Sets/src/mage/cards/a/ArchpriestOfIona.java index 91071912dda..dc165494fb4 100644 --- a/Mage.Sets/src/mage/cards/a/ArchpriestOfIona.java +++ b/Mage.Sets/src/mage/cards/a/ArchpriestOfIona.java @@ -43,8 +43,7 @@ public final class ArchpriestOfIona extends CardImpl { // At the beginning of combat on your turn, if you have a full party, target creature gets +1/+1 and gains flying until end of turn. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new BoostTargetEffect(1, 1, Duration.EndOfTurn), - false + new BoostTargetEffect(1, 1, Duration.EndOfTurn) ), FullPartyCondition.instance, "At the beginning of combat on your turn, " + "if you have a full party, target creature gets +1/+1 and gains flying until end of turn." ); diff --git a/Mage.Sets/src/mage/cards/a/ArchwingDragon.java b/Mage.Sets/src/mage/cards/a/ArchwingDragon.java index f012837afb2..1f4569ea3da 100644 --- a/Mage.Sets/src/mage/cards/a/ArchwingDragon.java +++ b/Mage.Sets/src/mage/cards/a/ArchwingDragon.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HasteAbility; @@ -30,7 +30,7 @@ public final class ArchwingDragon extends CardImpl { this.addAbility(HasteAbility.getInstance()); // At the beginning of the end step, return Archwing Dragon to its owner's hand. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ReturnToHandSourceEffect(true), TargetController.NEXT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, new ReturnToHandSourceEffect(true), false)); } diff --git a/Mage.Sets/src/mage/cards/a/ArtificerClass.java b/Mage.Sets/src/mage/cards/a/ArtificerClass.java index d0f983b67fd..1499be16931 100644 --- a/Mage.Sets/src/mage/cards/a/ArtificerClass.java +++ b/Mage.Sets/src/mage/cards/a/ArtificerClass.java @@ -2,7 +2,7 @@ package mage.cards.a; import mage.abilities.Ability; import mage.abilities.common.BecomesClassLevelTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CreateTokenCopyTargetEffect; import mage.abilities.effects.common.RevealCardsFromLibraryUntilEffect; @@ -69,7 +69,7 @@ public final class ArtificerClass extends CardImpl { this.addAbility(new ClassLevelAbility(3, "{5}{U}")); // At the beginning of your end step, create a token that's a copy of target artifact you control. - Ability ability = new BeginningOfEndStepTriggeredAbility(new CreateTokenCopyTargetEffect(), TargetController.YOU, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new CreateTokenCopyTargetEffect()); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT)); this.addAbility(new SimpleStaticAbility(new GainClassAbilitySourceEffect(ability, 3))); } diff --git a/Mage.Sets/src/mage/cards/a/ArvinoxTheMindFlail.java b/Mage.Sets/src/mage/cards/a/ArvinoxTheMindFlail.java index 4f9241786ab..1012742cb9f 100644 --- a/Mage.Sets/src/mage/cards/a/ArvinoxTheMindFlail.java +++ b/Mage.Sets/src/mage/cards/a/ArvinoxTheMindFlail.java @@ -2,7 +2,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -53,7 +53,7 @@ public final class ArvinoxTheMindFlail extends CardImpl { // At the beginning of your end step, exile the bottom card of each opponent's library face down. For as long as those cards remain exiled, you may look at them, you may cast permanent spells from among them, and you may spend mana as though it were mana of any color to cast those spells. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ArvinoxTheMindFlailExileEffect(), TargetController.YOU, false + new ArvinoxTheMindFlailExileEffect() )); } diff --git a/Mage.Sets/src/mage/cards/a/AshcoatOfTheShadowSwarm.java b/Mage.Sets/src/mage/cards/a/AshcoatOfTheShadowSwarm.java index 4d4aad28e7e..c241d99bc16 100644 --- a/Mage.Sets/src/mage/cards/a/AshcoatOfTheShadowSwarm.java +++ b/Mage.Sets/src/mage/cards/a/AshcoatOfTheShadowSwarm.java @@ -3,7 +3,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.OneShotEffect; @@ -54,8 +54,8 @@ public final class AshcoatOfTheShadowSwarm extends CardImpl { // At the beginning of your end step, you may mill four cards. If you do, // return up to two Rat creature cards from your graveyard to your hand. - Ability ability = new BeginningOfEndStepTriggeredAbility( - new MillCardsControllerEffect(4), TargetController.YOU, true + Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, + new MillCardsControllerEffect(4), true ); ability.addEffect(new AshcoatEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AshenReaper.java b/Mage.Sets/src/mage/cards/a/AshenReaper.java index d625ed39c02..42bf48228ce 100644 --- a/Mage.Sets/src/mage/cards/a/AshenReaper.java +++ b/Mage.Sets/src/mage/cards/a/AshenReaper.java @@ -2,7 +2,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.constants.WatcherScope; import mage.counters.CounterType; import mage.game.Game; @@ -46,7 +45,7 @@ public final class AshenReaper extends CardImpl { new AddCountersSourceEffect(CounterType.P1P1.createInstance()), AshenReaperCondition.instance, "put a +1/+1 counter on {this} " + "if a permanent was put into a graveyard from the battlefield this turn" - ), TargetController.YOU, false + ) )); } diff --git a/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java b/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java index 804b90842a6..8a9a0ef7ae8 100644 --- a/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java +++ b/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -37,7 +37,7 @@ public final class AsmiraHolyAvenger extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // At the beginning of each end step, put a +1/+1 counter on Asmira, Holy Avenger for each creature put into your graveyard from the battlefield this turn. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(0), new AsmiraHolyAvengerDynamicValue(), true), TargetController.ANY, false), new AsmiraHolyAvengerWatcher()); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new AddCountersSourceEffect(CounterType.P1P1.createInstance(0), new AsmiraHolyAvengerDynamicValue(), true), false), new AsmiraHolyAvengerWatcher()); } private AsmiraHolyAvenger(final AsmiraHolyAvenger card) { @@ -106,4 +106,4 @@ class AsmiraHolyAvengerDynamicValue implements DynamicValue { public String getMessage() { return "creature put into your graveyard from the battlefield this turn"; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AstarionTheDecadent.java b/Mage.Sets/src/mage/cards/a/AstarionTheDecadent.java index 273d44e66cf..05d07ab446b 100644 --- a/Mage.Sets/src/mage/cards/a/AstarionTheDecadent.java +++ b/Mage.Sets/src/mage/cards/a/AstarionTheDecadent.java @@ -3,7 +3,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ControllerGainedLifeCount; import mage.abilities.effects.Effect; @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.game.Game; import mage.target.common.TargetOpponent; import mage.watchers.common.PlayerGainedLifeWatcher; @@ -52,8 +51,7 @@ public final class AstarionTheDecadent extends CardImpl { // • Feed — Target opponent loses life equal to the amount of life they lost this turn. Ability ability = new BeginningOfEndStepTriggeredAbility( new LoseLifeTargetEffect(AstarionTheDecadentValue.instance) - .setText("target opponent loses life equal to the amount of life they lost this turn"), - TargetController.YOU, false + .setText("target opponent loses life equal to the amount of life they lost this turn") ); ability.addTarget(new TargetOpponent()); ability.withFirstModeFlavorWord("Feed"); diff --git a/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java b/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java index 6409f7a453b..f0f2df5cc95 100644 --- a/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java +++ b/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java @@ -4,7 +4,7 @@ import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.DevotionCount; import mage.abilities.effects.OneShotEffect; @@ -56,8 +56,7 @@ public final class AthreosShroudVeiled extends CardImpl { // At the beginning of your end step, put a coin counter on another target creature. Ability ability = new BeginningOfEndStepTriggeredAbility( - new AddCountersTargetEffect(CounterType.COIN.createInstance()), - TargetController.YOU, false + new AddCountersTargetEffect(CounterType.COIN.createInstance()) ); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java b/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java index 154f4d33f49..26fe88716d2 100644 --- a/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java +++ b/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.counter.ProliferateEffect; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlyingAbility; @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; /** * @@ -42,7 +41,7 @@ public final class AtraxaPraetorsVoice extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // At the beginning of your end step, proliferate. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.) - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ProliferateEffect(), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new ProliferateEffect())); } private AtraxaPraetorsVoice(final AtraxaPraetorsVoice card) { diff --git a/Mage.Sets/src/mage/cards/a/AtraxasSkitterfang.java b/Mage.Sets/src/mage/cards/a/AtraxasSkitterfang.java index 8f386609a89..1754330431a 100644 --- a/Mage.Sets/src/mage/cards/a/AtraxasSkitterfang.java +++ b/Mage.Sets/src/mage/cards/a/AtraxasSkitterfang.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.target.common.TargetControlledCreaturePermanent; @@ -50,7 +49,7 @@ public final class AtraxasSkitterfang extends CardImpl { ability, new RemoveCountersSourceCost(CounterType.OIL.createInstance()), "Remove an oil counter?" - ), false)); + ))); } private AtraxasSkitterfang(final AtraxasSkitterfang card) { diff --git a/Mage.Sets/src/mage/cards/a/AureliaExemplarOfJustice.java b/Mage.Sets/src/mage/cards/a/AureliaExemplarOfJustice.java index 38ab59087b6..916003cf47a 100644 --- a/Mage.Sets/src/mage/cards/a/AureliaExemplarOfJustice.java +++ b/Mage.Sets/src/mage/cards/a/AureliaExemplarOfJustice.java @@ -18,7 +18,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -45,8 +44,7 @@ public final class AureliaExemplarOfJustice extends CardImpl { // At the beginning of combat on your turn, choose up to one target creature you control. Until end of turn, that creature gets +2/+0, gains trample if it's red, and gains vigilance if it's white. Ability ability = new BeginningOfCombatTriggeredAbility( - new AureliaExemplarOfJusticeEffect(), - false + new AureliaExemplarOfJusticeEffect() ); ability.addTarget(new TargetControlledCreaturePermanent(0, 1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AuroraShifter.java b/Mage.Sets/src/mage/cards/a/AuroraShifter.java index 30e153d6a9b..960d9ccec34 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraShifter.java +++ b/Mage.Sets/src/mage/cards/a/AuroraShifter.java @@ -13,7 +13,6 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DoWhenCostPaid; import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; @@ -50,8 +49,8 @@ public final class AuroraShifter extends CardImpl { this.addAbility(new BeginningOfCombatTriggeredAbility( new DoWhenCostPaid(reflexive, new PayEnergyCost(2), - "Pay {E}{E}? When you do, {this} becomes a copy of another target creature you control, except it has this ability and \"Whenever this creature deals combat damage to a player, you get that many {E}.\""), - false)); + "Pay {E}{E}? When you do, {this} becomes a copy of another target creature you control, except it has this ability and \"Whenever this creature deals combat damage to a player, you get that many {E}.\"") + )); } private AuroraShifter(final AuroraShifter card) { @@ -107,8 +106,8 @@ class AuroraShifterCopyApplier extends CopyApplier { blueprint.getAbilities().add(new BeginningOfCombatTriggeredAbility( new DoWhenCostPaid(reflexive, new PayEnergyCost(2), - "Pay {E}{E}? When you do, {this} becomes a copy of another target creature you control, except it has this ability and \"Whenever this creature deals combat damage to a player, you get that many {E}.\""), - false)); + "Pay {E}{E}? When you do, {this} becomes a copy of another target creature you control, except it has this ability and \"Whenever this creature deals combat damage to a player, you get that many {E}.\"") + )); blueprint.getAbilities().add(new DealsCombatDamageToAPlayerTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/a/AutumnalGloom.java b/Mage.Sets/src/mage/cards/a/AutumnalGloom.java index d4b31e6a7af..97d6596861d 100644 --- a/Mage.Sets/src/mage/cards/a/AutumnalGloom.java +++ b/Mage.Sets/src/mage/cards/a/AutumnalGloom.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.DeliriumCondition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -32,7 +32,7 @@ public final class AutumnalGloom extends CardImpl { // Delirium — At the beginning of your end step, if there are four or more card types among cards in your graveyard, transform Autumnal Gloom. this.addAbility(new TransformAbility()); - Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), TargetController.YOU, DeliriumCondition.instance, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new TransformSourceEffect(), false, DeliriumCondition.instance); ability.setAbilityWord(AbilityWord.DELIRIUM); ability.addHint(CardTypesInGraveyardHint.YOU); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AvabruckCaretaker.java b/Mage.Sets/src/mage/cards/a/AvabruckCaretaker.java index 05893a0288f..b34392a4b94 100644 --- a/Mage.Sets/src/mage/cards/a/AvabruckCaretaker.java +++ b/Mage.Sets/src/mage/cards/a/AvabruckCaretaker.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.target.TargetPermanent; @@ -38,7 +37,7 @@ public final class AvabruckCaretaker extends CardImpl { Ability ability = new BeginningOfCombatTriggeredAbility( new AddCountersTargetEffect( CounterType.P1P1.createInstance(2) - ), false + ) ); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE_YOU_CONTROL)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java b/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java index 2766420d5dc..400732c969f 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java +++ b/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.EquippedSourceCondition; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; /** * @author fireshoes @@ -30,8 +29,8 @@ public final class AvacynianMissionaries extends CardImpl { // At the beginning of your end step, if Avacynian Missionaries is equipped, transform it. this.addAbility(new TransformAbility()); - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new TransformSourceEffect().setText("transform it"), - TargetController.YOU, EquippedSourceCondition.instance, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new TransformSourceEffect().setText("transform it"), + false, EquippedSourceCondition.instance)); } diff --git a/Mage.Sets/src/mage/cards/a/AvariciousDragon.java b/Mage.Sets/src/mage/cards/a/AvariciousDragon.java index e9d2b071b17..9f3784a5ea5 100644 --- a/Mage.Sets/src/mage/cards/a/AvariciousDragon.java +++ b/Mage.Sets/src/mage/cards/a/AvariciousDragon.java @@ -2,7 +2,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.triggers.BeginningOfDrawTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.discard.DiscardHandControllerEffect; import mage.abilities.keyword.FlyingAbility; @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import java.util.UUID; @@ -33,7 +32,7 @@ public final class AvariciousDragon extends CardImpl { .setText("draw an additional card"), false)); // At the beginning of your end step, discard your hand. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new DiscardHandControllerEffect(), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new DiscardHandControllerEffect())); } private AvariciousDragon(final AvariciousDragon card) { diff --git a/Mage.Sets/src/mage/cards/a/AyaraFurnaceQueen.java b/Mage.Sets/src/mage/cards/a/AyaraFurnaceQueen.java index 665f5e6f815..d8451ecda69 100644 --- a/Mage.Sets/src/mage/cards/a/AyaraFurnaceQueen.java +++ b/Mage.Sets/src/mage/cards/a/AyaraFurnaceQueen.java @@ -50,7 +50,7 @@ public final class AyaraFurnaceQueen extends CardImpl { // At the beginning of combat on your turn, return up to one target artifact or creature card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step. Ability ability = new BeginningOfCombatTriggeredAbility( - new AyaraFurnaceQueenEffect(), false + new AyaraFurnaceQueenEffect() ); ability.addTarget(new TargetCardInYourGraveyard(0, 1, filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AzraOddsmaker.java b/Mage.Sets/src/mage/cards/a/AzraOddsmaker.java index 8fd033c3800..9dbf5fa0b8e 100644 --- a/Mage.Sets/src/mage/cards/a/AzraOddsmaker.java +++ b/Mage.Sets/src/mage/cards/a/AzraOddsmaker.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -44,7 +43,7 @@ public final class AzraOddsmaker extends CardImpl { new DoIfCostPaid( new AzraOddsmakerEffect(), new DiscardCardCost() - ), false + ) )); } diff --git a/Mage.Sets/src/mage/cards/b/BairdArgivianRecruiter.java b/Mage.Sets/src/mage/cards/b/BairdArgivianRecruiter.java index 0cc2e855ce5..2d39cfdbfb8 100644 --- a/Mage.Sets/src/mage/cards/b/BairdArgivianRecruiter.java +++ b/Mage.Sets/src/mage/cards/b/BairdArgivianRecruiter.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.effects.common.CreateTokenEffect; @@ -45,7 +45,7 @@ public final class BairdArgivianRecruiter extends CardImpl { // At the beginning of your end step, if you control a creature with power greater than its base power, // create a 1/1 white Soldier creature token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new SoldierToken()), TargetController.YOU, condition, false + TargetController.YOU, new CreateTokenEffect(new SoldierToken()), false, condition ).addHint(hint)); } diff --git a/Mage.Sets/src/mage/cards/b/BanefulOmen.java b/Mage.Sets/src/mage/cards/b/BanefulOmen.java index 881b602b313..7c6a623fe87 100644 --- a/Mage.Sets/src/mage/cards/b/BanefulOmen.java +++ b/Mage.Sets/src/mage/cards/b/BanefulOmen.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.*; import mage.constants.CardType; @@ -20,7 +20,7 @@ public final class BanefulOmen extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{B}{B}"); // At the beginning of your end step, you may reveal the top card of your library. If you do, each opponent loses life equal to that card's converted mana cost. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new BanefulOmenEffect(), true)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new BanefulOmenEffect(), true)); } private BanefulOmen(final BanefulOmen card) { diff --git a/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java b/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java index 71039519c4b..70da770dc14 100644 --- a/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java +++ b/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java @@ -2,7 +2,7 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -52,7 +52,7 @@ public final class BarrinTolarianArchmage extends CardImpl { // At the beginning of your end step, if a permanent was put into your hand from the battlefield this turn, draw a card. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), TargetController.YOU, false + new DrawCardSourceControllerEffect(1) ), BarrinTolarianArchmageCondition.instance, "At the beginning of your end step, " + "if a permanent was put into your hand from the battlefield this turn, draw a card." ), new BarrinTolarianArchmageWatcher()); diff --git a/Mage.Sets/src/mage/cards/b/BatteringRam.java b/Mage.Sets/src/mage/cards/b/BatteringRam.java index 601f067f402..c2fb52c8cd6 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringRam.java +++ b/Mage.Sets/src/mage/cards/b/BatteringRam.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; /** @@ -39,7 +38,7 @@ public final class BatteringRam extends CardImpl { this.toughness = new MageInt(1); // At the beginning of combat on your turn, Battering Ram gains banding until end of combat. - this.addAbility(new BeginningOfCombatTriggeredAbility(new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfCombat), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfCombat))); // Whenever Battering Ram becomes blocked by a Wall, destroy that Wall at end of combat. Effect effect = new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect()), true); diff --git a/Mage.Sets/src/mage/cards/b/BattleOfHooverDam.java b/Mage.Sets/src/mage/cards/b/BattleOfHooverDam.java index 9715cff968d..fa2a607a372 100644 --- a/Mage.Sets/src/mage/cards/b/BattleOfHooverDam.java +++ b/Mage.Sets/src/mage/cards/b/BattleOfHooverDam.java @@ -4,7 +4,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.condition.common.ModeChoiceSourceCondition; import mage.abilities.decorator.ConditionalTriggeredAbility; @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; @@ -45,9 +44,8 @@ public final class BattleOfHooverDam extends CardImpl { // from your graveyard to the battlefield with a finality counter on it. Ability ncrAbility = new ConditionalTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.FINALITY.createInstance()), - TargetController.YOU, - false), + new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.FINALITY.createInstance()) + ), new ModeChoiceSourceCondition("NCR"), "&bull NCR — At the beginning of your end step, return target creature card with " + "mana value 3 or less from your graveyard to the battlefield with a finality counter on it."); diff --git a/Mage.Sets/src/mage/cards/b/BattlePlan.java b/Mage.Sets/src/mage/cards/b/BattlePlan.java index fa3a08aba1b..a9b495417e1 100644 --- a/Mage.Sets/src/mage/cards/b/BattlePlan.java +++ b/Mage.Sets/src/mage/cards/b/BattlePlan.java @@ -8,7 +8,6 @@ import mage.abilities.keyword.BasicLandcyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -23,7 +22,7 @@ public final class BattlePlan extends CardImpl { // At the beginning of combat on your turn, target creature you control gets +2/+0 until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( - new BoostTargetEffect(2, 0), false + new BoostTargetEffect(2, 0) ); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BattleRattleShaman.java b/Mage.Sets/src/mage/cards/b/BattleRattleShaman.java index 5f30ad273cd..95541f43537 100644 --- a/Mage.Sets/src/mage/cards/b/BattleRattleShaman.java +++ b/Mage.Sets/src/mage/cards/b/BattleRattleShaman.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BeckoningWillOWisp.java b/Mage.Sets/src/mage/cards/b/BeckoningWillOWisp.java index e191848facb..73fbd1b422b 100644 --- a/Mage.Sets/src/mage/cards/b/BeckoningWillOWisp.java +++ b/Mage.Sets/src/mage/cards/b/BeckoningWillOWisp.java @@ -45,7 +45,7 @@ public final class BeckoningWillOWisp extends CardImpl { // Lure the Unwary — At the beginning of combat on your turn, choose an opponent. this.addAbility(new BeginningOfCombatTriggeredAbility( - new BeckoningWillOWispEffect(), false + new BeckoningWillOWispEffect() ).withFlavorWord("Lure the Unwary")); // Creatures attacking the last chosen player get +1/+0. diff --git a/Mage.Sets/src/mage/cards/b/BelligerentOfTheBall.java b/Mage.Sets/src/mage/cards/b/BelligerentOfTheBall.java index 5e40184eabe..9fa2fe334d1 100644 --- a/Mage.Sets/src/mage/cards/b/BelligerentOfTheBall.java +++ b/Mage.Sets/src/mage/cards/b/BelligerentOfTheBall.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import mage.watchers.common.PermanentsEnteredBattlefieldWatcher; @@ -35,8 +34,8 @@ public final class BelligerentOfTheBall extends CardImpl { // Celebration -- At the beginning of combat on your turn, if two or more nonland permanents entered the battlefield under your control this turn, target creature you control gets +1/+0 and gains menace until end of turn. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new BoostTargetEffect(1, 0), - false), + new BoostTargetEffect(1, 0) + ), CelebrationCondition.instance, "At the beginning of combat on your turn, if two or more nonland " + "permanents entered the battlefield under your control this turn, target creature you control " + "gets +1/+0 and gains menace until end of turn." diff --git a/Mage.Sets/src/mage/cards/b/BellowingMauler.java b/Mage.Sets/src/mage/cards/b/BellowingMauler.java index d96cae32ab6..0d40c982d83 100644 --- a/Mage.Sets/src/mage/cards/b/BellowingMauler.java +++ b/Mage.Sets/src/mage/cards/b/BellowingMauler.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.constants.SubType; @@ -11,12 +11,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.StaticFilters; -import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.TargetPermanent; import mage.target.common.TargetSacrifice; /** @@ -34,7 +31,7 @@ public final class BellowingMauler extends CardImpl { this.toughness = new MageInt(6); // At the beginning of your end step, each player loses 4 life unless they sacrifice a nontoken creature. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new BellowingMaulerEffect(), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new BellowingMaulerEffect())); } private BellowingMauler(final BellowingMauler card) { diff --git a/Mage.Sets/src/mage/cards/b/BennieBracksZoologist.java b/Mage.Sets/src/mage/cards/b/BennieBracksZoologist.java index 6997db7f446..f90f8b78ead 100644 --- a/Mage.Sets/src/mage/cards/b/BennieBracksZoologist.java +++ b/Mage.Sets/src/mage/cards/b/BennieBracksZoologist.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.CreatedTokenThisTurnCondition; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.ConvokeAbility; @@ -31,8 +31,8 @@ public final class BennieBracksZoologist extends CardImpl { // At the beginning of each end step, if you created a token this turn, draw a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), - TargetController.ANY, CreatedTokenThisTurnCondition.instance, false + TargetController.ANY, new DrawCardSourceControllerEffect(1), + false, CreatedTokenThisTurnCondition.instance ).addHint(CreatedTokenThisTurnCondition.getHint()), new CreatedTokenWatcher()); } diff --git a/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java b/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java index aa6500ae756..54a12da1b25 100644 --- a/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java +++ b/Mage.Sets/src/mage/cards/b/BespokeBattlegarb.java @@ -36,8 +36,7 @@ public final class BespokeBattlegarb extends CardImpl { new AttachEffect( Outcome.BoostCreature, "attach {this} to up to one target creature you control" - ), - false + ) ), CelebrationCondition.instance, "At the beginning of combat on your turn, if two " + "or more nonland permanents entered the battlefield under your control this turn, " + "attach {this} to up to one target creature you control" diff --git a/Mage.Sets/src/mage/cards/b/BiogenicOoze.java b/Mage.Sets/src/mage/cards/b/BiogenicOoze.java index d182298add6..30db92d7831 100644 --- a/Mage.Sets/src/mage/cards/b/BiogenicOoze.java +++ b/Mage.Sets/src/mage/cards/b/BiogenicOoze.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; @@ -44,8 +43,7 @@ public final class BiogenicOoze extends CardImpl { // At the beginning if your end step, put a +1/+1 counter on each Ooze you control. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), - TargetController.YOU, false + new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter) )); // {1}{G}{G}{G}: Create a 2/2 green Ooze creature token. diff --git a/Mage.Sets/src/mage/cards/b/Biovisionary.java b/Mage.Sets/src/mage/cards/b/Biovisionary.java index a18113075dd..aa2bfb16867 100644 --- a/Mage.Sets/src/mage/cards/b/Biovisionary.java +++ b/Mage.Sets/src/mage/cards/b/Biovisionary.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.WinGameSourceControllerEffect; @@ -33,10 +33,8 @@ public final class Biovisionary extends CardImpl { //At the beginning of the end step, if you control four or more creatures named Biovisionary, you win the game. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new WinGameSourceControllerEffect(), - TargetController.NEXT, - new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 3), - false + TargetController.NEXT, new WinGameSourceControllerEffect(), + false, new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 3) ).addHint(new ValueHint("Creatures you control named Biovisionary", new PermanentsOnBattlefieldCount(filter)))); } diff --git a/Mage.Sets/src/mage/cards/b/BirthingRitual.java b/Mage.Sets/src/mage/cards/b/BirthingRitual.java index 3746f9fc440..65750001dda 100644 --- a/Mage.Sets/src/mage/cards/b/BirthingRitual.java +++ b/Mage.Sets/src/mage/cards/b/BirthingRitual.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.effects.OneShotEffect; @@ -42,7 +42,7 @@ public final class BirthingRitual extends CardImpl { // At the beginning of your end step, if you control a creature, look at the top seven cards of your library. Then you may sacrifice a creature. If you do, you may put a creature card with mana value X or less from among those cards onto the battlefield, where X is 1 plus the sacrificed creature's mana value. Put the rest on the bottom of your library in a random order. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new BirthingRitualEffect(), TargetController.YOU, condition, false + TargetController.YOU, new BirthingRitualEffect(), false, condition ).addHint(hint)); } diff --git a/Mage.Sets/src/mage/cards/b/BlackMarket.java b/Mage.Sets/src/mage/cards/b/BlackMarket.java index 9d690e27b47..044d39de677 100644 --- a/Mage.Sets/src/mage/cards/b/BlackMarket.java +++ b/Mage.Sets/src/mage/cards/b/BlackMarket.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -30,7 +29,7 @@ public final class BlackMarket extends CardImpl { // Whenever a creature dies, put a charge counter on Black Market. this.addAbility(new DiesCreatureTriggeredAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), false)); // At the beginning of your precombat main phase, add {B} for each charge counter on Black Market. - this.addAbility(new BeginningOfFirstMainTriggeredAbility(new BlackMarketEffect(), false)); + this.addAbility(new BeginningOfFirstMainTriggeredAbility(new BlackMarketEffect())); } diff --git a/Mage.Sets/src/mage/cards/b/BlackMarketConnections.java b/Mage.Sets/src/mage/cards/b/BlackMarketConnections.java index 6454ef0ac81..fa8316b3d44 100644 --- a/Mage.Sets/src/mage/cards/b/BlackMarketConnections.java +++ b/Mage.Sets/src/mage/cards/b/BlackMarketConnections.java @@ -9,7 +9,6 @@ import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.game.permanent.token.Shapeshifter32Token; import mage.game.permanent.token.TreasureToken; @@ -26,7 +25,7 @@ public final class BlackMarketConnections extends CardImpl { // At the beginning of your precombat main phase, choose one or more — // • Sell Contraband — Create a Treasure token. You lose 1 life. Ability ability = new BeginningOfFirstMainTriggeredAbility( - new CreateTokenEffect(new TreasureToken()), false + new CreateTokenEffect(new TreasureToken()) ); ability.addEffect(new LoseLifeSourceControllerEffect(1)); ability.withFirstModeFlavorWord("Sell Contraband"); diff --git a/Mage.Sets/src/mage/cards/b/BlacksmithsTalent.java b/Mage.Sets/src/mage/cards/b/BlacksmithsTalent.java index c30be85a588..640f18a2487 100644 --- a/Mage.Sets/src/mage/cards/b/BlacksmithsTalent.java +++ b/Mage.Sets/src/mage/cards/b/BlacksmithsTalent.java @@ -60,7 +60,7 @@ public final class BlacksmithsTalent extends CardImpl { // At the beginning of combat on your turn, attach target Equipment you control to up to one target creature you control. Ability ability = new BeginningOfCombatTriggeredAbility( - new BlacksmithsTalentEffect(), false + new BlacksmithsTalentEffect() ); ability.addTarget(new TargetPermanent(filter)); ability.addTarget(new TargetControlledCreaturePermanent(0, 1)); diff --git a/Mage.Sets/src/mage/cards/b/BleedingEffect.java b/Mage.Sets/src/mage/cards/b/BleedingEffect.java index 54e9d23c952..7335806050e 100644 --- a/Mage.Sets/src/mage/cards/b/BleedingEffect.java +++ b/Mage.Sets/src/mage/cards/b/BleedingEffect.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.Game; import mage.players.Player; @@ -30,7 +29,7 @@ public final class BleedingEffect extends CardImpl { // At the beginning of combat on your turn, creatures you control gain flying until end of turn if a creature card in your graveyard has flying. // The same is true for first strike, double strike, deathtouch, hexproof, indestructible, lifelink, menace, reach, trample, and vigilance. - this.addAbility(new BeginningOfCombatTriggeredAbility(new BleedingEffectEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new BleedingEffectEffect())); } private BleedingEffect(final BleedingEffect card) { diff --git a/Mage.Sets/src/mage/cards/b/BlitzHellion.java b/Mage.Sets/src/mage/cards/b/BlitzHellion.java index 89d548493d1..492d5a9b327 100644 --- a/Mage.Sets/src/mage/cards/b/BlitzHellion.java +++ b/Mage.Sets/src/mage/cards/b/BlitzHellion.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; @@ -32,9 +32,9 @@ public final class BlitzHellion extends CardImpl { // At the beginning of the end step, Blitz Hellion's owner shuffles it into their library. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ShuffleIntoLibrarySourceEffect() + TargetController.NEXT, new ShuffleIntoLibrarySourceEffect() .setText("{this}'s owner shuffles it into their library."), - TargetController.NEXT, false + false )); } diff --git a/Mage.Sets/src/mage/cards/b/BlitzwingAdaptiveAssailant.java b/Mage.Sets/src/mage/cards/b/BlitzwingAdaptiveAssailant.java index 6d94d317454..bf76a3de6bd 100644 --- a/Mage.Sets/src/mage/cards/b/BlitzwingAdaptiveAssailant.java +++ b/Mage.Sets/src/mage/cards/b/BlitzwingAdaptiveAssailant.java @@ -38,7 +38,7 @@ public final class BlitzwingAdaptiveAssailant extends CardImpl { // At the beginning of combat on your turn, choose flying or indestructible at random. Blitzwing gains that ability until end of turn. this.addAbility(new BeginningOfCombatTriggeredAbility( - new BlitzwingAdaptiveAssailantEffect(), false + new BlitzwingAdaptiveAssailantEffect() )); // Whenever Blitzwing deals combat damage to a player, convert it. diff --git a/Mage.Sets/src/mage/cards/b/BlitzwingCruelTormentor.java b/Mage.Sets/src/mage/cards/b/BlitzwingCruelTormentor.java index 3dd3cdbdadd..effa3be1f7a 100644 --- a/Mage.Sets/src/mage/cards/b/BlitzwingCruelTormentor.java +++ b/Mage.Sets/src/mage/cards/b/BlitzwingCruelTormentor.java @@ -2,7 +2,7 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.MoreThanMeetsTheEyeAbility; import mage.cards.CardImpl; @@ -35,7 +35,7 @@ public final class BlitzwingCruelTormentor extends CardImpl { // At the beginning of your end step, target opponent loses life equal to the life that player lost this turn. If no life is lost this way, convert Blitzwing. Ability ability = new BeginningOfEndStepTriggeredAbility( - new BlitzwingCruelTormentorEffect(), TargetController.YOU, false + new BlitzwingCruelTormentorEffect() ); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BloodHound.java b/Mage.Sets/src/mage/cards/b/BloodHound.java index 942a67c4953..a04de89872a 100644 --- a/Mage.Sets/src/mage/cards/b/BloodHound.java +++ b/Mage.Sets/src/mage/cards/b/BloodHound.java @@ -2,14 +2,13 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.RemoveAllCountersSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -35,8 +34,7 @@ public final class BloodHound extends CardImpl { // At the beginning of your end step, remove all +1/+1 counters from Blood Hound. this.addAbility(new BeginningOfEndStepTriggeredAbility( new RemoveAllCountersSourceEffect(CounterType.P1P1) - .setText("remove all +1/+1 counters from {this}"), - TargetController.YOU, false + .setText("remove all +1/+1 counters from {this}") )); } diff --git a/Mage.Sets/src/mage/cards/b/BloodMist.java b/Mage.Sets/src/mage/cards/b/BloodMist.java index eab56cc5fb6..09e97c2f9fb 100644 --- a/Mage.Sets/src/mage/cards/b/BloodMist.java +++ b/Mage.Sets/src/mage/cards/b/BloodMist.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -23,7 +22,7 @@ public final class BloodMist extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}"); // At the beginning of combat on your turn, target creature you control gains double strike until end of turn. - Ability ability = new BeginningOfCombatTriggeredAbility(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BloodbatSummoner.java b/Mage.Sets/src/mage/cards/b/BloodbatSummoner.java index 50cc84793be..4491fd40c12 100644 --- a/Mage.Sets/src/mage/cards/b/BloodbatSummoner.java +++ b/Mage.Sets/src/mage/cards/b/BloodbatSummoner.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.TokenPredicate; @@ -53,7 +52,7 @@ public final class BloodbatSummoner extends CardImpl { .withColor("B"), false, false, Duration.Custom ).setText("up to one target Blood token you control becomes a " + - "2/2 black Bat creature with flying and haste in addition to its other types"), false); + "2/2 black Bat creature with flying and haste in addition to its other types")); ability.addTarget(new TargetPermanent(0, 1, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BloodchiefAscension.java b/Mage.Sets/src/mage/cards/b/BloodchiefAscension.java index 703f6761805..660376d076c 100644 --- a/Mage.Sets/src/mage/cards/b/BloodchiefAscension.java +++ b/Mage.Sets/src/mage/cards/b/BloodchiefAscension.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.PutCardIntoGraveFromAnywhereAllTriggeredAbility; import mage.abilities.condition.common.OpponentLostLifeCondition; import mage.abilities.condition.common.SourceHasCounterCondition; @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SetTargetPointer; import mage.constants.TargetController; -import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterCard; @@ -31,11 +30,10 @@ public final class BloodchiefAscension extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{B}"); // At the beginning of each end step, if an opponent lost 2 or more life this turn, you may put a quest counter on Bloodchief Ascension. (Damage causes loss of life.) - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, - new AddCountersSourceEffect(CounterType.QUEST.createInstance(1), false), - TargetController.ANY, - new OpponentLostLifeCondition(ComparisonType.MORE_THAN, 1), - true)); + this.addAbility(new BeginningOfEndStepTriggeredAbility( + TargetController.ANY, new AddCountersSourceEffect(CounterType.QUEST.createInstance(1), false), + true, new OpponentLostLifeCondition(ComparisonType.MORE_THAN, 1) + )); // Whenever a card is put into an opponent's graveyard from anywhere, if Bloodchief Ascension has three or more quest counters on it, you may have that player lose 2 life. If you do, you gain 2 life. Ability ability = new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/b/Bloodcurdler.java b/Mage.Sets/src/mage/cards/b/Bloodcurdler.java index a2fa27b9d82..bf7db105f9d 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodcurdler.java +++ b/Mage.Sets/src/mage/cards/b/Bloodcurdler.java @@ -2,7 +2,7 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.ThresholdCondition; @@ -45,7 +45,7 @@ public final class Bloodcurdler extends CardImpl { )); thresholdAbility.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new BeginningOfEndStepTriggeredAbility( - new ExileCardFromOwnGraveyardControllerEffect(2), TargetController.YOU, false + new ExileCardFromOwnGraveyardControllerEffect(2) )), ThresholdCondition.instance, "and has \"At the beginning of your end step, exile two cards from your graveyard.\"" )); diff --git a/Mage.Sets/src/mage/cards/b/BloodsoakedReveler.java b/Mage.Sets/src/mage/cards/b/BloodsoakedReveler.java index 03fde45f86b..bd266074285 100644 --- a/Mage.Sets/src/mage/cards/b/BloodsoakedReveler.java +++ b/Mage.Sets/src/mage/cards/b/BloodsoakedReveler.java @@ -2,7 +2,7 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; @@ -38,8 +38,8 @@ public final class BloodsoakedReveler extends CardImpl { // At the beginning of your end step, if you gained life this turn, create a Blood token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new BloodToken()), - TargetController.YOU, condition, false + TargetController.YOU, new CreateTokenEffect(new BloodToken()), + false, condition ).addHint(hint)); // {4}{B}: Each opponent loses 2 life and you gain 2 life. diff --git a/Mage.Sets/src/mage/cards/b/BloomwielderDryads.java b/Mage.Sets/src/mage/cards/b/BloomwielderDryads.java index 87117bf661a..e3782f4aedc 100644 --- a/Mage.Sets/src/mage/cards/b/BloomwielderDryads.java +++ b/Mage.Sets/src/mage/cards/b/BloomwielderDryads.java @@ -2,7 +2,7 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.WardAbility; @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.target.common.TargetControlledCreaturePermanent; @@ -36,7 +35,7 @@ public final class BloomwielderDryads extends CardImpl { // At the beginning of your end step, put a +1/+1 counter on target creature you control. Ability ability = new BeginningOfEndStepTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), TargetController.YOU, false + new AddCountersTargetEffect(CounterType.P1P1.createInstance()) ); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BoardedWindow.java b/Mage.Sets/src/mage/cards/b/BoardedWindow.java index 141d2dc8920..76130381174 100644 --- a/Mage.Sets/src/mage/cards/b/BoardedWindow.java +++ b/Mage.Sets/src/mage/cards/b/BoardedWindow.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.ExileSourceEffect; @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; -import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; import mage.game.Game; import mage.game.combat.CombatGroup; @@ -36,7 +35,7 @@ public final class BoardedWindow extends CardImpl { // At the beginning of each end step, if you were dealt 4 or more damage this turn, exile Boarded Window. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new ExileSourceEffect(), TargetController.ANY, BoardedWindowCondition.instance, false + TargetController.ANY, new ExileSourceEffect(), false, BoardedWindowCondition.instance ), new DamageDoneWatcher()); } diff --git a/Mage.Sets/src/mage/cards/b/BoundaryLandsRanger.java b/Mage.Sets/src/mage/cards/b/BoundaryLandsRanger.java index 56760cf201b..db8efb5c5d7 100644 --- a/Mage.Sets/src/mage/cards/b/BoundaryLandsRanger.java +++ b/Mage.Sets/src/mage/cards/b/BoundaryLandsRanger.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import java.util.UUID; @@ -34,7 +33,7 @@ public final class BoundaryLandsRanger extends CardImpl { new BeginningOfCombatTriggeredAbility( new DoIfCostPaid( new DrawCardSourceControllerEffect(1), new DiscardCardCost() - ), false + ) ), FerociousCondition.instance, "At the beginning of combat on your turn, if you control " + "a creature with power 4 or greater, you may discard a card. If you do, draw a card." ).addHint(FerociousHint.instance)); diff --git a/Mage.Sets/src/mage/cards/b/BountyOfTheLuxa.java b/Mage.Sets/src/mage/cards/b/BountyOfTheLuxa.java index 7e509442870..80c7575ea60 100644 --- a/Mage.Sets/src/mage/cards/b/BountyOfTheLuxa.java +++ b/Mage.Sets/src/mage/cards/b/BountyOfTheLuxa.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class BountyOfTheLuxa extends CardImpl { // At the beginning of your precombat main phase, remove all flood counters from Bounty of the Luxa. // If no counters were removed this way, put a flood counter on Bounty of the Luxa and draw a card. // Otherwise, add {C}{G}{U}. - this.addAbility(new BeginningOfFirstMainTriggeredAbility(new BountyOfTheLuxaEffect(), false)); + this.addAbility(new BeginningOfFirstMainTriggeredAbility(new BountyOfTheLuxaEffect())); } private BountyOfTheLuxa(final BountyOfTheLuxa card) { diff --git a/Mage.Sets/src/mage/cards/b/BraidsArisenNightmare.java b/Mage.Sets/src/mage/cards/b/BraidsArisenNightmare.java index da6a239d47d..54769817e1d 100644 --- a/Mage.Sets/src/mage/cards/b/BraidsArisenNightmare.java +++ b/Mage.Sets/src/mage/cards/b/BraidsArisenNightmare.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.constants.SubType; @@ -17,7 +17,6 @@ import mage.filter.predicate.mageobject.SharesCardTypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetSacrifice; import mage.util.CardUtil; @@ -38,7 +37,7 @@ public final class BraidsArisenNightmare extends CardImpl { // At the beginning of your end step, you may sacrifice an artifact, creature, enchantment, land, or planeswalker. // If you do, each opponent may sacrifice a permanent that shares a card type with it. // For each opponent who doesn't, that player loses 2 life and you draw a card. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new BraidsArisenNightmareEffect(), true)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new BraidsArisenNightmareEffect(), true)); } private BraidsArisenNightmare(final BraidsArisenNightmare card) { diff --git a/Mage.Sets/src/mage/cards/b/BrainstealerDragon.java b/Mage.Sets/src/mage/cards/b/BrainstealerDragon.java index 4d1a50a26d0..2ac0edd6e2a 100644 --- a/Mage.Sets/src/mage/cards/b/BrainstealerDragon.java +++ b/Mage.Sets/src/mage/cards/b/BrainstealerDragon.java @@ -2,7 +2,7 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; @@ -43,7 +43,7 @@ public final class BrainstealerDragon extends CardImpl { // At the beginning of your end step, exile the top card of each opponent's library. You may play those cards for as long as they remain exiled. If you cast a spell this way, you may spend mana as though it were mana of any color to cast it. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new BrainstealerDragonExileEffect(), TargetController.YOU, false + new BrainstealerDragonExileEffect() )); // Whenever a nonland permanent an opponent owns you control enters, they lose life equal to its mana value. diff --git a/Mage.Sets/src/mage/cards/b/BrambleguardCaptain.java b/Mage.Sets/src/mage/cards/b/BrambleguardCaptain.java index 904ddd7ca68..0260bfb2141 100644 --- a/Mage.Sets/src/mage/cards/b/BrambleguardCaptain.java +++ b/Mage.Sets/src/mage/cards/b/BrambleguardCaptain.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -32,7 +31,7 @@ public final class BrambleguardCaptain extends CardImpl { // At the beginning of combat on your turn, target creature you control gets +X/+0 until end of turn, where X is Brambleguard Captain's power. Ability ability = new BeginningOfCombatTriggeredAbility(new BoostTargetEffect( SourcePermanentPowerValue.NOT_NEGATIVE, StaticValue.get(0), Duration.EndOfTurn - ), false); + )); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BrasssTunnelGrinder.java b/Mage.Sets/src/mage/cards/b/BrasssTunnelGrinder.java index 30463be4cb5..8700a24950f 100644 --- a/Mage.Sets/src/mage/cards/b/BrasssTunnelGrinder.java +++ b/Mage.Sets/src/mage/cards/b/BrasssTunnelGrinder.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.DescendedThisTurnCondition; import mage.abilities.condition.common.SourceHasCounterCondition; @@ -42,8 +42,8 @@ public final class BrasssTunnelGrinder extends CardImpl { // At the beginning of your end step, if you descended this turn, put a bore counter on Brass's Tunnel-Grinder. Then if there are three or more bore counters on it, remove those counters and transform it. this.addAbility(new TransformAbility()); Ability ability = new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.BORE.createInstance()), - TargetController.YOU, DescendedThisTurnCondition.instance, false + TargetController.YOU, new AddCountersSourceEffect(CounterType.BORE.createInstance()), + false, DescendedThisTurnCondition.instance ); ConditionalOneShotEffect secondCheck = new ConditionalOneShotEffect( diff --git a/Mage.Sets/src/mage/cards/b/BreedingPit.java b/Mage.Sets/src/mage/cards/b/BreedingPit.java index 61e7304ff7f..278cc3f870f 100644 --- a/Mage.Sets/src/mage/cards/b/BreedingPit.java +++ b/Mage.Sets/src/mage/cards/b/BreedingPit.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; @@ -25,7 +25,7 @@ public final class BreedingPit extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{B}{B}")))); // At the beginning of your end step, create a 0/1 black Thrull creature token. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new CreateTokenEffect(new BreedingPitThrullToken()), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new BreedingPitThrullToken()))); } private BreedingPit(final BreedingPit card) { diff --git a/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java b/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java index 911f638c585..132d9740a2e 100644 --- a/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java +++ b/Mage.Sets/src/mage/cards/b/BriarbridgePatrol.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DealsDamageToOneOrMoreCreaturesTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect; @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; @@ -35,8 +34,8 @@ public final class BriarbridgePatrol extends CardImpl { // Whenever Briarbridge Patrol deals damage to one or more creatures, investigate (Create a colorless Clue artifact token with "2, Sacrifice this artifact: Draw a card."). this.addAbility(new DealsDamageToOneOrMoreCreaturesTriggeredAbility(new InvestigateEffect(), false, false, false)); // At the beginning of each end step, if you sacrificed three or more Clues this turn, you may put a creature card from your hand onto the battlefield. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A), TargetController.ANY, - BriarbridgePatrolCondition.instance, true), new PermanentsSacrificedWatcher()); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_CREATURE_A), + true, BriarbridgePatrolCondition.instance), new PermanentsSacrificedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/b/BrightcapBadger.java b/Mage.Sets/src/mage/cards/b/BrightcapBadger.java index 7c3b51bbdb0..34e8561d800 100644 --- a/Mage.Sets/src/mage/cards/b/BrightcapBadger.java +++ b/Mage.Sets/src/mage/cards/b/BrightcapBadger.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.game.permanent.token.SaprolingToken; @@ -47,7 +46,7 @@ public final class BrightcapBadger extends AdventureCard { // At the beginning of your end step, create a 1/1 green Saproling token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new SaprolingToken()), TargetController.YOU, false + new CreateTokenEffect(new SaprolingToken()) )); // Fungus Frolic diff --git a/Mage.Sets/src/mage/cards/b/BrimazBlightOfOreskos.java b/Mage.Sets/src/mage/cards/b/BrimazBlightOfOreskos.java index 86a40e591b5..381a9219239 100644 --- a/Mage.Sets/src/mage/cards/b/BrimazBlightOfOreskos.java +++ b/Mage.Sets/src/mage/cards/b/BrimazBlightOfOreskos.java @@ -2,7 +2,7 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.OneShotEffect; @@ -55,8 +55,8 @@ public final class BrimazBlightOfOreskos extends CardImpl { // At the beginning of each end step, if a Phyrexian died under your control this turn, proliferate. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ProliferateEffect(false), TargetController.ANY, - BrimazBlightOfOreskosCondition.instance, false + TargetController.ANY, new ProliferateEffect(false), + false, BrimazBlightOfOreskosCondition.instance ), new BrimazBlightOfOreskosWatcher()); } diff --git a/Mage.Sets/src/mage/cards/b/BrokersAscendancy.java b/Mage.Sets/src/mage/cards/b/BrokersAscendancy.java index 6a6605170aa..2374612a5c7 100644 --- a/Mage.Sets/src/mage/cards/b/BrokersAscendancy.java +++ b/Mage.Sets/src/mage/cards/b/BrokersAscendancy.java @@ -1,12 +1,11 @@ package mage.cards.b; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; @@ -24,7 +23,7 @@ public final class BrokersAscendancy extends CardImpl { Ability ability = new BeginningOfEndStepTriggeredAbility(new AddCountersAllEffect( CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURE - ), TargetController.YOU, false); + )); ability.addEffect(new AddCountersAllEffect( CounterType.LOYALTY.createInstance(), StaticFilters.FILTER_CONTROLLED_PERMANENT_PLANESWALKER diff --git a/Mage.Sets/src/mage/cards/b/BroodingSaurian.java b/Mage.Sets/src/mage/cards/b/BroodingSaurian.java index aa7ecee1468..291a1901476 100644 --- a/Mage.Sets/src/mage/cards/b/BroodingSaurian.java +++ b/Mage.Sets/src/mage/cards/b/BroodingSaurian.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.continuous.GainControlAllOwnedEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -33,7 +33,7 @@ public final class BroodingSaurian extends CardImpl { // At the beginning of each end step, each player gains control of all nontoken permanents they own. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new GainControlAllOwnedEffect(filter), TargetController.ANY, false + TargetController.ANY, new GainControlAllOwnedEffect(filter), false )); } diff --git a/Mage.Sets/src/mage/cards/b/BroodrageMycoid.java b/Mage.Sets/src/mage/cards/b/BroodrageMycoid.java index 959f2d63eb7..85466c1ea03 100644 --- a/Mage.Sets/src/mage/cards/b/BroodrageMycoid.java +++ b/Mage.Sets/src/mage/cards/b/BroodrageMycoid.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.DescendedThisTurnCondition; import mage.abilities.dynamicvalue.common.DescendedThisTurnCount; import mage.abilities.effects.common.CreateTokenEffect; @@ -29,8 +29,8 @@ public final class BroodrageMycoid extends CardImpl { // At the beginning of your end step, if you descended this turn, create a 1/1 black Fungus creature token with "This creature can't block." this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new FungusCantBlockToken()), - TargetController.YOU, DescendedThisTurnCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new FungusCantBlockToken()), + false, DescendedThisTurnCondition.instance ).addHint(DescendedThisTurnCount.getHint()), new DescendedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/b/BrotherhoodSpy.java b/Mage.Sets/src/mage/cards/b/BrotherhoodSpy.java index 36d6fb7528d..e3a2af67a09 100644 --- a/Mage.Sets/src/mage/cards/b/BrotherhoodSpy.java +++ b/Mage.Sets/src/mage/cards/b/BrotherhoodSpy.java @@ -43,7 +43,7 @@ public final class BrotherhoodSpy extends CardImpl { // At the beginning of combat on your turn, if you control a legendary Assassin, Brotherhood Spy gets +1/+0 until end of turn and can't be blocked this turn. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new BoostTargetEffect(1, 0), false + new BoostTargetEffect(1, 0) ), condition, "At the beginning of combat on your turn, if you control a legendary Assassin, " + "{this} gets +1/+0 until end of turn and can't be blocked this turn." ); diff --git a/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java b/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java index eca2601ebd7..be87db6713d 100644 --- a/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java +++ b/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java @@ -47,7 +47,7 @@ public final class BrudicladTelchorEngineer extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, filter, false))); // At the beginning of combat on your turn, create a 2/1 blue Myr artifact creature token. Then you may choose a token you control. If you do, each other token you control becomes a copy of that token. - this.addAbility(new BeginningOfCombatTriggeredAbility(new BrudicladTelchorEngineerEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new BrudicladTelchorEngineerEffect())); } private BrudicladTelchorEngineer(final BrudicladTelchorEngineer card) { diff --git a/Mage.Sets/src/mage/cards/b/Bulette.java b/Mage.Sets/src/mage/cards/b/Bulette.java index 2338b591f35..ac58df41cf7 100644 --- a/Mage.Sets/src/mage/cards/b/Bulette.java +++ b/Mage.Sets/src/mage/cards/b/Bulette.java @@ -2,7 +2,7 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -28,7 +28,7 @@ public final class Bulette extends CardImpl { // At the beginning of your end step, if a creature died this turn, put a +1/+1 counter on Bulette. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfYourEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false), + new BeginningOfEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance())), MorbidCondition.instance, "At the beginning of your end step, if a creature died this turn, put a +1/+1 counter on {this}." ).addHint(MorbidHint.instance)); diff --git a/Mage.Sets/src/mage/cards/b/BurningCinderFuryOfCrimsonChaosFire.java b/Mage.Sets/src/mage/cards/b/BurningCinderFuryOfCrimsonChaosFire.java index da003aac2ba..2067a9f6c33 100644 --- a/Mage.Sets/src/mage/cards/b/BurningCinderFuryOfCrimsonChaosFire.java +++ b/Mage.Sets/src/mage/cards/b/BurningCinderFuryOfCrimsonChaosFire.java @@ -2,7 +2,7 @@ package mage.cards.b; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.ContinuousEffect; @@ -38,8 +38,8 @@ public final class BurningCinderFuryOfCrimsonChaosFire extends CardImpl { this.addAbility(new BurningCinderFuryOfCrimsonChaosFireAbility()); // At the beginning of each player’s end step, if that player didn’t tap any nonland permanents that turn, Burning Cinder Fury of Crimson Chaos Fire deals 3 damage to that player. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3).setText("{this} deals 3 damage to that player"), - TargetController.ANY, new BurningCinderFuryOfCrimsonChaosFireCondition(), false), new BurningCinderFuryOfCrimsonChaosFireWatcher()); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new DamageTargetEffect(3).setText("{this} deals 3 damage to that player"), + false, new BurningCinderFuryOfCrimsonChaosFireCondition()), new BurningCinderFuryOfCrimsonChaosFireWatcher()); } private BurningCinderFuryOfCrimsonChaosFire(final BurningCinderFuryOfCrimsonChaosFire card) { diff --git a/Mage.Sets/src/mage/cards/b/ButterburBreeInnkeeper.java b/Mage.Sets/src/mage/cards/b/ButterburBreeInnkeeper.java index aaed87c1def..25cc2ecdb05 100644 --- a/Mage.Sets/src/mage/cards/b/ButterburBreeInnkeeper.java +++ b/Mage.Sets/src/mage/cards/b/ButterburBreeInnkeeper.java @@ -1,7 +1,7 @@ package mage.cards.b; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.effects.common.CreateTokenEffect; @@ -35,7 +35,7 @@ public final class ButterburBreeInnkeeper extends CardImpl { // At the beginning of your end step, if you don't control a Food, create a Food token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new FoodToken()), TargetController.YOU, condition, false + TargetController.YOU, new CreateTokenEffect(new FoodToken()), false, condition )); } diff --git a/Mage.Sets/src/mage/cards/c/CabalTherapist.java b/Mage.Sets/src/mage/cards/c/CabalTherapist.java index 4bfd7b0dd5d..01295d55012 100644 --- a/Mage.Sets/src/mage/cards/c/CabalTherapist.java +++ b/Mage.Sets/src/mage/cards/c/CabalTherapist.java @@ -17,7 +17,6 @@ import mage.cards.Cards; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.Game; import mage.players.Player; @@ -51,7 +50,7 @@ public final class CabalTherapist extends CardImpl { ability.addTarget(new TargetPlayer()); this.addAbility(new BeginningOfFirstMainTriggeredAbility( new DoWhenCostPaid(ability, new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE - ), "Sacrifice a creature?"), false + ), "Sacrifice a creature?") )); } diff --git a/Mage.Sets/src/mage/cards/c/CactusfolkSureshot.java b/Mage.Sets/src/mage/cards/c/CactusfolkSureshot.java index 83faee57518..90eef3b4e88 100644 --- a/Mage.Sets/src/mage/cards/c/CactusfolkSureshot.java +++ b/Mage.Sets/src/mage/cards/c/CactusfolkSureshot.java @@ -46,7 +46,7 @@ public final class CactusfolkSureshot extends CardImpl { // At the beginning of combat on your turn, other creatures you control with power 4 or greater gain trample and haste until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility(new GainAbilityControlledEffect( TrampleAbility.getInstance(), Duration.EndOfTurn, filter, true - ).setText("other creatures you control with power 4 or greater gain trample"), false); + ).setText("other creatures you control with power 4 or greater gain trample")); ability.addEffect(new GainAbilityControlledEffect( HasteAbility.getInstance(), Duration.EndOfTurn, filter, true ).setText("and haste until end of turn")); diff --git a/Mage.Sets/src/mage/cards/c/CaetusSeaTyrantOfSegovia.java b/Mage.Sets/src/mage/cards/c/CaetusSeaTyrantOfSegovia.java index 6fb8f125b1b..be5fd3a7870 100644 --- a/Mage.Sets/src/mage/cards/c/CaetusSeaTyrantOfSegovia.java +++ b/Mage.Sets/src/mage/cards/c/CaetusSeaTyrantOfSegovia.java @@ -2,7 +2,7 @@ package mage.cards.c; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledSpellsEffect; @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.common.FilterNonlandCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -47,7 +46,7 @@ public final class CaetusSeaTyrantOfSegovia extends CardImpl { // At the beginning of your end step, untap up to four target creatures. Ability ability = new BeginningOfEndStepTriggeredAbility( - new UntapTargetEffect(), TargetController.YOU, false + new UntapTargetEffect() ); ability.addTarget(new TargetCreaturePermanent(0, 4)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CallForUnity.java b/Mage.Sets/src/mage/cards/c/CallForUnity.java index 912c1528dfe..2dc68a3eacd 100644 --- a/Mage.Sets/src/mage/cards/c/CallForUnity.java +++ b/Mage.Sets/src/mage/cards/c/CallForUnity.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.TriggeredAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -33,7 +33,7 @@ public final class CallForUnity extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}"); // Revolt — At the beginning of your end step, if a permanent you controlled left the battlefield this turn, put a unity counter on Call for Unity. - TriggeredAbility ability = new BeginningOfYourEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.UNITY.createInstance(), true), false); + TriggeredAbility ability = new BeginningOfEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.UNITY.createInstance(), true)); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, RevoltCondition.instance, ruleText).addHint(RevoltCondition.getHint()), new RevoltWatcher()); // Creatures you control get +1/+1 for each unity counter on Call for Unity. diff --git a/Mage.Sets/src/mage/cards/c/CandlegroveWitch.java b/Mage.Sets/src/mage/cards/c/CandlegroveWitch.java index 932908a334b..e7fef672fa0 100644 --- a/Mage.Sets/src/mage/cards/c/CandlegroveWitch.java +++ b/Mage.Sets/src/mage/cards/c/CandlegroveWitch.java @@ -31,7 +31,7 @@ public final class CandlegroveWitch extends CardImpl { new BeginningOfCombatTriggeredAbility( new GainAbilitySourceEffect( FlyingAbility.getInstance(), Duration.EndOfTurn - ), false + ) ), CovenCondition.instance, "At the beginning of combat on your turn, if you control three " + "or more creatures with different powers, {this} gains flying until end of turn." ).addHint(CovenHint.instance).setAbilityWord(AbilityWord.COVEN)); diff --git a/Mage.Sets/src/mage/cards/c/CandlelitCavalry.java b/Mage.Sets/src/mage/cards/c/CandlelitCavalry.java index 1b9331b5bb6..bbcbaa73149 100644 --- a/Mage.Sets/src/mage/cards/c/CandlelitCavalry.java +++ b/Mage.Sets/src/mage/cards/c/CandlelitCavalry.java @@ -31,7 +31,7 @@ public final class CandlelitCavalry extends CardImpl { new BeginningOfCombatTriggeredAbility( new GainAbilitySourceEffect( TrampleAbility.getInstance(), Duration.EndOfTurn - ), false + ) ), CovenCondition.instance, "At the beginning of combat on your turn, if you control " + "three or more creatures with different powers, {this} gains trample until end of turn." ).addHint(CovenHint.instance).setAbilityWord(AbilityWord.COVEN)); diff --git a/Mage.Sets/src/mage/cards/c/CanonizedInBlood.java b/Mage.Sets/src/mage/cards/c/CanonizedInBlood.java index 4eea209de30..121dae9729f 100644 --- a/Mage.Sets/src/mage/cards/c/CanonizedInBlood.java +++ b/Mage.Sets/src/mage/cards/c/CanonizedInBlood.java @@ -1,7 +1,7 @@ package mage.cards.c; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.DescendedThisTurnCondition; import mage.abilities.costs.common.SacrificeSourceCost; @@ -30,8 +30,8 @@ public final class CanonizedInBlood extends CardImpl { // At the beginning of your end step, if you descended this turn, put a +1/+1 counter on target creature you control. Ability ability = new BeginningOfEndStepTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), TargetController.YOU, - DescendedThisTurnCondition.instance, false + TargetController.YOU, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), + false, DescendedThisTurnCondition.instance ).addHint(DescendedThisTurnCount.getHint()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability, new DescendedWatcher()); diff --git a/Mage.Sets/src/mage/cards/c/CanyonCrab.java b/Mage.Sets/src/mage/cards/c/CanyonCrab.java index 39cbb9e402e..c745f01ab73 100644 --- a/Mage.Sets/src/mage/cards/c/CanyonCrab.java +++ b/Mage.Sets/src/mage/cards/c/CanyonCrab.java @@ -1,7 +1,7 @@ package mage.cards.c; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.HaventCastSpellFromHandThisTurnCondition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -33,8 +33,8 @@ public final class CanyonCrab extends CardImpl { // At the beginning of your end step, if you haven't cast a spell from your hand this turn, draw a card, then discard a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1), - TargetController.YOU, HaventCastSpellFromHandThisTurnCondition.instance, false + TargetController.YOU, new DrawDiscardControllerEffect(1, 1), + false, HaventCastSpellFromHandThisTurnCondition.instance ).addHint(HaventCastSpellFromHandThisTurnCondition.hint)); } diff --git a/Mage.Sets/src/mage/cards/c/CaptainAmericaFirstAvenger.java b/Mage.Sets/src/mage/cards/c/CaptainAmericaFirstAvenger.java index cdb2b4f22ea..be037d2e8f0 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainAmericaFirstAvenger.java +++ b/Mage.Sets/src/mage/cards/c/CaptainAmericaFirstAvenger.java @@ -62,7 +62,7 @@ public final class CaptainAmericaFirstAvenger extends CardImpl { // ... Catch — At the beginning of combat on your turn, attach up to one target Equipment you control to Captain America. ability = new BeginningOfCombatTriggeredAbility( - new CaptainAmericaFirstAvengerCatchEffect(), false + new CaptainAmericaFirstAvengerCatchEffect() ); ability.addTarget(new TargetPermanent(0, 1, filter)); this.addAbility(ability.withFlavorWord("... Catch")); diff --git a/Mage.Sets/src/mage/cards/c/CaptainNghathrod.java b/Mage.Sets/src/mage/cards/c/CaptainNghathrod.java index c41d54859ea..e1a1e39f424 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainNghathrod.java +++ b/Mage.Sets/src/mage/cards/c/CaptainNghathrod.java @@ -3,7 +3,7 @@ package mage.cards.c; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DealsDamageToAPlayerAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.SavedDamageValue; @@ -66,8 +66,7 @@ public final class CaptainNghathrod extends CardImpl { Ability ability = new BeginningOfEndStepTriggeredAbility( new ReturnFromGraveyardToBattlefieldTargetEffect() .setText("choose target artifact or creature card in an opponent's graveyard that was put " + - "there from their library this turn. Put it onto the battlefield under your control"), - TargetController.YOU, false + "there from their library this turn. Put it onto the battlefield under your control") ); ability.addTarget(new TargetCardInOpponentsGraveyard(filter2)); this.addAbility(ability, new CaptainNghathrodWatcher()); diff --git a/Mage.Sets/src/mage/cards/c/CaptivatingGlance.java b/Mage.Sets/src/mage/cards/c/CaptivatingGlance.java index ff224fef4af..a92d84f7fb4 100644 --- a/Mage.Sets/src/mage/cards/c/CaptivatingGlance.java +++ b/Mage.Sets/src/mage/cards/c/CaptivatingGlance.java @@ -2,7 +2,7 @@ package mage.cards.c; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.AttachEffect; @@ -42,7 +42,7 @@ public final class CaptivatingGlance extends CardImpl { this.addAbility(ability); // At the beginning of your end step, clash with an opponent. If you win, gain control of enchanted creature. Otherwise, that player gains control of enchanted creature. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new CaptivatingGlanceEffect(), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new CaptivatingGlanceEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/CaseOfTheShatteredPact.java b/Mage.Sets/src/mage/cards/c/CaseOfTheShatteredPact.java index 596e8074bd3..007aa4b1a92 100644 --- a/Mage.Sets/src/mage/cards/c/CaseOfTheShatteredPact.java +++ b/Mage.Sets/src/mage/cards/c/CaseOfTheShatteredPact.java @@ -21,7 +21,6 @@ import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.Game; import mage.target.common.TargetCardInLibrary; @@ -44,8 +43,8 @@ public final class CaseOfTheShatteredPact extends CardImpl { // To solve -- There are five colors among permanents you control. // Solved -- At the beginning of combat on your turn, target creature you control gains flying, double strike, and vigilance until end of turn. TriggeredAbility triggeredAbility = new BeginningOfCombatTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance()) - .setText("target creature you control gains flying"), - false); + .setText("target creature you control gains flying") + ); triggeredAbility.addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance()) .setText(", double strike,")); triggeredAbility.addEffect(new GainAbilityTargetEffect(VigilanceAbility.getInstance()) diff --git a/Mage.Sets/src/mage/cards/c/CatapultFodder.java b/Mage.Sets/src/mage/cards/c/CatapultFodder.java index 1d6d1fc1b85..2853b20b656 100644 --- a/Mage.Sets/src/mage/cards/c/CatapultFodder.java +++ b/Mage.Sets/src/mage/cards/c/CatapultFodder.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; @@ -33,7 +32,7 @@ public final class CatapultFodder extends CardImpl { // At the beginning of combat on your turn, if you control three or more creatures that each have toughness greater than their power, transform Catapult Fodder. this.addAbility(new TransformAbility()); this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfCombatTriggeredAbility(new TransformSourceEffect(), false), + new BeginningOfCombatTriggeredAbility(new TransformSourceEffect()), CatapultFodderCondition.instance, "At the beginning of combat on your turn, if you control three or more creatures that each have toughness greater than their power, transform {this}" )); diff --git a/Mage.Sets/src/mage/cards/c/CatharsCall.java b/Mage.Sets/src/mage/cards/c/CatharsCall.java index 4e6037962fa..6016c84db2b 100644 --- a/Mage.Sets/src/mage/cards/c/CatharsCall.java +++ b/Mage.Sets/src/mage/cards/c/CatharsCall.java @@ -1,7 +1,7 @@ package mage.cards.c; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -38,8 +38,7 @@ public final class CatharsCall extends CardImpl { ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA)); ability.addEffect(new GainAbilityAttachedEffect( new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new HumanToken()), - TargetController.YOU, false + new CreateTokenEffect(new HumanToken()) ), AttachmentType.AURA ).setText("and \"At the beginning of your end step, create a 1/1 white Human creature token.\"")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/Celebr8000.java b/Mage.Sets/src/mage/cards/c/Celebr8000.java index d44d5baf3fb..1ccde38a6f7 100644 --- a/Mage.Sets/src/mage/cards/c/Celebr8000.java +++ b/Mage.Sets/src/mage/cards/c/Celebr8000.java @@ -40,7 +40,7 @@ public final class Celebr8000 extends CardImpl { // * 5 -- flying // * 6 -- indestructible this.addAbility( - new BeginningOfCombatTriggeredAbility(new Celebr8000Effect(), false)); + new BeginningOfCombatTriggeredAbility(new Celebr8000Effect())); } private Celebr8000(final Celebr8000 card) { diff --git a/Mage.Sets/src/mage/cards/c/CelestineTheLivingSaint.java b/Mage.Sets/src/mage/cards/c/CelestineTheLivingSaint.java index d9441534900..809fb4d10e7 100644 --- a/Mage.Sets/src/mage/cards/c/CelestineTheLivingSaint.java +++ b/Mage.Sets/src/mage/cards/c/CelestineTheLivingSaint.java @@ -2,7 +2,7 @@ package mage.cards.c; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.common.ControllerGainedLifeCount; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; import mage.abilities.keyword.FlyingAbility; @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.ObjectSourcePlayer; @@ -55,7 +54,7 @@ public final class CelestineTheLivingSaint extends CardImpl { // Healing Tears -- At the beginning of your end step, return target creature card with mana value X or less from your graveyard to the battlefield, where X is the amount of life you gained this turn. Ability ability = new BeginningOfEndStepTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect() .setText("return target creature card with mana value X or less from your graveyard to the battlefield, " + - "where X is the amount of life you gained this turn"), TargetController.YOU, false); + "where X is the amount of life you gained this turn")); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility( ability.withFlavorWord("Healing Tears") @@ -87,4 +86,4 @@ enum CelestineTheLivingSaintPredicate implements ObjectSourcePlayerPredicateHate — At the beggining of your end step, if an opponent lost life from source other than combat damage this turn, Dark Apprenticeship deals 2 damage to target player. Ability ability = new ConditionalInterveningIfTriggeredAbility( - new BeginningOfEndStepTriggeredAbility(new DamageTargetEffect(2), TargetController.YOU, false), + new BeginningOfEndStepTriggeredAbility(new DamageTargetEffect(2)), HateCondition.instance, "Hate — At the beggining of your end step, if an opponent lost life from source other than combat damage this turn, Dark Apprenticeship deals 2 damage to target player."); ability.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/d/DavrosDalekCreator.java b/Mage.Sets/src/mage/cards/d/DavrosDalekCreator.java index 629bf5f1d89..4ac67e3b370 100644 --- a/Mage.Sets/src/mage/cards/d/DavrosDalekCreator.java +++ b/Mage.Sets/src/mage/cards/d/DavrosDalekCreator.java @@ -2,7 +2,7 @@ package mage.cards.d; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.OpponentLostLifeCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; @@ -45,8 +45,7 @@ public final class DavrosDalekCreator extends CardImpl { new CreateTokenEffect(new DalekToken()), new OpponentLostLifeCondition(ComparisonType.OR_GREATER, 3), "create a 3/3 black Dalek artifact creature token with menace if an opponent lost 3 or more life this turn" - ), - TargetController.YOU, false + ) ); ability.addHint(DavrosDalekCreatorHint.instance); ability.addEffect(new DavrosDalekCreatorEffect()); diff --git a/Mage.Sets/src/mage/cards/d/DawnOfANewAge.java b/Mage.Sets/src/mage/cards/d/DawnOfANewAge.java index 786dc880234..c302843ee1b 100644 --- a/Mage.Sets/src/mage/cards/d/DawnOfANewAge.java +++ b/Mage.Sets/src/mage/cards/d/DawnOfANewAge.java @@ -1,7 +1,7 @@ package mage.cards.d; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.Game; @@ -37,7 +36,7 @@ public final class DawnOfANewAge extends CardImpl { ); // At the beginning of your end step, remove a hope counter from Dawn of a New Age. If you do, draw a card. Then if Dawn of a New Age has no hope counters on it, sacrifice it and you gain 4 life. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new DawnOfANewAgeEffect(), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new DawnOfANewAgeEffect())); } private DawnOfANewAge(final DawnOfANewAge card) { diff --git a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java index 6ab8425cc95..90a8dbd9132 100644 --- a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java +++ b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java @@ -6,7 +6,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; @@ -41,7 +41,7 @@ public final class DawnbreakReclaimer extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of your end step, choose a creature card in an opponent's graveyard, then that player chooses a creature card in your graveyard. // You may return those cards to the battlefield under their owners' control. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new DawnbreakReclaimerEffect(), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new DawnbreakReclaimerEffect())); } private DawnbreakReclaimer(final DawnbreakReclaimer card) { diff --git a/Mage.Sets/src/mage/cards/d/DawnhartWardens.java b/Mage.Sets/src/mage/cards/d/DawnhartWardens.java index 487138052d0..64db6ce7043 100644 --- a/Mage.Sets/src/mage/cards/d/DawnhartWardens.java +++ b/Mage.Sets/src/mage/cards/d/DawnhartWardens.java @@ -32,8 +32,7 @@ public final class DawnhartWardens extends CardImpl { // Coven — At the beginning of combat on your turn, if you control three or more creatures with different powers, creatures you control get +1/+0 until end of turn. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new BoostControlledEffect(1, 0, Duration.EndOfTurn), - false + new BoostControlledEffect(1, 0, Duration.EndOfTurn) ), CovenCondition.instance, "At the beginning of combat on your turn, " + "if you control three or more creatures with different powers, " + "creatures you control get +1/+0 until end of turn." diff --git a/Mage.Sets/src/mage/cards/d/DeathPriestOfMyrkul.java b/Mage.Sets/src/mage/cards/d/DeathPriestOfMyrkul.java index 51a906c2b8b..28ef03e6081 100644 --- a/Mage.Sets/src/mage/cards/d/DeathPriestOfMyrkul.java +++ b/Mage.Sets/src/mage/cards/d/DeathPriestOfMyrkul.java @@ -1,7 +1,7 @@ package mage.cards.d; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.costs.mana.GenericManaCost; @@ -49,9 +49,8 @@ public final class DeathPriestOfMyrkul extends CardImpl { // At the beginning of your end step, if a creature died this turn, you may pay {1}. If you do, create a 1/1 black Skeleton creature token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, - new DoIfCostPaid(new CreateTokenEffect(new SkeletonToken()), new GenericManaCost(1)), - TargetController.YOU, MorbidCondition.instance, false + TargetController.YOU, new DoIfCostPaid(new CreateTokenEffect(new SkeletonToken()), new GenericManaCost(1)), + false, MorbidCondition.instance ).addHint(MorbidHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/d/DeathreapRitual.java b/Mage.Sets/src/mage/cards/d/DeathreapRitual.java index a4a9f34b931..643d1027431 100644 --- a/Mage.Sets/src/mage/cards/d/DeathreapRitual.java +++ b/Mage.Sets/src/mage/cards/d/DeathreapRitual.java @@ -2,7 +2,7 @@ package mage.cards.d; import java.util.UUID; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.hint.common.MorbidHint; @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.TargetController; -import mage.constants.Zone; /** * @@ -23,8 +22,8 @@ public final class DeathreapRitual extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{G}"); // Morbid — At the beginning of each end step, if a creature died this turn, you may draw a card. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), - TargetController.ANY, MorbidCondition.instance, true).addHint(MorbidHint.instance).setAbilityWord(AbilityWord.MORBID)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new DrawCardSourceControllerEffect(1), + true, MorbidCondition.instance).addHint(MorbidHint.instance).setAbilityWord(AbilityWord.MORBID)); } private DeathreapRitual(final DeathreapRitual card) { diff --git a/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java b/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java index 657b6347e01..46472f791f6 100644 --- a/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java +++ b/Mage.Sets/src/mage/cards/d/DeceiverOfForm.java @@ -30,7 +30,7 @@ public final class DeceiverOfForm extends CardImpl { // At the beginning of combat on your turn, reveal the top card of your library. // If a creature card is revealed this way, you may have creatures you control other than Deceiver of Form becomes copies of that card until end of turn. // You may put that card on the bottom of your library. - this.addAbility(new BeginningOfCombatTriggeredAbility(new DeceiverOfFormEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new DeceiverOfFormEffect())); } private DeceiverOfForm(final DeceiverOfForm card) { diff --git a/Mage.Sets/src/mage/cards/d/DeepGoblinSkulltaker.java b/Mage.Sets/src/mage/cards/d/DeepGoblinSkulltaker.java index 85d8aa7bbf9..020616a14c5 100644 --- a/Mage.Sets/src/mage/cards/d/DeepGoblinSkulltaker.java +++ b/Mage.Sets/src/mage/cards/d/DeepGoblinSkulltaker.java @@ -1,7 +1,7 @@ package mage.cards.d; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.DescendedThisTurnCondition; import mage.abilities.dynamicvalue.common.DescendedThisTurnCount; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -34,8 +34,8 @@ public final class DeepGoblinSkulltaker extends CardImpl { // At the beginning of your end step, if you descended this turn, put a +1/+1 counter on Deep Goblin Skulltaker. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - TargetController.YOU, DescendedThisTurnCondition.instance, false + TargetController.YOU, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), + false, DescendedThisTurnCondition.instance ).addHint(DescendedThisTurnCount.getHint()), new DescendedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/d/DeepfathomEcho.java b/Mage.Sets/src/mage/cards/d/DeepfathomEcho.java index e77ed193212..87fe6ed8077 100644 --- a/Mage.Sets/src/mage/cards/d/DeepfathomEcho.java +++ b/Mage.Sets/src/mage/cards/d/DeepfathomEcho.java @@ -32,7 +32,7 @@ public final class DeepfathomEcho extends CardImpl { // At the beginning of combat on your turn, Deepfathom Echo explores. Then you may have it become a copy of another creature you control until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( - new ExploreSourceEffect(false, "{this}"), false + new ExploreSourceEffect(false, "{this}") ); ability.addEffect(new DeepfathomEchoEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DemonicLore.java b/Mage.Sets/src/mage/cards/d/DemonicLore.java index 700785c14d4..be9f94ed3da 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicLore.java +++ b/Mage.Sets/src/mage/cards/d/DemonicLore.java @@ -1,6 +1,6 @@ package mage.cards.d; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.MultipliedValue; @@ -10,7 +10,6 @@ import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import java.util.UUID; @@ -30,8 +29,7 @@ public final class DemonicLore extends CardImpl { // At the beginning of your end step, you lose 2 life for each card in your hand. this.addAbility(new BeginningOfEndStepTriggeredAbility( new LoseLifeSourceControllerEffect(xValue) - .setText("you lose 2 life for each card in your hand"), - TargetController.YOU, false + .setText("you lose 2 life for each card in your hand") )); } diff --git a/Mage.Sets/src/mage/cards/d/DemonicRising.java b/Mage.Sets/src/mage/cards/d/DemonicRising.java index 907bbed0f7a..8ded22ba9d3 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicRising.java +++ b/Mage.Sets/src/mage/cards/d/DemonicRising.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.abilities.TriggeredAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.CreatureCountCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -24,7 +24,7 @@ public final class DemonicRising extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}{B}"); // At the beginning of your end step, if you control exactly one creature, create a 5/5 black Demon creature token with flying. - TriggeredAbility ability = new BeginningOfYourEndStepTriggeredAbility(new CreateTokenEffect(new DemonToken()), false); + TriggeredAbility ability = new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new DemonToken())); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, new CreatureCountCondition(1, TargetController.YOU), ruleText)); } diff --git a/Mage.Sets/src/mage/cards/d/DenethorRulingSteward.java b/Mage.Sets/src/mage/cards/d/DenethorRulingSteward.java index c0dca240f13..4daff724875 100644 --- a/Mage.Sets/src/mage/cards/d/DenethorRulingSteward.java +++ b/Mage.Sets/src/mage/cards/d/DenethorRulingSteward.java @@ -2,7 +2,7 @@ package mage.cards.d; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.CreatureDiedControlledCondition; import mage.abilities.costs.common.SacrificeTargetCost; @@ -37,8 +37,8 @@ public final class DenethorRulingSteward extends CardImpl { // At the beginning of your end step, if a creature died under your control this turn, create a 1/1 white Human Soldier creature token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new HumanSoldierToken()), TargetController.YOU, - CreatureDiedControlledCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new HumanSoldierToken()), + false, CreatureDiedControlledCondition.instance ).addHint(CreatureDiedControlledCondition.getHint())); // {2}, Sacrifice another creature: Each opponent loses 1 life and you gain 1 life. diff --git a/Mage.Sets/src/mage/cards/d/Desolation.java b/Mage.Sets/src/mage/cards/d/Desolation.java index d0c06c24287..fdbab89aae5 100644 --- a/Mage.Sets/src/mage/cards/d/Desolation.java +++ b/Mage.Sets/src/mage/cards/d/Desolation.java @@ -1,7 +1,7 @@ package mage.cards.d; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -28,7 +28,7 @@ public final class Desolation extends CardImpl { // At the beginning of each end step, each player who tapped a land for mana this // turn sacrifices a land. Desolation deals 2 damage to each player who sacrificed a Plains this way. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new DesolationEffect(), TargetController.ANY, false + TargetController.ANY, new DesolationEffect(), false ), new DesolationWatcher()); } diff --git a/Mage.Sets/src/mage/cards/d/DeterminedIteration.java b/Mage.Sets/src/mage/cards/d/DeterminedIteration.java index 1bfd100ee47..83be29801e0 100644 --- a/Mage.Sets/src/mage/cards/d/DeterminedIteration.java +++ b/Mage.Sets/src/mage/cards/d/DeterminedIteration.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.game.Game; import mage.target.targetpointer.FixedTargets; @@ -29,7 +28,7 @@ public final class DeterminedIteration extends CardImpl { // At the beginning of combat on your turn, populate. The token created this way gains haste. Sacrifice it at the beginning of the next end step. this.addAbility(new BeginningOfCombatTriggeredAbility( - new DeterminedIterationEffect(), false + new DeterminedIterationEffect() )); } diff --git a/Mage.Sets/src/mage/cards/d/DireFleetWarmonger.java b/Mage.Sets/src/mage/cards/d/DireFleetWarmonger.java index d3a70ce3699..98c29c9b855 100644 --- a/Mage.Sets/src/mage/cards/d/DireFleetWarmonger.java +++ b/Mage.Sets/src/mage/cards/d/DireFleetWarmonger.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import java.util.UUID; @@ -35,8 +34,8 @@ public final class DireFleetWarmonger extends CardImpl { new BoostSourceEffect(2, 2, Duration.EndOfTurn).setText("{this} gets +2/+2"), new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE) ).addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn) - .concatBy("and").setText("gains trample until end of turn")), - false)); + .concatBy("and").setText("gains trample until end of turn")) + )); } private DireFleetWarmonger(final DireFleetWarmonger card) { diff --git a/Mage.Sets/src/mage/cards/d/DoggedPursuit.java b/Mage.Sets/src/mage/cards/d/DoggedPursuit.java index a56e3c6a681..5c0a032cac6 100644 --- a/Mage.Sets/src/mage/cards/d/DoggedPursuit.java +++ b/Mage.Sets/src/mage/cards/d/DoggedPursuit.java @@ -1,13 +1,12 @@ package mage.cards.d; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import java.util.UUID; @@ -21,7 +20,7 @@ public final class DoggedPursuit extends CardImpl { // At the beginning of your end step, each opponent loses 1 life and you gain 1 life. Ability ability = new BeginningOfEndStepTriggeredAbility( - new LoseLifeOpponentsEffect(1), TargetController.YOU, false + new LoseLifeOpponentsEffect(1) ); ability.addEffect(new GainLifeEffect(1).concatBy("and")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/Domestication.java b/Mage.Sets/src/mage/cards/d/Domestication.java index 86d300be017..a83bb7f4bec 100644 --- a/Mage.Sets/src/mage/cards/d/Domestication.java +++ b/Mage.Sets/src/mage/cards/d/Domestication.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -45,7 +45,7 @@ public final class Domestication extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); // At the beginning of your end step, if enchanted creature's power is 4 or greater, sacrifice Domestication. - TriggeredAbility ability2 = new BeginningOfYourEndStepTriggeredAbility(new SacrificeSourceEffect(), false); + TriggeredAbility ability2 = new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect()); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability2, new DomesticationCondition(), "At the beginning of your end step, if enchanted creature's power is 4 or greater, sacrifice {this}")); } diff --git a/Mage.Sets/src/mage/cards/d/DoomedArtisan.java b/Mage.Sets/src/mage/cards/d/DoomedArtisan.java index 1e04193b114..8e451bea1ec 100644 --- a/Mage.Sets/src/mage/cards/d/DoomedArtisan.java +++ b/Mage.Sets/src/mage/cards/d/DoomedArtisan.java @@ -1,7 +1,7 @@ package mage.cards.d; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.combat.CantAttackBlockAllEffect; @@ -41,7 +41,7 @@ public final class DoomedArtisan extends CardImpl { // At the beginning of your end step, create a colorless Sculpture artifact creature token with "This creature's power and toughness are equal to the number of Sculptures you control" this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new DoomedArtisanToken()), TargetController.YOU, false) + new CreateTokenEffect(new DoomedArtisanToken())) ); } diff --git a/Mage.Sets/src/mage/cards/d/DormantGrove.java b/Mage.Sets/src/mage/cards/d/DormantGrove.java index a8d955548f2..3db92560395 100644 --- a/Mage.Sets/src/mage/cards/d/DormantGrove.java +++ b/Mage.Sets/src/mage/cards/d/DormantGrove.java @@ -12,7 +12,6 @@ import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -34,8 +33,7 @@ public final class DormantGrove extends CardImpl { this.addAbility(new TransformAbility()); Ability ability = new BeginningOfCombatTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), - false + new AddCountersTargetEffect(CounterType.P1P1.createInstance()) ); ability.addEffect(new ConditionalOneShotEffect( new TransformSourceEffect(), diff --git a/Mage.Sets/src/mage/cards/d/DragonCultist.java b/Mage.Sets/src/mage/cards/d/DragonCultist.java index 7bfd35515e7..4c3a3ccbc2f 100644 --- a/Mage.Sets/src/mage/cards/d/DragonCultist.java +++ b/Mage.Sets/src/mage/cards/d/DragonCultist.java @@ -2,7 +2,7 @@ package mage.cards.d; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.CreateTokenEffect; @@ -12,10 +12,8 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.game.Game; -import mage.game.events.DamagedEvent; import mage.game.events.GameEvent; import mage.game.permanent.token.DragonToken; -import mage.util.CardUtil; import mage.watchers.Watcher; import java.util.Collections; @@ -37,8 +35,8 @@ public final class DragonCultist extends CardImpl { // Commander creatures you own have "At the beginning of your end step, if a source you controlled dealt 5 or more damage this turn, create a 4/4 red Dragon creature token with flying." this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new DragonToken()), TargetController.YOU, - DragonCultistCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new DragonToken()), + false, DragonCultistCondition.instance ), Duration.WhileOnBattlefield, StaticFilters.FILTER_CREATURES_OWNED_COMMANDER )), new DragonCultistWatcher()); } diff --git a/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java b/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java index ae7cca50d59..62bf8124c40 100644 --- a/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java +++ b/Mage.Sets/src/mage/cards/d/DragonscaleGeneral.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.keyword.BolsterEffect; import mage.cards.CardImpl; @@ -35,7 +35,7 @@ public final class DragonscaleGeneral extends CardImpl { this.toughness = new MageInt(3); // At the beginning of your end step, bolster X, where X is the number of tapped creatures you control. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new BolsterEffect(new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new BolsterEffect(new PermanentsOnBattlefieldCount(filter)))); } private DragonscaleGeneral(final DragonscaleGeneral card) { diff --git a/Mage.Sets/src/mage/cards/d/DreadfeastDemon.java b/Mage.Sets/src/mage/cards/d/DreadfeastDemon.java index c2de57041c0..118980776ed 100644 --- a/Mage.Sets/src/mage/cards/d/DreadfeastDemon.java +++ b/Mage.Sets/src/mage/cards/d/DreadfeastDemon.java @@ -1,7 +1,7 @@ package mage.cards.d; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.CreateTokenCopySourceEffect; import mage.abilities.effects.common.DoIfCostPaid; @@ -10,11 +10,9 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -44,7 +42,7 @@ public final class DreadfeastDemon extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(new DoIfCostPaid( new CreateTokenCopySourceEffect(), new SacrificeTargetCost(filter), null, false - ), TargetController.YOU, false)); + ))); } private DreadfeastDemon(final DreadfeastDemon card) { diff --git a/Mage.Sets/src/mage/cards/d/DreamshackleGeist.java b/Mage.Sets/src/mage/cards/d/DreamshackleGeist.java index 124482f548f..2ec9f55fc02 100644 --- a/Mage.Sets/src/mage/cards/d/DreamshackleGeist.java +++ b/Mage.Sets/src/mage/cards/d/DreamshackleGeist.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -34,7 +33,7 @@ public final class DreamshackleGeist extends CardImpl { // At the beginning of combat on your turn, choose up to one — // • Tap target creature. Ability ability = new BeginningOfCombatTriggeredAbility( - new TapTargetEffect(), false + new TapTargetEffect() ); ability.addTarget(new TargetCreaturePermanent()); ability.getModes().setMinModes(0); diff --git a/Mage.Sets/src/mage/cards/d/DreamshaperShaman.java b/Mage.Sets/src/mage/cards/d/DreamshaperShaman.java index 364468697a7..1bfa0f8c8bf 100644 --- a/Mage.Sets/src/mage/cards/d/DreamshaperShaman.java +++ b/Mage.Sets/src/mage/cards/d/DreamshaperShaman.java @@ -1,7 +1,7 @@ package mage.cards.d; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.CompositeCost; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -12,12 +12,10 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.PutCards; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.Predicates; -import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -49,7 +47,7 @@ public final class DreamshaperShaman extends CardImpl { new ManaCostsImpl<>("{2}{R}"), new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_NON_LAND), "pay {2}{R} and sacrifice a nonland permanent" ) - ), TargetController.YOU, false)); + ))); } private DreamshaperShaman(final DreamshaperShaman card) { diff --git a/Mage.Sets/src/mage/cards/d/DrossHarvester.java b/Mage.Sets/src/mage/cards/d/DrossHarvester.java index 30c0181b0f6..b6d0ef6ed64 100644 --- a/Mage.Sets/src/mage/cards/d/DrossHarvester.java +++ b/Mage.Sets/src/mage/cards/d/DrossHarvester.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; /** * @@ -30,8 +29,8 @@ public final class DrossHarvester extends CardImpl { // Protection from white this.addAbility(ProtectionAbility.from(ObjectColor.WHITE)); // At the beginning of your end step, you lose 4 life. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new LoseLifeSourceControllerEffect(4), - TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new LoseLifeSourceControllerEffect(4) + )); // Whenever a creature dies, you gain 2 life. this.addAbility(new DiesCreatureTriggeredAbility(new GainLifeEffect(2), false)); } diff --git a/Mage.Sets/src/mage/cards/d/DuelcraftTrainer.java b/Mage.Sets/src/mage/cards/d/DuelcraftTrainer.java index 77d745ad8c0..bd4a5bdfc7e 100644 --- a/Mage.Sets/src/mage/cards/d/DuelcraftTrainer.java +++ b/Mage.Sets/src/mage/cards/d/DuelcraftTrainer.java @@ -36,7 +36,7 @@ public final class DuelcraftTrainer extends CardImpl { Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility(new GainAbilityTargetEffect( DoubleStrikeAbility.getInstance(), Duration.EndOfTurn - ), false), CovenCondition.instance, "At the beginning " + + )), CovenCondition.instance, "At the beginning " + "of combat on your turn, if you control three or more creatures with different powers, " + "target creature you control gains double strike until end of turn." ); diff --git a/Mage.Sets/src/mage/cards/d/DukeUlderRavengard.java b/Mage.Sets/src/mage/cards/d/DukeUlderRavengard.java index 3c5453d224c..232f99632d0 100644 --- a/Mage.Sets/src/mage/cards/d/DukeUlderRavengard.java +++ b/Mage.Sets/src/mage/cards/d/DukeUlderRavengard.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.target.TargetPermanent; @@ -35,8 +34,7 @@ public final class DukeUlderRavengard extends CardImpl { // At the beginning of combat on your turn, another target creature gains haste and myriad until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new GainAbilityTargetEffect(HasteAbility.getInstance()) - .setText("another target creature you control gains haste"), - false + .setText("another target creature you control gains haste") ); ability.addEffect(new GainAbilityTargetEffect(new MyriadAbility()).setText("and myriad until end of turn")); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/d/Duplicity.java b/Mage.Sets/src/mage/cards/d/Duplicity.java index 8423a1fd735..3d5150f821a 100644 --- a/Mage.Sets/src/mage/cards/d/Duplicity.java +++ b/Mage.Sets/src/mage/cards/d/Duplicity.java @@ -8,7 +8,7 @@ import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.StaticAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.EntersBattlefieldEffect; @@ -43,7 +43,7 @@ public final class Duplicity extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DuplicityExileHandEffect(), true)); // At the beginning of your end step, discard a card. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new DiscardControllerEffect(1), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new DiscardControllerEffect(1))); // When you lose control of Duplicity, put all cards exiled with Duplicity into their owner's graveyard. this.addAbility(new DuplicityEntersBattlefieldAbility(new CreateDelayedTriggeredAbilityEffect(new LoseControlDuplicity()))); diff --git a/Mage.Sets/src/mage/cards/d/DustStalker.java b/Mage.Sets/src/mage/cards/d/DustStalker.java index 56ee4d7da59..c387cc8e00e 100644 --- a/Mage.Sets/src/mage/cards/d/DustStalker.java +++ b/Mage.Sets/src/mage/cards/d/DustStalker.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.DevoidAbility; @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorlessPredicate; import mage.filter.predicate.mageobject.AnotherPredicate; @@ -43,8 +42,8 @@ public final class DustStalker extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // At the beginning of each end step, if you control no other colorless creatures, return Dust Stalker to its owner's hand. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(), TargetController.ANY, - new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.EQUAL_TO, 0), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new ReturnToHandSourceEffect(), + false, new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.EQUAL_TO, 0))); } private DustStalker(final DustStalker card) { diff --git a/Mage.Sets/src/mage/cards/e/EccentricApprentice.java b/Mage.Sets/src/mage/cards/e/EccentricApprentice.java index 54a694d1643..bafd1e10fd5 100644 --- a/Mage.Sets/src/mage/cards/e/EccentricApprentice.java +++ b/Mage.Sets/src/mage/cards/e/EccentricApprentice.java @@ -43,7 +43,7 @@ public final class EccentricApprentice extends CardImpl { // At the beginning of combat on your turn, if you've completed a dungeon, up to one target creature becomes a Bird with base power and toughness 1/1 and flying until end of turn. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new EccentricApprenticeEffect(), false + new EccentricApprenticeEffect() ), CompletedDungeonCondition.instance, "At the beginning of combat on your turn, " + "if you've completed a dungeon, up to one target creature becomes a Bird " + "with base power and toughness 1/1 and flying until end of turn." diff --git a/Mage.Sets/src/mage/cards/e/EdwardKenway.java b/Mage.Sets/src/mage/cards/e/EdwardKenway.java index bda5f9730a1..fead2baf58d 100644 --- a/Mage.Sets/src/mage/cards/e/EdwardKenway.java +++ b/Mage.Sets/src/mage/cards/e/EdwardKenway.java @@ -2,7 +2,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DealsDamageToAPlayerAllTriggeredAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; @@ -47,7 +47,7 @@ public final class EdwardKenway extends CardImpl { // At the beginning of your end step, create a Treasure token for each tapped Assassin, Pirate, and/or Vehicle you control. this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect( - new TreasureToken(), new PermanentsOnBattlefieldCount(filter)), TargetController.YOU, false)); + new TreasureToken(), new PermanentsOnBattlefieldCount(filter)))); // Whenever a Vehicle you control deals combat damage to a player, look at the top card of that player's library, then exile it face down. You may play that card for as long as it remains exiled. this.addAbility(new DealsDamageToAPlayerAllTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfInspiration.java b/Mage.Sets/src/mage/cards/e/EidolonOfInspiration.java index c8a8bf81c0b..90d017c399a 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfInspiration.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfInspiration.java @@ -8,7 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -27,7 +26,7 @@ public final class EidolonOfInspiration extends CardImpl { // At the beginning of combat on your turn, target creature you control gets +2/+0 until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( - new BoostTargetEffect(2, 0), false + new BoostTargetEffect(2, 0) ); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ElanorGardner.java b/Mage.Sets/src/mage/cards/e/ElanorGardner.java index e69ac0aeef1..f4334113020 100644 --- a/Mage.Sets/src/mage/cards/e/ElanorGardner.java +++ b/Mage.Sets/src/mage/cards/e/ElanorGardner.java @@ -2,7 +2,7 @@ package mage.cards.e; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.CreateTokenEffect; @@ -43,9 +43,9 @@ public final class ElanorGardner extends CardImpl { // At the beginning of your end step, if you sacrificed a Food this turn, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new SearchLibraryPutInPlayEffect( + TargetController.YOU, new SearchLibraryPutInPlayEffect( new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true - ), TargetController.YOU, ElanorGardnerCondition.instance, true + ), true, ElanorGardnerCondition.instance ).addHint(ElanorGardnerCondition.getHint()), new ElanorGardnerWatcher()); } diff --git a/Mage.Sets/src/mage/cards/e/EldraziLinebreaker.java b/Mage.Sets/src/mage/cards/e/EldraziLinebreaker.java index 8be9203d00c..fa97012e398 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziLinebreaker.java +++ b/Mage.Sets/src/mage/cards/e/EldraziLinebreaker.java @@ -17,7 +17,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -47,8 +46,7 @@ public final class EldraziLinebreaker extends CardImpl { // At the beginning of combat on your turn, target creature you control gains haste and gets +X/+0 until end of turn, where X is the number of Eldrazi you control. Ability ability = new BeginningOfCombatTriggeredAbility( new GainAbilityTargetEffect(HasteAbility.getInstance()) - .setText("target creature you control gains haste"), - false + .setText("target creature you control gains haste") ); ability.addEffect(new BoostTargetEffect(xValue, StaticValue.get(0)) .setText("and gets +X/+0 until end of turn, where X is the number of Eldrazi you control")); diff --git a/Mage.Sets/src/mage/cards/e/Electrozoa.java b/Mage.Sets/src/mage/cards/e/Electrozoa.java index 56254db6ff3..96e2aab42d4 100644 --- a/Mage.Sets/src/mage/cards/e/Electrozoa.java +++ b/Mage.Sets/src/mage/cards/e/Electrozoa.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import java.util.UUID; @@ -39,7 +38,7 @@ public final class Electrozoa extends CardImpl { // At the beginning of your precombat main phase, tap Electrozoa unless you pay {E}. this.addAbility(new BeginningOfFirstMainTriggeredAbility( - new TapSourceUnlessPaysEffect(new PayEnergyCost(1)), false + new TapSourceUnlessPaysEffect(new PayEnergyCost(1)) )); } diff --git a/Mage.Sets/src/mage/cards/e/ElementalResonance.java b/Mage.Sets/src/mage/cards/e/ElementalResonance.java index a4ff1a3a676..a9e1ed245cf 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalResonance.java +++ b/Mage.Sets/src/mage/cards/e/ElementalResonance.java @@ -18,7 +18,6 @@ import mage.choices.ChoiceImpl; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; -import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -43,7 +42,7 @@ public final class ElementalResonance extends CardImpl { this.addAbility(ability); // At the beginning of your precombat main phase, add mana equal to enchanted permanent's mana cost. - this.addAbility(new BeginningOfFirstMainTriggeredAbility(new ElementalResonanceEffect(), false)); + this.addAbility(new BeginningOfFirstMainTriggeredAbility(new ElementalResonanceEffect())); } private ElementalResonance(final ElementalResonance card) { diff --git a/Mage.Sets/src/mage/cards/e/ElendaAndAzor.java b/Mage.Sets/src/mage/cards/e/ElendaAndAzor.java index f236fe30fbd..12d6d51fff6 100644 --- a/Mage.Sets/src/mage/cards/e/ElendaAndAzor.java +++ b/Mage.Sets/src/mage/cards/e/ElendaAndAzor.java @@ -3,7 +3,7 @@ package mage.cards.e; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ManaCosts; @@ -46,11 +46,11 @@ public final class ElendaAndAzor extends CardImpl { // At the beginning of each end step, you may pay 4 life. If you do, create a number of 1/1 black Vampire // Knight creature tokens with lifelink equal to the number of cards you've drawn this turn. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect( + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new DoIfCostPaid(new CreateTokenEffect( new VampireKnightToken(), CardsDrawnThisTurnDynamicValue.instance) .setText("create a number of 1/1 black Vampire Knight creature tokens with lifelink " + "equal to the number of cards you've drawn this turn"), new PayLifeCost(4)), - TargetController.ANY, false).addHint(CardsDrawnThisTurnDynamicValue.getHint())); + false).addHint(CardsDrawnThisTurnDynamicValue.getHint())); } private ElendaAndAzor(final ElendaAndAzor card) { diff --git a/Mage.Sets/src/mage/cards/e/EmergentHaunting.java b/Mage.Sets/src/mage/cards/e/EmergentHaunting.java index c6171eebe19..72624ce2151 100644 --- a/Mage.Sets/src/mage/cards/e/EmergentHaunting.java +++ b/Mage.Sets/src/mage/cards/e/EmergentHaunting.java @@ -1,6 +1,6 @@ package mage.cards.e; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.CompoundCondition; import mage.abilities.condition.Condition; @@ -35,13 +35,12 @@ public final class EmergentHaunting extends CardImpl { // At the beginning of your end step, if you haven't cast a spell from your hand this turn and Emergent Haunting isn't a creature, it becomes a 3/3 Spirit creature with flying in addition to its other types. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, - new BecomesCreatureSourceEffect( + TargetController.YOU, new BecomesCreatureSourceEffect( new CreatureToken(3, 3, "3/3 Spirit creature with flying in addition to its other types") .withSubType(SubType.SPIRIT).withAbility(FlyingAbility.getInstance()), null, Duration.WhileOnBattlefield ), - TargetController.YOU, condition, false + false, condition ).withRuleTextReplacement(true).addHint(HaventCastSpellFromHandThisTurnCondition.hint)); // {2}{U}: Surveil 1. diff --git a/Mage.Sets/src/mage/cards/e/EmperorOfBones.java b/Mage.Sets/src/mage/cards/e/EmperorOfBones.java index 080153fd15c..44b362bfd66 100644 --- a/Mage.Sets/src/mage/cards/e/EmperorOfBones.java +++ b/Mage.Sets/src/mage/cards/e/EmperorOfBones.java @@ -44,8 +44,7 @@ public final class EmperorOfBones extends CardImpl { // At the beginning of combat on your turn, exile up to one target card from a graveyard. Ability ability = new BeginningOfCombatTriggeredAbility( - new ExileTargetEffect().setToSourceExileZone(true), - false + new ExileTargetEffect().setToSourceExileZone(true) ); ability.addTarget(new TargetCardInGraveyard(0, 1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EnchantersBane.java b/Mage.Sets/src/mage/cards/e/EnchantersBane.java index 2d4245c2f84..b9e900d2362 100644 --- a/Mage.Sets/src/mage/cards/e/EnchantersBane.java +++ b/Mage.Sets/src/mage/cards/e/EnchantersBane.java @@ -1,13 +1,12 @@ package mage.cards.e; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -25,7 +24,7 @@ public final class EnchantersBane extends CardImpl { // At the beginning of your end step, target enchantment deals damage equal to its converted mana cost to its controller unless that player sacrifices it. Ability ability = new BeginningOfEndStepTriggeredAbility( - new EnchantersBaneEffect(), TargetController.YOU, false + new EnchantersBaneEffect() ); ability.addTarget(new TargetEnchantmentPermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java b/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java index d707500333a..29987c6f78f 100644 --- a/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java +++ b/Mage.Sets/src/mage/cards/e/EnigmaticIncarnation.java @@ -2,7 +2,7 @@ package mage.cards.e; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledEnchantmentPermanent; @@ -33,7 +32,7 @@ public final class EnigmaticIncarnation extends CardImpl { // At the beginning of your end step, you may sacrifice another enchantment. If you do, search your library for a creature card with converted mana cost equal to 1 plus the sacrificed enchantment's converted mana cost, put that card onto the battlefield, then shuffle your library. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new EnigmaticIncarnationEffect(), TargetController.YOU, false + new EnigmaticIncarnationEffect() )); } diff --git a/Mage.Sets/src/mage/cards/e/EnterprisingScallywag.java b/Mage.Sets/src/mage/cards/e/EnterprisingScallywag.java index f493e4e5052..d1fa7a97063 100644 --- a/Mage.Sets/src/mage/cards/e/EnterprisingScallywag.java +++ b/Mage.Sets/src/mage/cards/e/EnterprisingScallywag.java @@ -1,7 +1,7 @@ package mage.cards.e; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.DescendedThisTurnCondition; import mage.abilities.dynamicvalue.common.DescendedThisTurnCount; import mage.abilities.effects.common.CreateTokenEffect; @@ -30,8 +30,8 @@ public final class EnterprisingScallywag extends CardImpl { // At the beginning of your end step, if you descended this turn, create a Treasure token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new TreasureToken()), TargetController.YOU, - DescendedThisTurnCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new TreasureToken()), + false, DescendedThisTurnCondition.instance ).addHint(DescendedThisTurnCount.getHint()), new DescendedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/e/EowynLadyOfRohan.java b/Mage.Sets/src/mage/cards/e/EowynLadyOfRohan.java index b7acdd43458..cd8e9814d92 100644 --- a/Mage.Sets/src/mage/cards/e/EowynLadyOfRohan.java +++ b/Mage.Sets/src/mage/cards/e/EowynLadyOfRohan.java @@ -38,7 +38,7 @@ public final class EowynLadyOfRohan extends CardImpl { // At the beginning of combat on your turn, target creature gains your choice of first strike or vigilance until end of turn. If that creature is equipped, it gains first strike and vigilance until end of turn instead. Ability ability = new BeginningOfCombatTriggeredAbility( - new EowynLadyOfRohanEffect(), false + new EowynLadyOfRohanEffect() ); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ErgRaiders.java b/Mage.Sets/src/mage/cards/e/ErgRaiders.java index 22a7091b2fb..9a3a486642a 100644 --- a/Mage.Sets/src/mage/cards/e/ErgRaiders.java +++ b/Mage.Sets/src/mage/cards/e/ErgRaiders.java @@ -3,7 +3,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.AttackedThisTurnSourceCondition; @@ -15,10 +15,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.watchers.common.AttackedThisTurnWatcher; /** * @@ -40,7 +38,7 @@ public final class ErgRaiders extends CardImpl { "{this} deals 2 damage to you unless it came under your control this turn" ); Ability ability = new ConditionalInterveningIfTriggeredAbility( - new BeginningOfEndStepTriggeredAbility(effect, TargetController.YOU, false), + new BeginningOfEndStepTriggeredAbility(effect), new InvertCondition(AttackedThisTurnSourceCondition.instance), "At the beginning of your end step, if {this} didn't attack this turn, {this} deals 2 damage to you unless it came under your control this turn."); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/e/ErietteOfTheCharmedApple.java b/Mage.Sets/src/mage/cards/e/ErietteOfTheCharmedApple.java index 199998fd616..f4483740e32 100644 --- a/Mage.Sets/src/mage/cards/e/ErietteOfTheCharmedApple.java +++ b/Mage.Sets/src/mage/cards/e/ErietteOfTheCharmedApple.java @@ -3,7 +3,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -13,7 +13,6 @@ import mage.abilities.effects.common.combat.CantAttackYouAllEffect; import mage.abilities.hint.ValueHint; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.EnchantedBySourceControllerPredicate; @@ -49,7 +48,7 @@ public final class ErietteOfTheCharmedApple extends CardImpl { // At the beginning of your end step, each opponent loses X life and you gain X life, where X is the number of Auras you control. Ability ability = new BeginningOfEndStepTriggeredAbility(new LoseLifeOpponentsEffect(count) - .setText("each opponent loses X life"), TargetController.YOU, false); + .setText("each opponent loses X life")); ability.addEffect(new GainLifeEffect(count) .setText("and you gain X life, where X is the number of Auras you control")); ability.addHint(new ValueHint("Number of Auras you control", count)); diff --git a/Mage.Sets/src/mage/cards/e/EvidenceExaminer.java b/Mage.Sets/src/mage/cards/e/EvidenceExaminer.java index 89ef5256030..d8cd9d50e50 100644 --- a/Mage.Sets/src/mage/cards/e/EvidenceExaminer.java +++ b/Mage.Sets/src/mage/cards/e/EvidenceExaminer.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import java.util.UUID; @@ -29,8 +28,7 @@ public final class EvidenceExaminer extends CardImpl { // At the beginning of combat on your turn, you may collect evidence 4. this.addAbility(new BeginningOfCombatTriggeredAbility( - new DoIfCostPaid(null, new CollectEvidenceCost(4)), - false + new DoIfCostPaid(null, new CollectEvidenceCost(4)) )); // Whenever you collect evidence, investigate. diff --git a/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java b/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java index b7a8ad576a4..f5905104315 100644 --- a/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java +++ b/Mage.Sets/src/mage/cards/e/EzuriClawOfProgress.java @@ -49,7 +49,7 @@ public final class EzuriClawOfProgress extends CardImpl { ), filter)); // At the beginning of combat on your turn, put X +1/+1 counters on another target creature you control, where X is the number of experience counters you have. - Ability ability = new BeginningOfCombatTriggeredAbility(new EzuriClawOfProgressEffect(), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new EzuriClawOfProgressEffect()); ability.addTarget(new TargetControlledCreaturePermanent(filter2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FaeOffering.java b/Mage.Sets/src/mage/cards/f/FaeOffering.java index 191f6c83998..9bde1f335e5 100644 --- a/Mage.Sets/src/mage/cards/f/FaeOffering.java +++ b/Mage.Sets/src/mage/cards/f/FaeOffering.java @@ -1,7 +1,7 @@ package mage.cards.f; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -33,8 +33,8 @@ public final class FaeOffering extends CardImpl { // At the beginning of each end step, if you've cast both a creature spell and a noncreature spell this turn, create a Clue token, a Food token, and a Treasure token. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new ClueArtifactToken()).withAdditionalTokens(new FoodToken(), new TreasureToken()), - TargetController.ANY, false + TargetController.ANY, new CreateTokenEffect(new ClueArtifactToken()).withAdditionalTokens(new FoodToken(), new TreasureToken()), + false ), FaeOfferingCondition.instance, "At the beginning of each end step, " + "if you've cast both a creature spell and a noncreature spell this turn, " + "create a Clue token, a Food token, and a Treasure token." diff --git a/Mage.Sets/src/mage/cards/f/FairgroundsTrumpeter.java b/Mage.Sets/src/mage/cards/f/FairgroundsTrumpeter.java index 025d5030f65..7af99a34ab5 100644 --- a/Mage.Sets/src/mage/cards/f/FairgroundsTrumpeter.java +++ b/Mage.Sets/src/mage/cards/f/FairgroundsTrumpeter.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -35,8 +35,8 @@ public final class FairgroundsTrumpeter extends CardImpl { // At the beginning of each end step, if a +1/+1 counter was put on a permanent under your control this turn, put a +1/+1 counter on Fairgrounds Trumpeter. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - TargetController.ANY, false), FairgroundsTrumpeterCondition.instance, + TargetController.ANY, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), + false), FairgroundsTrumpeterCondition.instance, "At the beginning of each end step, if a +1/+1 counter was put on a permanent under your control this turn, put a +1/+1 counter on {this}."), new FairgroundsTrumpeterWatcher()); } diff --git a/Mage.Sets/src/mage/cards/f/FangOfThePack.java b/Mage.Sets/src/mage/cards/f/FangOfThePack.java index 7df98269d16..3f5c064dfba 100644 --- a/Mage.Sets/src/mage/cards/f/FangOfThePack.java +++ b/Mage.Sets/src/mage/cards/f/FangOfThePack.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.target.common.TargetControlledCreaturePermanent; @@ -32,7 +31,7 @@ public final class FangOfThePack extends CardImpl { this.addAbility(new MeleeAbility()); // At the beginning of combat on your turn, another target creature you control gains melee until end of turn. - Ability ability = new BeginningOfCombatTriggeredAbility(new GainAbilityTargetEffect(new MeleeAbility(), Duration.EndOfTurn), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new GainAbilityTargetEffect(new MeleeAbility(), Duration.EndOfTurn)); ability.addTarget(new TargetControlledCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE_YOU_CONTROL)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FarTraveler.java b/Mage.Sets/src/mage/cards/f/FarTraveler.java index 9f4e2efbadf..f5b6c82c61e 100644 --- a/Mage.Sets/src/mage/cards/f/FarTraveler.java +++ b/Mage.Sets/src/mage/cards/f/FarTraveler.java @@ -1,7 +1,7 @@ package mage.cards.f; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.ExileThenReturnTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; @@ -35,7 +35,7 @@ public final class FarTraveler extends CardImpl { // Commander creatures you own have "At the beginning of your end step, exile up to one target tapped creature you control, then return it to the battlefield under its owner's control." Ability ability = new BeginningOfEndStepTriggeredAbility( - new ExileThenReturnTargetEffect(false, false), TargetController.YOU, false + new ExileThenReturnTargetEffect(false, false) ); ability.addTarget(new TargetPermanent(0, 1, filter)); this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( diff --git a/Mage.Sets/src/mage/cards/f/FaramirFieldCommander.java b/Mage.Sets/src/mage/cards/f/FaramirFieldCommander.java index 78077a7c36a..4766185c548 100644 --- a/Mage.Sets/src/mage/cards/f/FaramirFieldCommander.java +++ b/Mage.Sets/src/mage/cards/f/FaramirFieldCommander.java @@ -1,7 +1,7 @@ package mage.cards.f; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.TheRingTemptsYouChooseAnotherTriggeredAbility; import mage.abilities.condition.common.CreatureDiedControlledCondition; import mage.abilities.effects.common.CreateTokenEffect; @@ -32,8 +32,8 @@ public final class FaramirFieldCommander extends CardImpl { // At the beginning of your end step, if a creature died under your control this turn, draw a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), TargetController.YOU, - CreatureDiedControlledCondition.instance, false + TargetController.YOU, new DrawCardSourceControllerEffect(1), + false, CreatureDiedControlledCondition.instance ).addHint(CreatureDiedControlledCondition.getHint())); // Whenever the Ring tempts you, if you chose a creature other than Faramir, Field Commander as your Ring-bearer, create a 1/1 white Human Soldier creature token. @@ -49,4 +49,3 @@ public final class FaramirFieldCommander extends CardImpl { return new FaramirFieldCommander(this); } } - diff --git a/Mage.Sets/src/mage/cards/f/FaramirPrinceOfIthilien.java b/Mage.Sets/src/mage/cards/f/FaramirPrinceOfIthilien.java index b930af0a933..4d3cd3d6d58 100644 --- a/Mage.Sets/src/mage/cards/f/FaramirPrinceOfIthilien.java +++ b/Mage.Sets/src/mage/cards/f/FaramirPrinceOfIthilien.java @@ -3,7 +3,7 @@ package mage.cards.f; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfPlayersNextEndStepDelayedTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -43,7 +43,7 @@ public final class FaramirPrinceOfIthilien extends CardImpl { // At the beginning of your end step, choose an opponent. // At the beginning of that player's next end step, you draw a card if they didn't attack you that turn. // Otherwise, create three 1/1 white Human Soldier creature tokens. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new FaramirPrinceOfIthilienEffect(), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new FaramirPrinceOfIthilienEffect())); } private FaramirPrinceOfIthilien(final FaramirPrinceOfIthilien card) { diff --git a/Mage.Sets/src/mage/cards/f/FaramirStewardOfGondor.java b/Mage.Sets/src/mage/cards/f/FaramirStewardOfGondor.java index dd98e7b2f73..252036d6c90 100644 --- a/Mage.Sets/src/mage/cards/f/FaramirStewardOfGondor.java +++ b/Mage.Sets/src/mage/cards/f/FaramirStewardOfGondor.java @@ -1,7 +1,7 @@ package mage.cards.f; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.condition.common.MonarchIsSourceControllerCondition; import mage.abilities.effects.common.BecomesMonarchSourceEffect; @@ -44,8 +44,8 @@ public final class FaramirStewardOfGondor extends CardImpl { // At the beginning of your end step, if you're the monarch, create two 1/1 white Human Soldier creature tokens. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new HumanSoldierToken(), 2), TargetController.YOU, - MonarchIsSourceControllerCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new HumanSoldierToken(), 2), + false, MonarchIsSourceControllerCondition.instance )); } diff --git a/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java b/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java index a74e5551c94..9529fdde0d0 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java @@ -1,7 +1,7 @@ package mage.cards.f; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.dynamicvalue.common.CreaturesDiedThisTurnCount; import mage.abilities.effects.OneShotEffect; @@ -32,9 +32,9 @@ public final class FeastOfTheVictoriousDead extends CardImpl { // At the beginning of your end step, if one or more creatures died this turn, you gain that much life and distribute that many +1/+1 counters among creatures you control. Ability ability = new BeginningOfEndStepTriggeredAbility( - new GainLifeEffect(CreaturesDiedThisTurnCount.instance) + TargetController.YOU, new GainLifeEffect(CreaturesDiedThisTurnCount.instance) .setText("you gain that much life"), - TargetController.YOU, FeastOfTheVictoriousDeadCondition.instance, false + false, FeastOfTheVictoriousDeadCondition.instance ); ability.addEffect(new FeastOfTheVictoriousDeadEffect()); this.addAbility(ability.addHint(CreaturesDiedThisTurnHint.instance)); diff --git a/Mage.Sets/src/mage/cards/f/FeedThePack.java b/Mage.Sets/src/mage/cards/f/FeedThePack.java index a497ebe8360..2fd14671b33 100644 --- a/Mage.Sets/src/mage/cards/f/FeedThePack.java +++ b/Mage.Sets/src/mage/cards/f/FeedThePack.java @@ -3,7 +3,7 @@ package mage.cards.f; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -29,7 +29,7 @@ public final class FeedThePack extends CardImpl { // At the beginning of your end step, you may sacrifice a nontoken creature. If you do, create X 2/2 green Wolf creature tokens, where X is the sacrificed creature's toughness. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new FeedThePackEffect(), true)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new FeedThePackEffect(), true)); } private FeedThePack(final FeedThePack card) { @@ -79,4 +79,4 @@ class FeedThePackEffect extends OneShotEffect { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/f/Ferocification.java b/Mage.Sets/src/mage/cards/f/Ferocification.java index bcf4771b4f8..2f48c90cb72 100644 --- a/Mage.Sets/src/mage/cards/f/Ferocification.java +++ b/Mage.Sets/src/mage/cards/f/Ferocification.java @@ -10,7 +10,6 @@ import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class Ferocification extends CardImpl { // At the beginning of combat on your turn, choose one-- // * Target creature you control gets +2/+0 until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( - new BoostTargetEffect(2, 0), false + new BoostTargetEffect(2, 0) ); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/f/FeveredVisions.java b/Mage.Sets/src/mage/cards/f/FeveredVisions.java index 70b7d981553..d45701b7746 100644 --- a/Mage.Sets/src/mage/cards/f/FeveredVisions.java +++ b/Mage.Sets/src/mage/cards/f/FeveredVisions.java @@ -1,7 +1,7 @@ package mage.cards.f; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class FeveredVisions extends CardImpl { // At the beginning of each player's end step, that player draws a card. If the player is your opponent and has four or more cards in hand, // Fevered Visions deals 2 damage to that player. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new FeveredVisionsEffect(), TargetController.EACH_PLAYER, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.EACH_PLAYER, new FeveredVisionsEffect(), false)); } private FeveredVisions(final FeveredVisions card) { diff --git a/Mage.Sets/src/mage/cards/f/FeywildCaretaker.java b/Mage.Sets/src/mage/cards/f/FeywildCaretaker.java index 61860fd8027..5f5101d7206 100644 --- a/Mage.Sets/src/mage/cards/f/FeywildCaretaker.java +++ b/Mage.Sets/src/mage/cards/f/FeywildCaretaker.java @@ -1,7 +1,7 @@ package mage.cards.f; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.HaveInitiativeCondition; import mage.abilities.effects.common.CreateTokenEffect; @@ -34,8 +34,8 @@ public final class FeywildCaretaker extends CardImpl { // At the beginning of your end step, if you have the initiative, create a 1/1 blue Faerie Dragon creature token with flying. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new FaerieDragonToken()), TargetController.YOU, - HaveInitiativeCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new FaerieDragonToken()), + false, HaveInitiativeCondition.instance ).addHint(InitiativeHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/f/FightRigging.java b/Mage.Sets/src/mage/cards/f/FightRigging.java index cde7a4025ed..7ea5ed79be4 100644 --- a/Mage.Sets/src/mage/cards/f/FightRigging.java +++ b/Mage.Sets/src/mage/cards/f/FightRigging.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; @@ -42,8 +41,7 @@ public final class FightRigging extends CardImpl { // At the beginning of combat on your turn, put a +1/+1 counter on target creature you control. Then if you control a creature with power 7 or greater, you may play the exiled card without paying its mana cost. Ability ability = new BeginningOfCombatTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), - false + new AddCountersTargetEffect(CounterType.P1P1.createInstance()) ); ability.addEffect(new ConditionalOneShotEffect( new HideawayPlayEffect(), condition, "Then if you control a creature " + diff --git a/Mage.Sets/src/mage/cards/f/FirstResponder.java b/Mage.Sets/src/mage/cards/f/FirstResponder.java index d9c7fd9aca4..46a55e0c1dc 100644 --- a/Mage.Sets/src/mage/cards/f/FirstResponder.java +++ b/Mage.Sets/src/mage/cards/f/FirstResponder.java @@ -2,7 +2,7 @@ package mage.cards.f; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; @@ -35,7 +35,7 @@ public final class FirstResponder extends CardImpl { // At the beginning of your end step, you may return another creature you control to its owner's hand, then put a number of +1/+1 counters equal to that creature's power on First Responder. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new FirstResponderEffect(), TargetController.YOU, false + new FirstResponderEffect() )); } diff --git a/Mage.Sets/src/mage/cards/f/FlameBlitz.java b/Mage.Sets/src/mage/cards/f/FlameBlitz.java index 8a1fc3bd7e0..0173acb2599 100644 --- a/Mage.Sets/src/mage/cards/f/FlameBlitz.java +++ b/Mage.Sets/src/mage/cards/f/FlameBlitz.java @@ -1,13 +1,12 @@ package mage.cards.f; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.keyword.CyclingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import java.util.UUID; @@ -23,7 +22,7 @@ public final class FlameBlitz extends CardImpl { // At the beginning of your end step, Flame Blitz deals 5 damage to each planeswalker. this.addAbility(new BeginningOfEndStepTriggeredAbility(new DamageAllEffect( 5, StaticFilters.FILTER_PERMANENT_PLANESWALKER - ), TargetController.YOU, false)); + ))); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/f/ForceBubble.java b/Mage.Sets/src/mage/cards/f/ForceBubble.java index e8b3756dc00..e4407509e7f 100644 --- a/Mage.Sets/src/mage/cards/f/ForceBubble.java +++ b/Mage.Sets/src/mage/cards/f/ForceBubble.java @@ -4,7 +4,7 @@ package mage.cards.f; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.StateTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.RemoveAllCountersSourceEffect; @@ -21,7 +21,6 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; /** @@ -40,7 +39,7 @@ public final class ForceBubble extends CardImpl { this.addAbility(new ForceBubbleStateTriggeredAbility()); // At the beginning of each end step, remove all depletion counters from Force Bubble. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new RemoveAllCountersSourceEffect(CounterType.DEPLETION), TargetController.ANY, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new RemoveAllCountersSourceEffect(CounterType.DEPLETION), false)); } private ForceBubble(final ForceBubble card) { diff --git a/Mage.Sets/src/mage/cards/f/ForebodingStatue.java b/Mage.Sets/src/mage/cards/f/ForebodingStatue.java index 1bd52d1d33c..c9b454f25a3 100644 --- a/Mage.Sets/src/mage/cards/f/ForebodingStatue.java +++ b/Mage.Sets/src/mage/cards/f/ForebodingStatue.java @@ -3,7 +3,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.SourceHasCounterCondition; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.effects.common.UntapSourceEffect; @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.counters.CounterType; /** @@ -37,12 +36,12 @@ public final class ForebodingStatue extends CardImpl { ability.addEffect(new AddCountersSourceEffect(CounterType.OMEN.createInstance())); this.addAbility(ability); - // At the beginning of your end step, if there are three or more omen counters on Foreboding Statue, uptap it, then transform it. + // At the beginning of your end step, if there are three or more omen counters on Foreboding Statue, untap it, then transform it. this.addAbility(new TransformAbility()); ability = new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new UntapSourceEffect().setText("untap it,"), TargetController.YOU, - new SourceHasCounterCondition(CounterType.OMEN, 3), false - ).setTriggerPhrase("At the beginning of your end step, if there are three or more omen counters on {this}, "); + TargetController.YOU, new UntapSourceEffect().setText("untap it,"), + false, new SourceHasCounterCondition(CounterType.OMEN, 3) + ); ability.addEffect(new TransformSourceEffect().setText("then transform it")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java index fd1bbd8f16f..7b6c1206419 100644 --- a/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java +++ b/Mage.Sets/src/mage/cards/f/FormOfTheDragon.java @@ -3,7 +3,7 @@ package mage.cards.f; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DamageTargetEffect; @@ -42,7 +42,7 @@ public final class FormOfTheDragon extends CardImpl { this.addAbility(ability); // At the beginning of each end step, your life total becomes 5. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new SetPlayerLifeSourceEffect(5), TargetController.ANY, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new SetPlayerLifeSourceEffect(5), false)); // Creatures without flying can't attack you. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filter))); diff --git a/Mage.Sets/src/mage/cards/f/ForsakenThresher.java b/Mage.Sets/src/mage/cards/f/ForsakenThresher.java index 8474fa4df55..ff71b95d151 100644 --- a/Mage.Sets/src/mage/cards/f/ForsakenThresher.java +++ b/Mage.Sets/src/mage/cards/f/ForsakenThresher.java @@ -7,7 +7,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import java.util.UUID; @@ -24,7 +23,7 @@ public class ForsakenThresher extends CardImpl { this.nightCard = true; // At the beginning of your precombat main phase, add one mana of any color. - this.addAbility(new BeginningOfFirstMainTriggeredAbility(new AddManaOfAnyColorEffect(), false)); + this.addAbility(new BeginningOfFirstMainTriggeredAbility(new AddManaOfAnyColorEffect())); } private ForsakenThresher(final ForsakenThresher card) { diff --git a/Mage.Sets/src/mage/cards/f/FourKnocks.java b/Mage.Sets/src/mage/cards/f/FourKnocks.java index 041b0063144..6053169c83a 100644 --- a/Mage.Sets/src/mage/cards/f/FourKnocks.java +++ b/Mage.Sets/src/mage/cards/f/FourKnocks.java @@ -6,7 +6,6 @@ import mage.abilities.keyword.VanishingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import java.util.UUID; @@ -23,7 +22,7 @@ public final class FourKnocks extends CardImpl { // At the beginning of your precombat main phase, draw a card. this.addAbility(new BeginningOfFirstMainTriggeredAbility( - new DrawCardSourceControllerEffect(1), false + new DrawCardSourceControllerEffect(1) )); } diff --git a/Mage.Sets/src/mage/cards/f/FromTheRubble.java b/Mage.Sets/src/mage/cards/f/FromTheRubble.java index e0995597023..ed6dd13521b 100644 --- a/Mage.Sets/src/mage/cards/f/FromTheRubble.java +++ b/Mage.Sets/src/mage/cards/f/FromTheRubble.java @@ -2,7 +2,7 @@ package mage.cards.f; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.ChooseCreatureTypeEffect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldWithCounterTargetEffect; import mage.cards.CardImpl; @@ -39,9 +39,8 @@ public final class FromTheRubble extends CardImpl { // At the beginning of your end step, return target creature card of the chosen type from your graveyard to // the battlefield with a finality counter on it. - Ability ability = new BeginningOfYourEndStepTriggeredAbility( - new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.FINALITY.createInstance()), - false + Ability ability = new BeginningOfEndStepTriggeredAbility( + new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.FINALITY.createInstance()) ); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java b/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java index f9d76e0bf59..6d98b95bd59 100644 --- a/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java +++ b/Mage.Sets/src/mage/cards/f/FruitcakeElemental.java @@ -4,7 +4,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffect; @@ -20,7 +20,6 @@ import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; import mage.constants.SubType; -import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -44,7 +43,7 @@ public final class FruitcakeElemental extends CardImpl { this.addAbility(IndestructibleAbility.getInstance()); // At the end of your turn, Fruitcake Elemental deals 7 damage to you. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new DamageControllerEffect(7), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new DamageControllerEffect(7))); // {3}: Target player gains control of Fruitcake Elemental. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new FruitcakeElementalEffect(), new ManaCostsImpl<>("{3}")); diff --git a/Mage.Sets/src/mage/cards/f/FuriousRise.java b/Mage.Sets/src/mage/cards/f/FuriousRise.java index 9feda63b68e..74e1cb4d663 100644 --- a/Mage.Sets/src/mage/cards/f/FuriousRise.java +++ b/Mage.Sets/src/mage/cards/f/FuriousRise.java @@ -2,7 +2,7 @@ package mage.cards.f; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.FerociousCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.AsThoughEffect; @@ -32,7 +32,7 @@ public final class FuriousRise extends CardImpl { // At the beginning of your end step, if you control a creature with power 4 or greater, exile the top card of your library. // You may play that card until you exile another card with Furious Rise. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility( - new FuriousRiseEffect(), TargetController.YOU, false), FerociousCondition.instance, + new FuriousRiseEffect()), FerociousCondition.instance, "At the beginning of your end step, if you control a creature with power 4 or greater, exile the top card of your library. You may play that card until you exile another card with {this}.")); } diff --git a/Mage.Sets/src/mage/cards/f/FurybladeVampire.java b/Mage.Sets/src/mage/cards/f/FurybladeVampire.java index 9f8347103b1..1a1a9b8611a 100644 --- a/Mage.Sets/src/mage/cards/f/FurybladeVampire.java +++ b/Mage.Sets/src/mage/cards/f/FurybladeVampire.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import java.util.UUID; @@ -32,7 +31,7 @@ public final class FurybladeVampire extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // At the beginning of combat on your turn, you may discard a card. If you do, Furyblade Vampire gets +3/+0 until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( - new DoIfCostPaid(new BoostSourceEffect(3, 0, Duration.EndOfTurn), new DiscardCardCost(), "Discard a card for {this} to get +3/+0 until end of turn?", true), false); + new DoIfCostPaid(new BoostSourceEffect(3, 0, Duration.EndOfTurn), new DiscardCardCost(), "Discard a card for {this} to get +3/+0 until end of turn?", true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GadrakTheCrownScourge.java b/Mage.Sets/src/mage/cards/g/GadrakTheCrownScourge.java index 3c9d1c89fd5..40d370f7970 100644 --- a/Mage.Sets/src/mage/cards/g/GadrakTheCrownScourge.java +++ b/Mage.Sets/src/mage/cards/g/GadrakTheCrownScourge.java @@ -2,7 +2,7 @@ package mage.cards.g; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -54,7 +54,7 @@ public final class GadrakTheCrownScourge extends CardImpl { // At the beginning of your end step, create a Treasure token for each nontoken creature that died this turn. this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect( new TreasureToken(), GadrakTheCrownScourgeValue.instance - ), TargetController.YOU, false), new GadrakTheCrownScourgeWatcher()); + )), new GadrakTheCrownScourgeWatcher()); } private GadrakTheCrownScourge(final GadrakTheCrownScourge card) { diff --git a/Mage.Sets/src/mage/cards/g/GargoyleFlock.java b/Mage.Sets/src/mage/cards/g/GargoyleFlock.java index 27245eadbc2..03182721827 100644 --- a/Mage.Sets/src/mage/cards/g/GargoyleFlock.java +++ b/Mage.Sets/src/mage/cards/g/GargoyleFlock.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.CreatureEnteredUnderYourControlCondition; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; @@ -33,8 +33,8 @@ public final class GargoyleFlock extends CardImpl { // Skyswarm -- At the beginning of your end step, if a creature entered the battlefield under your control this turn, create a 1/1 blue Tyranid Gargoyle creature token with flying. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new TyranidGargoyleToken()), TargetController.YOU, - CreatureEnteredUnderYourControlCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new TyranidGargoyleToken()), + false, CreatureEnteredUnderYourControlCondition.instance ).withFlavorWord("Skyswarm"), new CreatureEnteredControllerWatcher()); } diff --git a/Mage.Sets/src/mage/cards/g/GarrulousSycophant.java b/Mage.Sets/src/mage/cards/g/GarrulousSycophant.java index d5326fa6242..75a55acb1f0 100644 --- a/Mage.Sets/src/mage/cards/g/GarrulousSycophant.java +++ b/Mage.Sets/src/mage/cards/g/GarrulousSycophant.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MonarchIsSourceControllerCondition; import mage.abilities.effects.Effect; import mage.abilities.effects.common.GainLifeEffect; @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; /** * @@ -32,8 +31,8 @@ public final class GarrulousSycophant extends CardImpl { this.toughness = new MageInt(4); // At the beginning of your end step, if you're the monarch, each opponent loses 1 life and you gain 1 life. - Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(1), - TargetController.YOU, MonarchIsSourceControllerCondition.instance, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new LoseLifeOpponentsEffect(1), + false, MonarchIsSourceControllerCondition.instance); Effect effect = new GainLifeEffect(1); effect.setText("and you gain 1 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GavelOfTheRighteous.java b/Mage.Sets/src/mage/cards/g/GavelOfTheRighteous.java index 06f190e555a..bbe616ea942 100644 --- a/Mage.Sets/src/mage/cards/g/GavelOfTheRighteous.java +++ b/Mage.Sets/src/mage/cards/g/GavelOfTheRighteous.java @@ -39,7 +39,7 @@ public final class GavelOfTheRighteous extends CardImpl { // At the beginning of combat on your turn, put a charge counter on Gavel of the Righteous. this.addAbility(new BeginningOfCombatTriggeredAbility( - new AddCountersSourceEffect(CounterType.CHARGE.createInstance()), false + new AddCountersSourceEffect(CounterType.CHARGE.createInstance()) )); // Equipped creature gets +1/+1 for each counter on Gavel of the Righteous. diff --git a/Mage.Sets/src/mage/cards/g/GeologyEnthusiast.java b/Mage.Sets/src/mage/cards/g/GeologyEnthusiast.java index 95d00f8ef4c..60523e6669c 100644 --- a/Mage.Sets/src/mage/cards/g/GeologyEnthusiast.java +++ b/Mage.Sets/src/mage/cards/g/GeologyEnthusiast.java @@ -2,7 +2,7 @@ package mage.cards.g; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.permanent.token.PowerstoneToken; @@ -35,7 +34,7 @@ public final class GeologyEnthusiast extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility( new CreateTokenEffect( new PowerstoneToken(), 1, true - ), TargetController.YOU, false + ) )); // {6}: Draw a card and put a +1/+1 counter on Geology Enthusiast. diff --git a/Mage.Sets/src/mage/cards/g/GimbalGremlinProdigy.java b/Mage.Sets/src/mage/cards/g/GimbalGremlinProdigy.java index ff25225f775..c15322785a5 100644 --- a/Mage.Sets/src/mage/cards/g/GimbalGremlinProdigy.java +++ b/Mage.Sets/src/mage/cards/g/GimbalGremlinProdigy.java @@ -3,7 +3,7 @@ package mage.cards.g; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -44,7 +44,7 @@ public final class GimbalGremlinProdigy extends CardImpl { // At the beginning of your end step, create a 0/0 red Gremlin artifact creature token. Put X +1/+1 counters on it, where X is the number of differently named artifact tokens you control. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new GimbalGremlinProdigyEffect(), TargetController.YOU, false + new GimbalGremlinProdigyEffect() )); } diff --git a/Mage.Sets/src/mage/cards/g/GiselaTheBrokenBlade.java b/Mage.Sets/src/mage/cards/g/GiselaTheBrokenBlade.java index f923888fcf3..f98766b075c 100644 --- a/Mage.Sets/src/mage/cards/g/GiselaTheBrokenBlade.java +++ b/Mage.Sets/src/mage/cards/g/GiselaTheBrokenBlade.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.MeldCondition; import mage.abilities.effects.common.MeldEffect; @@ -45,9 +45,9 @@ public final class GiselaTheBrokenBlade extends CardImpl { this.addAbility(LifelinkAbility.getInstance()); // At the beginning of your end step, if you both own and control Gisela, the Broken Blade and a creature named Bruna, the Fading Light, exile them, then meld them into Brisela, Voice of Nightmares. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new MeldEffect( + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new MeldEffect( "Bruna, the Fading Light", "Brisela, Voice of Nightmares" - ).setText("exile them, then meld them into Brisela, Voice of Nightmares"), TargetController.YOU, condition, false)); + ).setText("exile them, then meld them into Brisela, Voice of Nightmares"), false, condition)); } private GiselaTheBrokenBlade(final GiselaTheBrokenBlade card) { diff --git a/Mage.Sets/src/mage/cards/g/Gleancrawler.java b/Mage.Sets/src/mage/cards/g/Gleancrawler.java index b25cfc0ace7..e06ba1add1f 100644 --- a/Mage.Sets/src/mage/cards/g/Gleancrawler.java +++ b/Mage.Sets/src/mage/cards/g/Gleancrawler.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandFromGraveyardAllEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; @@ -43,8 +43,7 @@ public final class Gleancrawler extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility( new ReturnToHandFromGraveyardAllEffect(filter, TargetController.YOU) .setText("return to your hand all creature cards in your graveyard " + - "that were put there from the battlefield this turn"), - TargetController.YOU, false + "that were put there from the battlefield this turn") ), new CardsPutIntoGraveyardWatcher()); } diff --git a/Mage.Sets/src/mage/cards/g/GlissaHeraldOfPredation.java b/Mage.Sets/src/mage/cards/g/GlissaHeraldOfPredation.java index eb06e24ef74..ae56395b04b 100644 --- a/Mage.Sets/src/mage/cards/g/GlissaHeraldOfPredation.java +++ b/Mage.Sets/src/mage/cards/g/GlissaHeraldOfPredation.java @@ -40,7 +40,7 @@ public final class GlissaHeraldOfPredation extends CardImpl { // At the beginning of combat on your turn, choose one -- // * Incubate 2 twice. Ability ability = new BeginningOfCombatTriggeredAbility( - new GlissaHeraldOfPredationIncubateEffect(), false + new GlissaHeraldOfPredationIncubateEffect() ); // * Transform all Incubator tokens you control. diff --git a/Mage.Sets/src/mage/cards/g/Glitterfang.java b/Mage.Sets/src/mage/cards/g/Glitterfang.java index 05de5398bc1..b838d06f0ff 100644 --- a/Mage.Sets/src/mage/cards/g/Glitterfang.java +++ b/Mage.Sets/src/mage/cards/g/Glitterfang.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class Glitterfang extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // At the beginning of the end step, return Glitterfang to its owner's hand. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ReturnToHandSourceEffect(true), TargetController.NEXT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, new ReturnToHandSourceEffect(true), false)); } private Glitterfang(final Glitterfang card) { diff --git a/Mage.Sets/src/mage/cards/g/GloriousSunrise.java b/Mage.Sets/src/mage/cards/g/GloriousSunrise.java index 18801cdbf5a..479bd984004 100644 --- a/Mage.Sets/src/mage/cards/g/GloriousSunrise.java +++ b/Mage.Sets/src/mage/cards/g/GloriousSunrise.java @@ -51,7 +51,7 @@ public final class GloriousSunrise extends CardImpl { // • Creatures you control get +1/+1 and gain trample until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility(new BoostControlledEffect( 1, 1, Duration.EndOfTurn - ).setText("creatures you control get +1/+1"), false); + ).setText("creatures you control get +1/+1")); ability.addEffect(new GainAbilityControlledEffect( TrampleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE diff --git a/Mage.Sets/src/mage/cards/g/GluntchTheBestower.java b/Mage.Sets/src/mage/cards/g/GluntchTheBestower.java index 01225baca2f..b0f3b44dea7 100644 --- a/Mage.Sets/src/mage/cards/g/GluntchTheBestower.java +++ b/Mage.Sets/src/mage/cards/g/GluntchTheBestower.java @@ -2,7 +2,7 @@ package mage.cards.g; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -40,9 +40,7 @@ public final class GluntchTheBestower extends CardImpl { // At the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new GluntchTheBestowerEffect(), - TargetController.YOU, - false + new GluntchTheBestowerEffect() )); } diff --git a/Mage.Sets/src/mage/cards/g/GoShintaiOfAncientWars.java b/Mage.Sets/src/mage/cards/g/GoShintaiOfAncientWars.java index 095b615aafc..01011d968ac 100644 --- a/Mage.Sets/src/mage/cards/g/GoShintaiOfAncientWars.java +++ b/Mage.Sets/src/mage/cards/g/GoShintaiOfAncientWars.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.delayed.ReflexiveTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.DynamicValue; @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetPlayerOrPlaneswalker; @@ -50,8 +49,7 @@ public final class GoShintaiOfAncientWars extends CardImpl { ); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(new BeginningOfEndStepTriggeredAbility( - new DoWhenCostPaid(ability, new GenericManaCost(1), "Pay {1}?"), - TargetController.YOU, false + new DoWhenCostPaid(ability, new GenericManaCost(1), "Pay {1}?") ).addHint(hint)); } diff --git a/Mage.Sets/src/mage/cards/g/GoShintaiOfBoundlessVigor.java b/Mage.Sets/src/mage/cards/g/GoShintaiOfBoundlessVigor.java index 1a1141faa45..6c50c66c30e 100644 --- a/Mage.Sets/src/mage/cards/g/GoShintaiOfBoundlessVigor.java +++ b/Mage.Sets/src/mage/cards/g/GoShintaiOfBoundlessVigor.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.delayed.ReflexiveTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.DynamicValue; @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; @@ -55,7 +54,7 @@ public final class GoShintaiOfBoundlessVigor extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(new BeginningOfEndStepTriggeredAbility(new DoWhenCostPaid( ability, new GenericManaCost(1), "Pay {1}?" - ), TargetController.YOU, false).addHint(hint)); + )).addHint(hint)); } private GoShintaiOfBoundlessVigor(final GoShintaiOfBoundlessVigor card) { diff --git a/Mage.Sets/src/mage/cards/g/GoShintaiOfHiddenCruelty.java b/Mage.Sets/src/mage/cards/g/GoShintaiOfHiddenCruelty.java index d2943cda204..38c76716b3f 100644 --- a/Mage.Sets/src/mage/cards/g/GoShintaiOfHiddenCruelty.java +++ b/Mage.Sets/src/mage/cards/g/GoShintaiOfHiddenCruelty.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.delayed.ReflexiveTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -58,8 +57,7 @@ public final class GoShintaiOfHiddenCruelty extends CardImpl { ); ability.addTarget(new TargetPermanent(filter)); this.addAbility(new BeginningOfEndStepTriggeredAbility( - new DoWhenCostPaid(ability, new GenericManaCost(1), "Pay {1}?"), - TargetController.YOU, false + new DoWhenCostPaid(ability, new GenericManaCost(1), "Pay {1}?") ).addHint(GoShintaiOfHiddenCrueltyPredicate.getHint())); } diff --git a/Mage.Sets/src/mage/cards/g/GoShintaiOfLostWisdom.java b/Mage.Sets/src/mage/cards/g/GoShintaiOfLostWisdom.java index 7388f900b5f..aee2e8ce8a9 100644 --- a/Mage.Sets/src/mage/cards/g/GoShintaiOfLostWisdom.java +++ b/Mage.Sets/src/mage/cards/g/GoShintaiOfLostWisdom.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.delayed.ReflexiveTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.DynamicValue; @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.target.TargetPlayer; @@ -51,7 +50,7 @@ public final class GoShintaiOfLostWisdom extends CardImpl { ability.addTarget(new TargetPlayer()); this.addAbility(new BeginningOfEndStepTriggeredAbility(new DoWhenCostPaid( ability, new GenericManaCost(1), "Pay {1}?" - ), TargetController.YOU, false).addHint(hint)); + )).addHint(hint)); } private GoShintaiOfLostWisdom(final GoShintaiOfLostWisdom card) { diff --git a/Mage.Sets/src/mage/cards/g/GoShintaiOfSharedPurpose.java b/Mage.Sets/src/mage/cards/g/GoShintaiOfSharedPurpose.java index 8ee70362b77..f565593f6bd 100644 --- a/Mage.Sets/src/mage/cards/g/GoShintaiOfSharedPurpose.java +++ b/Mage.Sets/src/mage/cards/g/GoShintaiOfSharedPurpose.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.game.permanent.token.SpiritToken; @@ -47,7 +46,7 @@ public final class GoShintaiOfSharedPurpose extends CardImpl { new DoIfCostPaid( new CreateTokenEffect(new SpiritToken(), xValue), new GenericManaCost(1) - ), TargetController.YOU, false + ) ).addHint(hint)); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java b/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java index 66c48f2a028..e2905214605 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -40,7 +40,7 @@ public final class GoblinPyromancer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility(new BoostAllEffect(3, 0, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, false))); // At the beginning of the end step, destroy all Goblins. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new DestroyAllEffect(filterPermanent, false), TargetController.NEXT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, new DestroyAllEffect(filterPermanent, false), false)); } private GoblinPyromancer(final GoblinPyromancer card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java index 08fe4fb4bb5..7933b989f0b 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRabblemaster.java @@ -50,7 +50,7 @@ public final class GoblinRabblemaster extends CardImpl { this.addAbility(new SimpleStaticAbility(new AttacksIfAbleAllEffect(otherGoblinFilter))); // At the beginning of combat on your turn, create a 1/1 red Goblin creature token with haste. - this.addAbility(new BeginningOfCombatTriggeredAbility(new CreateTokenEffect(new GoblinToken(true)), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new CreateTokenEffect(new GoblinToken(true)))); // When Goblin Rabblemaster attacks, it gets +1/+0 until end of turn for each other attacking Goblin. this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(attackingFilter), StaticValue.get(0), Duration.EndOfTurn, "it"), false)); diff --git a/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java b/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java index 3ef1ace9a9d..e7fcb812e37 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRazerunners.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -19,7 +19,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetPlayerOrPlaneswalker; /** @@ -44,7 +43,7 @@ public final class GoblinRazerunners extends CardImpl { this.addAbility(ability); // At the beginning of your end step, you may have Goblin Razerunners deal damage equal to the number of +1/+1 counters on it to target player. - ability = new BeginningOfYourEndStepTriggeredAbility(new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)).setText("you may have {this} deal damage equal to the number of +1/+1 counters on it to target player or planeswalker"), true); + ability = new BeginningOfEndStepTriggeredAbility(new DamageTargetEffect(new CountersSourceCount(CounterType.P1P1)).setText("you may have {this} deal damage equal to the number of +1/+1 counters on it to target player or planeswalker"), true); ability.addTarget(new TargetPlayerOrPlaneswalker()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java b/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java index b02ed639667..0031eb32aac 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSpymaster.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; @@ -33,7 +33,7 @@ public final class GoblinSpymaster extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // At the beginning of each opponent's end step, that player creates a 1/1 red Goblin creature token with "Creatures you control attack each combat if able." - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new SpyMasterGoblinCreateTokenEffect(), TargetController.OPPONENT, null, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.OPPONENT, new SpyMasterGoblinCreateTokenEffect(), false, null)); } private GoblinSpymaster(final GoblinSpymaster card) { diff --git a/Mage.Sets/src/mage/cards/g/GodPharaohsGift.java b/Mage.Sets/src/mage/cards/g/GodPharaohsGift.java index a8a1582965a..84133db0e1c 100644 --- a/Mage.Sets/src/mage/cards/g/GodPharaohsGift.java +++ b/Mage.Sets/src/mage/cards/g/GodPharaohsGift.java @@ -35,7 +35,7 @@ public final class GodPharaohsGift extends CardImpl { // At the beginning of combat on your turn, you may exile a creature card from your graveyard. If you do, create a token that's a copy of that card, except it's a 4/4 black Zombie. It gains haste until end of turn. this.addAbility(new BeginningOfCombatTriggeredAbility( - new GodPharaohsGiftEffect(), false + new GodPharaohsGiftEffect() )); } diff --git a/Mage.Sets/src/mage/cards/g/GodPharaohsStatue.java b/Mage.Sets/src/mage/cards/g/GodPharaohsStatue.java index 09a3c432fbd..691b4f97caf 100644 --- a/Mage.Sets/src/mage/cards/g/GodPharaohsStatue.java +++ b/Mage.Sets/src/mage/cards/g/GodPharaohsStatue.java @@ -1,6 +1,6 @@ package mage.cards.g; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.abilities.effects.common.cost.SpellsCostIncreasingAllEffect; @@ -28,7 +28,7 @@ public final class GodPharaohsStatue extends CardImpl { // At the beginning of your end step, each opponent loses 1 life. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new LoseLifeOpponentsEffect(1), TargetController.YOU, false + new LoseLifeOpponentsEffect(1) )); } diff --git a/Mage.Sets/src/mage/cards/g/GollumObsessedStalker.java b/Mage.Sets/src/mage/cards/g/GollumObsessedStalker.java index b6cdbf3809e..f513e05e29a 100644 --- a/Mage.Sets/src/mage/cards/g/GollumObsessedStalker.java +++ b/Mage.Sets/src/mage/cards/g/GollumObsessedStalker.java @@ -3,7 +3,7 @@ package mage.cards.g; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.common.ControllerGainedLifeCount; import mage.abilities.effects.OneShotEffect; import mage.abilities.hint.Hint; @@ -40,9 +40,8 @@ public final class GollumObsessedStalker extends CardImpl { this.addAbility(new SkulkAbility()); // At the beginning of your end step, each opponent dealt combat damage this game by a creature named Gollum, Obsessed Stalker loses life equal to the amount of life you gained this turn. - Ability ability = new BeginningOfYourEndStepTriggeredAbility( - new GollumObsessedStalkerEffect(), - false + Ability ability = new BeginningOfEndStepTriggeredAbility( + new GollumObsessedStalkerEffect() ); ability.addWatcher(new PlayerGainedLifeWatcher()); ability.addWatcher(new GollumObsessedStalkerWatcher()); diff --git a/Mage.Sets/src/mage/cards/g/GorMuldrakAmphinologist.java b/Mage.Sets/src/mage/cards/g/GorMuldrakAmphinologist.java index 2e1fc887b02..053711606b3 100644 --- a/Mage.Sets/src/mage/cards/g/GorMuldrakAmphinologist.java +++ b/Mage.Sets/src/mage/cards/g/GorMuldrakAmphinologist.java @@ -2,7 +2,7 @@ package mage.cards.g; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -51,7 +51,7 @@ public final class GorMuldrakAmphinologist extends CardImpl { // At the beginning of your end step, each player who controls the fewest creatures creates a 4/3 blue Salamander Warrior creature token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new GorMuldrakAmphinologistEffect(), TargetController.YOU, false + new GorMuldrakAmphinologistEffect() )); } diff --git a/Mage.Sets/src/mage/cards/g/GrafRats.java b/Mage.Sets/src/mage/cards/g/GrafRats.java index e0c3383d384..5b37662a5df 100644 --- a/Mage.Sets/src/mage/cards/g/GrafRats.java +++ b/Mage.Sets/src/mage/cards/g/GrafRats.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import java.util.UUID; @@ -34,7 +33,7 @@ public final class GrafRats extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility(new MeldEffect( "Midnight Scavengers", "Chittering Host" - ), false), condition, "At the beginning " + + )), condition, "At the beginning " + "of combat on your turn, if you both own and control {this} and a creature " + "named Midnight Scavengers, exile them, then meld them into Chittering Host." )); diff --git a/Mage.Sets/src/mage/cards/g/GraftedSkullcap.java b/Mage.Sets/src/mage/cards/g/GraftedSkullcap.java index 0aa6c3fde4b..843008b9c0c 100644 --- a/Mage.Sets/src/mage/cards/g/GraftedSkullcap.java +++ b/Mage.Sets/src/mage/cards/g/GraftedSkullcap.java @@ -3,13 +3,12 @@ package mage.cards.g; import java.util.UUID; import mage.abilities.triggers.BeginningOfDrawTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.discard.DiscardHandControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; /** * @@ -25,8 +24,8 @@ public final class GraftedSkullcap extends CardImpl { this.addAbility(new BeginningOfDrawTriggeredAbility(new DrawCardSourceControllerEffect(1).setText("draw an additional card"), false)); // At the beginning of your end step, discard your hand. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new DiscardHandControllerEffect(), - TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new DiscardHandControllerEffect() + )); } private GraftedSkullcap(final GraftedSkullcap card) { diff --git a/Mage.Sets/src/mage/cards/g/GreasefangOkibaBoss.java b/Mage.Sets/src/mage/cards/g/GreasefangOkibaBoss.java index 16943afe5f5..31de0775b43 100644 --- a/Mage.Sets/src/mage/cards/g/GreasefangOkibaBoss.java +++ b/Mage.Sets/src/mage/cards/g/GreasefangOkibaBoss.java @@ -44,7 +44,7 @@ public final class GreasefangOkibaBoss extends CardImpl { this.toughness = new MageInt(3); // At the beginning of combat on your turn, return target Vehicle card from your graveyard to the battlefield. It gains haste. Return it your hand at beginning of the next end step. - Ability ability = new BeginningOfCombatTriggeredAbility(new GreasefangOkibaBossEffect(), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new GreasefangOkibaBossEffect()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GreatUncleanOne.java b/Mage.Sets/src/mage/cards/g/GreatUncleanOne.java index b54a391dce9..97833e79a24 100644 --- a/Mage.Sets/src/mage/cards/g/GreatUncleanOne.java +++ b/Mage.Sets/src/mage/cards/g/GreatUncleanOne.java @@ -2,7 +2,7 @@ package mage.cards.g; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.token.PlaguebearerOfNurgleToken; import mage.players.Player; @@ -33,7 +32,7 @@ public final class GreatUncleanOne extends CardImpl { // Reverberating Summons -- At the beginning of your end step, each opponent loses 2 life. Then for each opponent who has less life than you, create a 1/3 black Demon creature token named Plaguebearer of Nurgle. Ability ability = new BeginningOfEndStepTriggeredAbility( - new LoseLifeOpponentsEffect(2), TargetController.YOU, false + new LoseLifeOpponentsEffect(2) ); ability.addEffect(new CreateTokenEffect( new PlaguebearerOfNurgleToken(), GreatUncleanOneValue.instance diff --git a/Mage.Sets/src/mage/cards/g/GreedsGambit.java b/Mage.Sets/src/mage/cards/g/GreedsGambit.java index bd7fc87b001..28d770b814b 100644 --- a/Mage.Sets/src/mage/cards/g/GreedsGambit.java +++ b/Mage.Sets/src/mage/cards/g/GreedsGambit.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.LeavesBattlefieldTriggeredAbility; import mage.abilities.effects.common.*; @@ -9,7 +9,6 @@ import mage.abilities.effects.common.discard.DiscardControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.permanent.token.Bat21Token; @@ -30,7 +29,7 @@ public final class GreedsGambit extends CardImpl { this.addAbility(ability); // At the beginning of your end step, you discard a card, lose 2 life, and sacrifice a creature. - ability = new BeginningOfEndStepTriggeredAbility(new DiscardControllerEffect(1).setText("you discard a card"), TargetController.YOU, false); + ability = new BeginningOfEndStepTriggeredAbility(new DiscardControllerEffect(1).setText("you discard a card")); ability.addEffect(new LoseLifeSourceControllerEffect(2).setText(", lose 2 life")); ability.addEffect(new SacrificeControllerEffect( StaticFilters.FILTER_PERMANENT_A_CREATURE, 1, "" diff --git a/Mage.Sets/src/mage/cards/g/GremlinInfestation.java b/Mage.Sets/src/mage/cards/g/GremlinInfestation.java index 658309b58bf..ac3e849c2ad 100644 --- a/Mage.Sets/src/mage/cards/g/GremlinInfestation.java +++ b/Mage.Sets/src/mage/cards/g/GremlinInfestation.java @@ -3,9 +3,8 @@ package mage.cards.g; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesAttachedTriggeredAbility; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DamageAttachedControllerEffect; @@ -15,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.game.permanent.token.GremlinToken; import mage.target.TargetPermanent; import mage.target.common.TargetArtifactPermanent; @@ -39,7 +37,7 @@ public final class GremlinInfestation extends CardImpl { this.addAbility(ability); // At the beginning of your end step, Gremlin Infestation deals 2 damage to enchanted artifact's controller. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new DamageAttachedControllerEffect(2).setText("{this} deals 2 damage to enchanted artifact's controller"), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new DamageAttachedControllerEffect(2).setText("{this} deals 2 damage to enchanted artifact's controller"))); // When enchanted artifact is put into a graveyard, create a 2/2 red Gremlin creature token. this.addAbility(new DiesAttachedTriggeredAbility(new CreateTokenEffect(new GremlinToken()), "enchanted artifact", false, false)); diff --git a/Mage.Sets/src/mage/cards/g/GriffinAerie.java b/Mage.Sets/src/mage/cards/g/GriffinAerie.java index a3e4a3297c8..2c23807b080 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinAerie.java +++ b/Mage.Sets/src/mage/cards/g/GriffinAerie.java @@ -1,6 +1,6 @@ package mage.cards.g; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; -import mage.constants.TargetController; import mage.game.permanent.token.GriffinToken; import mage.watchers.common.PlayerGainedLifeWatcher; @@ -31,7 +30,7 @@ public final class GriffinAerie extends CardImpl { // At the beginning of your end step, if you gained 3 or more life this turn, create a 2/2 white Griffin creature token with flying. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new GriffinToken()), TargetController.YOU, false + new CreateTokenEffect(new GriffinToken()) ), condition, "At the beginning of your end step, " + "if you gained 3 or more life this turn, create a 2/2 white Griffin creature token with flying." ).addHint(hint), new PlayerGainedLifeWatcher()); diff --git a/Mage.Sets/src/mage/cards/g/GrismoldTheDreadsower.java b/Mage.Sets/src/mage/cards/g/GrismoldTheDreadsower.java index b633ec08609..5ea3e290dc9 100644 --- a/Mage.Sets/src/mage/cards/g/GrismoldTheDreadsower.java +++ b/Mage.Sets/src/mage/cards/g/GrismoldTheDreadsower.java @@ -1,7 +1,7 @@ package mage.cards.g; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.common.CreateTokenAllEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -45,8 +45,7 @@ public final class GrismoldTheDreadsower extends CardImpl { // At the beginning of your end step, each player creates a 1/1 green Plant creature token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenAllEffect(new GrismoldPlantToken(), TargetController.EACH_PLAYER), - TargetController.YOU, false + new CreateTokenAllEffect(new GrismoldPlantToken(), TargetController.EACH_PLAYER) )); // Whenever a creature token dies, put a +1/+1 counter on Grismold, the Dreadsower. diff --git a/Mage.Sets/src/mage/cards/g/Groundbreaker.java b/Mage.Sets/src/mage/cards/g/Groundbreaker.java index 8dadb394261..d7b5543ef23 100644 --- a/Mage.Sets/src/mage/cards/g/Groundbreaker.java +++ b/Mage.Sets/src/mage/cards/g/Groundbreaker.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; @@ -31,7 +31,7 @@ public final class Groundbreaker extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // At the beginning of the end step, sacrifice Groundbreaker. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.NEXT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, new SacrificeSourceEffect(), false)); } private Groundbreaker(final Groundbreaker card) { diff --git a/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java b/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java index fb6f082fd5d..e4f6c554687 100644 --- a/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java +++ b/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java @@ -2,7 +2,7 @@ package mage.cards.g; import java.util.UUID; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -35,7 +35,7 @@ public final class GrowingRitesOfItlimoc extends CardImpl { // At the beginning of your end step, if you control four or more creatures, transform Growing Rites of Itlimoc. this.addAbility(new TransformAbility()); this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfEndStepTriggeredAbility(new TransformSourceEffect(), TargetController.YOU, false), + new BeginningOfEndStepTriggeredAbility(new TransformSourceEffect()), new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_A_CREATURE, ComparisonType.MORE_THAN, 3), "At the beginning of your end step, if you control four or more creatures, transform {this}")); } diff --git a/Mage.Sets/src/mage/cards/g/GwaihirGreatestOfTheEagles.java b/Mage.Sets/src/mage/cards/g/GwaihirGreatestOfTheEagles.java index f0b6c16982d..fdbf14fcb52 100644 --- a/Mage.Sets/src/mage/cards/g/GwaihirGreatestOfTheEagles.java +++ b/Mage.Sets/src/mage/cards/g/GwaihirGreatestOfTheEagles.java @@ -3,7 +3,7 @@ package mage.cards.g; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.dynamicvalue.common.ControllerGainedLifeCount; import mage.abilities.effects.common.CreateTokenEffect; @@ -41,8 +41,8 @@ public final class GwaihirGreatestOfTheEagles extends CardImpl { // At the beginning of each end step, if you gained 3 or more life this turn, create a 3/3 white Bird creature token // with flying and "Whenever this creature attacks, target attacking creature gains flying until end of turn." this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new GwaihirBirdToken()), TargetController.ANY, - new YouGainedLifeCondition(ComparisonType.MORE_THAN, 2), false + TargetController.ANY, new CreateTokenEffect(new GwaihirBirdToken()), + false, new YouGainedLifeCondition(ComparisonType.MORE_THAN, 2) ).addHint(ControllerGainedLifeCount.getHint()), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/g/GyomeMasterChef.java b/Mage.Sets/src/mage/cards/g/GyomeMasterChef.java index bd2ffe7ff2d..372fa622fa2 100644 --- a/Mage.Sets/src/mage/cards/g/GyomeMasterChef.java +++ b/Mage.Sets/src/mage/cards/g/GyomeMasterChef.java @@ -2,7 +2,7 @@ package mage.cards.g; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.GenericManaCost; @@ -25,7 +25,6 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; import mage.game.permanent.token.FoodToken; -import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; import mage.util.CardUtil; import mage.watchers.Watcher; @@ -58,8 +57,7 @@ public final class GyomeMasterChef extends CardImpl { new CreateTokenEffect( new FoodToken(), GyomeMasterChefValue.instance ).setText("create a number of Food tokens equal to the number of nontoken creatures " + - "you had enter the battlefield under your control this turn"), - TargetController.YOU, false + "you had enter the battlefield under your control this turn") ).addHint(hint), new GyomeMasterChefWatcher()); // {1}, Sacrifice a Food: Target creature gains indestructible until end of turn. Tap it. diff --git a/Mage.Sets/src/mage/cards/h/HadanasClimb.java b/Mage.Sets/src/mage/cards/h/HadanasClimb.java index 05382f556c7..a1d27468050 100644 --- a/Mage.Sets/src/mage/cards/h/HadanasClimb.java +++ b/Mage.Sets/src/mage/cards/h/HadanasClimb.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.target.common.TargetControlledCreaturePermanent; @@ -32,7 +31,7 @@ public final class HadanasClimb extends CardImpl { // At the beginning of combat on your turn, put a +1/+1 counter on target creature you control. Then if that creature has three or more +1/+1 counters on it, transform Hadana's Climb. this.addAbility(new TransformAbility()); - Ability ability = new BeginningOfCombatTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); ability.addEffect(new ConditionalOneShotEffect(new TransformSourceEffect(), new TargetHasCounterCondition(CounterType.P1P1, 3, Integer.MAX_VALUE), "Then if that creature has three or more +1/+1 counters on it, transform {this}")); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/h/HakbalOfTheSurgingSoul.java b/Mage.Sets/src/mage/cards/h/HakbalOfTheSurgingSoul.java index a82b396c5f8..91580715647 100644 --- a/Mage.Sets/src/mage/cards/h/HakbalOfTheSurgingSoul.java +++ b/Mage.Sets/src/mage/cards/h/HakbalOfTheSurgingSoul.java @@ -37,7 +37,7 @@ public final class HakbalOfTheSurgingSoul extends CardImpl { this.toughness = new MageInt(3); // At the beginning of combat on your turn, each Merfolk creature you control explores. - this.addAbility(new BeginningOfCombatTriggeredAbility(new HakbalOfTheSurgingSoulExploreEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new HakbalOfTheSurgingSoulExploreEffect())); // Whenever Hakbal of the Surging Soul attacks, you may put a land card from your hand onto the battlefield. If you don't, draw a card. this.addAbility(new AttacksTriggeredAbility(new HakbalOfTheSurgingSoulEffect(), false)); diff --git a/Mage.Sets/src/mage/cards/h/HalanaAndAlenaPartners.java b/Mage.Sets/src/mage/cards/h/HalanaAndAlenaPartners.java index 690bf56d85b..498522b8616 100644 --- a/Mage.Sets/src/mage/cards/h/HalanaAndAlenaPartners.java +++ b/Mage.Sets/src/mage/cards/h/HalanaAndAlenaPartners.java @@ -41,8 +41,7 @@ public final class HalanaAndAlenaPartners extends CardImpl { // At the beginning of combat on your turn, put X +1/+1 counters on another target creature you control, where X is Halana and Alena's power. That creature gains haste until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new AddCountersTargetEffect(CounterType.P1P1.createInstance(0), SourcePermanentPowerValue.NOT_NEGATIVE) - .setText("put X +1/+1 counters on another target creature you control, where X is {this}'s power"), - false + .setText("put X +1/+1 counters on another target creature you control, where X is {this}'s power") ); ability.addEffect(new GainAbilityTargetEffect( HasteAbility.getInstance(), Duration.EndOfTurn diff --git a/Mage.Sets/src/mage/cards/h/HandOfVecna.java b/Mage.Sets/src/mage/cards/h/HandOfVecna.java index 885e1476604..34a8024e9db 100644 --- a/Mage.Sets/src/mage/cards/h/HandOfVecna.java +++ b/Mage.Sets/src/mage/cards/h/HandOfVecna.java @@ -40,7 +40,7 @@ public final class HandOfVecna extends CardImpl { // At the beginning of combat on your turn, equipped creature or a creature you control named Vecna gets +X/+X until end of turn, where X is the number of cards in your hand. this.addAbility(new BeginningOfCombatTriggeredAbility( - new HandOfVecnaEffect(), false + new HandOfVecnaEffect() )); // Equip—Pay 1 life for each card in your hand. diff --git a/Mage.Sets/src/mage/cards/h/HaphazardBombardment.java b/Mage.Sets/src/mage/cards/h/HaphazardBombardment.java index ba3e4554f25..8c64f38d7cb 100644 --- a/Mage.Sets/src/mage/cards/h/HaphazardBombardment.java +++ b/Mage.Sets/src/mage/cards/h/HaphazardBombardment.java @@ -3,7 +3,7 @@ package mage.cards.h; import java.util.List; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -41,7 +41,7 @@ public final class HaphazardBombardment extends CardImpl { FilterPermanent filter = new FilterPermanent("if two or more permanents you don't control have an aim counter on them"); filter.add(TargetController.NOT_YOU.getControllerPredicate()); filter.add(CounterType.AIM.getPredicate()); - this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfYourEndStepTriggeredAbility(new HaphazardBombardmentEndOfTurnEffect(), false), + this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility(new HaphazardBombardmentEndOfTurnEffect()), new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 1, false), "At the beginning of your end step, if two or more permanents you don't control have an aim counter on them, destroy one of those permanents at random")); } diff --git a/Mage.Sets/src/mage/cards/h/HaradrimSpearmaster.java b/Mage.Sets/src/mage/cards/h/HaradrimSpearmaster.java index de620ef06fe..203b2748e6f 100644 --- a/Mage.Sets/src/mage/cards/h/HaradrimSpearmaster.java +++ b/Mage.Sets/src/mage/cards/h/HaradrimSpearmaster.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.target.TargetPermanent; @@ -33,7 +32,7 @@ public final class HaradrimSpearmaster extends CardImpl { // At the beginning of combat on your turn, another target creature you control gets +1/+0 until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( - new BoostTargetEffect(1, 0), false + new BoostTargetEffect(1, 0) ); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE_YOU_CONTROL)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HarriedDronesmith.java b/Mage.Sets/src/mage/cards/h/HarriedDronesmith.java index 866cd51b5e7..bb15564b536 100644 --- a/Mage.Sets/src/mage/cards/h/HarriedDronesmith.java +++ b/Mage.Sets/src/mage/cards/h/HarriedDronesmith.java @@ -33,7 +33,7 @@ public final class HarriedDronesmith extends CardImpl { // At the beginning of combat on your turn, create a 1/1 colorless Thopter artifact creature token with flying. It gains haste until end of turn. Sacrifice it at the beginning of your next end step. this.addAbility(new BeginningOfCombatTriggeredAbility( - new HarriedDronesmithEffect(), false + new HarriedDronesmithEffect() )); } diff --git a/Mage.Sets/src/mage/cards/h/HarvesttideSentry.java b/Mage.Sets/src/mage/cards/h/HarvesttideSentry.java index 6f78a67d4fc..cfb0164577f 100644 --- a/Mage.Sets/src/mage/cards/h/HarvesttideSentry.java +++ b/Mage.Sets/src/mage/cards/h/HarvesttideSentry.java @@ -36,8 +36,7 @@ public final class HarvesttideSentry extends CardImpl { // Coven — At the beginning of combat on your turn, if you control three or more creatures with different powers, Harvesttide Sentry can't be blocked by creatures with power 2 or less this turn. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new CantBeBlockedByCreaturesSourceEffect(filter, Duration.EndOfTurn), - false + new CantBeBlockedByCreaturesSourceEffect(filter, Duration.EndOfTurn) ), CovenCondition.instance, "At the beginning of combat on your turn, " + "if you control three or more creatures with different powers, " + "{this} can't be blocked by creatures with power 2 or less this turn." diff --git a/Mage.Sets/src/mage/cards/h/HavengulLaboratory.java b/Mage.Sets/src/mage/cards/h/HavengulLaboratory.java index 786a23392c8..76ccb05d0c5 100644 --- a/Mage.Sets/src/mage/cards/h/HavengulLaboratory.java +++ b/Mage.Sets/src/mage/cards/h/HavengulLaboratory.java @@ -1,7 +1,7 @@ package mage.cards.h; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.common.TapSourceCost; @@ -45,8 +45,8 @@ public final class HavengulLaboratory extends CardImpl { // At the beginning of your end step, if you sacrificed three or more Clues this turn, transform Hawkins National Laboratory. this.addAbility(new TransformAbility()); this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new TransformSourceEffect(), - TargetController.YOU, HavengulLaboratoryCondition.instance, false + TargetController.YOU, new TransformSourceEffect(), + false, HavengulLaboratoryCondition.instance ), new HavengulLaboratoryWatcher()); } diff --git a/Mage.Sets/src/mage/cards/h/HazelOfTheRootbloom.java b/Mage.Sets/src/mage/cards/h/HazelOfTheRootbloom.java index 9c41da615b3..c63a6d61316 100644 --- a/Mage.Sets/src/mage/cards/h/HazelOfTheRootbloom.java +++ b/Mage.Sets/src/mage/cards/h/HazelOfTheRootbloom.java @@ -3,7 +3,7 @@ package mage.cards.h; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapVariableTargetCost; @@ -57,8 +57,7 @@ public final class HazelOfTheRootbloom extends CardImpl { // At the beginning of your end step, create a token that's a copy of target token you control. If that token is a Squirrel, instead create two tokens that are copies of it. ability = new BeginningOfEndStepTriggeredAbility( - new HazelOfTheRootbloomEffect(), - TargetController.YOU, false + new HazelOfTheRootbloomEffect() ); ability.addTarget(new TargetPermanent(filter2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HazoretsFavor.java b/Mage.Sets/src/mage/cards/h/HazoretsFavor.java index a5047eb488a..1bce9c5b5de 100644 --- a/Mage.Sets/src/mage/cards/h/HazoretsFavor.java +++ b/Mage.Sets/src/mage/cards/h/HazoretsFavor.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/h/HelmOfTheHost.java b/Mage.Sets/src/mage/cards/h/HelmOfTheHost.java index 8ae877cd0f5..fea2ab7368c 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfTheHost.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfTheHost.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; @@ -33,8 +32,7 @@ public final class HelmOfTheHost extends CardImpl { // At the beginning of combat on your turn, create a token that's a copy of equipped creature, except the token isn't legendary if equipped creature is legendary. That token gains haste. TriggeredAbility ability = new BeginningOfCombatTriggeredAbility( - new HelmOfTheHostEffect(), - false + new HelmOfTheHostEffect() ); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HenrikaDomnathi.java b/Mage.Sets/src/mage/cards/h/HenrikaDomnathi.java index 8700b70a93a..2b2b78e162c 100644 --- a/Mage.Sets/src/mage/cards/h/HenrikaDomnathi.java +++ b/Mage.Sets/src/mage/cards/h/HenrikaDomnathi.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import java.util.UUID; @@ -40,7 +39,7 @@ public final class HenrikaDomnathi extends CardImpl { // At the beginning of combat on your turn, choose one that hasn't been chosen — // • Each player sacrifices a creature. - Ability ability = new BeginningOfCombatTriggeredAbility(new SacrificeAllEffect(StaticFilters.FILTER_PERMANENT_CREATURE), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new SacrificeAllEffect(StaticFilters.FILTER_PERMANENT_CREATURE)); ability.setModeTag("each player sacrifice"); ability.getModes().setLimitUsageByOnce(false); diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfAnguish.java b/Mage.Sets/src/mage/cards/h/HeraldOfAnguish.java index c508a516306..48269309fce 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfAnguish.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfAnguish.java @@ -2,7 +2,7 @@ package mage.cards.h; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; -import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -38,7 +37,7 @@ public final class HeraldOfAnguish extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of your end step, each opponent discards a card. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new DiscardEachPlayerEffect(TargetController.OPPONENT), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new DiscardEachPlayerEffect(TargetController.OPPONENT))); // {1}{B}, Sacrifice an artifact: Target creature gets -2/-2 until end of turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}")); diff --git a/Mage.Sets/src/mage/cards/h/HiddenStockpile.java b/Mage.Sets/src/mage/cards/h/HiddenStockpile.java index ae0cb85811b..41b81013265 100644 --- a/Mage.Sets/src/mage/cards/h/HiddenStockpile.java +++ b/Mage.Sets/src/mage/cards/h/HiddenStockpile.java @@ -1,7 +1,7 @@ package mage.cards.h; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.costs.common.SacrificeTargetCost; @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; import mage.game.permanent.token.ServoToken; -import mage.target.common.TargetControlledCreaturePermanent; import mage.watchers.common.RevoltWatcher; import java.util.UUID; @@ -31,7 +30,7 @@ public final class HiddenStockpile extends CardImpl { // Revolt — At the beginning of your end step, if a permanent you controlled left the battlefield this turn, create a 1/1 colorless Servo artifact creature token. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfYourEndStepTriggeredAbility(new CreateTokenEffect(new ServoToken()), false), + new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new ServoToken())), RevoltCondition.instance, "At the beginning of your end step, if a permanent you controlled " + "left the battlefield this turn, create a 1/1 colorless Servo artifact creature token." ).setAbilityWord(AbilityWord.REVOLT).addHint(RevoltCondition.getHint()), new RevoltWatcher()); diff --git a/Mage.Sets/src/mage/cards/h/HollowhengeHuntmaster.java b/Mage.Sets/src/mage/cards/h/HollowhengeHuntmaster.java index cba9736b988..efe1f2b1abb 100644 --- a/Mage.Sets/src/mage/cards/h/HollowhengeHuntmaster.java +++ b/Mage.Sets/src/mage/cards/h/HollowhengeHuntmaster.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; @@ -46,7 +45,7 @@ public final class HollowhengeHuntmaster extends CardImpl { new AddCountersAllEffect( CounterType.P1P1.createInstance(2), StaticFilters.FILTER_CONTROLLED_CREATURE - ), false + ) )); // Nightbound diff --git a/Mage.Sets/src/mage/cards/h/HotPursuit.java b/Mage.Sets/src/mage/cards/h/HotPursuit.java index 6f9ea2cc78b..12318235707 100644 --- a/Mage.Sets/src/mage/cards/h/HotPursuit.java +++ b/Mage.Sets/src/mage/cards/h/HotPursuit.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.constants.WatcherScope; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -55,8 +54,7 @@ public final class HotPursuit extends CardImpl { // At the beginning of combat on your turn, if two or more players have lost the game, gain control of all goaded and/or suspected creatures until end of turn. Untap them. They gain haste until end of turn. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new GainControlAllUntapGainHasteEffect(filter), - false + new GainControlAllUntapGainHasteEffect(filter) ), HotPursuitCondition.instance, "At the beginning of combat on your turn, " + "if two or more players have lost the game, gain control of all goaded and/or " + "suspected creatures until end of turn. Untap them. They gain haste until end of turn." diff --git a/Mage.Sets/src/mage/cards/h/HowlingMoon.java b/Mage.Sets/src/mage/cards/h/HowlingMoon.java index f5c13aec028..2a29a038693 100644 --- a/Mage.Sets/src/mage/cards/h/HowlingMoon.java +++ b/Mage.Sets/src/mage/cards/h/HowlingMoon.java @@ -34,8 +34,7 @@ public final class HowlingMoon extends CardImpl { // At the beginning of combat on your turn, target Wolf or Werewolf you control gets +2/+2 until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( - new BoostTargetEffect(2, 2, Duration.EndOfTurn), - false + new BoostTargetEffect(2, 2, Duration.EndOfTurn) ); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java b/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java index a029036ad52..2acb47d31d8 100644 --- a/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java +++ b/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java @@ -1,7 +1,7 @@ package mage.cards.h; import mage.MageInt; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.WerewolfBackTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -49,7 +49,7 @@ public final class HowlpackAlpha extends CardImpl { ))); // At the beginning of your end step, create a 2/2 green Wolf creature token. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new CreateTokenEffect(new WolfToken()), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new WolfToken()))); // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Howlpack Alpha. this.addAbility(new WerewolfBackTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/h/HulkingRaptor.java b/Mage.Sets/src/mage/cards/h/HulkingRaptor.java index 0d224eb91e3..24644edaaff 100644 --- a/Mage.Sets/src/mage/cards/h/HulkingRaptor.java +++ b/Mage.Sets/src/mage/cards/h/HulkingRaptor.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import java.util.UUID; @@ -31,7 +30,7 @@ public final class HulkingRaptor extends CardImpl { // At the beginning of your precombat main phase, add {G}{G}. this.addAbility(new BeginningOfFirstMainTriggeredAbility( - new BasicManaEffect(Mana.GreenMana(2)), false + new BasicManaEffect(Mana.GreenMana(2)) )); } diff --git a/Mage.Sets/src/mage/cards/h/HungryLynx.java b/Mage.Sets/src/mage/cards/h/HungryLynx.java index e654581a62d..7bf025439e0 100644 --- a/Mage.Sets/src/mage/cards/h/HungryLynx.java +++ b/Mage.Sets/src/mage/cards/h/HungryLynx.java @@ -2,7 +2,7 @@ package mage.cards.h; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.Effect; @@ -49,7 +49,7 @@ public final class HungryLynx extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); // At the beginning of your end step, target opponent creates a 1/1 black Rat creature token with deathtouch. - Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenTargetEffect(new DeathtouchRatToken()), TargetController.YOU, null, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new CreateTokenTargetEffect(new DeathtouchRatToken()), false, null); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HuntersTalent.java b/Mage.Sets/src/mage/cards/h/HuntersTalent.java index 509f559bb77..e12bdee94a9 100644 --- a/Mage.Sets/src/mage/cards/h/HuntersTalent.java +++ b/Mage.Sets/src/mage/cards/h/HuntersTalent.java @@ -2,7 +2,7 @@ package mage.cards.h; import mage.abilities.Ability; import mage.abilities.common.AttacksWithCreaturesTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.FerociousCondition; @@ -63,8 +63,8 @@ public final class HuntersTalent extends CardImpl { // At the beginning of your end step, if you control a creature with power 4 or greater, draw a card. this.addAbility(new SimpleStaticAbility( new GainClassAbilitySourceEffect(new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), TargetController.YOU, - FerociousCondition.instance, false + TargetController.YOU, new DrawCardSourceControllerEffect(1), + false, FerociousCondition.instance ), 3) ).addHint(FerociousHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/h/HurkylMasterWizard.java b/Mage.Sets/src/mage/cards/h/HurkylMasterWizard.java index 5f871409ed4..d69236c84d9 100644 --- a/Mage.Sets/src/mage/cards/h/HurkylMasterWizard.java +++ b/Mage.Sets/src/mage/cards/h/HurkylMasterWizard.java @@ -2,7 +2,7 @@ package mage.cards.h; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.assignment.common.CardTypeAssignment; import mage.abilities.effects.OneShotEffect; @@ -36,8 +36,8 @@ public final class HurkylMasterWizard extends CardImpl { // At the beginning of your end step, if you've cast a noncreature spell this turn, reveal the top five cards of your library. For each card type among noncreature spells you've cast this turn, you may put a card of that type from among the revealed cards into your hand. Put the rest on the bottom of your library in a random order. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new HurkylMasterWizardEffect(), TargetController.YOU, - HurkylMasterWizardCondition.instance, false + TargetController.YOU, new HurkylMasterWizardEffect(), + false, HurkylMasterWizardCondition.instance ), new HurkylMasterWizardWatcher()); } diff --git a/Mage.Sets/src/mage/cards/i/IchorShade.java b/Mage.Sets/src/mage/cards/i/IchorShade.java index 570b26fe70b..3f5f1df98a9 100644 --- a/Mage.Sets/src/mage/cards/i/IchorShade.java +++ b/Mage.Sets/src/mage/cards/i/IchorShade.java @@ -2,7 +2,7 @@ package mage.cards.i; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; @@ -35,8 +35,8 @@ public final class IchorShade extends CardImpl { // At the beginning of your end step, if an artifact or creature was put into a graveyard from the battlefield this turn, put a +1/+1 counter on Ichor Shade. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - TargetController.YOU, IchorShadeCondition.instance, false + TargetController.YOU, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), + false, IchorShadeCondition.instance ), new IchorShadeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/i/Ichorid.java b/Mage.Sets/src/mage/cards/i/Ichorid.java index 148145dad43..73048fd93be 100644 --- a/Mage.Sets/src/mage/cards/i/Ichorid.java +++ b/Mage.Sets/src/mage/cards/i/Ichorid.java @@ -2,7 +2,7 @@ package mage.cards.i; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.SourceInGraveyardCondition; import mage.abilities.costs.common.ExileFromGraveCost; @@ -47,7 +47,7 @@ public final class Ichorid extends CardImpl { this.addAbility(HasteAbility.getInstance()); // At the beginning of the end step, sacrifice Ichorid. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.NEXT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, new SacrificeSourceEffect(), false)); // At the beginning of your upkeep, if Ichorid is in your graveyard, you may exile a black creature card other than Ichorid from your graveyard. If you do, return Ichorid to the battlefield. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.GRAVEYARD, TargetController.YOU, new DoIfCostPaid( diff --git a/Mage.Sets/src/mage/cards/i/ImoenMysticTrickster.java b/Mage.Sets/src/mage/cards/i/ImoenMysticTrickster.java index 00055162c8c..57f9af408a0 100644 --- a/Mage.Sets/src/mage/cards/i/ImoenMysticTrickster.java +++ b/Mage.Sets/src/mage/cards/i/ImoenMysticTrickster.java @@ -2,7 +2,7 @@ package mage.cards.i; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.ChooseABackgroundAbility; import mage.abilities.condition.common.CompletedDungeonCondition; import mage.abilities.condition.common.HaveInitiativeCondition; @@ -38,8 +38,8 @@ public final class ImoenMysticTrickster extends CardImpl { // At the beginning of your end step, if you have the initiative, draw a card. Draw another card if you've completed a dungeon. Ability ability = new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), - TargetController.YOU, HaveInitiativeCondition.instance, false + TargetController.YOU, new DrawCardSourceControllerEffect(1), + false, HaveInitiativeCondition.instance ); ability.addEffect(new ConditionalOneShotEffect( new DrawCardSourceControllerEffect(1), CompletedDungeonCondition.instance, diff --git a/Mage.Sets/src/mage/cards/i/ImotekhTheStormlord.java b/Mage.Sets/src/mage/cards/i/ImotekhTheStormlord.java index 282ad1a6179..a1d0b79edc2 100644 --- a/Mage.Sets/src/mage/cards/i/ImotekhTheStormlord.java +++ b/Mage.Sets/src/mage/cards/i/ImotekhTheStormlord.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; @@ -53,8 +52,7 @@ public final class ImotekhTheStormlord extends CardImpl { // Grand Strategist -- At the beginning of combat on your turn, another target artifact creature you control gets +2/+2 and gains menace until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new BoostTargetEffect(2, 2) - .setText("another target artifact creature you control gets +2/+2"), - false + .setText("another target artifact creature you control gets +2/+2") ); ability.addEffect(new GainAbilityTargetEffect(new MenaceAbility(false)) .setText("and gains menace until end of turn")); diff --git a/Mage.Sets/src/mage/cards/i/Impatience.java b/Mage.Sets/src/mage/cards/i/Impatience.java index 0d3c8e79c50..763f1422de1 100644 --- a/Mage.Sets/src/mage/cards/i/Impatience.java +++ b/Mage.Sets/src/mage/cards/i/Impatience.java @@ -3,7 +3,7 @@ package mage.cards.i; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.game.Game; import mage.watchers.common.CastSpellLastTurnWatcher; @@ -28,8 +27,8 @@ public final class Impatience extends CardImpl { // At the beginning of each player's end step, if that player didn't cast a spell this turn, Impatience deals 2 damage to that player. Effect effect = new DamageTargetEffect(2); effect.setText("{this} deals 2 damage to that player."); - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.ANY, - new ImpatienceCondition(), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, effect, + false, new ImpatienceCondition())); } private Impatience(final Impatience card) { diff --git a/Mage.Sets/src/mage/cards/i/ImpetuousDevils.java b/Mage.Sets/src/mage/cards/i/ImpetuousDevils.java index f5f4d362a7b..0d98b477525 100644 --- a/Mage.Sets/src/mage/cards/i/ImpetuousDevils.java +++ b/Mage.Sets/src/mage/cards/i/ImpetuousDevils.java @@ -4,7 +4,7 @@ package mage.cards.i; import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.combat.MustBeBlockedByTargetSourceEffect; import mage.abilities.keyword.HasteAbility; @@ -42,7 +42,7 @@ public final class ImpetuousDevils extends CardImpl { this.addAbility(new ImpetuousDevilsAbility()); // At the beginning of the end step, sacrifice Impetuous Devils. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.NEXT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, new SacrificeSourceEffect(), false)); } private ImpetuousDevils(final ImpetuousDevils card) { diff --git a/Mage.Sets/src/mage/cards/i/IndulgingPatrician.java b/Mage.Sets/src/mage/cards/i/IndulgingPatrician.java index 4ddb3b7ad8a..5c6e1417d83 100644 --- a/Mage.Sets/src/mage/cards/i/IndulgingPatrician.java +++ b/Mage.Sets/src/mage/cards/i/IndulgingPatrician.java @@ -1,7 +1,7 @@ package mage.cards.i; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.watchers.common.PlayerGainedLifeWatcher; import java.util.UUID; @@ -45,7 +44,7 @@ public final class IndulgingPatrician extends CardImpl { // At the beginning of your end step, if you gained 3 or more life this turn, each opponent loses 3 life. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new LoseLifeOpponentsEffect(3), TargetController.YOU, false + new LoseLifeOpponentsEffect(3) ), condition, "At the beginning of your end step, " + "if you gained 3 or more life this turn, each opponent loses 3 life." ).addHint(hint), new PlayerGainedLifeWatcher()); diff --git a/Mage.Sets/src/mage/cards/i/IndustrialAdvancement.java b/Mage.Sets/src/mage/cards/i/IndustrialAdvancement.java index 45e02c24322..9e78dfb8828 100644 --- a/Mage.Sets/src/mage/cards/i/IndustrialAdvancement.java +++ b/Mage.Sets/src/mage/cards/i/IndustrialAdvancement.java @@ -1,7 +1,7 @@ package mage.cards.i; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -9,7 +9,6 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; @@ -31,7 +30,7 @@ public final class IndustrialAdvancement extends CardImpl { // At the beginning of your end step, you may sacrifice a creature. If you do, look at the top X cards of your library, when X is that creature's mana value. You may put a creature card from among them onto the battlefield. Put the rest on the bottom of your library in a random order. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new IndustrialAdvancementEffect(), TargetController.YOU, false + new IndustrialAdvancementEffect() )); } diff --git a/Mage.Sets/src/mage/cards/i/InfernoHellion.java b/Mage.Sets/src/mage/cards/i/InfernoHellion.java index ab6e06604f5..8546f4673cb 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoHellion.java +++ b/Mage.Sets/src/mage/cards/i/InfernoHellion.java @@ -4,7 +4,7 @@ import java.util.UUID; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect; @@ -37,8 +37,8 @@ public final class InfernoHellion extends CardImpl { // At the beginning of each end step, if Inferno Hellion attacked or blocked this turn, its owner shuffles it into their library. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new ShuffleIntoLibrarySourceEffect(), - TargetController.ANY, false + TargetController.ANY, new ShuffleIntoLibrarySourceEffect(), + false ), InfernoHellionCondition.instance, "At the beginning of each end step, " diff --git a/Mage.Sets/src/mage/cards/i/InnkeepersTalent.java b/Mage.Sets/src/mage/cards/i/InnkeepersTalent.java index 8036a6c71ab..2acd40a3dc7 100644 --- a/Mage.Sets/src/mage/cards/i/InnkeepersTalent.java +++ b/Mage.Sets/src/mage/cards/i/InnkeepersTalent.java @@ -46,7 +46,7 @@ public final class InnkeepersTalent extends CardImpl { this.addAbility(new ClassReminderAbility()); // At the beginning of combat on your turn, put a +1/+1 counter on target creature you control. - Ability ability = new BeginningOfCombatTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance())); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/InnocuousResearcher.java b/Mage.Sets/src/mage/cards/i/InnocuousResearcher.java index 715551b2c89..95c91d86681 100644 --- a/Mage.Sets/src/mage/cards/i/InnocuousResearcher.java +++ b/Mage.Sets/src/mage/cards/i/InnocuousResearcher.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.common.ParleyCount; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.DrawCardAllEffect; @@ -41,8 +41,8 @@ public final class InnocuousResearcher extends CardImpl { // At the beginning of your end step, you may untap all lands you control. // If you do, you can't cast spells until your next turn. - Ability untapAbility = new BeginningOfEndStepTriggeredAbility( - new UntapAllLandsControllerEffect(), TargetController.YOU, true); + Ability untapAbility = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, + new UntapAllLandsControllerEffect(), true); untapAbility.addEffect(new InnocuousResearcherEffect().concatBy("If you do,")); this.addAbility(untapAbility); } diff --git a/Mage.Sets/src/mage/cards/i/InstillFuror.java b/Mage.Sets/src/mage/cards/i/InstillFuror.java index 7632d6685dc..8919d256f28 100644 --- a/Mage.Sets/src/mage/cards/i/InstillFuror.java +++ b/Mage.Sets/src/mage/cards/i/InstillFuror.java @@ -3,7 +3,7 @@ package mage.cards.i; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.AttackedThisTurnSourceCondition; @@ -20,11 +20,9 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; -import mage.watchers.common.AttackedThisTurnWatcher; /** * @@ -47,7 +45,7 @@ public final class InstillFuror extends CardImpl { // Enchanted creature has "At the beginning of your end step, sacrifice this creature unless it attacked this turn." Ability gainedAbility = new BeginningOfEndStepTriggeredAbility( new ConditionalOneShotEffect(new SacrificeSourceEffect(), new InvertCondition(AttackedThisTurnSourceCondition.instance), - "sacrifice this creature unless it attacked this turn"), TargetController.YOU, false); + "sacrifice this creature unless it attacked this turn")); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield); effect.setText("Enchanted creature has \"At the beginning of your end step, sacrifice this creature unless it attacked this turn.\""); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/cards/i/InventiveWingsmith.java b/Mage.Sets/src/mage/cards/i/InventiveWingsmith.java index 592978c318f..a1ede65f256 100644 --- a/Mage.Sets/src/mage/cards/i/InventiveWingsmith.java +++ b/Mage.Sets/src/mage/cards/i/InventiveWingsmith.java @@ -1,7 +1,7 @@ package mage.cards.i; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.CompoundCondition; import mage.abilities.condition.Condition; import mage.abilities.condition.common.HaventCastSpellFromHandThisTurnCondition; @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.counters.CounterType; import java.util.UUID; @@ -38,8 +37,8 @@ public final class InventiveWingsmith extends CardImpl { // At the beginning of your end step, if you haven't cast a spell from your hand this turn and Inventive Wingsmith doesn't have a flying counter on it, put a flying counter on it. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.FLYING.createInstance()), - TargetController.YOU, condition, false + TargetController.YOU, new AddCountersSourceEffect(CounterType.FLYING.createInstance()), + false, condition ).withRuleTextReplacement(true).addHint(HaventCastSpellFromHandThisTurnCondition.hint)); } diff --git a/Mage.Sets/src/mage/cards/i/InversionBehemoth.java b/Mage.Sets/src/mage/cards/i/InversionBehemoth.java index e8c88c695d0..64dce666eec 100644 --- a/Mage.Sets/src/mage/cards/i/InversionBehemoth.java +++ b/Mage.Sets/src/mage/cards/i/InversionBehemoth.java @@ -11,7 +11,6 @@ import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class InversionBehemoth extends CardImpl { this.toughness = new MageInt(9); // At the beginning of combat on your turn, switch the power and toughness of each of any number of target creatures until end of turn. - Ability ability = new BeginningOfCombatTriggeredAbility(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn).setText("switch the power and toughness of each of any number of target creatures until end of turn."), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new SwitchPowerToughnessTargetEffect(Duration.EndOfTurn).setText("switch the power and toughness of each of any number of target creatures until end of turn.")); ability.addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IridescentHornbeetle.java b/Mage.Sets/src/mage/cards/i/IridescentHornbeetle.java index bc0f62c5eee..81e54f4a760 100644 --- a/Mage.Sets/src/mage/cards/i/IridescentHornbeetle.java +++ b/Mage.Sets/src/mage/cards/i/IridescentHornbeetle.java @@ -2,7 +2,7 @@ package mage.cards.i; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.constants.WatcherScope; import mage.counters.CounterType; import mage.game.Game; @@ -38,7 +37,7 @@ public final class IridescentHornbeetle extends CardImpl { // At the beginning of your end step, create a 1/1 green Insect creature token for each +1/+1 counter you've put on creatures under your control this turn. this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect( new InsectToken(), IridescentHornbeetleValue.instance - ), TargetController.YOU, false), new IridescentHornbeetleWatcher()); + )), new IridescentHornbeetleWatcher()); } private IridescentHornbeetle(final IridescentHornbeetle card) { diff --git a/Mage.Sets/src/mage/cards/i/IronFistOfTheEmpire.java b/Mage.Sets/src/mage/cards/i/IronFistOfTheEmpire.java index 112352a6677..80c03b2baec 100644 --- a/Mage.Sets/src/mage/cards/i/IronFistOfTheEmpire.java +++ b/Mage.Sets/src/mage/cards/i/IronFistOfTheEmpire.java @@ -4,7 +4,7 @@ package mage.cards.i; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.HateCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -26,7 +26,7 @@ public final class IronFistOfTheEmpire extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{U}{B}{R}"); // Hate — At the beggining of each end step, if opponent lost life from a source other than combat damage this turn, you gain 2 life and create a 2/2 red Soldier creature token with first strike name Royal Guard. - TriggeredAbility triggeredAbility = new BeginningOfEndStepTriggeredAbility(new GainLifeEffect(2), TargetController.ANY, false); + TriggeredAbility triggeredAbility = new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new GainLifeEffect(2), false); triggeredAbility.addEffect(new CreateTokenEffect(new RoyalGuardToken())); Ability ability = new ConditionalInterveningIfTriggeredAbility( triggeredAbility, diff --git a/Mage.Sets/src/mage/cards/i/IxhelScionOfAtraxa.java b/Mage.Sets/src/mage/cards/i/IxhelScionOfAtraxa.java index 01417a703df..4ebf12292f6 100644 --- a/Mage.Sets/src/mage/cards/i/IxhelScionOfAtraxa.java +++ b/Mage.Sets/src/mage/cards/i/IxhelScionOfAtraxa.java @@ -2,7 +2,7 @@ package mage.cards.i; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.ExileFaceDownYouMayPlayAsLongAsExiledTargetEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; @@ -41,8 +41,8 @@ public final class IxhelScionOfAtraxa extends CardImpl { // Corrupted — At the beginning of your end step, each opponent who has three or more poison counters // exiles the top card of their library face down. You may look at and play those cards for as long as // they remain exiled, and you may spend mana as though it were mana of any color to cast those spells. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility( - new IxhelScionOfAtraxaEffect(), false).setAbilityWord(AbilityWord.CORRUPTED) + this.addAbility(new BeginningOfEndStepTriggeredAbility( + new IxhelScionOfAtraxaEffect()).setAbilityWord(AbilityWord.CORRUPTED) ); } @@ -94,4 +94,4 @@ class IxhelScionOfAtraxaEffect extends OneShotEffect { .setTargetPointer(new FixedTargets(cards, game)) .apply(game, source); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/j/JadarGhoulcallerOfNephalia.java b/Mage.Sets/src/mage/cards/j/JadarGhoulcallerOfNephalia.java index 8e054999252..eda2be5ab63 100644 --- a/Mage.Sets/src/mage/cards/j/JadarGhoulcallerOfNephalia.java +++ b/Mage.Sets/src/mage/cards/j/JadarGhoulcallerOfNephalia.java @@ -1,7 +1,7 @@ package mage.cards.j; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -48,8 +48,8 @@ public final class JadarGhoulcallerOfNephalia extends CardImpl { // At the beginning of your end step, if you control no creatures with decayed, create a 2/2 black Zombie creature token with decayed. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieDecayedToken()), - TargetController.YOU, condition, false + TargetController.YOU, new CreateTokenEffect(new ZombieDecayedToken()), + false, condition ).addHint(hint)); } diff --git a/Mage.Sets/src/mage/cards/j/JarJarBinks.java b/Mage.Sets/src/mage/cards/j/JarJarBinks.java index b8f4d666785..f451b4d96c8 100644 --- a/Mage.Sets/src/mage/cards/j/JarJarBinks.java +++ b/Mage.Sets/src/mage/cards/j/JarJarBinks.java @@ -44,7 +44,7 @@ public final class JarJarBinks extends CardImpl { this.addAbility(ability); // At the beggining of combat on your turn, tap the creature you control with the highest power. If two or more creatures are tied for the greatest power, you choose one of them. - this.addAbility(new BeginningOfCombatTriggeredAbility(new JarJarBinksTapEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new JarJarBinksTapEffect())); } private JarJarBinks(final JarJarBinks card) { diff --git a/Mage.Sets/src/mage/cards/j/JemLightfooteSkyExplorer.java b/Mage.Sets/src/mage/cards/j/JemLightfooteSkyExplorer.java index 7b57e037dac..91d281391a7 100644 --- a/Mage.Sets/src/mage/cards/j/JemLightfooteSkyExplorer.java +++ b/Mage.Sets/src/mage/cards/j/JemLightfooteSkyExplorer.java @@ -1,7 +1,7 @@ package mage.cards.j; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.HaventCastSpellFromHandThisTurnCondition; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; @@ -34,8 +34,8 @@ public final class JemLightfooteSkyExplorer extends CardImpl { // At the beginning of your end step, if you haven't cast a spell from your hand this turn, draw a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), - TargetController.YOU, HaventCastSpellFromHandThisTurnCondition.instance, false + TargetController.YOU, new DrawCardSourceControllerEffect(1), + false, HaventCastSpellFromHandThisTurnCondition.instance ).addHint(HaventCastSpellFromHandThisTurnCondition.hint)); } diff --git a/Mage.Sets/src/mage/cards/j/JerrenCorruptedBishop.java b/Mage.Sets/src/mage/cards/j/JerrenCorruptedBishop.java index c1f3ad60997..0b514ae90af 100644 --- a/Mage.Sets/src/mage/cards/j/JerrenCorruptedBishop.java +++ b/Mage.Sets/src/mage/cards/j/JerrenCorruptedBishop.java @@ -3,7 +3,7 @@ package mage.cards.j; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.mana.GenericManaCost; @@ -59,9 +59,9 @@ public final class JerrenCorruptedBishop extends CardImpl { // At the beginning of your end step, if you have exactly 13 life, you may pay {4}{B}{B}. If you do, transform Jerren. this.addAbility(new TransformAbility()); - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new DoIfCostPaid( + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new DoIfCostPaid( new TransformSourceEffect(), new ManaCostsImpl<>("{4}{B}{B}") - ), TargetController.YOU, JerrenCorruptedBishopCondition.instance, false)); + ), false, JerrenCorruptedBishopCondition.instance)); } private JerrenCorruptedBishop(final JerrenCorruptedBishop card) { diff --git a/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java b/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java index 69cffd5d880..fa9c181f7ed 100644 --- a/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java +++ b/Mage.Sets/src/mage/cards/j/JinGitaxiasCoreAugur.java @@ -3,7 +3,7 @@ package mage.cards.j; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect; @@ -32,7 +32,7 @@ public final class JinGitaxiasCoreAugur extends CardImpl { this.addAbility(FlashAbility.getInstance()); // At the beginning of your end step, draw seven cards. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new DrawCardSourceControllerEffect(7), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new DrawCardSourceControllerEffect(7))); // Each opponent's maximum hand size is reduced by seven. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, @@ -47,4 +47,4 @@ public final class JinGitaxiasCoreAugur extends CardImpl { public JinGitaxiasCoreAugur copy() { return new JinGitaxiasCoreAugur(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/j/JinxedChoker.java b/Mage.Sets/src/mage/cards/j/JinxedChoker.java index 157058654e9..9b443a8d5bc 100644 --- a/Mage.Sets/src/mage/cards/j/JinxedChoker.java +++ b/Mage.Sets/src/mage/cards/j/JinxedChoker.java @@ -1,7 +1,7 @@ package mage.cards.j; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.OnEventTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -34,7 +34,7 @@ public final class JinxedChoker extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); // At the beginning of your end step, target opponent gains control of Jinxed Choker and puts a charge counter on it. - Ability endStepAbility = new BeginningOfYourEndStepTriggeredAbility(new TargetPlayerGainControlSourceEffect(), false); + Ability endStepAbility = new BeginningOfEndStepTriggeredAbility(new TargetPlayerGainControlSourceEffect()); endStepAbility.addEffect(new JinxedChokerAddCounterEffect()); endStepAbility.addTarget(new TargetOpponent()); this.addAbility(endStepAbility); diff --git a/Mage.Sets/src/mage/cards/j/Johan.java b/Mage.Sets/src/mage/cards/j/Johan.java index 48d70fce468..ebaa821884a 100644 --- a/Mage.Sets/src/mage/cards/j/Johan.java +++ b/Mage.Sets/src/mage/cards/j/Johan.java @@ -19,7 +19,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/cards/j/JolraelVoiceOfZhalfir.java b/Mage.Sets/src/mage/cards/j/JolraelVoiceOfZhalfir.java index 276017c650f..711ada8ac90 100644 --- a/Mage.Sets/src/mage/cards/j/JolraelVoiceOfZhalfir.java +++ b/Mage.Sets/src/mage/cards/j/JolraelVoiceOfZhalfir.java @@ -50,7 +50,7 @@ public final class JolraelVoiceOfZhalfir extends CardImpl { // At the beginning of combat on your turn, up to one target land you control becomes an X/X green and blue Bird creature with flying and haste until end of turn, where X is the number of cards in your hand. It's still a land. Ability ability = new BeginningOfCombatTriggeredAbility( - new JolraelVoiceOfZhalfirEffect(), false + new JolraelVoiceOfZhalfirEffect() ); ability.addTarget(new TargetPermanent( 0, 1, StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND diff --git a/Mage.Sets/src/mage/cards/j/JonIrenicusShatteredOne.java b/Mage.Sets/src/mage/cards/j/JonIrenicusShatteredOne.java index b894d0ddea8..02b7ce60391 100644 --- a/Mage.Sets/src/mage/cards/j/JonIrenicusShatteredOne.java +++ b/Mage.Sets/src/mage/cards/j/JonIrenicusShatteredOne.java @@ -3,7 +3,7 @@ package mage.cards.j; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksAllTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -50,7 +50,7 @@ public final class JonIrenicusShatteredOne extends CardImpl { // At the beginning of your end step, target opponent gains control of up to one target creature you control. Put two +1/+1 counters on it and tap it. // It's goaded for the rest of the game and it gains “This creature can't be sacrificed.” - Ability ability = new BeginningOfEndStepTriggeredAbility(new JonIrenicusShatteredOneEffect(), TargetController.YOU, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new JonIrenicusShatteredOneEffect()); ability.addTarget(new TargetOpponent()); ability.addTarget(new TargetControlledCreaturePermanent(0, 1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JubilantMascot.java b/Mage.Sets/src/mage/cards/j/JubilantMascot.java index 5b2a939b1c5..cceafa71a50 100644 --- a/Mage.Sets/src/mage/cards/j/JubilantMascot.java +++ b/Mage.Sets/src/mage/cards/j/JubilantMascot.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AnotherPredicate; @@ -43,7 +42,7 @@ public final class JubilantMascot extends CardImpl { new AddCountersTargetEffect(CounterType.P1P1.createInstance()) .setText("support 2"), new ManaCostsImpl<>("{3}{W}") - ), false); + )); ability.addTarget(new TargetCreaturePermanent(0, 2, filter, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JumboImp.java b/Mage.Sets/src/mage/cards/j/JumboImp.java index cc652b335e2..f01962e2968 100644 --- a/Mage.Sets/src/mage/cards/j/JumboImp.java +++ b/Mage.Sets/src/mage/cards/j/JumboImp.java @@ -3,7 +3,7 @@ package mage.cards.j; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.OneShotEffect; @@ -46,7 +46,7 @@ public final class JumboImp extends CardImpl { this.addAbility(ability2); // At the beginning of your end step, roll a six-sided die and remove a number of +1/+1 counters from Jumbo Imp equal to the result. - Ability ability3 = new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new JumboImpRemoveCountersEffect(), TargetController.YOU, null, false); + Ability ability3 = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new JumboImpRemoveCountersEffect(), false, null); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/cards/j/JynErsoAndCassianAndor.java b/Mage.Sets/src/mage/cards/j/JynErsoAndCassianAndor.java index c421820afca..a0123576086 100644 --- a/Mage.Sets/src/mage/cards/j/JynErsoAndCassianAndor.java +++ b/Mage.Sets/src/mage/cards/j/JynErsoAndCassianAndor.java @@ -30,8 +30,8 @@ public final class JynErsoAndCassianAndor extends CardImpl { // At the beginning of combat on your turn, target creature gets +1/+0 and gains haste until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new BoostTargetEffect(1, 0, Duration.EndOfTurn) - .setText("target creature gets +1/+0"), - false); + .setText("target creature gets +1/+0") + ); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn) .setText("and gains haste until end of turn")); ability.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/k/KaimaTheFracturedCalm.java b/Mage.Sets/src/mage/cards/k/KaimaTheFracturedCalm.java index 43816d1d469..c0c2058ed78 100644 --- a/Mage.Sets/src/mage/cards/k/KaimaTheFracturedCalm.java +++ b/Mage.Sets/src/mage/cards/k/KaimaTheFracturedCalm.java @@ -2,7 +2,7 @@ package mage.cards.k; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.combat.GoadTargetEffect; import mage.cards.CardImpl; @@ -32,7 +32,7 @@ public final class KaimaTheFracturedCalm extends CardImpl { // At the beginning of your end step, goad each creature your opponents control that's enchanted by an Aura you control. Put a +1/+1 counter on Kaima, the Fractured Calm for each creature goaded this way. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new KaimaTheFracturedCalmEffect(), TargetController.YOU, false + new KaimaTheFracturedCalmEffect() )); } diff --git a/Mage.Sets/src/mage/cards/k/KaitoShizuki.java b/Mage.Sets/src/mage/cards/k/KaitoShizuki.java index 0975ae307ac..83a867d4331 100644 --- a/Mage.Sets/src/mage/cards/k/KaitoShizuki.java +++ b/Mage.Sets/src/mage/cards/k/KaitoShizuki.java @@ -2,7 +2,7 @@ package mage.cards.k; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.RaidCondition; @@ -44,8 +44,8 @@ public final class KaitoShizuki extends CardImpl { // At the beginning of your end step, if Kaito Shizuki entered the battlefield this turn, he phases out. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new PhaseOutSourceEffect().setText("he phases out"), - TargetController.YOU, SourceEnteredThisTurnCondition.instance, false + TargetController.YOU, new PhaseOutSourceEffect().setText("he phases out"), + false, SourceEnteredThisTurnCondition.instance ).addHint(hint)); // +1: Draw a card. Then discard a card unless you attacked this turn. diff --git a/Mage.Sets/src/mage/cards/k/KamahlHeartOfKrosa.java b/Mage.Sets/src/mage/cards/k/KamahlHeartOfKrosa.java index 78db391b6d1..c89034bf004 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlHeartOfKrosa.java +++ b/Mage.Sets/src/mage/cards/k/KamahlHeartOfKrosa.java @@ -35,7 +35,7 @@ public final class KamahlHeartOfKrosa extends CardImpl { // At the beginning of combat on your turn, creatures you control get +3/+3 and gain trample until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility(new BoostControlledEffect( 3, 3, Duration.EndOfTurn - ).setText("creatures you control get +3/+3"), false); + ).setText("creatures you control get +3/+3")); ability.addEffect(new GainAbilityControlledEffect( TrampleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES diff --git a/Mage.Sets/src/mage/cards/k/KamiOfTransience.java b/Mage.Sets/src/mage/cards/k/KamiOfTransience.java index 1a6b58b45a1..ff955aacb62 100644 --- a/Mage.Sets/src/mage/cards/k/KamiOfTransience.java +++ b/Mage.Sets/src/mage/cards/k/KamiOfTransience.java @@ -2,7 +2,7 @@ package mage.cards.k; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect; @@ -46,8 +46,8 @@ public final class KamiOfTransience extends CardImpl { // At the beginning of each end step, if an enchantment was put into your graveyard from the battlefield this turn, you may return Kami of Transience from your graveyard to your hand. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), - TargetController.ANY, KamiOfTransienceCondition.instance, true + Zone.GRAVEYARD, TargetController.ANY, new ReturnSourceFromGraveyardToHandEffect(), + true, KamiOfTransienceCondition.instance ).addHint(KamiOfTransienceCondition.getHint()), new KamiOfTransienceWatcher()); } diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheAccord.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheAccord.java index 810c329a62e..1c90188f3da 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheAccord.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheAccord.java @@ -2,7 +2,7 @@ package mage.cards.k; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -45,16 +45,16 @@ public final class KeeperOfTheAccord extends CardImpl { // At the beginning of each opponent's end step, if that player controls more creatures than you, create a 1/1 white Soldier creature token. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new SoldierToken()), TargetController.OPPONENT, false + TargetController.OPPONENT, new CreateTokenEffect(new SoldierToken()), false ), KeeperOfTheAccordCondition.CREATURES, "At the beginning of each opponent's end step, " + "if that player controls more creatures than you, create a 1/1 white Soldier creature token." )); // At the beginning of each opponent's end step, if that player controls more lands than you, you may search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle your library. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfEndStepTriggeredAbility(new SearchLibraryPutInPlayEffect( + new BeginningOfEndStepTriggeredAbility(TargetController.OPPONENT, new SearchLibraryPutInPlayEffect( new TargetCardInLibrary(filter), true - ), TargetController.OPPONENT, true), + ), true), KeeperOfTheAccordCondition.LANDS, "At the beginning of each opponent's end step, " + "if that player controls more lands than you, you may search your library for a basic Plains card, " + "put it onto the battlefield tapped, then shuffle." diff --git a/Mage.Sets/src/mage/cards/k/KeldonTwilight.java b/Mage.Sets/src/mage/cards/k/KeldonTwilight.java index e3144d2fd88..09e13ba8c3f 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonTwilight.java +++ b/Mage.Sets/src/mage/cards/k/KeldonTwilight.java @@ -3,7 +3,7 @@ package mage.cards.k; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.Effect; import mage.abilities.effects.common.SacrificeEffect; @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControlledFromStartOfControllerTurnPredicate; import mage.game.Game; @@ -36,7 +35,7 @@ public final class KeldonTwilight extends CardImpl { Effect effect = new SacrificeEffect(filter, 1, "that player "); effect.setText("that player sacrifices a creature they controlled since the beginning of the turn"); BeginningOfEndStepTriggeredAbility ability - = new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.ANY, new KeldonTwilightCondition(), false); + = new BeginningOfEndStepTriggeredAbility(TargetController.ANY, effect, false, new KeldonTwilightCondition()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KethekCrucibleGoliath.java b/Mage.Sets/src/mage/cards/k/KethekCrucibleGoliath.java index 82e2030fc1a..0e0f4deee40 100644 --- a/Mage.Sets/src/mage/cards/k/KethekCrucibleGoliath.java +++ b/Mage.Sets/src/mage/cards/k/KethekCrucibleGoliath.java @@ -2,7 +2,7 @@ package mage.cards.k; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.RevealCardsFromLibraryUntilEffect; import mage.cards.CardImpl; @@ -15,8 +15,6 @@ import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.TargetPermanent; -import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetSacrifice; import java.util.UUID; @@ -40,7 +38,7 @@ public final class KethekCrucibleGoliath extends CardImpl { // until you reveal a nonlegendary creature card with lesser mana value, put it onto the battlefield, // then put the rest on the bottom of your library in a random order. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new KethekCrucibleGoliathEffect(), TargetController.YOU, false + new KethekCrucibleGoliathEffect() )); } diff --git a/Mage.Sets/src/mage/cards/k/KhabalGhoul.java b/Mage.Sets/src/mage/cards/k/KhabalGhoul.java index e0d1a88adcd..7264d4c0278 100644 --- a/Mage.Sets/src/mage/cards/k/KhabalGhoul.java +++ b/Mage.Sets/src/mage/cards/k/KhabalGhoul.java @@ -3,7 +3,7 @@ package mage.cards.k; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.common.CreaturesDiedThisTurnCount; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.hint.common.CreaturesDiedThisTurnHint; @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; -import mage.watchers.common.CreaturesDiedWatcher; /** * @@ -28,8 +27,8 @@ public final class KhabalGhoul extends CardImpl { this.toughness = new MageInt(1); // At the beginning of each end step, put a +1/+1 counter on Khabal Ghoul for each creature that died this turn. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(), - CreaturesDiedThisTurnCount.instance, true), TargetController.ANY, false).addHint(CreaturesDiedThisTurnHint.instance)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new AddCountersSourceEffect(CounterType.P1P1.createInstance(), + CreaturesDiedThisTurnCount.instance, true), false).addHint(CreaturesDiedThisTurnHint.instance)); } private KhabalGhoul(final KhabalGhoul card) { diff --git a/Mage.Sets/src/mage/cards/k/KillerService.java b/Mage.Sets/src/mage/cards/k/KillerService.java index c626a487de6..e4687c33cf2 100644 --- a/Mage.Sets/src/mage/cards/k/KillerService.java +++ b/Mage.Sets/src/mage/cards/k/KillerService.java @@ -1,6 +1,6 @@ package mage.cards.k; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.CompositeCost; import mage.abilities.costs.common.SacrificeTargetCost; @@ -11,7 +11,6 @@ import mage.abilities.effects.common.DoIfCostPaid; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.FoodToken; @@ -46,7 +45,7 @@ public final class KillerService extends CardImpl { new GenericManaCost(2), new SacrificeTargetCost(filter), "pay {2} and sacrifice a token" ) - ), TargetController.YOU, false + ) )); } diff --git a/Mage.Sets/src/mage/cards/k/KlothysGodOfDestiny.java b/Mage.Sets/src/mage/cards/k/KlothysGodOfDestiny.java index c3b79fd7103..7ac9210f286 100644 --- a/Mage.Sets/src/mage/cards/k/KlothysGodOfDestiny.java +++ b/Mage.Sets/src/mage/cards/k/KlothysGodOfDestiny.java @@ -42,7 +42,7 @@ public final class KlothysGodOfDestiny extends CardImpl { // At the beginning of your precombat main phase, exile target card from a graveyard. If it was a land card, add {R} or {G}. Otherwise, you gain 2 life and Klothys deals 2 damage to each opponent. Ability ability = new BeginningOfFirstMainTriggeredAbility( - new KlothysGodOfDestinyEffect(), false + new KlothysGodOfDestinyEffect() ); ability.addTarget(new TargetCardInGraveyard()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KnightOfTheEbonLegion.java b/Mage.Sets/src/mage/cards/k/KnightOfTheEbonLegion.java index 32e07ad9340..73aed41bc7c 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheEbonLegion.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheEbonLegion.java @@ -2,7 +2,7 @@ package mage.cards.k; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.watchers.common.PlayerLostLifeWatcher; @@ -49,8 +48,7 @@ public final class KnightOfTheEbonLegion extends CardImpl { // At the beginning of your end step, if a player lost 4 or more life this turn, put a +1/+1 counter on Knight of the Ebon Legion. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - TargetController.YOU, false + new AddCountersSourceEffect(CounterType.P1P1.createInstance()) ), KnightOfTheEbonLegionCondition.instance, "At the beginning of your end step, " + "if a player lost 4 or more life this turn, put a +1/+1 counter on {this}." ).addHint(new ConditionHint(KnightOfTheEbonLegionCondition.instance, "A player lost 4 or more life this turn"))); @@ -81,4 +79,4 @@ enum KnightOfTheEbonLegionCondition implements Condition { .stream() .anyMatch(uuid -> watcher.getLifeLost(uuid) > 3); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KnightRampager.java b/Mage.Sets/src/mage/cards/k/KnightRampager.java index a9e854688e1..382f85715a1 100644 --- a/Mage.Sets/src/mage/cards/k/KnightRampager.java +++ b/Mage.Sets/src/mage/cards/k/KnightRampager.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.Target; import mage.target.common.TargetOpponent; @@ -33,7 +32,7 @@ public final class KnightRampager extends CardImpl { // Frenzied Rampage — At the beginning of combat on your turn, choose an opponent at random. Knight Rampager attacks that player this combat if able. this.addAbility(new BeginningOfCombatTriggeredAbility( - new AttackIfAbleTargetRandomOpponentSourceEffect(), false + new AttackIfAbleTargetRandomOpponentSourceEffect() ).withFlavorWord("Frenzied Rampage")); // When Knight Rampager dies, it deals 4 damage to target opponent chosen at random. diff --git a/Mage.Sets/src/mage/cards/k/KotoriPilotProdigy.java b/Mage.Sets/src/mage/cards/k/KotoriPilotProdigy.java index 010a77e9cb0..a43fc7b3004 100644 --- a/Mage.Sets/src/mage/cards/k/KotoriPilotProdigy.java +++ b/Mage.Sets/src/mage/cards/k/KotoriPilotProdigy.java @@ -47,8 +47,7 @@ public final class KotoriPilotProdigy extends CardImpl { // At the beginning of combat on your turn, target artifact creature you control gains lifelink and vigilance until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new GainAbilityTargetEffect(LifelinkAbility.getInstance()) - .setText("target artifact creature you control gains lifelink"), - false + .setText("target artifact creature you control gains lifelink") ); ability.addEffect(new GainAbilityTargetEffect( VigilanceAbility.getInstance() diff --git a/Mage.Sets/src/mage/cards/k/KrovikanHorror.java b/Mage.Sets/src/mage/cards/k/KrovikanHorror.java index f5d911dfac2..f56226ff8cf 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanHorror.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanHorror.java @@ -4,7 +4,7 @@ package mage.cards.k; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.common.SacrificeTargetCost; @@ -39,8 +39,8 @@ public final class KrovikanHorror extends CardImpl { // At the beginning of the end step, if Krovikan Horror is in your graveyard with a creature card directly above it, you may return Krovikan Horror to your hand. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), - TargetController.NEXT, KrovikanHorrorCondition.instance, true + Zone.GRAVEYARD, TargetController.NEXT, new ReturnSourceFromGraveyardToHandEffect(), + true, KrovikanHorrorCondition.instance )); // {1}, Sacrifice a creature: Krovikan Horror deals 1 damage to any target. diff --git a/Mage.Sets/src/mage/cards/k/KrovikanVampire.java b/Mage.Sets/src/mage/cards/k/KrovikanVampire.java index 0a11b8387a5..c33596292f8 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanVampire.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanVampire.java @@ -3,7 +3,7 @@ package mage.cards.k; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -37,11 +37,9 @@ public final class KrovikanVampire extends CardImpl { // At the beginning of each end step, if a creature dealt damage by Krovikan Vampire this turn died, put that card onto the battlefield under your control. Sacrifice it when you lose control of Krovikan Vampire. Ability ability = new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, - new KrovikanVampireEffect(), - TargetController.ANY, - new KrovikanVampireInterveningIfCondition(), - false); + TargetController.ANY, new KrovikanVampireEffect(), + false, new KrovikanVampireInterveningIfCondition() + ); ability.addWatcher(new KrovikanVampireCreaturesDamagedWatcher()); ability.addWatcher(new KrovikanVampireCreaturesDiedWatcher()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java b/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java index 25296aa0c39..3cef4d9be6d 100644 --- a/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java +++ b/Mage.Sets/src/mage/cards/k/KuonOgreAscendant.java @@ -4,7 +4,7 @@ package mage.cards.k; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.FlipSourceEffect; @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.token.TokenImpl; @@ -41,10 +40,8 @@ public final class KuonOgreAscendant extends CardImpl { // At the beginning of the end step, if three or more creatures died this turn, flip Kuon, Ogre Ascendant. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, - new FlipSourceEffect(new KuonsEssenceToken()), - TargetController.NEXT, - KuonOgreAscendantCondition.instance, false)); + TargetController.NEXT, new FlipSourceEffect(new KuonsEssenceToken()), + false, KuonOgreAscendantCondition.instance)); } private KuonOgreAscendant(final KuonOgreAscendant card) { diff --git a/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java b/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java index 2f42c723f19..7be2f92321b 100644 --- a/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java +++ b/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java @@ -3,7 +3,7 @@ package mage.cards.k; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -36,7 +36,7 @@ public final class KynaiosAndTiroOfMeletis extends CardImpl { this.toughness = new MageInt(8); // At the beginning of your end step, draw a card. Each player may put a land card from their hand onto the battlefield, then each opponent who didn't draws a card. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new KynaiosAndTirosEffect(), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new KynaiosAndTirosEffect())); } private KynaiosAndTiroOfMeletis(final KynaiosAndTiroOfMeletis card) { diff --git a/Mage.Sets/src/mage/cards/l/LaboratoryDrudge.java b/Mage.Sets/src/mage/cards/l/LaboratoryDrudge.java index 26e3a1a7727..faafb4de90d 100644 --- a/Mage.Sets/src/mage/cards/l/LaboratoryDrudge.java +++ b/Mage.Sets/src/mage/cards/l/LaboratoryDrudge.java @@ -2,7 +2,7 @@ package mage.cards.l; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -32,10 +32,10 @@ public final class LaboratoryDrudge extends CardImpl { // At the beginning of each end step, draw a card if you've cast a spell from a graveyard or activated an ability of a card in a graveyard this turn. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ConditionalOneShotEffect( + TargetController.ANY, new ConditionalOneShotEffect( new DrawCardSourceControllerEffect(1), LaboratoryDrudgeCondition.instance, "draw a card if you've cast a spell from a graveyard or activated an ability of a card in a graveyard this turn" - ), TargetController.ANY, false + ), false ), new LaboratoryDrudgeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/l/LadyOfLaughter.java b/Mage.Sets/src/mage/cards/l/LadyOfLaughter.java index 8a86b21516b..9e31ac6e4c0 100644 --- a/Mage.Sets/src/mage/cards/l/LadyOfLaughter.java +++ b/Mage.Sets/src/mage/cards/l/LadyOfLaughter.java @@ -1,7 +1,7 @@ package mage.cards.l; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.CelebrationCondition; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.keyword.FlyingAbility; @@ -33,8 +33,8 @@ public final class LadyOfLaughter extends CardImpl { // Celebration -- At the beginning of your end step, if two or more nonland permanents entered the battlefield under your control this turn, draw a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), TargetController.YOU, - CelebrationCondition.instance, false + TargetController.YOU, new DrawCardSourceControllerEffect(1), + false, CelebrationCondition.instance ).addHint(CelebrationCondition.getHint()).setAbilityWord(AbilityWord.CELEBRATION), new PermanentsEnteredBattlefieldWatcher()); } diff --git a/Mage.Sets/src/mage/cards/l/LagomosHandOfHatred.java b/Mage.Sets/src/mage/cards/l/LagomosHandOfHatred.java index fb20c3328f4..e86e80c5a35 100644 --- a/Mage.Sets/src/mage/cards/l/LagomosHandOfHatred.java +++ b/Mage.Sets/src/mage/cards/l/LagomosHandOfHatred.java @@ -38,7 +38,7 @@ public final class LagomosHandOfHatred extends CardImpl { this.toughness = new MageInt(3); // At the beginning of combat on your turn, create a 2/1 red Elemental creature token with trample and haste. Sacrifice it at the beginning of the next end step. - this.addAbility(new BeginningOfCombatTriggeredAbility(new LagomosHandOfHatredEffect(), false)); + 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( diff --git a/Mage.Sets/src/mage/cards/l/LathielTheBounteousDawn.java b/Mage.Sets/src/mage/cards/l/LathielTheBounteousDawn.java index fb1facbf7f9..f78d7464be6 100644 --- a/Mage.Sets/src/mage/cards/l/LathielTheBounteousDawn.java +++ b/Mage.Sets/src/mage/cards/l/LathielTheBounteousDawn.java @@ -2,7 +2,7 @@ package mage.cards.l; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -44,9 +44,9 @@ public final class LathielTheBounteousDawn extends CardImpl { // At the beginning of each end step, if you gained life this turn, distribute up to that many +1/+1 counters among any number of other target creatures. Ability ability = new ConditionalInterveningIfTriggeredAbility( - new BeginningOfEndStepTriggeredAbility(new DistributeCountersEffect( + new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new DistributeCountersEffect( CounterType.P1P1, 1, false, "" - ), TargetController.ANY, false), + ), false), condition, "At the beginning of each end step, if you gained life this turn, " + "distribute up to that many +1/+1 counters among any number of other target creatures." ); @@ -92,4 +92,4 @@ enum LathielTheBounteousDawnValue implements DynamicValue { public static Hint getHint() { return hint; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/l/LathnuHellion.java b/Mage.Sets/src/mage/cards/l/LathnuHellion.java index 09645a058e8..76ad67c51e9 100644 --- a/Mage.Sets/src/mage/cards/l/LathnuHellion.java +++ b/Mage.Sets/src/mage/cards/l/LathnuHellion.java @@ -3,7 +3,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.PayEnergyCost; @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; /** * @@ -39,7 +38,7 @@ public final class LathnuHellion extends CardImpl { Cost cost = new PayEnergyCost(2); cost.setText("{E}{E}"); Effect effect = new SacrificeSourceUnlessPaysEffect(cost); - this.addAbility(new BeginningOfEndStepTriggeredAbility(effect, TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(effect)); } private LathnuHellion(final LathnuHellion card) { diff --git a/Mage.Sets/src/mage/cards/l/LegionWarboss.java b/Mage.Sets/src/mage/cards/l/LegionWarboss.java index e379ebfb55d..3b18b127f80 100644 --- a/Mage.Sets/src/mage/cards/l/LegionWarboss.java +++ b/Mage.Sets/src/mage/cards/l/LegionWarboss.java @@ -18,7 +18,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.token.GoblinToken; @@ -43,8 +42,7 @@ public final class LegionWarboss extends CardImpl { // At the beginning of combat on your turn, create a 1/1 red Goblin creature token. That token gains haste until end of turn and attacks this combat if able. this.addAbility(new BeginningOfCombatTriggeredAbility( - new LegionWarbossEffect(), - false + new LegionWarbossEffect() )); } diff --git a/Mage.Sets/src/mage/cards/l/LeinoreAutumnSovereign.java b/Mage.Sets/src/mage/cards/l/LeinoreAutumnSovereign.java index 3956b2a1747..8761d193c2c 100644 --- a/Mage.Sets/src/mage/cards/l/LeinoreAutumnSovereign.java +++ b/Mage.Sets/src/mage/cards/l/LeinoreAutumnSovereign.java @@ -32,8 +32,7 @@ public final class LeinoreAutumnSovereign extends CardImpl { // Coven — At the beginning of combat on your turn, put a +1/+1 counter on up to one target creature you control. Then if you control three or more creatures with different powers, draw a card. Ability ability = new BeginningOfCombatTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), - false + new AddCountersTargetEffect(CounterType.P1P1.createInstance()) ); ability.addEffect(new ConditionalOneShotEffect( new DrawCardSourceControllerEffect(1), CovenCondition.instance, diff --git a/Mage.Sets/src/mage/cards/l/LeoninVanguard.java b/Mage.Sets/src/mage/cards/l/LeoninVanguard.java index 3af88dd8667..7809d688a1c 100644 --- a/Mage.Sets/src/mage/cards/l/LeoninVanguard.java +++ b/Mage.Sets/src/mage/cards/l/LeoninVanguard.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.filter.StaticFilters; /** @@ -34,8 +33,7 @@ public final class LeoninVanguard extends CardImpl { // At the beginning of combat on your turn, if you control three or more creatures, Leonin Vanguard gets +1/+1 until end of turn and you gain 1 life. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new BoostSourceEffect(1, 1, Duration.EndOfTurn), - false + new BoostSourceEffect(1, 1, Duration.EndOfTurn) ), new PermanentsOnTheBattlefieldCondition( StaticFilters.FILTER_CONTROLLED_CREATURES, diff --git a/Mage.Sets/src/mage/cards/l/LighthouseChronologist.java b/Mage.Sets/src/mage/cards/l/LighthouseChronologist.java index 577439ce7b2..8f3ea692923 100644 --- a/Mage.Sets/src/mage/cards/l/LighthouseChronologist.java +++ b/Mage.Sets/src/mage/cards/l/LighthouseChronologist.java @@ -4,7 +4,7 @@ import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.NotMyTurnCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect; @@ -16,7 +16,6 @@ import mage.cards.LevelerCard; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; import java.util.UUID; @@ -44,7 +43,7 @@ public final class LighthouseChronologist extends LevelerCard { // At the beginning of each end step, if it's not your turn, take an extra turn after this one. Abilities abilities2 = new AbilitiesImpl<>(); abilities2.add(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new AddExtraTurnControllerEffect(false), TargetController.ANY, NotMyTurnCondition.instance, false) + TargetController.ANY, new AddExtraTurnControllerEffect(false), false, NotMyTurnCondition.instance) .addHint(NotMyTurnHint.instance)); this.addAbilities(LevelerCardBuilder.construct( diff --git a/Mage.Sets/src/mage/cards/l/LightningPhoenix.java b/Mage.Sets/src/mage/cards/l/LightningPhoenix.java index 82649cc8c4b..8a849151d89 100644 --- a/Mage.Sets/src/mage/cards/l/LightningPhoenix.java +++ b/Mage.Sets/src/mage/cards/l/LightningPhoenix.java @@ -2,7 +2,7 @@ package mage.cards.l; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.CantBlockAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -47,9 +47,9 @@ public final class LightningPhoenix extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( Zone.GRAVEYARD, - new DoIfCostPaid( + TargetController.YOU, new DoIfCostPaid( new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl<>("{R}") - ), TargetController.YOU, null, false + ), false, null ), LightningPhoenixCondition.instance, "At the beginning of your end step, " + "if an opponent was dealt 3 or more damage this turn, you may pay {R}. " + "If you do, return {this} from your graveyard to the battlefield." diff --git a/Mage.Sets/src/mage/cards/l/LightningReaver.java b/Mage.Sets/src/mage/cards/l/LightningReaver.java index 1cf6efbb224..d55c6923746 100644 --- a/Mage.Sets/src/mage/cards/l/LightningReaver.java +++ b/Mage.Sets/src/mage/cards/l/LightningReaver.java @@ -1,7 +1,7 @@ package mage.cards.l; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CountersSourceCount; @@ -43,7 +43,7 @@ public final class LightningReaver extends CardImpl { // At the beginning of your end step, Lightning Reaver deals damage equal to the number of charge counters on it to each opponent. this.addAbility(new BeginningOfEndStepTriggeredAbility(new DamagePlayersEffect( Outcome.Damage, xValue, TargetController.OPPONENT - ).setText("{this} deals damage equal to the number of charge counters on it to each opponent"), TargetController.YOU, false)); + ).setText("{this} deals damage equal to the number of charge counters on it to each opponent"))); } private LightningReaver(final LightningReaver card) { diff --git a/Mage.Sets/src/mage/cards/l/LightningShrieker.java b/Mage.Sets/src/mage/cards/l/LightningShrieker.java index f87c59f8d4c..9c34f083b00 100644 --- a/Mage.Sets/src/mage/cards/l/LightningShrieker.java +++ b/Mage.Sets/src/mage/cards/l/LightningShrieker.java @@ -2,7 +2,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ShuffleIntoLibrarySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -35,7 +35,7 @@ public final class LightningShrieker extends CardImpl { // At the beginning of the end step, Lightning Shrieker's owner shuffles it into their library. Effect effect = new ShuffleIntoLibrarySourceEffect(); effect.setText("{this}'s owner shuffles it into their library."); - this.addAbility(new BeginningOfEndStepTriggeredAbility(effect, TargetController.NEXT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, effect, false)); } private LightningShrieker(final LightningShrieker card) { diff --git a/Mage.Sets/src/mage/cards/l/LightshieldArray.java b/Mage.Sets/src/mage/cards/l/LightshieldArray.java index 6a62ec837d9..45076095e12 100644 --- a/Mage.Sets/src/mage/cards/l/LightshieldArray.java +++ b/Mage.Sets/src/mage/cards/l/LightshieldArray.java @@ -2,7 +2,7 @@ package mage.cards.l; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.OneShotEffect; @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.Game; @@ -36,7 +35,7 @@ public final class LightshieldArray extends CardImpl { // At the beginning of your end step, put a +1/+1 counter on each creature that attacked this turn. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new LightshieldArrayEffect(), TargetController.YOU, false + new LightshieldArrayEffect() )); // Sacrifice Lightshield Array: Creatures you control gain hexproof and indestructible until end of turn. diff --git a/Mage.Sets/src/mage/cards/l/LilianasDevotee.java b/Mage.Sets/src/mage/cards/l/LilianasDevotee.java index ec0a33f35c6..2ffcce4281b 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasDevotee.java +++ b/Mage.Sets/src/mage/cards/l/LilianasDevotee.java @@ -1,7 +1,7 @@ package mage.cards.l; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.ZombieToken; @@ -45,7 +44,7 @@ public final class LilianasDevotee extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility(new DoIfCostPaid( new CreateTokenEffect(new ZombieToken()), new ManaCostsImpl<>("{1}{B}") - ), TargetController.YOU, false), MorbidCondition.instance, + )), MorbidCondition.instance, "At the beginning of your end step, if a creature died this turn, " + "you may pay {1}{B}. If you do, create a 2/2 black Zombie creature token." ).addHint(MorbidHint.instance)); diff --git a/Mage.Sets/src/mage/cards/l/LilianasScrounger.java b/Mage.Sets/src/mage/cards/l/LilianasScrounger.java index 8058e8b2694..3def5d14982 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasScrounger.java +++ b/Mage.Sets/src/mage/cards/l/LilianasScrounger.java @@ -2,7 +2,7 @@ package mage.cards.l; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -38,7 +38,7 @@ public final class LilianasScrounger extends CardImpl { // At the beginning of each end step, if a creature died this turn, you may put a loyalty counter on a Liliana planeswalker you control. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility( - new LilianasScroungerEffect(), TargetController.ANY, false + TargetController.ANY, new LilianasScroungerEffect(), false ), MorbidCondition.instance, "At the beginning of each end step, " + "if a creature died this turn, you may put a loyalty counter on a Liliana planeswalker you control." ).addHint(MorbidHint.instance)); diff --git a/Mage.Sets/src/mage/cards/l/LinvalaShieldOfSeaGate.java b/Mage.Sets/src/mage/cards/l/LinvalaShieldOfSeaGate.java index 35d3098d10a..dafe59292ad 100644 --- a/Mage.Sets/src/mage/cards/l/LinvalaShieldOfSeaGate.java +++ b/Mage.Sets/src/mage/cards/l/LinvalaShieldOfSeaGate.java @@ -54,8 +54,7 @@ public final class LinvalaShieldOfSeaGate extends CardImpl { // At the beginning of combat on your turn, if you have a full party, choose target nonland permanent an opponent controls. Until your next turn, it can't attack or block, and its activated abilities can't be activated. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new LinvalaShieldOfSeaGateRestrictionEffect(), - false + new LinvalaShieldOfSeaGateRestrictionEffect() ), FullPartyCondition.instance, "At the beginning of combat on your turn, " + "if you have a full party, choose target nonland permanent an opponent controls. " + "Until your next turn, it can't attack or block, and its activated abilities can't be activated." diff --git a/Mage.Sets/src/mage/cards/l/LitaMechanicalEngineer.java b/Mage.Sets/src/mage/cards/l/LitaMechanicalEngineer.java index 71946acbbf7..abffae82b0e 100644 --- a/Mage.Sets/src/mage/cards/l/LitaMechanicalEngineer.java +++ b/Mage.Sets/src/mage/cards/l/LitaMechanicalEngineer.java @@ -2,7 +2,7 @@ package mage.cards.l; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -48,8 +48,7 @@ public final class LitaMechanicalEngineer extends CardImpl { // At the beginning of your end step, untap each other artifact creature you control. this.addAbility(new BeginningOfEndStepTriggeredAbility( new UntapAllEffect(filter) - .setText("untap each other artifact creature you control"), - TargetController.YOU, false + .setText("untap each other artifact creature you control") )); // {3}{W}, {T}: Create a 5/5 colorless Vehicle artifact token named Zeppelin with flying and crew 3. diff --git a/Mage.Sets/src/mage/cards/l/LoneRider.java b/Mage.Sets/src/mage/cards/l/LoneRider.java index b87c872bc69..1d2c7db5c86 100644 --- a/Mage.Sets/src/mage/cards/l/LoneRider.java +++ b/Mage.Sets/src/mage/cards/l/LoneRider.java @@ -1,7 +1,7 @@ package mage.cards.l; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -49,7 +49,7 @@ public final class LoneRider extends CardImpl { this.addAbility(new TransformAbility()); this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new TransformSourceEffect(), TargetController.NEXT, false + TargetController.NEXT, new TransformSourceEffect(), false ), condition, ruleText ).addHint(hint), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/l/LordSkitterSewerKing.java b/Mage.Sets/src/mage/cards/l/LordSkitterSewerKing.java index 083a9074d46..6708d689dc4 100644 --- a/Mage.Sets/src/mage/cards/l/LordSkitterSewerKing.java +++ b/Mage.Sets/src/mage/cards/l/LordSkitterSewerKing.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.AnotherPredicate; @@ -51,8 +50,7 @@ public final class LordSkitterSewerKing extends CardImpl { // At the beginning of combat on your turn, create a 1/1 black Rat creature token with "This creature can't block." this.addAbility(new BeginningOfCombatTriggeredAbility( - new CreateTokenEffect(new RatCantBlockToken()), - false + new CreateTokenEffect(new RatCantBlockToken()) )); } diff --git a/Mage.Sets/src/mage/cards/l/LoreholdExcavation.java b/Mage.Sets/src/mage/cards/l/LoreholdExcavation.java index b4c47a1f421..6605b0665fe 100644 --- a/Mage.Sets/src/mage/cards/l/LoreholdExcavation.java +++ b/Mage.Sets/src/mage/cards/l/LoreholdExcavation.java @@ -1,7 +1,7 @@ package mage.cards.l; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.costs.mana.GenericManaCost; @@ -32,7 +32,7 @@ public final class LoreholdExcavation extends CardImpl { // At the beginning of your end step, mill a card. If a land card was milled this way, you gain 1 life. Otherwise, Lorehold Excavation deals 1 damage to each opponent. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new LoreholdExcavationEffect(), TargetController.YOU, false + new LoreholdExcavationEffect() )); // {5}, Exile a creature card from your graveyard: Create a tapped 3/2 red and white Spirit creature token. diff --git a/Mage.Sets/src/mage/cards/l/LoyalApprentice.java b/Mage.Sets/src/mage/cards/l/LoyalApprentice.java index 9ca5b618731..cd2b0f47334 100644 --- a/Mage.Sets/src/mage/cards/l/LoyalApprentice.java +++ b/Mage.Sets/src/mage/cards/l/LoyalApprentice.java @@ -39,7 +39,7 @@ public final class LoyalApprentice extends CardImpl { // Lieutenant — At the beginning of combat on your turn, if you control your commander, create a 1/1 colorless Thopter artifact creature token with flying. That token gains haste until end of turn. this.addAbility(new ConditionalTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new LoyalApprenticeEffect(), false + new LoyalApprenticeEffect() ), CommanderInPlayCondition.instance, "Lieutenant — " + "At the beginning of combat on your turn, if you control your commander, " + "create a 1/1 colorless Thopter artifact creature token with flying. " + diff --git a/Mage.Sets/src/mage/cards/l/LoyalDrake.java b/Mage.Sets/src/mage/cards/l/LoyalDrake.java index 71ef4ed520a..900dddf2df4 100644 --- a/Mage.Sets/src/mage/cards/l/LoyalDrake.java +++ b/Mage.Sets/src/mage/cards/l/LoyalDrake.java @@ -11,7 +11,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; /** * @@ -32,8 +31,7 @@ public final class LoyalDrake extends CardImpl { // Lieutenant — At the beginning of combat on your turn, if you control your commander, draw a card. this.addAbility(new ConditionalTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new DrawCardSourceControllerEffect(1), - false + new DrawCardSourceControllerEffect(1) ), CommanderInPlayCondition.instance, "Lieutenant — At the beginning of combat " + "on your turn, if you control your commander, draw a card." diff --git a/Mage.Sets/src/mage/cards/l/LoyalGuardian.java b/Mage.Sets/src/mage/cards/l/LoyalGuardian.java index 82eaa1e91e3..02ab5f4c48c 100644 --- a/Mage.Sets/src/mage/cards/l/LoyalGuardian.java +++ b/Mage.Sets/src/mage/cards/l/LoyalGuardian.java @@ -11,7 +11,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; @@ -37,7 +36,7 @@ public final class LoyalGuardian extends CardImpl { new AddCountersAllEffect( CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURE - ), false + ) ), CommanderInPlayCondition.instance, "Lieutenant — At the beginning of combat " + "on your turn, if you control your commander, " diff --git a/Mage.Sets/src/mage/cards/l/LoyalSubordinate.java b/Mage.Sets/src/mage/cards/l/LoyalSubordinate.java index 79655e32a81..1eea09a2c49 100644 --- a/Mage.Sets/src/mage/cards/l/LoyalSubordinate.java +++ b/Mage.Sets/src/mage/cards/l/LoyalSubordinate.java @@ -11,7 +11,6 @@ import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; /** * @@ -32,8 +31,7 @@ public final class LoyalSubordinate extends CardImpl { // Lieutenant — At the beginning of combat on your turn, if you control your commander, each opponent loses 3 life. this.addAbility(new ConditionalTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new LoseLifeOpponentsEffect(3), - false + new LoseLifeOpponentsEffect(3) ), CommanderInPlayCondition.instance, "Lieutenant — At the beginning of combat " + "on your turn, if you control your commander, " diff --git a/Mage.Sets/src/mage/cards/l/LoyalUnicorn.java b/Mage.Sets/src/mage/cards/l/LoyalUnicorn.java index c4fc9e21cc1..f2a52c879d7 100644 --- a/Mage.Sets/src/mage/cards/l/LoyalUnicorn.java +++ b/Mage.Sets/src/mage/cards/l/LoyalUnicorn.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.filter.StaticFilters; /** @@ -39,7 +38,7 @@ public final class LoyalUnicorn extends CardImpl { Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES, true - ), false + ) ); ability.addEffect(new GainAbilityAllEffect( VigilanceAbility.getInstance(), Duration.EndOfTurn, diff --git a/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java b/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java index e330115c8df..48b14c97270 100644 --- a/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java +++ b/Mage.Sets/src/mage/cards/l/LudevicNecroAlchemist.java @@ -2,7 +2,7 @@ package mage.cards.l; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.OneShotEffect; import mage.abilities.hint.ConditionHint; @@ -32,8 +32,7 @@ public final class LudevicNecroAlchemist extends CardImpl { // At the beginning of each player's end step, that player may draw a card if a player other than you lost life this turn. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new LudevicNecroAlchemistEffect(), - TargetController.EACH_PLAYER, + TargetController.EACH_PLAYER, new LudevicNecroAlchemistEffect(), false) .addHint(new ConditionHint(LudevicNecroAlchemistCondition.instance, "Player other than you lost life this turn"))); diff --git a/Mage.Sets/src/mage/cards/l/LuluLoyalHollyphant.java b/Mage.Sets/src/mage/cards/l/LuluLoyalHollyphant.java index 7d45ddc310e..e4478024080 100644 --- a/Mage.Sets/src/mage/cards/l/LuluLoyalHollyphant.java +++ b/Mage.Sets/src/mage/cards/l/LuluLoyalHollyphant.java @@ -2,7 +2,7 @@ package mage.cards.l; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.ChooseABackgroundAbility; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.effects.common.UntapAllEffect; @@ -48,8 +48,8 @@ public final class LuluLoyalHollyphant extends CardImpl { // At the beginning of your end step, if a permanent you controlled left the battlefield this turn, put a +1/+1 counter on each tapped creature you control, then untap them. Ability ability = new BeginningOfEndStepTriggeredAbility( - new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), - TargetController.YOU, RevoltCondition.instance, false + TargetController.YOU, new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), + false, RevoltCondition.instance ); ability.addEffect(new UntapAllEffect(filter).setText(", then untap them")); this.addAbility(ability.addHint(RevoltCondition.getHint()), new RevoltWatcher()); diff --git a/Mage.Sets/src/mage/cards/l/LuminarchAscension.java b/Mage.Sets/src/mage/cards/l/LuminarchAscension.java index 95fdabc5156..fdef9d188a2 100644 --- a/Mage.Sets/src/mage/cards/l/LuminarchAscension.java +++ b/Mage.Sets/src/mage/cards/l/LuminarchAscension.java @@ -3,7 +3,7 @@ package mage.cards.l; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.SourceHasCounterCondition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,8 +37,8 @@ public final class LuminarchAscension extends CardImpl { // At the beginning of each opponent's end step, if you didn't lose life this turn, you may put a quest counter on Luminarch Ascension. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.QUEST.createInstance()), - TargetController.OPPONENT, true + TargetController.OPPONENT, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), + true ), LuminarchAscensionCondition.instance, rule )); diff --git a/Mage.Sets/src/mage/cards/l/LuminarchAspirant.java b/Mage.Sets/src/mage/cards/l/LuminarchAspirant.java index 6fb8f81784f..80a79dd7be0 100644 --- a/Mage.Sets/src/mage/cards/l/LuminarchAspirant.java +++ b/Mage.Sets/src/mage/cards/l/LuminarchAspirant.java @@ -8,7 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.target.common.TargetControlledCreaturePermanent; @@ -29,7 +28,7 @@ public final class LuminarchAspirant extends CardImpl { // At the beginning of combat on your turn, put a +1/+1 counter on target creature you control. Ability ability = new BeginningOfCombatTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false + new AddCountersTargetEffect(CounterType.P1P1.createInstance()) ); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LunarConvocation.java b/Mage.Sets/src/mage/cards/l/LunarConvocation.java index f0133974330..169914baa3c 100644 --- a/Mage.Sets/src/mage/cards/l/LunarConvocation.java +++ b/Mage.Sets/src/mage/cards/l/LunarConvocation.java @@ -1,7 +1,7 @@ package mage.cards.l; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.common.PayLifeCost; @@ -30,14 +30,14 @@ public final class LunarConvocation extends CardImpl { // At the beginning of your end step, if you gained life this turn, each opponent loses 1 life. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new LoseLifeOpponentsEffect(1), TargetController.YOU, - LunarConvocationCondition.GAINED, false + TargetController.YOU, new LoseLifeOpponentsEffect(1), + false, LunarConvocationCondition.GAINED )); // At the beginning of your end step, if you gained and lost life this turn, create a 1/1 black Bat creature token with flying. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new BatToken()), TargetController.YOU, - LunarConvocationCondition.GAINED_AND_LOST, false + TargetController.YOU, new CreateTokenEffect(new BatToken()), + false, LunarConvocationCondition.GAINED_AND_LOST )); // {1}{B}, Pay 2 life: Draw a card. diff --git a/Mage.Sets/src/mage/cards/l/LuxArtillery.java b/Mage.Sets/src/mage/cards/l/LuxArtillery.java index cc3b5dfa2b9..918f5c0e743 100644 --- a/Mage.Sets/src/mage/cards/l/LuxArtillery.java +++ b/Mage.Sets/src/mage/cards/l/LuxArtillery.java @@ -1,10 +1,9 @@ package mage.cards.l; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.condition.Condition; -import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.DamagePlayersEffect; import mage.abilities.keyword.SunburstAbility; @@ -40,13 +39,9 @@ public final class LuxArtillery extends CardImpl { // Whenever you cast an artifact creature spell, it gains sunburst. this.addAbility(new SpellCastControllerTriggeredAbility(new LuxArtilleryEffect(this), filter, false, SetTargetPointer.SPELL)); - // At the beginning of your end step, if there are thirty or more counters among artifacts - // and creatures you control, Lux Artillery deals 10 damage to each opponent. - this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfYourEndStepTriggeredAbility( - Zone.BATTLEFIELD, new DamagePlayersEffect(10, TargetController.OPPONENT), false), LuxArtilleryCondition.instance, - "At the beginning of your end step, if there are thirty or more counters among artifacts " + - "and creatures you control, {this} deals 10 damage to each opponent" - )); + // At the beginning of your end step, if there are thirty or more counters among artifacts and creatures you control, Lux Artillery deals 10 damage to each opponent. + this.addAbility(new BeginningOfEndStepTriggeredAbility(new DamagePlayersEffect(10, TargetController.OPPONENT)) + .withInterveningIf(LuxArtilleryCondition.instance)); } private LuxArtillery(final LuxArtillery card) { diff --git a/Mage.Sets/src/mage/cards/l/LydiaFrye.java b/Mage.Sets/src/mage/cards/l/LydiaFrye.java index d2e1453fc6d..cb88e541c73 100644 --- a/Mage.Sets/src/mage/cards/l/LydiaFrye.java +++ b/Mage.Sets/src/mage/cards/l/LydiaFrye.java @@ -2,7 +2,7 @@ package mage.cards.l; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.OneShotEffect; @@ -47,7 +47,7 @@ public final class LydiaFrye extends CardImpl { // At the beginning of your end step, surveil X, where X is the number of tapped Assassins you control. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new LydiaFryeEffect(), TargetController.YOU, false + new LydiaFryeEffect() ).addHint(LydiaFryeEffect.getHint())); } diff --git a/Mage.Sets/src/mage/cards/m/MadDog.java b/Mage.Sets/src/mage/cards/m/MadDog.java index 4cf9161da0d..f8d45d22f2b 100644 --- a/Mage.Sets/src/mage/cards/m/MadDog.java +++ b/Mage.Sets/src/mage/cards/m/MadDog.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.OrCondition; @@ -15,10 +15,8 @@ import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.watchers.common.AttackedThisTurnWatcher; /** * @author xenohedron @@ -36,7 +34,7 @@ public final class MadDog extends CardImpl { // At the beginning of your end step, if Mad Dog didn't attack or come under your control this turn, sacrifice it. Condition condition = new InvertCondition(new OrCondition(AttackedThisTurnSourceCondition.instance, MadDogCondition.instance)); Ability ability = new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility( - new SacrificeSourceEffect(), TargetController.YOU, false), condition, + new SacrificeSourceEffect()), condition, "At the beginning of your end step, if {this} didn't attack or come under your control this turn, sacrifice it"); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MagmaticCore.java b/Mage.Sets/src/mage/cards/m/MagmaticCore.java index d133c811e9f..b53cf52cfe3 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaticCore.java +++ b/Mage.Sets/src/mage/cards/m/MagmaticCore.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CountersSourceCount; @@ -12,7 +12,6 @@ import mage.abilities.keyword.CumulativeUpkeepAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanentAmount; @@ -34,8 +33,7 @@ public final class MagmaticCore extends CardImpl { new DamageMultiEffect(value) .setText("{this} deals X damage divided as you choose " + "among any number of target creatures," - + " where X is the number of age counters on it."), - TargetController.YOU, false + + " where X is the number of age counters on it.") ); ability.addTarget(new TargetCreaturePermanentAmount(value)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MagmaticSprinter.java b/Mage.Sets/src/mage/cards/m/MagmaticSprinter.java index 473935a14d2..34ae7be5832 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaticSprinter.java +++ b/Mage.Sets/src/mage/cards/m/MagmaticSprinter.java @@ -2,7 +2,7 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.effects.common.DoUnlessControllerPaysEffect; @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.target.TargetPermanent; @@ -48,8 +47,7 @@ public final class MagmaticSprinter extends CardImpl { new DoUnlessControllerPaysEffect( new ReturnToHandSourceEffect(true), new RemoveCountersSourceCost(CounterType.OIL.createInstance(2)) - ).setText("return {this} to its owner's hand unless you remove two oil counters from it"), - TargetController.YOU, false + ).setText("return {this} to its owner's hand unless you remove two oil counters from it") )); } diff --git a/Mage.Sets/src/mage/cards/m/MagusLuceaKane.java b/Mage.Sets/src/mage/cards/m/MagusLuceaKane.java index 2e49763f7ec..5aad60426dc 100644 --- a/Mage.Sets/src/mage/cards/m/MagusLuceaKane.java +++ b/Mage.Sets/src/mage/cards/m/MagusLuceaKane.java @@ -40,8 +40,7 @@ public final class MagusLuceaKane extends CardImpl { // Spiritual Leader -- At the beginning of combat on your turn, put a +1/+1 counter on target creature. Ability ability = new BeginningOfCombatTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), - false + new AddCountersTargetEffect(CounterType.P1P1.createInstance()) ); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability.withFlavorWord("Spiritual Leader")); diff --git a/Mage.Sets/src/mage/cards/m/MahadiEmporiumMaster.java b/Mage.Sets/src/mage/cards/m/MahadiEmporiumMaster.java index 8df37233bf4..b354f68a7dd 100644 --- a/Mage.Sets/src/mage/cards/m/MahadiEmporiumMaster.java +++ b/Mage.Sets/src/mage/cards/m/MahadiEmporiumMaster.java @@ -1,7 +1,7 @@ package mage.cards.m; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.common.CreaturesDiedThisTurnCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.hint.common.CreaturesDiedThisTurnHint; @@ -10,9 +10,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.game.permanent.token.TreasureToken; -import mage.watchers.common.CreaturesDiedWatcher; import java.util.UUID; @@ -33,7 +31,7 @@ public final class MahadiEmporiumMaster extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility( new CreateTokenEffect( new TreasureToken(), CreaturesDiedThisTurnCount.instance - ).setText("create a Treasure token for each creature that died this turn"), TargetController.YOU, false + ).setText("create a Treasure token for each creature that died this turn") ).addHint(CreaturesDiedThisTurnHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/m/MalcatorPurityOverseer.java b/Mage.Sets/src/mage/cards/m/MalcatorPurityOverseer.java index 6baced78405..f94f4981817 100644 --- a/Mage.Sets/src/mage/cards/m/MalcatorPurityOverseer.java +++ b/Mage.Sets/src/mage/cards/m/MalcatorPurityOverseer.java @@ -6,7 +6,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.dynamicvalue.DynamicValue; @@ -48,8 +48,8 @@ public final class MalcatorPurityOverseer extends CardImpl { // At the beginning of your end step, if three or more artifacts entered the battlefield under your control this turn, create a 3/3 colorless Phyrexian Golem artifact creature token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new PhyrexianGolemToken()), TargetController.YOU, - MalcatorPurityOverseerCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new PhyrexianGolemToken()), + false, MalcatorPurityOverseerCondition.instance ), new MalcatorPurityOverseerWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/Manabond.java b/Mage.Sets/src/mage/cards/m/Manabond.java index d5599ae15b7..acf2029d5e7 100644 --- a/Mage.Sets/src/mage/cards/m/Manabond.java +++ b/Mage.Sets/src/mage/cards/m/Manabond.java @@ -3,7 +3,7 @@ package mage.cards.m; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class Manabond extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); // At the beginning of your end step, reveal your hand and put all land cards from it onto the battlefield. If you do, discard your hand. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new ManabondEffect(), true)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new ManabondEffect(), true)); } private Manabond(final Manabond card) { diff --git a/Mage.Sets/src/mage/cards/m/ManifoldMouse.java b/Mage.Sets/src/mage/cards/m/ManifoldMouse.java index 6cb29ab38ff..4fdc04b2fdc 100644 --- a/Mage.Sets/src/mage/cards/m/ManifoldMouse.java +++ b/Mage.Sets/src/mage/cards/m/ManifoldMouse.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.target.TargetPermanent; @@ -38,7 +37,7 @@ public final class ManifoldMouse extends CardImpl { // At the beginning of combat on your turn, target Mouse you control gains your choice of double strike or trample until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility(new GainsChoiceOfAbilitiesEffect( - DoubleStrikeAbility.getInstance(), TrampleAbility.getInstance()), false); + DoubleStrikeAbility.getInstance(), TrampleAbility.getInstance())); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MaraudingLooter.java b/Mage.Sets/src/mage/cards/m/MaraudingLooter.java index 18878bafd25..d3500d59ff1 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingLooter.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingLooter.java @@ -2,7 +2,7 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.RaidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.DrawDiscardControllerEffect; @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.watchers.common.PlayerAttackedWatcher; import java.util.UUID; @@ -32,7 +31,7 @@ public final class MaraudingLooter extends CardImpl { // Raid - At the beginning of your end step, if you attacked this turn, you may draw a card. If you do, discard a card. Ability ability = new ConditionalInterveningIfTriggeredAbility( - new BeginningOfEndStepTriggeredAbility(new DrawDiscardControllerEffect(1, 1, true), TargetController.YOU, false), + new BeginningOfEndStepTriggeredAbility(new DrawDiscardControllerEffect(1, 1, true)), RaidCondition.instance, "At the beginning of your end step, " + "if you attacked this turn, " diff --git a/Mage.Sets/src/mage/cards/m/MarkOfFury.java b/Mage.Sets/src/mage/cards/m/MarkOfFury.java index 9b6aaf4cf39..4767497ef43 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfFury.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfFury.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; @@ -40,7 +40,7 @@ public final class MarkOfFury extends CardImpl { // Enchanted creature has haste. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); // At the beginning of the end step, return Mark of Fury to its owner's hand. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ReturnToHandSourceEffect(true), TargetController.ANY, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new ReturnToHandSourceEffect(true), false)); } private MarkOfFury(final MarkOfFury card) { diff --git a/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java b/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java index a2a07f0e2d0..cd6f2909d89 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.effects.common.AttachEffect; @@ -40,13 +40,12 @@ public final class MarkOfTheOni extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); // At the beginning of the end step, if you control no Demons, sacrifice Mark of the Oni. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, - new SacrificeSourceEffect(), - TargetController.NEXT, - new PermanentsOnTheBattlefieldCondition( + this.addAbility(new BeginningOfEndStepTriggeredAbility( + TargetController.NEXT, new SacrificeSourceEffect(), + false, new PermanentsOnTheBattlefieldCondition( new FilterControlledPermanent(SubType.DEMON, "if you control no Demons"), - ComparisonType.FEWER_THAN, 1), - false)); + ComparisonType.FEWER_THAN, 1) + )); } private MarkOfTheOni(final MarkOfTheOni card) { diff --git a/Mage.Sets/src/mage/cards/m/MarkovPurifier.java b/Mage.Sets/src/mage/cards/m/MarkovPurifier.java index 5be96f2e255..840306ea02f 100644 --- a/Mage.Sets/src/mage/cards/m/MarkovPurifier.java +++ b/Mage.Sets/src/mage/cards/m/MarkovPurifier.java @@ -3,7 +3,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DoIfCostPaid; @@ -32,9 +32,8 @@ public final class MarkovPurifier extends CardImpl { // At the beginning of your end step, if you gained life this turn, you may pay {2}. If you do, draw a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, - new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)), - TargetController.YOU, new YouGainedLifeCondition(), false + TargetController.YOU, new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new GenericManaCost(2)), + false, new YouGainedLifeCondition() ), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MarkovWaltzer.java b/Mage.Sets/src/mage/cards/m/MarkovWaltzer.java index c124594b44e..46aa54a306d 100644 --- a/Mage.Sets/src/mage/cards/m/MarkovWaltzer.java +++ b/Mage.Sets/src/mage/cards/m/MarkovWaltzer.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -36,8 +35,7 @@ public final class MarkovWaltzer extends CardImpl { // At the beginning of combat on your turn, up to two target creatures you control each get +1/+0 until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new BoostTargetEffect(1, 0) - .setText("up to two target creatures you control each get +1/+0 until end of turn"), - false + .setText("up to two target creatures you control each get +1/+0 until end of turn") ); ability.addTarget(new TargetControlledCreaturePermanent(0, 2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java b/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java index 6aeecef0b48..bf12a53d574 100644 --- a/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java +++ b/Mage.Sets/src/mage/cards/m/MathasFiendSeeker.java @@ -4,7 +4,7 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -47,7 +47,7 @@ public final class MathasFiendSeeker extends CardImpl { this.addAbility(new MenaceAbility(false)); // At the beginning of your end step, put a bounty counter on target creature an opponent controls. For as long as that creature has a bounty counter on it, it has "When this creature dies, each opponent draws a card and gains 2 life." - Ability ability = new BeginningOfYourEndStepTriggeredAbility(new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()), false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new AddCountersTargetEffect(CounterType.BOUNTY.createInstance())); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE)); Ability ability2 = new DiesSourceTriggeredAbility(new DrawCardAllEffect(1, TargetController.OPPONENT)); ability2.addEffect(new OpponentsGainLifeEffect()); diff --git a/Mage.Sets/src/mage/cards/m/MeTheImmortal.java b/Mage.Sets/src/mage/cards/m/MeTheImmortal.java index 33a76c3422e..33c04b6f460 100644 --- a/Mage.Sets/src/mage/cards/m/MeTheImmortal.java +++ b/Mage.Sets/src/mage/cards/m/MeTheImmortal.java @@ -47,8 +47,8 @@ public final class MeTheImmortal extends CardImpl { // At the beginning of combat on your turn, put your choice of a +1/+1, first strike, vigilance, or menace counter on Me, the Immortal. this.addAbility(new BeginningOfCombatTriggeredAbility(new AddCounterChoiceSourceEffect( CounterType.P1P1, CounterType.FIRST_STRIKE, CounterType.VIGILANCE, CounterType.MENACE - ).setText("put your choice of a +1/+1, first strike, vigilance, or menace counter on {this}"), - false)); + ).setText("put your choice of a +1/+1, first strike, vigilance, or menace counter on {this}") + )); // Counters remain on Me as it moves to any zone other than a player's hand or library. this.addAbility(new SimpleStaticAbility(Zone.ALL, new MeTheImmortalEffect())); // You may cast Me from your graveyard by discarding two cards in addition to paying its other costs. diff --git a/Mage.Sets/src/mage/cards/m/MeasureOfWickedness.java b/Mage.Sets/src/mage/cards/m/MeasureOfWickedness.java index d175328f21d..8021e47408f 100644 --- a/Mage.Sets/src/mage/cards/m/MeasureOfWickedness.java +++ b/Mage.Sets/src/mage/cards/m/MeasureOfWickedness.java @@ -1,7 +1,7 @@ package mage.cards.m; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.PutCardIntoGraveFromAnywhereAllTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.target.common.TargetOpponent; @@ -35,7 +34,7 @@ public final class MeasureOfWickedness extends CardImpl { // At the beginning of your end step, sacrifice Measure of Wickedness and you lose 8 life. - Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, null, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new SacrificeSourceEffect(), false, null); Effect effect = new LoseLifeSourceControllerEffect(8); effect.setText("and you lose 8 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MercadianAtlas.java b/Mage.Sets/src/mage/cards/m/MercadianAtlas.java index a8c2b1cfa32..3e3e3b85270 100644 --- a/Mage.Sets/src/mage/cards/m/MercadianAtlas.java +++ b/Mage.Sets/src/mage/cards/m/MercadianAtlas.java @@ -3,14 +3,13 @@ package mage.cards.m; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.game.Game; import mage.watchers.common.PlayLandWatcher; @@ -25,11 +24,8 @@ public final class MercadianAtlas extends CardImpl { // At the beginning of your end step, if you didn't play a land this turn, you may draw a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, - new DrawCardSourceControllerEffect(1), - TargetController.YOU, - MercadianAtlasCondition.instance, - true + TargetController.YOU, new DrawCardSourceControllerEffect(1), + true, MercadianAtlasCondition.instance ), new PlayLandWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java index 155d1b701b0..bc15b67a256 100644 --- a/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java +++ b/Mage.Sets/src/mage/cards/m/MerenOfClanNelToth.java @@ -2,7 +2,7 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersPlayersEffect; @@ -38,7 +38,7 @@ public final class MerenOfClanNelToth extends CardImpl { // At the beginning of your end step, choose target creature card in your graveyard. // If that card's converted mana cost is less than or equal to the number of experience counters you have, return it to the battlefield. Otherwise, put it into your hand. - Ability ability = new BeginningOfYourEndStepTriggeredAbility(new MerenOfClanNelTothEffect(), false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new MerenOfClanNelTothEffect()); ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MerrowCommerce.java b/Mage.Sets/src/mage/cards/m/MerrowCommerce.java index 3939b04d65d..437cf4d18ab 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowCommerce.java +++ b/Mage.Sets/src/mage/cards/m/MerrowCommerce.java @@ -2,7 +2,7 @@ package mage.cards.m; import java.util.UUID; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.UntapAllControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -28,7 +28,7 @@ public final class MerrowCommerce extends CardImpl { // At the beginning of your end step, untap all Merfolk you control. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new UntapAllControllerEffect(filter, "untap all Merfolk you control"), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new UntapAllControllerEffect(filter, "untap all Merfolk you control"))); } private MerrowCommerce(final MerrowCommerce card) { diff --git a/Mage.Sets/src/mage/cards/m/MightMakesRight.java b/Mage.Sets/src/mage/cards/m/MightMakesRight.java index 9745ce632e5..570b2f2a3af 100644 --- a/Mage.Sets/src/mage/cards/m/MightMakesRight.java +++ b/Mage.Sets/src/mage/cards/m/MightMakesRight.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -37,7 +36,7 @@ public final class MightMakesRight extends CardImpl { // At the beginning of combat on your turn, if you control each creature on the battlefield with the greatest power, gain control // of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn. - TriggeredAbility gainControlAbility = new BeginningOfCombatTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn), false); + TriggeredAbility gainControlAbility = new BeginningOfCombatTriggeredAbility(new GainControlTargetEffect(Duration.EndOfTurn)); gainControlAbility.addEffect(new UntapTargetEffect()); gainControlAbility.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)); gainControlAbility.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE)); diff --git a/Mage.Sets/src/mage/cards/m/MightOfTheAncestors.java b/Mage.Sets/src/mage/cards/m/MightOfTheAncestors.java index 6e5b5474c1b..35c5f80e1de 100644 --- a/Mage.Sets/src/mage/cards/m/MightOfTheAncestors.java +++ b/Mage.Sets/src/mage/cards/m/MightOfTheAncestors.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -25,8 +24,7 @@ public final class MightOfTheAncestors extends CardImpl { // At the beginning of combat on your turn, target creature you control gets +2/+0 and gains vigilance until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new BoostTargetEffect(2, 0, Duration.EndOfTurn) - .setText("target creature you control gets +2/+0"), - false + .setText("target creature you control gets +2/+0") ); ability.addEffect(new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn) .setText("and gains vigilance until end of turn")); diff --git a/Mage.Sets/src/mage/cards/m/MindwrackHarpy.java b/Mage.Sets/src/mage/cards/m/MindwrackHarpy.java index a7b452f0808..b95ba5e5b7f 100644 --- a/Mage.Sets/src/mage/cards/m/MindwrackHarpy.java +++ b/Mage.Sets/src/mage/cards/m/MindwrackHarpy.java @@ -29,8 +29,7 @@ public final class MindwrackHarpy extends CardImpl { // At the beginning of combat on your turn, each player puts the top three cards of their library into their graveyard. this.addAbility(new BeginningOfCombatTriggeredAbility( - new MillCardsEachPlayerEffect(3, TargetController.ANY), - false + new MillCardsEachPlayerEffect(3, TargetController.ANY) )); } diff --git a/Mage.Sets/src/mage/cards/m/MinionReflector.java b/Mage.Sets/src/mage/cards/m/MinionReflector.java index 76adc421fd0..4f133f51143 100644 --- a/Mage.Sets/src/mage/cards/m/MinionReflector.java +++ b/Mage.Sets/src/mage/cards/m/MinionReflector.java @@ -1,7 +1,7 @@ package mage.cards.m; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffect; @@ -74,7 +74,7 @@ class MinionReflectorEffect extends OneShotEffect { effect.setTargetPointer(new FixedTarget(permanent, game)); effect.apply(game, source); for (Permanent addedToken : effect.getAddedPermanents()) { - ContinuousEffect continuousEffect = new GainAbilityTargetEffect(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.ANY, false), Duration.Custom); + ContinuousEffect continuousEffect = new GainAbilityTargetEffect(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new SacrificeSourceEffect(), false), Duration.Custom); continuousEffect.setTargetPointer(new FixedTarget(addedToken.getId())); game.addEffect(continuousEffect, source); } diff --git a/Mage.Sets/src/mage/cards/m/MintharaMercilessSoul.java b/Mage.Sets/src/mage/cards/m/MintharaMercilessSoul.java index 89c6d837820..c742d359ea2 100644 --- a/Mage.Sets/src/mage/cards/m/MintharaMercilessSoul.java +++ b/Mage.Sets/src/mage/cards/m/MintharaMercilessSoul.java @@ -2,7 +2,7 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.dynamicvalue.common.SourceControllerCountersCount; @@ -39,8 +39,8 @@ public final class MintharaMercilessSoul extends CardImpl { // At the beginning of your end step, if a permanent you controlled left the battlefield this turn, you get an experience counter. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new AddCountersPlayersEffect(CounterType.EXPERIENCE.createInstance(), TargetController.YOU), - TargetController.YOU, RevoltCondition.instance, false + TargetController.YOU, new AddCountersPlayersEffect(CounterType.EXPERIENCE.createInstance(), TargetController.YOU), + false, RevoltCondition.instance ).addHint(RevoltCondition.getHint()), new RevoltWatcher()); // Creatures you control get +1/+0 for each experience counter you have. diff --git a/Mage.Sets/src/mage/cards/m/MiragePhalanx.java b/Mage.Sets/src/mage/cards/m/MiragePhalanx.java index c972629d382..5b958d7c16b 100644 --- a/Mage.Sets/src/mage/cards/m/MiragePhalanx.java +++ b/Mage.Sets/src/mage/cards/m/MiragePhalanx.java @@ -43,7 +43,7 @@ public class MiragePhalanx extends CardImpl { // “At the beginning of combat on your turn, create a token that's a copy of this creature, // except it has haste and loses soulbond. // Exile it at end of combat.” - Ability ability = new BeginningOfCombatTriggeredAbility(new MiragePhalanxEffect(), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new MiragePhalanxEffect()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText))); } diff --git a/Mage.Sets/src/mage/cards/m/MirkoObsessiveTheorist.java b/Mage.Sets/src/mage/cards/m/MirkoObsessiveTheorist.java index dd325ba83ee..327b27a5fd3 100644 --- a/Mage.Sets/src/mage/cards/m/MirkoObsessiveTheorist.java +++ b/Mage.Sets/src/mage/cards/m/MirkoObsessiveTheorist.java @@ -2,7 +2,7 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SurveilTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldWithCounterTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -50,10 +50,10 @@ public final class MirkoObsessiveTheorist extends CardImpl { this.addAbility(new SurveilTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()))); // At the beginning of your end step, you may return target creature card with power less than Mirko's from your graveyard to the battlefield with a finality counter on it. - Ability ability = new BeginningOfYourEndStepTriggeredAbility( + Ability ability = new BeginningOfEndStepTriggeredAbility( new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.FINALITY.createInstance()) .setText("you may return target creature card with power less than {this}'s from your graveyard to the " + - "battlefield with a finality counter on it. (If it would die, exile it instead.)"),true + "battlefield with a finality counter on it. (If it would die, exile it instead.)"), true ); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MirkwoodChanneler.java b/Mage.Sets/src/mage/cards/m/MirkwoodChanneler.java index d673bfad641..2eba4f3318e 100644 --- a/Mage.Sets/src/mage/cards/m/MirkwoodChanneler.java +++ b/Mage.Sets/src/mage/cards/m/MirkwoodChanneler.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.target.common.TargetControlledPermanent; @@ -44,8 +43,7 @@ public final class MirkwoodChanneler extends CardImpl { // At the beginning of combat on your turn, target Elf you control gains trample and gets +X/+X until end of turn, where X is the number of Forests you control. Ability ability = new BeginningOfCombatTriggeredAbility( new GainAbilityTargetEffect(TrampleAbility.getInstance()) - .setText("target Elf you control gains trample"), - false + .setText("target Elf you control gains trample") ); ability.addEffect(new BoostTargetEffect(xValue, xValue) .setText("and gets +X/+X until end of turn, where X is the number of Forests you control") diff --git a/Mage.Sets/src/mage/cards/m/MirrodinBesieged.java b/Mage.Sets/src/mage/cards/m/MirrodinBesieged.java index eb66bfc942e..6af67534394 100644 --- a/Mage.Sets/src/mage/cards/m/MirrodinBesieged.java +++ b/Mage.Sets/src/mage/cards/m/MirrodinBesieged.java @@ -1,7 +1,7 @@ package mage.cards.m; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.condition.common.ModeChoiceSourceCondition; @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.filter.FilterSpell; import mage.filter.StaticFilters; import mage.filter.common.FilterArtifactSpell; @@ -53,7 +52,7 @@ public final class MirrodinBesieged extends CardImpl { // • Phyrexian — At the beginning of your end step, draw a card, then discard a card. Then if there are fifteen or more artifact cards in your graveyard, target opponent loses the game. Ability ability = new ConditionalTriggeredAbility(new BeginningOfEndStepTriggeredAbility( - new MirrodinBesiegedEffect(), TargetController.YOU, false + new MirrodinBesiegedEffect() ), new ModeChoiceSourceCondition("Phyrexian"), ruleTrigger2); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MishraEminentOne.java b/Mage.Sets/src/mage/cards/m/MishraEminentOne.java index 0f44e6f9452..4f1af012df4 100644 --- a/Mage.Sets/src/mage/cards/m/MishraEminentOne.java +++ b/Mage.Sets/src/mage/cards/m/MishraEminentOne.java @@ -42,7 +42,7 @@ public final class MishraEminentOne extends CardImpl { // At the beginning of combat on your turn, create a token that's a copy of target noncreature artifact you control, except its name is Mishra's Warform and it's a 4/4 Construct artifact creature in addition to its other types. It gains haste until end of turn. Sacrifice it at the beginning of the next end step. Ability ability = new BeginningOfCombatTriggeredAbility( - new MishraEminentOneEffect(), false + new MishraEminentOneEffect() ); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MizzixReplicaRider.java b/Mage.Sets/src/mage/cards/m/MizzixReplicaRider.java index 79fdbd5e082..94ba17057d2 100644 --- a/Mage.Sets/src/mage/cards/m/MizzixReplicaRider.java +++ b/Mage.Sets/src/mage/cards/m/MizzixReplicaRider.java @@ -2,7 +2,7 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -106,7 +106,7 @@ enum MizzixReplicaRiderApplier implements StackObjectCopyApplier { Spell spell = (Spell) stackObject; spell.addAbilityForCopy(HasteAbility.getInstance()); spell.addAbilityForCopy(new BeginningOfEndStepTriggeredAbility( - new SacrificeSourceEffect().setText("sacrifice this permanent"), TargetController.YOU, false + new SacrificeSourceEffect().setText("sacrifice this permanent") )); } @@ -114,4 +114,4 @@ enum MizzixReplicaRiderApplier implements StackObjectCopyApplier { public MageObjectReferencePredicate getNextNewTargetType() { return null; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/m/MortarionDaemonPrimarch.java b/Mage.Sets/src/mage/cards/m/MortarionDaemonPrimarch.java index 4700e3f4f81..032df74476f 100644 --- a/Mage.Sets/src/mage/cards/m/MortarionDaemonPrimarch.java +++ b/Mage.Sets/src/mage/cards/m/MortarionDaemonPrimarch.java @@ -2,7 +2,7 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -35,7 +35,7 @@ public final class MortarionDaemonPrimarch extends CardImpl { // Primarch of the Death Guard -- At the beginning of your end step, you may pay {X}. If you do, create X 2/2 black Astartes Warrior creature tokens with menace. X can't be greater than the amount of life you lost this turn. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new MortarionDaemonPrimarchEffect(), TargetController.YOU, false + new MortarionDaemonPrimarchEffect() ).withFlavorWord("Primarch of the Death Guard")); } diff --git a/Mage.Sets/src/mage/cards/m/MountVelusManticore.java b/Mage.Sets/src/mage/cards/m/MountVelusManticore.java index fc14a3cf639..f3c64841660 100644 --- a/Mage.Sets/src/mage/cards/m/MountVelusManticore.java +++ b/Mage.Sets/src/mage/cards/m/MountVelusManticore.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; -import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetAnyTarget; @@ -33,7 +32,7 @@ public final class MountVelusManticore extends CardImpl { // At the beginning of combat on your turn, you may discard a card. When you do, Mount Velus Manticore deals X damage to any target, where X is the number of card types the discarded card has. this.addAbility(new BeginningOfCombatTriggeredAbility( - new MountVelusManticoreEffect(), false + new MountVelusManticoreEffect() )); } diff --git a/Mage.Sets/src/mage/cards/m/MuerraTrashTactician.java b/Mage.Sets/src/mage/cards/m/MuerraTrashTactician.java index 36fa1f4e751..4e494003845 100644 --- a/Mage.Sets/src/mage/cards/m/MuerraTrashTactician.java +++ b/Mage.Sets/src/mage/cards/m/MuerraTrashTactician.java @@ -40,8 +40,7 @@ public final class MuerraTrashTactician extends CardImpl { // At the beginning of your first main phase, add {R} or {G} for each Raccoon you control. this.addAbility(new BeginningOfFirstMainTriggeredAbility( new AddManaInAnyCombinationEffect(xValue, xValue, ColoredManaSymbol.R, ColoredManaSymbol.G) - .setText("add {R} or {G} for each Raccoon you control"), - false + .setText("add {R} or {G} for each Raccoon you control") ).setTriggerPhrase("At the beginning of your first main phase, ").addHint(hint)); // Whenever you expend 4, you gain 3 life. diff --git a/Mage.Sets/src/mage/cards/m/Murmuration.java b/Mage.Sets/src/mage/cards/m/Murmuration.java index a9a84e5cc81..92862159498 100644 --- a/Mage.Sets/src/mage/cards/m/Murmuration.java +++ b/Mage.Sets/src/mage/cards/m/Murmuration.java @@ -1,7 +1,7 @@ package mage.cards.m; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -49,8 +48,7 @@ public final class Murmuration extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility( new CreateTokenEffect(new StormCrowToken(), MurmurationDynamicValue.instance) .setText("for each spell you've cast this turn, create a " + - "1/2 blue Bird creature token with flying named Storm Crow"), - TargetController.YOU, false + "1/2 blue Bird creature token with flying named Storm Crow") ).addHint(MurmurationDynamicValue.getHint())); } diff --git a/Mage.Sets/src/mage/cards/m/MusterTheDeparted.java b/Mage.Sets/src/mage/cards/m/MusterTheDeparted.java index d9a9a227621..f98328a02cc 100644 --- a/Mage.Sets/src/mage/cards/m/MusterTheDeparted.java +++ b/Mage.Sets/src/mage/cards/m/MusterTheDeparted.java @@ -1,6 +1,6 @@ package mage.cards.m; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.effects.common.CreateTokenEffect; @@ -27,8 +27,8 @@ public final class MusterTheDeparted extends CardImpl { // Morbid -- At the beginning of your end step, if a creature died this turn, populate. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new PopulateEffect(), TargetController.YOU, - MorbidCondition.instance, false + TargetController.YOU, new PopulateEffect(), + false, MorbidCondition.instance ).setAbilityWord(AbilityWord.MORBID)); } diff --git a/Mage.Sets/src/mage/cards/n/NahirisMachinations.java b/Mage.Sets/src/mage/cards/n/NahirisMachinations.java index e79f7234af4..74a6e839bdb 100644 --- a/Mage.Sets/src/mage/cards/n/NahirisMachinations.java +++ b/Mage.Sets/src/mage/cards/n/NahirisMachinations.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterBlockingCreature; import mage.target.common.TargetControlledCreaturePermanent; @@ -29,7 +28,7 @@ public final class NahirisMachinations extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); // At the beginning of combat on your turn, target creature you control gains indestructible until end of turn. - Ability ability = new BeginningOfCombatTriggeredAbility(new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn)); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NahirisResolve.java b/Mage.Sets/src/mage/cards/n/NahirisResolve.java index 6d3e9196a0b..e9fcffc3417 100644 --- a/Mage.Sets/src/mage/cards/n/NahirisResolve.java +++ b/Mage.Sets/src/mage/cards/n/NahirisResolve.java @@ -1,7 +1,7 @@ package mage.cards.n; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.delayed.AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -46,7 +46,7 @@ public final class NahirisResolve extends CardImpl { // At the beginning of your end step, exile any number of nontoken artifacts and/or creatures you control. Return those cards to the battlefield under their owner's control at the beginning of your next upkeep. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new NahirisResolveExileEffect(), TargetController.YOU, false + new NahirisResolveExileEffect() )); } diff --git a/Mage.Sets/src/mage/cards/n/Nalfeshnee.java b/Mage.Sets/src/mage/cards/n/Nalfeshnee.java index 1353f628f77..ccc9c483288 100644 --- a/Mage.Sets/src/mage/cards/n/Nalfeshnee.java +++ b/Mage.Sets/src/mage/cards/n/Nalfeshnee.java @@ -2,7 +2,7 @@ package mage.cards.n; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -105,7 +105,7 @@ enum NalfeshneeApplier implements StackObjectCopyApplier { public void modifySpell(StackObject copiedSpell, Game game) { Spell spell = (Spell) copiedSpell; spell.addAbilityForCopy(HasteAbility.getInstance()); - spell.addAbilityForCopy(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.ANY, false)); + spell.addAbilityForCopy(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new SacrificeSourceEffect(), false)); } @Override diff --git a/Mage.Sets/src/mage/cards/n/NaliaDeArnise.java b/Mage.Sets/src/mage/cards/n/NaliaDeArnise.java index 6b0b650d696..3101cd723a5 100644 --- a/Mage.Sets/src/mage/cards/n/NaliaDeArnise.java +++ b/Mage.Sets/src/mage/cards/n/NaliaDeArnise.java @@ -57,7 +57,7 @@ public final class NaliaDeArnise extends CardImpl { Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility(new AddCountersAllEffect( CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURE - ), false), FullPartyCondition.instance, "At the beginning " + + )), FullPartyCondition.instance, "At the beginning " + "of combat on your turn, if you have a full party, put a +1/+1 counter on each creature " + "you control and those creatures gain deathtouch until end of turn." ); diff --git a/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java b/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java index 9bea0b72cd5..846b7b84c20 100644 --- a/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java +++ b/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java @@ -1,7 +1,7 @@ package mage.cards.n; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.RaidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.MillCardsTargetEffect; @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; -import mage.constants.TargetController; import mage.target.common.TargetOpponent; import mage.watchers.common.PlayerAttackedWatcher; @@ -26,7 +25,7 @@ public final class NavigatorsRuin extends CardImpl { // Raid - At the beginning of your end step, if you attacked with a creature this turm, target opponent puts the top four cards of their library into their graveyard. Ability ability = new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility( - new MillCardsTargetEffect(4), TargetController.YOU, false), + new MillCardsTargetEffect(4)), RaidCondition.instance, "At the beginning of your end step, " + "if you attacked this turn, target opponent mills four cards." diff --git a/Mage.Sets/src/mage/cards/n/Necrodominance.java b/Mage.Sets/src/mage/cards/n/Necrodominance.java index 3aab2e46b60..bd172ea7801 100644 --- a/Mage.Sets/src/mage/cards/n/Necrodominance.java +++ b/Mage.Sets/src/mage/cards/n/Necrodominance.java @@ -1,7 +1,7 @@ package mage.cards.n; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.PayLifeCost; @@ -32,7 +32,7 @@ public final class Necrodominance extends CardImpl { // At the beginning of your end step, you may pay any amount of life. If you do, draw that many cards. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new NecrodominanceEffect(), TargetController.YOU, false + new NecrodominanceEffect() )); // Your maximum hand size is five. @@ -90,4 +90,4 @@ class NecrodominanceEffect extends OneShotEffect { return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/Necroplasm.java b/Mage.Sets/src/mage/cards/n/Necroplasm.java index f0bdf8a7f1e..fe130d75dc9 100644 --- a/Mage.Sets/src/mage/cards/n/Necroplasm.java +++ b/Mage.Sets/src/mage/cards/n/Necroplasm.java @@ -4,7 +4,7 @@ package mage.cards.n; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ManaValuePredicate; @@ -40,7 +39,7 @@ public final class Necroplasm extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()))); // At the beginning of your end step, destroy each creature with converted mana cost equal to the number of +1/+1 counters on Necroplasm. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new NecroplasmEffect(), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new NecroplasmEffect())); // Dredge 2 this.addAbility(new DredgeAbility(2)); diff --git a/Mage.Sets/src/mage/cards/n/NessianHornbeetle.java b/Mage.Sets/src/mage/cards/n/NessianHornbeetle.java index dd0db5c4a8c..bf85dd5896a 100644 --- a/Mage.Sets/src/mage/cards/n/NessianHornbeetle.java +++ b/Mage.Sets/src/mage/cards/n/NessianHornbeetle.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; @@ -44,8 +43,7 @@ public final class NessianHornbeetle extends CardImpl { // At the beginning of combat on your turn, if you control another creature with power 4 or greater, put a +1/+1 counter on Nessian Hornbeetle. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - false + new AddCountersSourceEffect(CounterType.P1P1.createInstance()) ), condition, "At the beginning of combat on your turn, if you control " + "another creature with power 4 or greater, put a +1/+1 counter on {this}." )); diff --git a/Mage.Sets/src/mage/cards/n/NestingDovehawk.java b/Mage.Sets/src/mage/cards/n/NestingDovehawk.java index e1bc9ec3da2..a7bb1ba2d77 100644 --- a/Mage.Sets/src/mage/cards/n/NestingDovehawk.java +++ b/Mage.Sets/src/mage/cards/n/NestingDovehawk.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; @@ -32,7 +31,7 @@ public final class NestingDovehawk extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of combat on your turn, populate. - this.addAbility(new BeginningOfCombatTriggeredAbility(new PopulateEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new PopulateEffect())); // Whenever a creature token you control enters, put a +1/+1 counter on Nesting Dovehawk. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/n/NettlevineBlight.java b/Mage.Sets/src/mage/cards/n/NettlevineBlight.java index 4b64b2c5e4b..fa496913248 100644 --- a/Mage.Sets/src/mage/cards/n/NettlevineBlight.java +++ b/Mage.Sets/src/mage/cards/n/NettlevineBlight.java @@ -2,7 +2,7 @@ package mage.cards.n; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; @@ -43,7 +43,7 @@ public final class NettlevineBlight extends CardImpl { this.addAbility(ability); // Enchanted permanent has "At the beginning of your end step, sacrifice this permanent and attach Nettlevine Blight to a creature or land you control." - this.addAbility(new BeginningOfEndStepTriggeredAbility(new NettlevineBlightEffect(), TargetController.CONTROLLER_ATTACHED_TO, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.CONTROLLER_ATTACHED_TO, new NettlevineBlightEffect(), false)); } diff --git a/Mage.Sets/src/mage/cards/n/NexusOfBecoming.java b/Mage.Sets/src/mage/cards/n/NexusOfBecoming.java index 8da74cb5063..b8a5cfcacff 100644 --- a/Mage.Sets/src/mage/cards/n/NexusOfBecoming.java +++ b/Mage.Sets/src/mage/cards/n/NexusOfBecoming.java @@ -28,7 +28,7 @@ public final class NexusOfBecoming extends CardImpl { // At the beginning of combat on your turn, draw a card. Then you may exile an artifact or creature card from your hand. If you do, create a token that's a copy of the exiled card, except it's a 3/3 Golem artifact creature in addition to its other types. Ability ability = new BeginningOfCombatTriggeredAbility( - new DrawCardSourceControllerEffect(1), false + new DrawCardSourceControllerEffect(1) ); ability.addEffect(new NexusOfBecomingEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NeyithOfTheDireHunt.java b/Mage.Sets/src/mage/cards/n/NeyithOfTheDireHunt.java index 24d87438061..e51874478ef 100644 --- a/Mage.Sets/src/mage/cards/n/NeyithOfTheDireHunt.java +++ b/Mage.Sets/src/mage/cards/n/NeyithOfTheDireHunt.java @@ -46,7 +46,7 @@ public final class NeyithOfTheDireHunt extends CardImpl { // At the beginning of combat on your turn, you may pay {2}{R/G}. If you do, double target creature's power until end of turn. That creature must be blocked this combat if able. Ability ability = new BeginningOfCombatTriggeredAbility(new DoIfCostPaid( new NeyithOfTheDireHuntEffect(), new ManaCostsImpl<>("{2}{R/G}") - ), false); + )); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NightpackAmbusher.java b/Mage.Sets/src/mage/cards/n/NightpackAmbusher.java index 07e39c3a258..0287715e60d 100644 --- a/Mage.Sets/src/mage/cards/n/NightpackAmbusher.java +++ b/Mage.Sets/src/mage/cards/n/NightpackAmbusher.java @@ -2,7 +2,7 @@ package mage.cards.n; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.game.Game; @@ -56,7 +55,7 @@ public final class NightpackAmbusher extends CardImpl { // At the beginning of your end step, if you didn't cast a spell this turn, create a 2/2 green Wolf creature token. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new WolfToken()), TargetController.YOU, false + new CreateTokenEffect(new WolfToken()) ), NightpackAmbusherCondition.instance, "At the beginning of your end step, " + "if you didn't cast a spell this turn, create a 2/2 green Wolf creature token." )); @@ -80,4 +79,4 @@ enum NightpackAmbusherCondition implements Condition { CastSpellLastTurnWatcher watcher = game.getState().getWatcher(CastSpellLastTurnWatcher.class); return watcher != null && watcher.getAmountOfSpellsPlayerCastOnCurrentTurn(source.getControllerId()) == 0; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NilsDisciplineEnforcer.java b/Mage.Sets/src/mage/cards/n/NilsDisciplineEnforcer.java index 19ed4ab3304..0f94f592c7c 100644 --- a/Mage.Sets/src/mage/cards/n/NilsDisciplineEnforcer.java +++ b/Mage.Sets/src/mage/cards/n/NilsDisciplineEnforcer.java @@ -2,7 +2,7 @@ package mage.cards.n; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCosts; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,7 +40,7 @@ public final class NilsDisciplineEnforcer extends CardImpl { // At the beginning of your end step, for each player, put a +1/+1 counter on up to one target creature that player controls. Ability ability = new BeginningOfEndStepTriggeredAbility( - new NilsDisciplineEnforcerCountersEffect(), TargetController.YOU, false + new NilsDisciplineEnforcerCountersEffect() ); ability.setTargetAdjuster(NilsDisciplineEnforcerAdjuster.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NimAbomination.java b/Mage.Sets/src/mage/cards/n/NimAbomination.java index 90361da4dfb..4711fc98f0b 100644 --- a/Mage.Sets/src/mage/cards/n/NimAbomination.java +++ b/Mage.Sets/src/mage/cards/n/NimAbomination.java @@ -1,7 +1,7 @@ package mage.cards.n; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.SourceTappedCondition; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; import java.util.UUID; @@ -27,8 +26,8 @@ public final class NimAbomination extends CardImpl { this.toughness = new MageInt(4); // At the beginning of your end step, if Nim Abomination is untapped, you lose 3 life. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new LoseLifeSourceControllerEffect(3), - TargetController.YOU, SourceTappedCondition.UNTAPPED, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new LoseLifeSourceControllerEffect(3), + false, SourceTappedCondition.UNTAPPED)); } private NimAbomination(final NimAbomination card) { diff --git a/Mage.Sets/src/mage/cards/n/NimbleTrapfinder.java b/Mage.Sets/src/mage/cards/n/NimbleTrapfinder.java index 6025583135e..99ac134be42 100644 --- a/Mage.Sets/src/mage/cards/n/NimbleTrapfinder.java +++ b/Mage.Sets/src/mage/cards/n/NimbleTrapfinder.java @@ -55,8 +55,7 @@ public final class NimbleTrapfinder extends CardImpl { new BeginningOfCombatTriggeredAbility( new GainAbilityAllEffect(new DealsCombatDamageToAPlayerTriggeredAbility( new DrawCardSourceControllerEffect(1), false - ), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES), - false + ), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES) ), FullPartyCondition.instance, "At the beginning of combat on your turn, " + "if you have a full party, creatures you control gain " + "\"Whenever this creature deals combat damage to a player, draw a card\" until end of turn." diff --git a/Mage.Sets/src/mage/cards/n/NumaJoragaChieftain.java b/Mage.Sets/src/mage/cards/n/NumaJoragaChieftain.java index 1e3f78d99c2..8f128de6df0 100644 --- a/Mage.Sets/src/mage/cards/n/NumaJoragaChieftain.java +++ b/Mage.Sets/src/mage/cards/n/NumaJoragaChieftain.java @@ -37,7 +37,7 @@ public final class NumaJoragaChieftain extends CardImpl { // At the beginning of combat on your turn, you may pay {X}{X}. When you do, distribute X +1/+1 counters among any number of target Elves. this.addAbility(new BeginningOfCombatTriggeredAbility( - new NumaJoragaChieftainEffect(), false + new NumaJoragaChieftainEffect() )); // Partner diff --git a/Mage.Sets/src/mage/cards/n/NyxHerald.java b/Mage.Sets/src/mage/cards/n/NyxHerald.java index 601ab2e47a2..b46c05f7e77 100644 --- a/Mage.Sets/src/mage/cards/n/NyxHerald.java +++ b/Mage.Sets/src/mage/cards/n/NyxHerald.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.EnchantmentOrEnchantedPredicate; @@ -42,8 +41,7 @@ public final class NyxHerald extends CardImpl { // At the beginning of combat on your turn, target enchanted creature or enchantment creature you control gets +1/+1 and gains trample until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new BoostTargetEffect(1, 1) - .setText("target enchanted creature or enchantment creature you control gets +1/+1"), - false + .setText("target enchanted creature or enchantment creature you control gets +1/+1") ); ability.addEffect(new GainAbilityTargetEffect( TrampleAbility.getInstance(), Duration.EndOfTurn diff --git a/Mage.Sets/src/mage/cards/o/OathOfChandra.java b/Mage.Sets/src/mage/cards/o/OathOfChandra.java index f3902bfd132..d4c77f71cef 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfChandra.java +++ b/Mage.Sets/src/mage/cards/o/OathOfChandra.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -42,8 +42,8 @@ public final class OathOfChandra extends CardImpl { // At the beginning of each end step, if a planeswalker entered the battlefield under your control this turn, Oath of Chandra deals 2 damage to each opponent. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility( - new DamagePlayersEffect(Outcome.Damage, StaticValue.get(2), TargetController.OPPONENT), - TargetController.ANY, false), OathOfChandraCondition.instance, + TargetController.ANY, new DamagePlayersEffect(Outcome.Damage, StaticValue.get(2), TargetController.OPPONENT), + false), OathOfChandraCondition.instance, "At the beginning of each end step, if a planeswalker entered the battlefield under your control this turn, {this} deals 2 damage to each opponent."), new OathOfChandraWatcher()); } diff --git a/Mage.Sets/src/mage/cards/o/OathOfLiliana.java b/Mage.Sets/src/mage/cards/o/OathOfLiliana.java index 6132c72860b..b47cf7e38c5 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfLiliana.java +++ b/Mage.Sets/src/mage/cards/o/OathOfLiliana.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -35,8 +35,8 @@ public final class OathOfLiliana extends CardImpl { // At the beginning of each end step, if a planeswalker entered the battlefield under your control this turn, create a 2/2 black Zombie creature token. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new ZombieToken()), - TargetController.ANY, false), OathOfLilianaCondition.instance, + TargetController.ANY, new CreateTokenEffect(new ZombieToken()), + false), OathOfLilianaCondition.instance, "At the beginning of each end step, if a planeswalker entered the battlefield under your control this turn, " + "create a 2/2 black Zombie creature token."), new OathOfLilianaWatcher()); } diff --git a/Mage.Sets/src/mage/cards/o/ObliviousBookworm.java b/Mage.Sets/src/mage/cards/o/ObliviousBookworm.java index e93846523b7..17fab386478 100644 --- a/Mage.Sets/src/mage/cards/o/ObliviousBookworm.java +++ b/Mage.Sets/src/mage/cards/o/ObliviousBookworm.java @@ -2,7 +2,7 @@ package mage.cards.o; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.InvertCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -40,8 +40,8 @@ public final class ObliviousBookworm extends CardImpl { this.toughness = new MageInt(3); // At the beginning of your end step, you may draw a card. If you do, discard a card unless a permanent entered the battlefield face down under your control this turn or you turned a permanent face up this turn. - Ability ability = new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), TargetController.YOU, true + Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, + new DrawCardSourceControllerEffect(1), true ); ability.addEffect(new ConditionalOneShotEffect( new DiscardControllerEffect(1), ObliviousBookwormCondition.instance, "If you do, discard " + diff --git a/Mage.Sets/src/mage/cards/o/ObuunMulDayaAncestor.java b/Mage.Sets/src/mage/cards/o/ObuunMulDayaAncestor.java index 5ab5b6f1292..699612a54ee 100644 --- a/Mage.Sets/src/mage/cards/o/ObuunMulDayaAncestor.java +++ b/Mage.Sets/src/mage/cards/o/ObuunMulDayaAncestor.java @@ -38,7 +38,7 @@ public final class ObuunMulDayaAncestor extends CardImpl { // At the beginning of combat on your turn, up to one target land you control becomes an X/X Elemental creature with trample and haste until end of turn, where X is Obuun's power. It's still a land. Ability ability = new BeginningOfCombatTriggeredAbility( - new ObuunMulDayaAncestorEffect(), false + new ObuunMulDayaAncestorEffect() ); ability.addTarget(new TargetPermanent( 0, 1, StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND, false diff --git a/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java b/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java index 4591c1dc2cf..7dea71cf41f 100644 --- a/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java +++ b/Mage.Sets/src/mage/cards/o/ObzedatGhostCouncil.java @@ -3,7 +3,7 @@ package mage.cards.o; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.GainLifeEffect; @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetOpponent; @@ -45,7 +44,7 @@ public final class ObzedatGhostCouncil extends CardImpl { //At the beginning of your end step you may exile Obzedat. If you do, return it to the battlefield under its owner's //control at the beginning of your next upkeep. It gains haste. - Ability ability2 = new BeginningOfYourEndStepTriggeredAbility(new ObzedatGhostCouncilExileSourceEffect(), true); + Ability ability2 = new BeginningOfEndStepTriggeredAbility(new ObzedatGhostCouncilExileSourceEffect(), true); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/o/OcelotPride.java b/Mage.Sets/src/mage/cards/o/OcelotPride.java index b1260156e3e..9e39c4cd544 100644 --- a/Mage.Sets/src/mage/cards/o/OcelotPride.java +++ b/Mage.Sets/src/mage/cards/o/OcelotPride.java @@ -2,7 +2,7 @@ package mage.cards.o; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.CitysBlessingCondition; import mage.abilities.condition.common.YouGainedLifeCondition; @@ -57,8 +57,8 @@ public final class OcelotPride extends CardImpl { // At the beginning of your end step, if you gained life this turn, create a 1/1 white Cat creature token. Then if you have the city's blessing, for each token you control that entered the battlefield this turn, create a token that's a copy of it. Ability ability = new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new CatToken3()), - TargetController.YOU, condition, false + TargetController.YOU, new CreateTokenEffect(new CatToken3()), + false, condition ); ability.addEffect(new ConditionalOneShotEffect( new OcelotPrideEffect(), @@ -114,4 +114,4 @@ class OcelotPrideEffect extends OneShotEffect { } return result; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/o/Octomancer.java b/Mage.Sets/src/mage/cards/o/Octomancer.java index 4431fd51f9e..67de42fbd71 100644 --- a/Mage.Sets/src/mage/cards/o/Octomancer.java +++ b/Mage.Sets/src/mage/cards/o/Octomancer.java @@ -2,7 +2,7 @@ package mage.cards.o; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.CreateTokenCopyTargetEffect; import mage.abilities.keyword.GiftAbility; import mage.cards.CardImpl; @@ -45,7 +45,7 @@ public final class Octomancer extends CardImpl { // At the beginning of each end step, create a token that's a copy of target creature token that entered the battlefield this turn. Ability ability = new BeginningOfEndStepTriggeredAbility( - new CreateTokenCopyTargetEffect(), TargetController.ANY, false + TargetController.ANY, new CreateTokenCopyTargetEffect(), false ); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OffspringsRevenge.java b/Mage.Sets/src/mage/cards/o/OffspringsRevenge.java index fd3dff545cc..998a93ab6b9 100644 --- a/Mage.Sets/src/mage/cards/o/OffspringsRevenge.java +++ b/Mage.Sets/src/mage/cards/o/OffspringsRevenge.java @@ -44,7 +44,7 @@ public final class OffspringsRevenge extends CardImpl { // At the beginning of combat on your turn, exile target red, white, or black creature card from your graveyard. Create a token that's a copy of that card, except it's 1/1. It gains haste until your next turn. Ability ability = new BeginningOfCombatTriggeredAbility( - new OffspringsRevengeEffect(), false + new OffspringsRevengeEffect() ); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OkaunEyeOfChaos.java b/Mage.Sets/src/mage/cards/o/OkaunEyeOfChaos.java index b8a648c9e59..a8249816c16 100644 --- a/Mage.Sets/src/mage/cards/o/OkaunEyeOfChaos.java +++ b/Mage.Sets/src/mage/cards/o/OkaunEyeOfChaos.java @@ -35,7 +35,7 @@ public final class OkaunEyeOfChaos extends CardImpl { this.addAbility(new PartnerWithAbility("Zndrsplt, Eye of Wisdom", true)); // At the beginning of combat on your turn, flip a coin until you lose a flip. - this.addAbility(new BeginningOfCombatTriggeredAbility(new FlipUntilLoseEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new FlipUntilLoseEffect())); // Whenever a player wins a coin flip, double Okaun's power and toughness until end of turn. this.addAbility(new WinsCoinFlipTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/o/OkoTheRingleader.java b/Mage.Sets/src/mage/cards/o/OkoTheRingleader.java index 2c854fdd201..bd80a86ab79 100644 --- a/Mage.Sets/src/mage/cards/o/OkoTheRingleader.java +++ b/Mage.Sets/src/mage/cards/o/OkoTheRingleader.java @@ -41,7 +41,7 @@ public final class OkoTheRingleader extends CardImpl { // At the beginning of combat on your turn, Oko, the Ringleader becomes a copy of up to one target creature you control until end of turn, except he has hexproof. Ability ability = new BeginningOfCombatTriggeredAbility( - new OkoTheRingleaderCopySelfEffect(), false + new OkoTheRingleaderCopySelfEffect() ); ability.addTarget(new TargetControlledCreaturePermanent(0, 1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OldFlitterfang.java b/Mage.Sets/src/mage/cards/o/OldFlitterfang.java index 1c1287fb934..c0c2e7768df 100644 --- a/Mage.Sets/src/mage/cards/o/OldFlitterfang.java +++ b/Mage.Sets/src/mage/cards/o/OldFlitterfang.java @@ -2,7 +2,7 @@ package mage.cards.o; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,8 +38,8 @@ public final class OldFlitterfang extends CardImpl { // At the beginning of each end step, if a creature died this turn, create a Food token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new FoodToken()), TargetController.ANY, - MorbidCondition.instance, false + TargetController.ANY, new CreateTokenEffect(new FoodToken()), + false, MorbidCondition.instance ).addHint(MorbidHint.instance)); // {2}{B}, Sacrifice another creature or artifact: Old Flitterfang gets +2/+2 until end of turn. diff --git a/Mage.Sets/src/mage/cards/o/OmenpathJourney.java b/Mage.Sets/src/mage/cards/o/OmenpathJourney.java index cd0419fd783..308ad3775c9 100644 --- a/Mage.Sets/src/mage/cards/o/OmenpathJourney.java +++ b/Mage.Sets/src/mage/cards/o/OmenpathJourney.java @@ -1,7 +1,7 @@ package mage.cards.o; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.ExileZone; @@ -37,7 +36,7 @@ public final class OmenpathJourney extends CardImpl { // At the beginning of your end step, choose a card at random exiled with Omenpath Journey and put it onto the battlefield tapped. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new OmenpathJourneyChooseEffect(), TargetController.YOU, false + new OmenpathJourneyChooseEffect() )); } diff --git a/Mage.Sets/src/mage/cards/o/OmnathLocusOfAll.java b/Mage.Sets/src/mage/cards/o/OmnathLocusOfAll.java index d97be0dc72b..31832287fc9 100644 --- a/Mage.Sets/src/mage/cards/o/OmnathLocusOfAll.java +++ b/Mage.Sets/src/mage/cards/o/OmnathLocusOfAll.java @@ -37,7 +37,7 @@ public class OmnathLocusOfAll extends CardImpl { // if it has three or more colored mana symbols in its mana cost. If you do, add three mana in any combination of // colors and put it into your hand. If you don’t reveal it, put it into your hand. this.addAbility(new BeginningOfFirstMainTriggeredAbility( - new OmnathLocusOfAllCardEffect(), false + new OmnathLocusOfAllCardEffect() )); } diff --git a/Mage.Sets/src/mage/cards/o/OptimusPrimeHero.java b/Mage.Sets/src/mage/cards/o/OptimusPrimeHero.java index 0bb61678675..833b7d03404 100644 --- a/Mage.Sets/src/mage/cards/o/OptimusPrimeHero.java +++ b/Mage.Sets/src/mage/cards/o/OptimusPrimeHero.java @@ -2,7 +2,7 @@ package mage.cards.o; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.keyword.BolsterEffect; @@ -35,7 +35,7 @@ public final class OptimusPrimeHero extends CardImpl { this.addAbility(new MoreThanMeetsTheEyeAbility(this, "{2}{U}{R}{W}")); // At the beginning of each end step, bolster 1. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new BolsterEffect(1), TargetController.ANY, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new BolsterEffect(1), false)); // When Optimus Prime dies, return it to the battlefield converted under its owner’s control. this.addAbility(new DiesSourceTriggeredAbility(new OptimusPrimeHeroEffect())); diff --git a/Mage.Sets/src/mage/cards/o/OrneryTumblewagg.java b/Mage.Sets/src/mage/cards/o/OrneryTumblewagg.java index 812d734dee8..5aa5c3cbdbc 100644 --- a/Mage.Sets/src/mage/cards/o/OrneryTumblewagg.java +++ b/Mage.Sets/src/mage/cards/o/OrneryTumblewagg.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -32,8 +31,7 @@ public final class OrneryTumblewagg extends CardImpl { // At the beginning of combat on your turn, put a +1/+1 counter on target creature. Ability ability = new BeginningOfCombatTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), - false + new AddCountersTargetEffect(CounterType.P1P1.createInstance()) ); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/o/OsaiVultures.java b/Mage.Sets/src/mage/cards/o/OsaiVultures.java index 598965b596a..77e9ea8fc17 100644 --- a/Mage.Sets/src/mage/cards/o/OsaiVultures.java +++ b/Mage.Sets/src/mage/cards/o/OsaiVultures.java @@ -3,7 +3,7 @@ package mage.cards.o; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.costs.common.RemoveCountersSourceCost; @@ -37,7 +37,7 @@ public final class OsaiVultures extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // At the beginning of each end step, if a creature died this turn, put a carrion counter on Osai Vultures. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.CARRION.createInstance()), TargetController.ANY, false), MorbidCondition.instance, + TargetController.ANY, new AddCountersSourceEffect(CounterType.CARRION.createInstance()), false), MorbidCondition.instance, "At the beginning of each end step, if a creature died this turn, put a carrion counter on {this}.").addHint(MorbidHint.instance)); // Remove two carrion counters from Osai Vultures: Osai Vultures gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), diff --git a/Mage.Sets/src/mage/cards/o/OverseerOfVault76.java b/Mage.Sets/src/mage/cards/o/OverseerOfVault76.java index efaca723613..734d7b37a4f 100644 --- a/Mage.Sets/src/mage/cards/o/OverseerOfVault76.java +++ b/Mage.Sets/src/mage/cards/o/OverseerOfVault76.java @@ -64,8 +64,8 @@ public final class OverseerOfVault76 extends CardImpl { 3) .setText("remove three quest counters from among permanents you control"); this.addAbility(new BeginningOfCombatTriggeredAbility( - new DoWhenCostPaid(boostAbility, cost, "Remove three quest counters from among permanents you control?"), - false)); + new DoWhenCostPaid(boostAbility, cost, "Remove three quest counters from among permanents you control?") + )); } private OverseerOfVault76(final OverseerOfVault76 card) { diff --git a/Mage.Sets/src/mage/cards/o/OwlbearShepherd.java b/Mage.Sets/src/mage/cards/o/OwlbearShepherd.java index bf7eb4028a9..a371e988be8 100644 --- a/Mage.Sets/src/mage/cards/o/OwlbearShepherd.java +++ b/Mage.Sets/src/mage/cards/o/OwlbearShepherd.java @@ -3,7 +3,7 @@ package mage.cards.o; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.FormidableCondition; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -39,8 +39,8 @@ public final class OwlbearShepherd extends CardImpl { // At the beginning of your end step, if creatures you control have total power and toughness 8 or greater, draw a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), - TargetController.YOU, FormidableCondition.instance, false + TargetController.YOU, new DrawCardSourceControllerEffect(1), + false, FormidableCondition.instance ).addHint(hint)); } diff --git a/Mage.Sets/src/mage/cards/p/PacksongPup.java b/Mage.Sets/src/mage/cards/p/PacksongPup.java index b20913e7fd8..cdb22dbfbfd 100644 --- a/Mage.Sets/src/mage/cards/p/PacksongPup.java +++ b/Mage.Sets/src/mage/cards/p/PacksongPup.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; @@ -52,8 +51,7 @@ public final class PacksongPup extends CardImpl { // At the beginning of combat on your turn, if you control another Wolf or Werewolf, put a +1/+1 counter on Packsong Pup. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - false + new AddCountersSourceEffect(CounterType.P1P1.createInstance()) ), condition, "At the beginning of combat on your turn," + " if you control another Wolf or Werewolf, put a +1/+1 counter on {this}" ).addHint(hint)); diff --git a/Mage.Sets/src/mage/cards/p/PalanisHatcher.java b/Mage.Sets/src/mage/cards/p/PalanisHatcher.java index 26b138640e9..cd85c033cd5 100644 --- a/Mage.Sets/src/mage/cards/p/PalanisHatcher.java +++ b/Mage.Sets/src/mage/cards/p/PalanisHatcher.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.permanent.token.DinosaurEggToken; @@ -54,8 +53,7 @@ public final class PalanisHatcher extends CardImpl { // At the beginning of combat on your turn, if you control one or more Eggs, sacrifice an Egg, then create a 3/3 green Dinosaur creature token. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new SacrificeControllerEffect(filterEgg, 1, ""), - false + new SacrificeControllerEffect(filterEgg, 1, "") ), new PermanentsOnTheBattlefieldCondition(filterEgg), "At the beginning of combat on your turn, if you control one or more Eggs, " + "sacrifice an Egg, then create a 3/3 green Dinosaur creature token." diff --git a/Mage.Sets/src/mage/cards/p/PalantirOfOrthanc.java b/Mage.Sets/src/mage/cards/p/PalantirOfOrthanc.java index b17017e15b9..b48eab4ebe9 100644 --- a/Mage.Sets/src/mage/cards/p/PalantirOfOrthanc.java +++ b/Mage.Sets/src/mage/cards/p/PalantirOfOrthanc.java @@ -2,7 +2,7 @@ package mage.cards.p; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.keyword.ScryEffect; @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; @@ -33,8 +32,7 @@ public final class PalantirOfOrthanc extends CardImpl { // At the beginning of your end step, put an influence counter on Palantir of Orthanc and scry 2. Then target opponent may have you draw a card. If that player doesn't, you mill X cards, where X is the number of influence counters on Palantir of Orthanc, and that player loses life equal to the total mana value of those cards. Ability ability = new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.INFLUENCE.createInstance()), - TargetController.YOU, false + new AddCountersSourceEffect(CounterType.INFLUENCE.createInstance()) ); ability.addEffect(new ScryEffect(2, false).concatBy("and")); ability.addEffect(new PalantirOfOrthancEffect()); diff --git a/Mage.Sets/src/mage/cards/p/PanickedBystander.java b/Mage.Sets/src/mage/cards/p/PanickedBystander.java index 696650dc4f4..19a0bc1f76d 100644 --- a/Mage.Sets/src/mage/cards/p/PanickedBystander.java +++ b/Mage.Sets/src/mage/cards/p/PanickedBystander.java @@ -1,7 +1,7 @@ package mage.cards.p; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesThisOrAnotherTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; @@ -40,8 +40,8 @@ public final class PanickedBystander extends CardImpl { // At the beginning of your end step, if you gained 3 or more life this turn, transform Panicked Bystander. this.addAbility(new TransformAbility()); this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new TransformSourceEffect(), - TargetController.YOU, condition, false + TargetController.YOU, new TransformSourceEffect(), + false, condition ), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/p/ParadoxZone.java b/Mage.Sets/src/mage/cards/p/ParadoxZone.java index 49b1976b14e..d2092b42aa6 100644 --- a/Mage.Sets/src/mage/cards/p/ParadoxZone.java +++ b/Mage.Sets/src/mage/cards/p/ParadoxZone.java @@ -1,7 +1,7 @@ package mage.cards.p; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.CountersSourceCount; @@ -11,7 +11,6 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.permanent.token.FractalToken; @@ -35,7 +34,7 @@ public final class ParadoxZone extends CardImpl { // At the beginning of your end step, double the number of growth counters on Paradox Zone. Then create a 0/0 blue and green Fractal creature token. Put X +1/+1 counters on it, where X is the number of growth counters on Paradox Zone. Ability ability = new BeginningOfEndStepTriggeredAbility( - new DoubleCountersSourceEffect(CounterType.GROWTH), TargetController.YOU, false + new DoubleCountersSourceEffect(CounterType.GROWTH) ); Effect effect = FractalToken.getEffect( xValue, "Put X +1/+1 counters on it, where X is the number of growth counters on {this}" diff --git a/Mage.Sets/src/mage/cards/p/PartyThrasher.java b/Mage.Sets/src/mage/cards/p/PartyThrasher.java index aa265085a82..db789dbb755 100644 --- a/Mage.Sets/src/mage/cards/p/PartyThrasher.java +++ b/Mage.Sets/src/mage/cards/p/PartyThrasher.java @@ -57,7 +57,7 @@ public final class PartyThrasher extends CardImpl { new DoIfCostPaid( new PartyThrasherEffect(), new DiscardCardCost() - ), false + ) )); } diff --git a/Mage.Sets/src/mage/cards/p/PassagewaySeer.java b/Mage.Sets/src/mage/cards/p/PassagewaySeer.java index 32b5557b278..37928dcb99e 100644 --- a/Mage.Sets/src/mage/cards/p/PassagewaySeer.java +++ b/Mage.Sets/src/mage/cards/p/PassagewaySeer.java @@ -1,7 +1,7 @@ package mage.cards.p; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.HaveInitiativeCondition; import mage.abilities.effects.common.TakeTheInitiativeEffect; @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.counters.CounterType; import java.util.UUID; @@ -39,8 +38,8 @@ public final class PassagewaySeer extends CardImpl { // At the beginning of your end step, if you have the initiative, put a +1/+1 counter on Passageway Seer. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - TargetController.YOU, HaveInitiativeCondition.instance, false + TargetController.YOU, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), + false, HaveInitiativeCondition.instance ).addHint(InitiativeHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/p/PegasusGuardian.java b/Mage.Sets/src/mage/cards/p/PegasusGuardian.java index 64d9dc2941c..e0fe90dc1bf 100644 --- a/Mage.Sets/src/mage/cards/p/PegasusGuardian.java +++ b/Mage.Sets/src/mage/cards/p/PegasusGuardian.java @@ -1,7 +1,7 @@ package mage.cards.p; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileThenReturnTargetEffect; @@ -34,8 +34,8 @@ public final class PegasusGuardian extends AdventureCard { // At the beginning of your end step, if a permanent you controlled left the battlefield this turn, create a 1/1 white Pegasus creature token with flying. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new PegasusToken()), TargetController.YOU, - RevoltCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new PegasusToken()), + false, RevoltCondition.instance ).addHint(RevoltCondition.getHint()), new RevoltWatcher()); // Rescue the Foal diff --git a/Mage.Sets/src/mage/cards/p/PestsOfHonor.java b/Mage.Sets/src/mage/cards/p/PestsOfHonor.java index 48448769052..9bc6f9bf106 100644 --- a/Mage.Sets/src/mage/cards/p/PestsOfHonor.java +++ b/Mage.Sets/src/mage/cards/p/PestsOfHonor.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.watchers.common.PermanentsEnteredBattlefieldWatcher; @@ -31,8 +30,7 @@ public final class PestsOfHonor extends CardImpl { // Celebration - At the beginning of combat on your turn, if two or more nonland permanents entered the battlefield under your control this turn, put a +1/+1 counter on Pests of Honor. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - false + new AddCountersSourceEffect(CounterType.P1P1.createInstance()) ), CelebrationCondition.instance, "At the beginning of combat on your turn, if two or more " + "nonland permanents entered the battlefield under your control this turn, put a +1/+1 counter on {this}." ).addHint(CelebrationCondition.getHint()).setAbilityWord(AbilityWord.CELEBRATION), new PermanentsEnteredBattlefieldWatcher()); diff --git a/Mage.Sets/src/mage/cards/p/PhabineBosssConfidant.java b/Mage.Sets/src/mage/cards/p/PhabineBosssConfidant.java index 01638cca272..82d7345ecbe 100644 --- a/Mage.Sets/src/mage/cards/p/PhabineBosssConfidant.java +++ b/Mage.Sets/src/mage/cards/p/PhabineBosssConfidant.java @@ -53,8 +53,7 @@ public class PhabineBosssConfidant extends CardImpl { // Then creatures you control get +1/+1 until end of turn for each nonland card revealed this way. // Then each player draws a card. Ability parleyAbility = new BeginningOfCombatTriggeredAbility( - new PhabineBosssConfidantParleyEffect(), - false + new PhabineBosssConfidantParleyEffect() ); Effect drawCardAllEffect = new DrawCardAllEffect(1); drawCardAllEffect.concatBy("Then"); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianEtchings.java b/Mage.Sets/src/mage/cards/p/PhyrexianEtchings.java index cffe8c92bf0..8769417c425 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianEtchings.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianEtchings.java @@ -2,7 +2,7 @@ package mage.cards.p; import java.util.UUID; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.MultipliedValue; @@ -28,7 +28,7 @@ public final class PhyrexianEtchings extends CardImpl { this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{B}"))); // At the beginning of your end step, draw a card for each age counter on Phyrexian Etchings. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new DrawCardSourceControllerEffect(new CountersSourceCount(CounterType.AGE)), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new DrawCardSourceControllerEffect(new CountersSourceCount(CounterType.AGE)))); // When Phyrexian Etchings is put into a graveyard from the battlefield, you lose 2 life for each age counter on it. this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new LoseLifeSourceControllerEffect(new MultipliedValue(new CountersSourceCount(CounterType.AGE), 2)) diff --git a/Mage.Sets/src/mage/cards/p/PlagueReaver.java b/Mage.Sets/src/mage/cards/p/PlagueReaver.java index 81391af130a..8e9eed7c5fd 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueReaver.java +++ b/Mage.Sets/src/mage/cards/p/PlagueReaver.java @@ -3,7 +3,7 @@ package mage.cards.p; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,7 +40,7 @@ public final class PlagueReaver extends CardImpl { // At the beginning of your end step, sacrifice each other creature you control. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new PlagueReaverSacrificeEffect(), TargetController.YOU, false + new PlagueReaverSacrificeEffect() )); // Discard two cards, Sacrifice Plague Reaver: Choose target opponent. Return Plague Reaver to the battlefield under that player's control at the beginning of their next upkeep. diff --git a/Mage.Sets/src/mage/cards/p/PlatoonDispenser.java b/Mage.Sets/src/mage/cards/p/PlatoonDispenser.java index 9ee9b852f58..8ac6b72b381 100644 --- a/Mage.Sets/src/mage/cards/p/PlatoonDispenser.java +++ b/Mage.Sets/src/mage/cards/p/PlatoonDispenser.java @@ -1,7 +1,7 @@ package mage.cards.p; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -47,8 +47,8 @@ public final class PlatoonDispenser extends CardImpl { // At the beginning of your end step, if you control two or more other creatures, draw a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), - TargetController.YOU, condition, false + TargetController.YOU, new DrawCardSourceControllerEffect(1), + false, condition )); // {3}{W}: Create a 1/1 colorless Soldier Artifact creature token. diff --git a/Mage.Sets/src/mage/cards/p/PorcelainZealot.java b/Mage.Sets/src/mage/cards/p/PorcelainZealot.java index 763d0e45271..c27cdeab24e 100644 --- a/Mage.Sets/src/mage/cards/p/PorcelainZealot.java +++ b/Mage.Sets/src/mage/cards/p/PorcelainZealot.java @@ -13,7 +13,6 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.ToxicAbility; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -35,8 +34,8 @@ public final class PorcelainZealot extends CardImpl { // At the beginning of combat on your turn, target creature you control gets +1/+1 until end of turn. If that creature has toxic, instead it gets +2/+2 until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( - new PorcelainZealotEffect(), - false); + new PorcelainZealotEffect() + ); ability.addTarget(new TargetControlledCreaturePermanent(1, 1)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PossessedPortal.java b/Mage.Sets/src/mage/cards/p/PossessedPortal.java index 23bb27a8413..1d5b8f10fe4 100644 --- a/Mage.Sets/src/mage/cards/p/PossessedPortal.java +++ b/Mage.Sets/src/mage/cards/p/PossessedPortal.java @@ -1,7 +1,7 @@ package mage.cards.p; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; @@ -30,7 +30,7 @@ public final class PossessedPortal extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PossessedPortalReplacementEffect())); // At the beginning of each end step, each player sacrifices a permanent unless they discard a card. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new PossessedPortalEffect(), TargetController.ANY, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new PossessedPortalEffect(), false)); } private PossessedPortal(final PossessedPortal card) { diff --git a/Mage.Sets/src/mage/cards/p/PrairieDog.java b/Mage.Sets/src/mage/cards/p/PrairieDog.java index 4cfb8830df2..434fa42020c 100644 --- a/Mage.Sets/src/mage/cards/p/PrairieDog.java +++ b/Mage.Sets/src/mage/cards/p/PrairieDog.java @@ -2,7 +2,7 @@ package mage.cards.p; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.HaventCastSpellFromHandThisTurnCondition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,8 +37,8 @@ public final class PrairieDog extends CardImpl { // At the beginning of your end step, if you haven't cast a spell from your hand this turn, put a +1/+1 counter on Prairie Dog. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - TargetController.YOU, HaventCastSpellFromHandThisTurnCondition.instance, false + TargetController.YOU, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), + false, HaventCastSpellFromHandThisTurnCondition.instance ).addHint(HaventCastSpellFromHandThisTurnCondition.hint)); // {4}{W}: Until end of turn, if you would put one or more +1/+1 counters on a creature you control, put that many plus one +1/+1 counters on it instead. diff --git a/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java b/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java index 4f05d6a527b..d42a363bd71 100644 --- a/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java +++ b/Mage.Sets/src/mage/cards/p/PredatoryAdvantage.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.WatcherScope; -import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class PredatoryAdvantage extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{G}"); // At the beginning of each opponent's end step, if that player didn't cast a creature spell this turn, create a 2/2 green Lizard creature token. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new LizardToken()), TargetController.OPPONENT, new DidNotCastCreatureCondition(), false), new CastCreatureWatcher()); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.OPPONENT, new CreateTokenEffect(new LizardToken()), false, new DidNotCastCreatureCondition()), new CastCreatureWatcher()); } private PredatoryAdvantage(final PredatoryAdvantage card) { diff --git a/Mage.Sets/src/mage/cards/p/PriestOfTheBlessedGraf.java b/Mage.Sets/src/mage/cards/p/PriestOfTheBlessedGraf.java index e53b005ea4e..20fb2ae8459 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfTheBlessedGraf.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfTheBlessedGraf.java @@ -2,7 +2,7 @@ package mage.cards.p; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.Controllable; import mage.game.Game; @@ -41,7 +40,7 @@ public final class PriestOfTheBlessedGraf extends CardImpl { // At the beginning of your end step, create X 1/1 white Spirit creature tokens with flying, where X is the number of opponents who control more lands than you. this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect( new SpiritWhiteToken(), PriestOfTheBlessedGrafValue.instance - ), TargetController.YOU, false).addHint(PriestOfTheBlessedGrafHint.instance)); + )).addHint(PriestOfTheBlessedGrafHint.instance)); } private PriestOfTheBlessedGraf(final PriestOfTheBlessedGraf card) { diff --git a/Mage.Sets/src/mage/cards/p/PrimordialMist.java b/Mage.Sets/src/mage/cards/p/PrimordialMist.java index 49b4fc05ee4..dc323142e78 100644 --- a/Mage.Sets/src/mage/cards/p/PrimordialMist.java +++ b/Mage.Sets/src/mage/cards/p/PrimordialMist.java @@ -2,7 +2,7 @@ package mage.cards.p; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; @@ -11,12 +11,7 @@ import mage.abilities.effects.keyword.ManifestEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.card.FaceDownPredicate; import mage.game.Game; @@ -41,7 +36,7 @@ public final class PrimordialMist extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}"); // At the beginning of your end step, you may manifest the top card of your library. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ManifestEffect(1), TargetController.YOU, true)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new ManifestEffect(1), true)); // Exile a face-down permanent you control face-up: You may play that card this turn TargetPermanent target = new TargetPermanent(filter); diff --git a/Mage.Sets/src/mage/cards/p/PrimordialPlasm.java b/Mage.Sets/src/mage/cards/p/PrimordialPlasm.java index 455768ccadd..bae0d2e9ea0 100644 --- a/Mage.Sets/src/mage/cards/p/PrimordialPlasm.java +++ b/Mage.Sets/src/mage/cards/p/PrimordialPlasm.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.target.TargetPermanent; @@ -33,8 +32,7 @@ public final class PrimordialPlasm extends CardImpl { // At the beginning of combat on your turn, another target creature gets +2/+2 and loses all abilities until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new BoostTargetEffect(2, 2) - .setText("another target creature gets +2/+2"), - false + .setText("another target creature gets +2/+2") ); ability.addEffect(new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn) .setText("and loses all abilities until end of turn")); diff --git a/Mage.Sets/src/mage/cards/p/ProftsEideticMemory.java b/Mage.Sets/src/mage/cards/p/ProftsEideticMemory.java index 2ac61796472..8797f7c4fa1 100644 --- a/Mage.Sets/src/mage/cards/p/ProftsEideticMemory.java +++ b/Mage.Sets/src/mage/cards/p/ProftsEideticMemory.java @@ -18,7 +18,6 @@ import mage.constants.SuperType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.target.common.TargetControlledCreaturePermanent; @@ -48,8 +47,8 @@ public final class ProftsEideticMemory extends CardImpl { new BeginningOfCombatTriggeredAbility( new AddCountersTargetEffect( CounterType.P1P1.createInstance(), - new IntPlusDynamicValue(-1, CardsDrawnThisTurnDynamicValue.instance)), - false), + new IntPlusDynamicValue(-1, CardsDrawnThisTurnDynamicValue.instance)) + ), DrewTwoOrMoreCardsCondition.instance, "At the beginning of combat on your turn, if you've drawn more than one card this turn, " + "put X +1/+1 counters on target creature you control, " + diff --git a/Mage.Sets/src/mage/cards/p/PromiseOfAclazotz.java b/Mage.Sets/src/mage/cards/p/PromiseOfAclazotz.java index 5fbfe8a7a67..6ba163d05f3 100644 --- a/Mage.Sets/src/mage/cards/p/PromiseOfAclazotz.java +++ b/Mage.Sets/src/mage/cards/p/PromiseOfAclazotz.java @@ -3,7 +3,7 @@ package mage.cards.p; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DoIfCostPaid; @@ -12,7 +12,6 @@ import mage.cards.AdventureCard; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.game.permanent.token.VampireDemonToken; @@ -34,7 +33,7 @@ public class PromiseOfAclazotz extends AdventureCard { Ability ability = new BeginningOfEndStepTriggeredAbility(new DoIfCostPaid( new PopulateEffect(), new SacrificeTargetCost(filter) - ), TargetController.YOU, false); + )); this.addAbility(ability); // Foul Rebirth diff --git a/Mage.Sets/src/mage/cards/p/PromiseOfTomorrow.java b/Mage.Sets/src/mage/cards/p/PromiseOfTomorrow.java index 800fa7086c4..dea8fdf10dd 100644 --- a/Mage.Sets/src/mage/cards/p/PromiseOfTomorrow.java +++ b/Mage.Sets/src/mage/cards/p/PromiseOfTomorrow.java @@ -1,7 +1,6 @@ package mage.cards.p; -import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -39,7 +38,7 @@ public final class PromiseOfTomorrow extends CardImpl { )); // At the beginning of each end step, if you control no creatures, sacrifice Promise of Tomorrow and return all cards exiled with it to the battlefield under your control. - BeginningOfEndStepTriggeredAbility returnAbility = new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.ANY, false); + BeginningOfEndStepTriggeredAbility returnAbility = new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new SacrificeSourceEffect(), false); returnAbility.addEffect(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD)); this.addAbility(new ConditionalInterveningIfTriggeredAbility( returnAbility, condition, "At the beginning of each end step, if you control no creatures, " + diff --git a/Mage.Sets/src/mage/cards/p/ProsperTomeBound.java b/Mage.Sets/src/mage/cards/p/ProsperTomeBound.java index f79c2c07309..6d47b03d9fc 100644 --- a/Mage.Sets/src/mage/cards/p/ProsperTomeBound.java +++ b/Mage.Sets/src/mage/cards/p/ProsperTomeBound.java @@ -1,7 +1,7 @@ package mage.cards.p; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.PlayCardTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ExileTopXMayPlayUntilEffect; @@ -36,7 +36,7 @@ public final class ProsperTomeBound extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility( new ExileTopXMayPlayUntilEffect( 1, Duration.UntilEndOfYourNextTurn - ), TargetController.YOU, false + ) ).withFlavorWord("Mystic Arcanum")); // Pact Boon — Whenever you play a card from exile, create a Treasure token. diff --git a/Mage.Sets/src/mage/cards/p/PsychicVortex.java b/Mage.Sets/src/mage/cards/p/PsychicVortex.java index fb9fc6e1ae2..e01349aa26c 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicVortex.java +++ b/Mage.Sets/src/mage/cards/p/PsychicVortex.java @@ -1,7 +1,7 @@ package mage.cards.p; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; import mage.abilities.effects.common.SacrificeControllerEffect; @@ -10,7 +10,6 @@ import mage.abilities.keyword.CumulativeUpkeepAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.Game; import mage.players.Player; @@ -31,7 +30,7 @@ public final class PsychicVortex extends CardImpl { // At the beginning of your end step, sacrifice a land and discard your hand. Ability ability = new BeginningOfEndStepTriggeredAbility(new SacrificeControllerEffect( StaticFilters.FILTER_LAND, 1, null - ), TargetController.YOU, false); + )); ability.addEffect(new DiscardHandControllerEffect().concatBy("and")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PyromancersSwath.java b/Mage.Sets/src/mage/cards/p/PyromancersSwath.java index 4327d36c278..139ba6408a5 100644 --- a/Mage.Sets/src/mage/cards/p/PyromancersSwath.java +++ b/Mage.Sets/src/mage/cards/p/PyromancersSwath.java @@ -4,7 +4,7 @@ package mage.cards.p; import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.discard.DiscardHandControllerEffect; @@ -28,7 +28,7 @@ public final class PyromancersSwath extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PyromancersSwathReplacementEffect())); // At the beginning of each end step, discard your hand. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new DiscardHandControllerEffect(), TargetController.ANY, null, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new DiscardHandControllerEffect(), false, null)); } diff --git a/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java b/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java index 153518bcc7a..4688f34e747 100644 --- a/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java +++ b/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java @@ -1,7 +1,7 @@ package mage.cards.q; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.SourceHasCounterCondition; @@ -51,8 +51,8 @@ public final class QuestForUlasTemple extends CardImpl { // At the beginning of each end step, if there are three or more quest counters on Quest for Ula's Temple, you may put a Kraken, Leviathan, Octopus, or Serpent creature card from your hand onto the battlefield. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), - TargetController.ANY, condition, false + TargetController.ANY, new PutCardFromHandOntoBattlefieldEffect(filter), + false, condition )); } diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java b/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java index 9954f1f577f..bd1cc5662ac 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java @@ -1,7 +1,7 @@ package mage.cards.q; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; @@ -43,8 +43,8 @@ public final class QuicksilverFountain extends CardImpl { // At the beginning of each end step, if all lands on the battlefield are Islands, remove all flood counters from them. // Note: This applies only if Quicksilver Fountain is on the battlefield - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, - new QuicksilverFountainEffect2(), TargetController.ANY, condition, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility( + TargetController.ANY, new QuicksilverFountainEffect2(), false, condition)); } private QuicksilverFountain(final QuicksilverFountain card) { diff --git a/Mage.Sets/src/mage/cards/q/QuintoriusLoremaster.java b/Mage.Sets/src/mage/cards/q/QuintoriusLoremaster.java index 783b45007bc..ca664488b90 100644 --- a/Mage.Sets/src/mage/cards/q/QuintoriusLoremaster.java +++ b/Mage.Sets/src/mage/cards/q/QuintoriusLoremaster.java @@ -3,7 +3,7 @@ package mage.cards.q; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; @@ -68,7 +68,7 @@ public final class QuintoriusLoremaster extends CardImpl { // At the beginning of your end step, exile target noncreature, nonland card from your graveyard. Create a 3/2 red and white Spirit creature token. Ability ability = new BeginningOfEndStepTriggeredAbility( - new ExileTargetForSourceEffect(), TargetController.YOU, false + new ExileTargetForSourceEffect() ); ability.addEffect(new CreateTokenEffect(new Spirit32Token())); ability.addTarget(new TargetCardInYourGraveyard(filter)); @@ -189,4 +189,4 @@ class QuintoriusLoremasterReplacementEffect extends ReplacementEffectImpl { && ((ZoneChangeEvent) event).getToZone() == Zone.GRAVEYARD && mor.zoneCounterIsCurrent(game); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/r/RaggedRecluse.java b/Mage.Sets/src/mage/cards/r/RaggedRecluse.java index c8635c25072..0f6e003e7ce 100644 --- a/Mage.Sets/src/mage/cards/r/RaggedRecluse.java +++ b/Mage.Sets/src/mage/cards/r/RaggedRecluse.java @@ -1,7 +1,7 @@ package mage.cards.r; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.ControllerDiscardedThisTurnCondition; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.hint.common.ControllerDiscardedHint; @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.watchers.common.DiscardedCardWatcher; import java.util.UUID; @@ -33,8 +32,8 @@ public final class RaggedRecluse extends CardImpl { // At the beginning of your end step, if you discarded a card this turn, transform Ragged Recluse. this.addAbility(new TransformAbility()); this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new TransformSourceEffect(), TargetController.YOU, - ControllerDiscardedThisTurnCondition.instance, false + TargetController.YOU, new TransformSourceEffect(), + false, ControllerDiscardedThisTurnCondition.instance ).addHint(ControllerDiscardedHint.instance), new DiscardedCardWatcher()); } diff --git a/Mage.Sets/src/mage/cards/r/RagingBattleMouse.java b/Mage.Sets/src/mage/cards/r/RagingBattleMouse.java index 72bd3553d96..3f7ae7785d6 100644 --- a/Mage.Sets/src/mage/cards/r/RagingBattleMouse.java +++ b/Mage.Sets/src/mage/cards/r/RagingBattleMouse.java @@ -43,7 +43,7 @@ public final class RagingBattleMouse extends CardImpl { // Celebration -- At the beginning of combat on your turn, if two or more nonland permanents entered the battlefield under your control this turn, target creature you control gets +1/+1 until end of turn. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new BoostTargetEffect(1, 1, Duration.EndOfTurn), false + new BoostTargetEffect(1, 1, Duration.EndOfTurn) ), CelebrationCondition.instance, "At the beginning of combat on your turn, " + "if two or more nonland permanents entered the battlefield under your control this turn, " + "target creature you control gets +1/+1 until end of turn." diff --git a/Mage.Sets/src/mage/cards/r/RaidersWake.java b/Mage.Sets/src/mage/cards/r/RaidersWake.java index f4da9d6ef89..d69a9914f2b 100644 --- a/Mage.Sets/src/mage/cards/r/RaidersWake.java +++ b/Mage.Sets/src/mage/cards/r/RaidersWake.java @@ -1,7 +1,7 @@ package mage.cards.r; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiscardsACardOpponentTriggeredAbility; import mage.abilities.condition.common.RaidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.SetTargetPointer; -import mage.constants.TargetController; import mage.target.common.TargetOpponent; import mage.watchers.common.PlayerAttackedWatcher; @@ -32,7 +31,7 @@ public final class RaidersWake extends CardImpl { // Raid — At the beginning of your end step, if you attacked this turn, target opponent discards a card. Ability ability = new ConditionalInterveningIfTriggeredAbility( - new BeginningOfEndStepTriggeredAbility(new DiscardTargetEffect(1), TargetController.YOU, false), RaidCondition.instance, + new BeginningOfEndStepTriggeredAbility(new DiscardTargetEffect(1)), RaidCondition.instance, "At the beginning of your end step, if you attacked this turn, target opponent discards a card."); ability.addTarget(new TargetOpponent()); ability.setAbilityWord(AbilityWord.RAID); diff --git a/Mage.Sets/src/mage/cards/r/RakdosPatronOfChaos.java b/Mage.Sets/src/mage/cards/r/RakdosPatronOfChaos.java index 8f25f7f78c1..a8782418aba 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosPatronOfChaos.java +++ b/Mage.Sets/src/mage/cards/r/RakdosPatronOfChaos.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.DoUnlessTargetPlayerOrTargetsControllerPaysEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -14,7 +14,6 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.permanent.TokenPredicate; @@ -52,8 +51,8 @@ public final class RakdosPatronOfChaos extends CardImpl { new DrawCardSourceControllerEffect(2), new SacrificeTargetCost(2, filter)) .setText("target opponent may sacrifice two nonland, nontoken permanents. " + - "If they don't, you draw two cards."), - TargetController.YOU, false); + "If they don't, you draw two cards.") + ); ability.addTarget(new TargetOpponent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RammasEchorAncientShield.java b/Mage.Sets/src/mage/cards/r/RammasEchorAncientShield.java index 7f66aef5d09..e338455417d 100644 --- a/Mage.Sets/src/mage/cards/r/RammasEchorAncientShield.java +++ b/Mage.Sets/src/mage/cards/r/RammasEchorAncientShield.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.permanent.token.TeyoToken; @@ -42,7 +41,7 @@ public final class RammasEchorAncientShield extends CardImpl { this.addAbility(ability); // At the beginning of combat on your turn, creatures you control with defender gain exalted until end of turn. - this.addAbility(new BeginningOfCombatTriggeredAbility(new GainAbilityControlledEffect(new ExaltedAbility(), Duration.EndOfTurn, filter), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new GainAbilityControlledEffect(new ExaltedAbility(), Duration.EndOfTurn, filter))); } private RammasEchorAncientShield(final RammasEchorAncientShield card) { diff --git a/Mage.Sets/src/mage/cards/r/RaphaelFiendishSavior.java b/Mage.Sets/src/mage/cards/r/RaphaelFiendishSavior.java index 12067131b84..87e6931c9a4 100644 --- a/Mage.Sets/src/mage/cards/r/RaphaelFiendishSavior.java +++ b/Mage.Sets/src/mage/cards/r/RaphaelFiendishSavior.java @@ -3,7 +3,7 @@ package mage.cards.r; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CreaturePutInYourGraveyardCondition; import mage.abilities.effects.common.CreateTokenEffect; @@ -66,8 +66,8 @@ public final class RaphaelFiendishSavior extends CardImpl { // At the beginning of each end step, if a creature card was put into your graveyard from anywhere this turn, create a 1/1 red Devil creature token with "When this creature dies, it deals 1 damage to any target." this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new DevilToken()), TargetController.ANY, - CreaturePutInYourGraveyardCondition.instance, false + TargetController.ANY, new CreateTokenEffect(new DevilToken()), + false, CreaturePutInYourGraveyardCondition.instance ).addHint(CreaturePutInYourGraveyardCondition.getHint()), new CreaturePutIntoGraveyardWatcher()); } diff --git a/Mage.Sets/src/mage/cards/r/RavingDead.java b/Mage.Sets/src/mage/cards/r/RavingDead.java index 8025c5ae401..5b272e7d6fe 100644 --- a/Mage.Sets/src/mage/cards/r/RavingDead.java +++ b/Mage.Sets/src/mage/cards/r/RavingDead.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; @@ -34,7 +33,7 @@ public final class RavingDead extends CardImpl { // Deathtouch this.addAbility(DeathtouchAbility.getInstance()); // At the beginning of combat on your turn, choose an opponent at random. Raving Dead attacks that player this combat if able. - this.addAbility(new BeginningOfCombatTriggeredAbility(new AttackIfAbleTargetRandomOpponentSourceEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new AttackIfAbleTargetRandomOpponentSourceEffect())); // Whenever Raving Dead deals combat damage to a player, that player loses half their life, rounded down. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new RavingDeadDamageEffect(), false, true)); } diff --git a/Mage.Sets/src/mage/cards/r/RazorPendulum.java b/Mage.Sets/src/mage/cards/r/RazorPendulum.java index 3d506e54033..238040897a7 100644 --- a/Mage.Sets/src/mage/cards/r/RazorPendulum.java +++ b/Mage.Sets/src/mage/cards/r/RazorPendulum.java @@ -1,7 +1,7 @@ package mage.cards.r; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.OneShotEffect; @@ -27,7 +27,7 @@ public final class RazorPendulum extends CardImpl { // At the beginning of each player’s end step, if that player has 5 or less life, Razor Pendulum deals 2 damage to that player. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new RazorPendulumEffect(), TargetController.ANY, false + TargetController.ANY, new RazorPendulumEffect(), false ), RazorPendulumCondition.instance, "At the beginning of each player's end step, " + "if that player has 5 or less life, {this} deals 2 damage to that player." )); diff --git a/Mage.Sets/src/mage/cards/r/ReaperFromTheAbyss.java b/Mage.Sets/src/mage/cards/r/ReaperFromTheAbyss.java index adefb7338a2..c47d2a456f8 100644 --- a/Mage.Sets/src/mage/cards/r/ReaperFromTheAbyss.java +++ b/Mage.Sets/src/mage/cards/r/ReaperFromTheAbyss.java @@ -2,7 +2,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.hint.common.MorbidHint; @@ -37,8 +37,8 @@ public final class ReaperFromTheAbyss extends CardImpl { this.addAbility(FlyingAbility.getInstance()); Ability ability = new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new DestroyTargetEffect(), - TargetController.ANY, MorbidCondition.instance, false + TargetController.ANY, new DestroyTargetEffect(), + false, MorbidCondition.instance ); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability.setAbilityWord(AbilityWord.MORBID).addHint(MorbidHint.instance)); diff --git a/Mage.Sets/src/mage/cards/r/RecklessStormseeker.java b/Mage.Sets/src/mage/cards/r/RecklessStormseeker.java index 6ae077ea926..76eeb01bcc3 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessStormseeker.java +++ b/Mage.Sets/src/mage/cards/r/RecklessStormseeker.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -34,8 +33,7 @@ public final class RecklessStormseeker extends CardImpl { // At the beginning of combat on your turn, target creature you control gets +1/+0 and gains haste until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new BoostTargetEffect(1, 0) - .setText("target creature you control gets +1/+0"), - false + .setText("target creature you control gets +1/+0") ); ability.addEffect(new GainAbilityTargetEffect( HasteAbility.getInstance(), Duration.EndOfTurn diff --git a/Mage.Sets/src/mage/cards/r/RegalBloodlord.java b/Mage.Sets/src/mage/cards/r/RegalBloodlord.java index d799e47c888..e739b254bfc 100644 --- a/Mage.Sets/src/mage/cards/r/RegalBloodlord.java +++ b/Mage.Sets/src/mage/cards/r/RegalBloodlord.java @@ -1,7 +1,7 @@ package mage.cards.r; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.dynamicvalue.common.ControllerGainedLifeCount; @@ -10,7 +10,6 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.TargetController; import mage.game.permanent.token.BatToken; @@ -37,8 +36,8 @@ public final class RegalBloodlord extends CardImpl { // At the beginning of each end step, if you gained life this turn, create a 1/1 black Bat creature token with flying. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new BatToken()), - TargetController.ANY, false + TargetController.ANY, new CreateTokenEffect(new BatToken()), + false ), new YouGainedLifeCondition(), "At the beginning of each end step, " diff --git a/Mage.Sets/src/mage/cards/r/RegnaTheRedeemer.java b/Mage.Sets/src/mage/cards/r/RegnaTheRedeemer.java index e40b2b0ef6c..794e2187e35 100644 --- a/Mage.Sets/src/mage/cards/r/RegnaTheRedeemer.java +++ b/Mage.Sets/src/mage/cards/r/RegnaTheRedeemer.java @@ -4,7 +4,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.IntCompareCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -45,8 +45,7 @@ public final class RegnaTheRedeemer extends CardImpl { // At the beginning of each end step, if your team gained life this turn, create two 1/1 white Warrior creature tokens. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new WarriorToken(), 2), - TargetController.ANY, + TargetController.ANY, new CreateTokenEffect(new WarriorToken(), 2), false ), new RegnaTheRedeemerCondition(), diff --git a/Mage.Sets/src/mage/cards/r/ReinforcedRonin.java b/Mage.Sets/src/mage/cards/r/ReinforcedRonin.java index 3cdbd24725b..c0920ad81f1 100644 --- a/Mage.Sets/src/mage/cards/r/ReinforcedRonin.java +++ b/Mage.Sets/src/mage/cards/r/ReinforcedRonin.java @@ -1,7 +1,7 @@ package mage.cards.r; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.ChannelAbility; @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import java.util.UUID; @@ -32,7 +31,7 @@ public final class ReinforcedRonin extends CardImpl { // At the beginning of your end step, return Reinforced Ronin to its owner's hand. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ReturnToHandSourceEffect(), TargetController.YOU, false + new ReturnToHandSourceEffect() )); // Channel — {1}{R}, Discard Reinforced Ronin: Draw a card. diff --git a/Mage.Sets/src/mage/cards/r/RenegadeSilent.java b/Mage.Sets/src/mage/cards/r/RenegadeSilent.java index 34eb1f3a0ad..7ce19daa21f 100644 --- a/Mage.Sets/src/mage/cards/r/RenegadeSilent.java +++ b/Mage.Sets/src/mage/cards/r/RenegadeSilent.java @@ -2,7 +2,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.PhaseOutSourceEffect; import mage.abilities.effects.common.combat.GoadTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.target.common.TargetCreaturePermanent; @@ -32,8 +31,7 @@ public final class RenegadeSilent extends CardImpl { // At the beginning of your end step, goad up to one target creature you don't control and put a +1/+1 counter on Renegade Silent. Renegade Silent phases out. Ability ability = new BeginningOfEndStepTriggeredAbility( - new GoadTargetEffect().setText("goad up to one target creature you don't control"), - TargetController.YOU, false + new GoadTargetEffect().setText("goad up to one target creature you don't control") ); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL)); ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance()) diff --git a/Mage.Sets/src/mage/cards/r/ResplendentAngel.java b/Mage.Sets/src/mage/cards/r/ResplendentAngel.java index baf27b3a86f..139ef3adbad 100644 --- a/Mage.Sets/src/mage/cards/r/ResplendentAngel.java +++ b/Mage.Sets/src/mage/cards/r/ResplendentAngel.java @@ -2,7 +2,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,8 +37,8 @@ public final class ResplendentAngel extends CardImpl { // At the beginning of each end step, if you gained 5 or more life this turn, create a 4/4 white Angel creature token with flying and vigilance. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new AngelVigilanceToken()), - TargetController.ANY, new YouGainedLifeCondition(ComparisonType.MORE_THAN, 4), false + TargetController.ANY, new CreateTokenEffect(new AngelVigilanceToken()), + false, new YouGainedLifeCondition(ComparisonType.MORE_THAN, 4) ).addHint(ControllerGainedLifeCount.getHint()), new PlayerGainedLifeWatcher()); // {3}{W}{W}{W}: Until end of turn, Resplendent Angel gets +2/+2 and gains lifelink. diff --git a/Mage.Sets/src/mage/cards/r/RestlessBloodseeker.java b/Mage.Sets/src/mage/cards/r/RestlessBloodseeker.java index e854d512d31..25e42d18a6f 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessBloodseeker.java +++ b/Mage.Sets/src/mage/cards/r/RestlessBloodseeker.java @@ -2,7 +2,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.common.ActivateAsSorceryActivatedAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.costs.common.SacrificeTargetCost; @@ -17,8 +17,6 @@ import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.BloodToken; -import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetSacrifice; import mage.watchers.common.PlayerGainedLifeWatcher; import java.util.UUID; @@ -47,8 +45,8 @@ public final class RestlessBloodseeker extends CardImpl { // At the beginning of your end step, if you gained life this turn, create a Blood token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new BloodToken()), - TargetController.YOU, condition, false + TargetController.YOU, new CreateTokenEffect(new BloodToken()), + false, condition ).addHint(hint), new PlayerGainedLifeWatcher()); // Sacrifice two Blood tokens: Transform Restless Bloodseeker. Activate only as a sorcery. diff --git a/Mage.Sets/src/mage/cards/r/RiaIvorBaneOfBladehold.java b/Mage.Sets/src/mage/cards/r/RiaIvorBaneOfBladehold.java index 6f4884d0f3d..10b7b53ef36 100644 --- a/Mage.Sets/src/mage/cards/r/RiaIvorBaneOfBladehold.java +++ b/Mage.Sets/src/mage/cards/r/RiaIvorBaneOfBladehold.java @@ -36,7 +36,7 @@ public final class RiaIvorBaneOfBladehold extends CardImpl { this.addAbility(new BattleCryAbility()); // At the beginning of combat on your turn, the next time target creature would deal combat damage to one or more players this combat, prevent that damage. If damage is prevented this way, create that many 1/1 colorless Phyrexian Mite artifact creature tokens with toxic 1 and "This creature can't block." - Ability ability = new BeginningOfCombatTriggeredAbility(new RiaIvorBaneOfBladeholdEffect(), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new RiaIvorBaneOfBladeholdEffect()); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RidersOfTheMark.java b/Mage.Sets/src/mage/cards/r/RidersOfTheMark.java index e80086b9ea7..beca0f7a2d2 100644 --- a/Mage.Sets/src/mage/cards/r/RidersOfTheMark.java +++ b/Mage.Sets/src/mage/cards/r/RidersOfTheMark.java @@ -2,7 +2,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.AttackedThisTurnSourceCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -24,7 +24,6 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.HumanSoldierToken; import mage.players.Player; -import mage.watchers.common.AttackedThisTurnWatcher; import java.util.UUID; @@ -61,9 +60,7 @@ public final class RidersOfTheMark extends CardImpl { // At the beginning of your end step, if Riders of the Mark attacked this turn, return it to its owner's hand. If you do, create a number of 1/1 white Human Soldier creature tokens equal to its toughness. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new RidersOfTheMarkEffect(), - TargetController.YOU, - false + new RidersOfTheMarkEffect() ), AttackedThisTurnSourceCondition.instance, "At the beginning of your end step, if {this} attacked this turn, " diff --git a/Mage.Sets/src/mage/cards/r/RionyaFireDancer.java b/Mage.Sets/src/mage/cards/r/RionyaFireDancer.java index bd3427705df..f60d70ea09a 100644 --- a/Mage.Sets/src/mage/cards/r/RionyaFireDancer.java +++ b/Mage.Sets/src/mage/cards/r/RionyaFireDancer.java @@ -37,7 +37,7 @@ public final class RionyaFireDancer extends CardImpl { // At the beginning of combat on your turn, create X tokens that are copies of another target creature you control, where X is one plus the number of instant and sorcery spells you've cast this turn. They gain haste. Exile them at the beginning of the next end step. Ability ability = new BeginningOfCombatTriggeredAbility( - new RionyaFireDancerEffect(), false + new RionyaFireDancerEffect() ); ability.addTarget(new TargetPermanent(StaticFilters.FILTER_ANOTHER_CREATURE_YOU_CONTROL)); this.addAbility(ability.addHint(RionyaFireDancerHint.instance), new RionyaFireDancerWatcher()); diff --git a/Mage.Sets/src/mage/cards/r/RipplesOfUndeath.java b/Mage.Sets/src/mage/cards/r/RipplesOfUndeath.java index 210f848b851..d243d5b11b2 100644 --- a/Mage.Sets/src/mage/cards/r/RipplesOfUndeath.java +++ b/Mage.Sets/src/mage/cards/r/RipplesOfUndeath.java @@ -11,7 +11,6 @@ import mage.abilities.effects.common.DoIfCostPaid; import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -33,7 +32,7 @@ public final class RipplesOfUndeath extends CardImpl { // At the beginning of your precombat main phase, mill three cards. Then you may pay {1} and 3 life. If you do, put a card from among those cards into your hand. this.addAbility(new BeginningOfFirstMainTriggeredAbility( - new RipplesOfUndeathEffect(), false + new RipplesOfUndeathEffect() )); } diff --git a/Mage.Sets/src/mage/cards/r/RithLiberatedPrimeval.java b/Mage.Sets/src/mage/cards/r/RithLiberatedPrimeval.java index 90aa54b4237..ca6b071bc7e 100644 --- a/Mage.Sets/src/mage/cards/r/RithLiberatedPrimeval.java +++ b/Mage.Sets/src/mage/cards/r/RithLiberatedPrimeval.java @@ -2,7 +2,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -53,8 +53,8 @@ public final class RithLiberatedPrimeval extends CardImpl { // At the beginning of your end step, if a creature or planeswalker an opponent controlled was dealt excess damage this turn, create a 4/4 red Dragon creature token with flying. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new DragonToken()), TargetController.YOU, - RithLiberatedPrimevalCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new DragonToken()), + false, RithLiberatedPrimevalCondition.instance ), new RithLiberatedPrimevalWatcher()); } diff --git a/Mage.Sets/src/mage/cards/r/RitualGuardian.java b/Mage.Sets/src/mage/cards/r/RitualGuardian.java index d27338d6567..4b0e08f5126 100644 --- a/Mage.Sets/src/mage/cards/r/RitualGuardian.java +++ b/Mage.Sets/src/mage/cards/r/RitualGuardian.java @@ -31,7 +31,7 @@ public final class RitualGuardian extends CardImpl { new BeginningOfCombatTriggeredAbility( new GainAbilitySourceEffect( LifelinkAbility.getInstance(), Duration.EndOfTurn - ), false + ) ), CovenCondition.instance, "At the beginning of combat on your turn, if you control three " + "or more creatures with different powers, {this} gains lifelink until end of turn." ).addHint(CovenHint.instance).setAbilityWord(AbilityWord.COVEN)); diff --git a/Mage.Sets/src/mage/cards/r/RoccoStreetChef.java b/Mage.Sets/src/mage/cards/r/RoccoStreetChef.java index b1511c8d90c..9b569ed7626 100644 --- a/Mage.Sets/src/mage/cards/r/RoccoStreetChef.java +++ b/Mage.Sets/src/mage/cards/r/RoccoStreetChef.java @@ -3,7 +3,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -37,7 +37,7 @@ public final class RoccoStreetChef extends CardImpl { // At the beginning of your end step, each player exiles the top card of their library. Until your next end step, each player may play the card they exiled this way. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new RoccoStreetChefEffect(), TargetController.YOU, false + new RoccoStreetChefEffect() )); // Whenever a player plays a land from exile or casts a spell from exile, you put a +1/+1 counter on target creature and create a Food token. diff --git a/Mage.Sets/src/mage/cards/r/RodolfDuskbringer.java b/Mage.Sets/src/mage/cards/r/RodolfDuskbringer.java index e81eaddb3dd..af1ea89da68 100644 --- a/Mage.Sets/src/mage/cards/r/RodolfDuskbringer.java +++ b/Mage.Sets/src/mage/cards/r/RodolfDuskbringer.java @@ -1,7 +1,7 @@ package mage.cards.r; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.GainLifeControllerTriggeredAbility; import mage.abilities.common.delayed.ReflexiveTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -71,7 +71,7 @@ public final class RodolfDuskbringer extends CardImpl { ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(new BeginningOfEndStepTriggeredAbility(new DoWhenCostPaid( ability, new ManaCostsImpl<>("{1}{W/B}"), "Pay {1}{W/B}?" - ), TargetController.YOU, false).addHint(ControllerGainedLifeCount.getHint()), new PlayerGainedLifeWatcher()); + )).addHint(ControllerGainedLifeCount.getHint()), new PlayerGainedLifeWatcher()); } private RodolfDuskbringer(final RodolfDuskbringer card) { @@ -95,4 +95,4 @@ enum RodolfDuskbringerPredicate implements Predicate { .getLifeGained(input.getOwnerId()) >= input.getManaValue(); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/r/RuhanOfTheFomori.java b/Mage.Sets/src/mage/cards/r/RuhanOfTheFomori.java index ad4a0b5fe44..235b780b283 100644 --- a/Mage.Sets/src/mage/cards/r/RuhanOfTheFomori.java +++ b/Mage.Sets/src/mage/cards/r/RuhanOfTheFomori.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; /** * @@ -28,7 +27,7 @@ public final class RuhanOfTheFomori extends CardImpl { this.toughness = new MageInt(7); // At the beginning of combat on your turn, choose an opponent at random. Ruhan of the Fomori attacks that player this combat if able. - this.addAbility(new BeginningOfCombatTriggeredAbility(new AttackIfAbleTargetRandomOpponentSourceEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new AttackIfAbleTargetRandomOpponentSourceEffect())); } private RuhanOfTheFomori(final RuhanOfTheFomori card) { diff --git a/Mage.Sets/src/mage/cards/r/RuinLurkerBat.java b/Mage.Sets/src/mage/cards/r/RuinLurkerBat.java index 184bcfa1405..4e6fe531477 100644 --- a/Mage.Sets/src/mage/cards/r/RuinLurkerBat.java +++ b/Mage.Sets/src/mage/cards/r/RuinLurkerBat.java @@ -1,7 +1,7 @@ package mage.cards.r; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.DescendedThisTurnCondition; import mage.abilities.dynamicvalue.common.DescendedThisTurnCount; import mage.abilities.effects.keyword.ScryEffect; @@ -36,8 +36,8 @@ public final class RuinLurkerBat extends CardImpl { // At the beginning of your end step, if you descended this turn, scry 1. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ScryEffect(1, false), TargetController.YOU, - DescendedThisTurnCondition.instance, false + TargetController.YOU, new ScryEffect(1, false), + false, DescendedThisTurnCondition.instance ).addHint(DescendedThisTurnCount.getHint()), new DescendedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/r/RuinRaider.java b/Mage.Sets/src/mage/cards/r/RuinRaider.java index 488065ad043..80449a637c7 100644 --- a/Mage.Sets/src/mage/cards/r/RuinRaider.java +++ b/Mage.Sets/src/mage/cards/r/RuinRaider.java @@ -2,7 +2,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.RaidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.RevealPutInHandLoseLifeEffect; @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.watchers.common.PlayerAttackedWatcher; import java.util.UUID; @@ -33,7 +32,7 @@ public final class RuinRaider extends CardImpl { // Raid — At the beginning of your end step, if you attacked this turn, reveal the top card of your library and put that card into your hand. You lose life equal to the card's converted mana cost. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new RevealPutInHandLoseLifeEffect(), TargetController.YOU, false + new RevealPutInHandLoseLifeEffect() ), RaidCondition.instance, "At the beginning of your end step, " + "if you attacked this turn, reveal the top card of your library " + "and put that card into your hand. You lose life equal to the card's mana value." diff --git a/Mage.Sets/src/mage/cards/s/SabertoothMauler.java b/Mage.Sets/src/mage/cards/s/SabertoothMauler.java index abd3aa20b38..3e78ae0031e 100644 --- a/Mage.Sets/src/mage/cards/s/SabertoothMauler.java +++ b/Mage.Sets/src/mage/cards/s/SabertoothMauler.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.UntapSourceEffect; @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import java.util.UUID; @@ -33,7 +32,7 @@ public final class SabertoothMauler extends CardImpl { Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance() - ), TargetController.YOU, false + ) ), MorbidCondition.instance, "At the beginning of your end step, " + "if a creature died this turn, put a +1/+1 counter on {this} and untap it." ); diff --git a/Mage.Sets/src/mage/cards/s/SafanaCalimportCutthroat.java b/Mage.Sets/src/mage/cards/s/SafanaCalimportCutthroat.java index 9aeee31acc8..8e532504c03 100644 --- a/Mage.Sets/src/mage/cards/s/SafanaCalimportCutthroat.java +++ b/Mage.Sets/src/mage/cards/s/SafanaCalimportCutthroat.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.ChooseABackgroundAbility; import mage.abilities.condition.common.CompletedDungeonCondition; import mage.abilities.condition.common.HaveInitiativeCondition; @@ -39,13 +39,13 @@ public final class SafanaCalimportCutthroat extends CardImpl { // At the beginning of your end step, if you have the initiative, create a Treasure token. If you've completed a dungeon, create three of those tokens instead. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ConditionalOneShotEffect( + TargetController.YOU, new ConditionalOneShotEffect( new CreateTokenEffect(new TreasureToken(), 3), new CreateTokenEffect(new TreasureToken()), CompletedDungeonCondition.instance, "create a Treasure token. " + "If you've completed a dungeon, create three of those tokens instead" ), - TargetController.YOU, HaveInitiativeCondition.instance, false + false, HaveInitiativeCondition.instance ).addHint(CompletedDungeonCondition.getHint()).addHint(InitiativeHint.instance), new CompletedDungeonWatcher()); // Choose a Background diff --git a/Mage.Sets/src/mage/cards/s/SamLoyalAttendant.java b/Mage.Sets/src/mage/cards/s/SamLoyalAttendant.java index d633304eee5..d75760526ca 100644 --- a/Mage.Sets/src/mage/cards/s/SamLoyalAttendant.java +++ b/Mage.Sets/src/mage/cards/s/SamLoyalAttendant.java @@ -36,7 +36,7 @@ public final class SamLoyalAttendant extends CardImpl { // At the beginning of combat on your turn, create a Food token. this.addAbility(new BeginningOfCombatTriggeredAbility( - new CreateTokenEffect(new FoodToken()), false + new CreateTokenEffect(new FoodToken()) )); // Activated abilities of Foods you control cost {1} less to activate. diff --git a/Mage.Sets/src/mage/cards/s/SanctumOfCalmWaters.java b/Mage.Sets/src/mage/cards/s/SanctumOfCalmWaters.java index f8a84096699..1f4696f4578 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumOfCalmWaters.java +++ b/Mage.Sets/src/mage/cards/s/SanctumOfCalmWaters.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; @@ -38,8 +37,8 @@ public final class SanctumOfCalmWaters extends CardImpl { // At the beginning of your precombat main phase, you may draw X cards, where X is the number of Shrines you control. If you do, discard a card. Ability ability = new BeginningOfFirstMainTriggeredAbility(new DrawCardSourceControllerEffect(xValue) - .setText("you may draw X cards, where X is the number of Shrines you control"), - true) + .setText("you may draw X cards, where X is the number of Shrines you control"), true + ) .addHint(new ValueHint("Shrines you control", xValue)); ability.addEffect(new DiscardControllerEffect(1).setText("If you do, discard a card")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SanctumOfFruitfulHarvest.java b/Mage.Sets/src/mage/cards/s/SanctumOfFruitfulHarvest.java index 62f71b38bcd..049e03d2f0f 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumOfFruitfulHarvest.java +++ b/Mage.Sets/src/mage/cards/s/SanctumOfFruitfulHarvest.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; @@ -41,8 +40,8 @@ public final class SanctumOfFruitfulHarvest extends CardImpl { Mana.AnyMana(1), xValue, "add X mana of any one color, where X is the number of Shrines you control", - true), - false) + true) + ) .addHint(new ValueHint("Shrines you control", xValue))); } diff --git a/Mage.Sets/src/mage/cards/s/SanctumOfStoneFangs.java b/Mage.Sets/src/mage/cards/s/SanctumOfStoneFangs.java index 92808c52645..b21aa11d119 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumOfStoneFangs.java +++ b/Mage.Sets/src/mage/cards/s/SanctumOfStoneFangs.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; @@ -38,8 +37,8 @@ public final class SanctumOfStoneFangs extends CardImpl { // At the beginning of your precombat main phase, each opponent loses X life and you gain X life, where X is the number of Shrines you control. Ability ability = new BeginningOfFirstMainTriggeredAbility( - new LoseLifeOpponentsEffect(xValue).setText("each opponent loses X life"), - false) + new LoseLifeOpponentsEffect(xValue).setText("each opponent loses X life") + ) .addHint(new ValueHint("Shrines you control", xValue)); ability.addEffect(new GainLifeEffect(xValue).setText("and you gain X life, where X is the number of Shrines you control")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SandsteppeWarRiders.java b/Mage.Sets/src/mage/cards/s/SandsteppeWarRiders.java index 0e98fe3cee5..8f18224eb1c 100644 --- a/Mage.Sets/src/mage/cards/s/SandsteppeWarRiders.java +++ b/Mage.Sets/src/mage/cards/s/SandsteppeWarRiders.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.predicate.permanent.TokenPredicate; @@ -40,7 +39,7 @@ public final class SandsteppeWarRiders extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // At the beginning of combat on your turn, bolster X, where X is the number of differently named artifact tokens you control. - this.addAbility(new BeginningOfCombatTriggeredAbility(new BolsterEffect(SandsteppeWarRidersValue.instance), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new BolsterEffect(SandsteppeWarRidersValue.instance))); } private SandsteppeWarRiders(final SandsteppeWarRiders card) { diff --git a/Mage.Sets/src/mage/cards/s/SandwurmConvergence.java b/Mage.Sets/src/mage/cards/s/SandwurmConvergence.java index f5b92d0e78d..6188da66652 100644 --- a/Mage.Sets/src/mage/cards/s/SandwurmConvergence.java +++ b/Mage.Sets/src/mage/cards/s/SandwurmConvergence.java @@ -1,6 +1,6 @@ package mage.cards.s; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.combat.CantAttackYouAllEffect; @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.permanent.token.Wurm55Token; @@ -34,7 +33,7 @@ public final class SandwurmConvergence extends CardImpl { this.addAbility(new SimpleStaticAbility(new CantAttackYouAllEffect(Duration.WhileOnBattlefield, filter, true))); // At the beginning of your end step, create a 5/5 green Wurm creature token. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new Wurm55Token()), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new Wurm55Token()))); } private SandwurmConvergence(final SandwurmConvergence card) { diff --git a/Mage.Sets/src/mage/cards/s/SanguineSpy.java b/Mage.Sets/src/mage/cards/s/SanguineSpy.java index 908f4d77282..799e7640e67 100644 --- a/Mage.Sets/src/mage/cards/s/SanguineSpy.java +++ b/Mage.Sets/src/mage/cards/s/SanguineSpy.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.DifferentManaValuesInGraveCondition; import mage.abilities.costs.common.PayLifeCost; @@ -49,9 +49,8 @@ public final class SanguineSpy extends CardImpl { // At the beginning of your end step, if there are five or more mana values among cards in your graveyard, you may pay 2 life. If you do, draw a card. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfYourEndStepTriggeredAbility( - new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new PayLifeCost(2)), - false + new BeginningOfEndStepTriggeredAbility( + new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new PayLifeCost(2)) ), DifferentManaValuesInGraveCondition.FIVE, "At the beginning of your end step, if there are " + "five or more mana values among cards in your graveyard, you may pay 2 life. If you do, draw a card." ).addHint(DifferentManaValuesInGraveHint.instance)); diff --git a/Mage.Sets/src/mage/cards/s/SarevokDeathbringer.java b/Mage.Sets/src/mage/cards/s/SarevokDeathbringer.java index b6afc49f838..c7fb7a6b0a4 100644 --- a/Mage.Sets/src/mage/cards/s/SarevokDeathbringer.java +++ b/Mage.Sets/src/mage/cards/s/SarevokDeathbringer.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.ChooseABackgroundAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.InvertCondition; @@ -35,8 +35,8 @@ public final class SarevokDeathbringer extends CardImpl { // At the beginning of each player's end step, if no permanents left the battlefield this turn, that player loses X life, where X is Sarevok's power. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new LoseLifeTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE), TargetController.EACH_PLAYER, - new InvertCondition(SarevokDeathbringerCondition.instance), false + TargetController.EACH_PLAYER, new LoseLifeTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE), + false, new InvertCondition(SarevokDeathbringerCondition.instance) ), new RevoltWatcher()); // Choose a Background diff --git a/Mage.Sets/src/mage/cards/s/SavageGorger.java b/Mage.Sets/src/mage/cards/s/SavageGorger.java index 50c7c156c96..39ddc7c630f 100644 --- a/Mage.Sets/src/mage/cards/s/SavageGorger.java +++ b/Mage.Sets/src/mage/cards/s/SavageGorger.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.OpponentsLostLifeCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import java.util.UUID; @@ -34,7 +33,7 @@ public final class SavageGorger extends CardImpl { // At the beginning of your upkeep, if an opponent lost life this turn, put a +1/+1 counter on Savage Gorger. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility(new AddCountersSourceEffect( - CounterType.P1P1.createInstance()), TargetController.YOU, false + CounterType.P1P1.createInstance()) ), OpponentsLostLifeCondition.instance, "At the beginning of your end step, " + "if an opponent lost life this turn, put a +1/+1 counter on {this}." ).addHint(OpponentsLostLifeHint.instance)); diff --git a/Mage.Sets/src/mage/cards/s/SawbladeSkinripper.java b/Mage.Sets/src/mage/cards/s/SawbladeSkinripper.java index 9c0d15130af..4b23c0010df 100644 --- a/Mage.Sets/src/mage/cards/s/SawbladeSkinripper.java +++ b/Mage.Sets/src/mage/cards/s/SawbladeSkinripper.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.common.SacrificeTargetCost; @@ -50,8 +50,8 @@ public final class SawbladeSkinripper extends CardImpl { // At the beginning of your end step, if you sacrificed one or more permanents this turn, Sawblade Skinripper deals that much damage to any target. ability = new BeginningOfEndStepTriggeredAbility( - new DamageTargetEffect(SawbladeSkinripperValue.instance), TargetController.YOU, - SawbladeSkinripperCondition.instance, false + TargetController.YOU, new DamageTargetEffect(SawbladeSkinripperValue.instance), + false, SawbladeSkinripperCondition.instance ); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new PermanentsSacrificedWatcher()); diff --git a/Mage.Sets/src/mage/cards/s/ScavengersTalent.java b/Mage.Sets/src/mage/cards/s/ScavengersTalent.java index c695f98e3fc..65d8e49248f 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengersTalent.java +++ b/Mage.Sets/src/mage/cards/s/ScavengersTalent.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.SacrificePermanentTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -19,7 +19,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; @@ -80,7 +79,7 @@ public final class ScavengersTalent extends CardImpl { new BeginningOfEndStepTriggeredAbility( new DoIfCostPaid( new ScavengersTalentEffect(), new SacrificeTargetCost(3, filter) - ), TargetController.YOU, false + ) ), 3 ))); } diff --git a/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java b/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java index d7a0fc21537..d09225cc010 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java +++ b/Mage.Sets/src/mage/cards/s/ScavengingGhoul.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.dynamicvalue.common.CreaturesDiedThisTurnCount; @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; -import mage.watchers.common.CreaturesDiedWatcher; /** * @@ -32,8 +31,8 @@ public final class ScavengingGhoul extends CardImpl { this.toughness = new MageInt(2); // At the beginning of each end step, put a corpse counter on Scavenging Ghoul for each creature that died this turn. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.CORPSE.createInstance(), - CreaturesDiedThisTurnCount.instance, true), TargetController.ANY, false).addHint(CreaturesDiedThisTurnHint.instance)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new AddCountersSourceEffect(CounterType.CORPSE.createInstance(), + CreaturesDiedThisTurnCount.instance, true), false).addHint(CreaturesDiedThisTurnHint.instance)); // Remove a corpse counter from Scavenging Ghoul: Regenerate Scavenging Ghoul. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.CORPSE.createInstance()))); diff --git a/Mage.Sets/src/mage/cards/s/ScuttlingButler.java b/Mage.Sets/src/mage/cards/s/ScuttlingButler.java index 51877e49959..ac709ef1e0a 100644 --- a/Mage.Sets/src/mage/cards/s/ScuttlingButler.java +++ b/Mage.Sets/src/mage/cards/s/ScuttlingButler.java @@ -37,7 +37,7 @@ public final class ScuttlingButler extends CardImpl { // At the beginning of combat on your turn, if you control two or more multicolored permanents, Scuttling Butler gains double strike until end of turn. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfCombatTriggeredAbility(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn), false), + new BeginningOfCombatTriggeredAbility(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn)), condition, "At the beginning of combat on your turn, if you control two or more multicolored permanents, {this} gains double strike until end of turn." )); diff --git a/Mage.Sets/src/mage/cards/s/SeanceBoard.java b/Mage.Sets/src/mage/cards/s/SeanceBoard.java index c75276bff5c..fbb284c11da 100644 --- a/Mage.Sets/src/mage/cards/s/SeanceBoard.java +++ b/Mage.Sets/src/mage/cards/s/SeanceBoard.java @@ -6,7 +6,7 @@ import java.util.UUID; import mage.Mana; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -36,10 +36,8 @@ public final class SeanceBoard extends CardImpl { // Morbid -- At the beginning of each end step, if a creature died this turn, put a soul counter on Seance Board. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.SOUL.createInstance()), - TargetController.ANY, - MorbidCondition.instance, - false + TargetController.ANY, new AddCountersSourceEffect(CounterType.SOUL.createInstance()), + false, MorbidCondition.instance ).addHint(MorbidHint.instance).setAbilityWord(AbilityWord.MORBID)); // {T}: Add X mana of any one color, where X is the number of soul counters on Seance Board. diff --git a/Mage.Sets/src/mage/cards/s/SearslicerGoblin.java b/Mage.Sets/src/mage/cards/s/SearslicerGoblin.java index 88cc2899dde..58052dfb06e 100644 --- a/Mage.Sets/src/mage/cards/s/SearslicerGoblin.java +++ b/Mage.Sets/src/mage/cards/s/SearslicerGoblin.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.RaidCondition; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -30,8 +30,8 @@ public final class SearslicerGoblin extends CardImpl { // Raid -- At the beginning of your end step, if you attacked this turn, create a 1/1 red Goblin creature token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new GoblinToken()), TargetController.YOU, - RaidCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new GoblinToken()), + false, RaidCondition.instance ).setAbilityWord(AbilityWord.RAID), new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/SeasonOfTheWitch.java b/Mage.Sets/src/mage/cards/s/SeasonOfTheWitch.java index 9414462089b..445cf78037d 100644 --- a/Mage.Sets/src/mage/cards/s/SeasonOfTheWitch.java +++ b/Mage.Sets/src/mage/cards/s/SeasonOfTheWitch.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.PayLifeCost; @@ -42,7 +42,7 @@ public final class SeasonOfTheWitch extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(cost))); // At the beginning of the end step, destroy all untapped creatures that didn't attack this turn, except for creatures that couldn't attack. - Ability ability = new BeginningOfEndStepTriggeredAbility(new SeasonOfTheWitchEffect(), TargetController.ANY, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new SeasonOfTheWitchEffect(), false); ability.addWatcher(new CouldAttackThisTurnWatcher()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SeeRed.java b/Mage.Sets/src/mage/cards/s/SeeRed.java index 09732734f03..f2c706af023 100644 --- a/Mage.Sets/src/mage/cards/s/SeeRed.java +++ b/Mage.Sets/src/mage/cards/s/SeeRed.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.RaidCondition; @@ -55,7 +55,7 @@ public final class SeeRed extends CardImpl { // At the beginning of your end step, if you didn't attack with a creature this turn, sacrifice See Red. ability = new ConditionalInterveningIfTriggeredAbility( - new BeginningOfYourEndStepTriggeredAbility(new SacrificeSourceEffect(), false), + new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect()), new InvertCondition(RaidCondition.instance), "At the beginning of your end step, if you didn't attack with a creature this turn, sacrifice {this}." ); diff --git a/Mage.Sets/src/mage/cards/s/SentryBot.java b/Mage.Sets/src/mage/cards/s/SentryBot.java index 13a991ea907..6796385afdc 100644 --- a/Mage.Sets/src/mage/cards/s/SentryBot.java +++ b/Mage.Sets/src/mage/cards/s/SentryBot.java @@ -17,7 +17,6 @@ import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.StaticFilters; @@ -56,8 +55,8 @@ public final class SentryBot extends CardImpl { new AddCountersAllEffect( CounterType.P1P1.createInstance(), StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED), - new PayEnergyCost(3)), - false)); + new PayEnergyCost(3)) + )); } private SentryBot(final SentryBot card) { diff --git a/Mage.Sets/src/mage/cards/s/SentryOak.java b/Mage.Sets/src/mage/cards/s/SentryOak.java index eddc97545f6..c9b263a9a95 100644 --- a/Mage.Sets/src/mage/cards/s/SentryOak.java +++ b/Mage.Sets/src/mage/cards/s/SentryOak.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.game.Game; /** diff --git a/Mage.Sets/src/mage/cards/s/ShadrixSilverquill.java b/Mage.Sets/src/mage/cards/s/ShadrixSilverquill.java index de585fa998e..1d4d3e793a6 100644 --- a/Mage.Sets/src/mage/cards/s/ShadrixSilverquill.java +++ b/Mage.Sets/src/mage/cards/s/ShadrixSilverquill.java @@ -56,7 +56,7 @@ public final class ShadrixSilverquill extends CardImpl { this.addAbility(DoubleStrikeAbility.getInstance()); // At the beginning of combat on your turn, you may choose two. Each mode must target a different player. - Ability ability = new BeginningOfCombatTriggeredAbility(null, false); + Ability ability = new BeginningOfCombatTriggeredAbility(null); ability.getModes().setMinModes(2); ability.getModes().setMaxModes(2); ability.getModes().setMaxModesFilter(filter0); diff --git a/Mage.Sets/src/mage/cards/s/ShannaPurifyingBlade.java b/Mage.Sets/src/mage/cards/s/ShannaPurifyingBlade.java index 872092db507..311d0a45542 100644 --- a/Mage.Sets/src/mage/cards/s/ShannaPurifyingBlade.java +++ b/Mage.Sets/src/mage/cards/s/ShannaPurifyingBlade.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.common.ControllerGainedLifeCount; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.LifelinkAbility; @@ -35,7 +35,7 @@ public final class ShannaPurifyingBlade extends CardImpl { // At the beginning of your end step, you may pay {X}. If you do, draw X cards. X can't be greater than the amount of life you gained this turn. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ShannaPurifyingBladeEffect(), TargetController.YOU, false + new ShannaPurifyingBladeEffect() ).addHint(ControllerGainedLifeCount.getHint()), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/ShatterskullCharger.java b/Mage.Sets/src/mage/cards/s/ShatterskullCharger.java index 7a11c1c79f3..626b8bac5a0 100644 --- a/Mage.Sets/src/mage/cards/s/ShatterskullCharger.java +++ b/Mage.Sets/src/mage/cards/s/ShatterskullCharger.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.InvertCondition; @@ -17,7 +17,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import java.util.UUID; @@ -56,8 +55,7 @@ public final class ShatterskullCharger extends CardImpl { // At the beginning of your end step, if Shatterskull Charger doesn't have a +1/+1 counter on it, return it to its owner's hand. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new ReturnToHandSourceEffect(true), - TargetController.YOU, false + new ReturnToHandSourceEffect(true) ), condition, "At the beginning of your end step, " + "if {this} doesn't have a +1/+1 counter on it, return it to its owner's hand." )); diff --git a/Mage.Sets/src/mage/cards/s/ShessraDeathsWhisper.java b/Mage.Sets/src/mage/cards/s/ShessraDeathsWhisper.java index 9ac93a5e6ee..30927b5b23b 100644 --- a/Mage.Sets/src/mage/cards/s/ShessraDeathsWhisper.java +++ b/Mage.Sets/src/mage/cards/s/ShessraDeathsWhisper.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.costs.common.PayLifeCost; @@ -39,8 +39,8 @@ public final class ShessraDeathsWhisper extends CardImpl { // Whispers of the Grave — At the beginning of your end step, if a creature died this turn, you may pay 2 life. If you do, draw a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new DoIfCostPaid(new DrawCardSourceControllerEffect(1), - new PayLifeCost(2)), TargetController.YOU, MorbidCondition.instance, false + TargetController.YOU, new DoIfCostPaid(new DrawCardSourceControllerEffect(1), + new PayLifeCost(2)), false, MorbidCondition.instance ).addHint(MorbidHint.instance).withFlavorWord("Whispers of the Grave")); } diff --git a/Mage.Sets/src/mage/cards/s/ShortcutToMushrooms.java b/Mage.Sets/src/mage/cards/s/ShortcutToMushrooms.java index d89b0c5a666..e48476fbe99 100644 --- a/Mage.Sets/src/mage/cards/s/ShortcutToMushrooms.java +++ b/Mage.Sets/src/mage/cards/s/ShortcutToMushrooms.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -29,8 +29,8 @@ public final class ShortcutToMushrooms extends CardImpl { // At the beginning of your end step, if a permanent you controlled left the battlefield this turn, put a +1/+1 counter on target creature you control. Ability ability = new BeginningOfEndStepTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), - TargetController.YOU, RevoltCondition.instance, false + TargetController.YOU, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), + false, RevoltCondition.instance ).addHint(RevoltCondition.getHint()); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability, new RevoltWatcher()); diff --git a/Mage.Sets/src/mage/cards/s/SiegeGangLieutenant.java b/Mage.Sets/src/mage/cards/s/SiegeGangLieutenant.java index 10a198d998d..40832f59859 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeGangLieutenant.java +++ b/Mage.Sets/src/mage/cards/s/SiegeGangLieutenant.java @@ -42,7 +42,7 @@ public final class SiegeGangLieutenant extends CardImpl { // Lieutenant -- At the beginning of combat on your turn, if you control your commander, create two 1/1 red Goblin creature tokens. Those tokens gain haste until end of turn. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new SiegeGangLieutenantEffect(), false + new SiegeGangLieutenantEffect() ), CommanderInPlayCondition.instance, "At the beginning of combat on your turn, " + "if you control your commander, create two 1/1 red Goblin creature tokens. " + "Those tokens gain haste until end of turn." diff --git a/Mage.Sets/src/mage/cards/s/SiegeVeteran.java b/Mage.Sets/src/mage/cards/s/SiegeVeteran.java index 981a189e2bb..c0fa83ab22c 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeVeteran.java +++ b/Mage.Sets/src/mage/cards/s/SiegeVeteran.java @@ -11,7 +11,6 @@ import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.AnotherPredicate; @@ -43,7 +42,7 @@ public final class SiegeVeteran extends CardImpl { // At the beginning of combat on your turn, put a +1/+1 counter on target creature you control. Ability ability = new BeginningOfCombatTriggeredAbility( - new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false + new AddCountersTargetEffect(CounterType.P1P1.createInstance()) ); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SigardianZealot.java b/Mage.Sets/src/mage/cards/s/SigardianZealot.java index 4377cf01b7b..c1001938246 100644 --- a/Mage.Sets/src/mage/cards/s/SigardianZealot.java +++ b/Mage.Sets/src/mage/cards/s/SigardianZealot.java @@ -36,7 +36,7 @@ public final class SigardianZealot extends CardImpl { // At the beginning of combat on your turn, choose any number of creatures with different powers. Each of them gets +X/+X and gains vigilance until end of turn, where X is Sigardian Zealot's power. this.addAbility(new BeginningOfCombatTriggeredAbility( - new SigardianZealotEffect(), false + new SigardianZealotEffect() )); } diff --git a/Mage.Sets/src/mage/cards/s/SightOfTheScalelords.java b/Mage.Sets/src/mage/cards/s/SightOfTheScalelords.java index d1ad010ee4c..addc5e75e21 100644 --- a/Mage.Sets/src/mage/cards/s/SightOfTheScalelords.java +++ b/Mage.Sets/src/mage/cards/s/SightOfTheScalelords.java @@ -35,7 +35,7 @@ public final class SightOfTheScalelords extends CardImpl { // At the beginning of combat on your turn, creature you control with toughness 4 or greater get +2/+2 and gain vigilance until end of turn. Effect effect = new BoostControlledEffect(2, 2, Duration.EndOfTurn, filter, false); effect.setText("creatures you control with toughness 4 or greater get +2/+2"); - Ability ability = new BeginningOfCombatTriggeredAbility(effect, false); + Ability ability = new BeginningOfCombatTriggeredAbility(effect); effect = new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn, filter); effect.setText("and gain vigilance until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SigilOfMyrkul.java b/Mage.Sets/src/mage/cards/s/SigilOfMyrkul.java index cb3573ff204..6cb3b80a05d 100644 --- a/Mage.Sets/src/mage/cards/s/SigilOfMyrkul.java +++ b/Mage.Sets/src/mage/cards/s/SigilOfMyrkul.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.Game; @@ -40,7 +39,7 @@ public final class SigilOfMyrkul extends CardImpl { // At the beginning of combat on your turn, mill a card. When you do, if there are four or more creature cards in your graveyard, put a +1/+1 counter on target creature you control and it gains deathtouch until end of turn. this.addAbility(new BeginningOfCombatTriggeredAbility( - new SigilOfMyrkulEffect(), false + new SigilOfMyrkulEffect() ).addHint(hint)); } diff --git a/Mage.Sets/src/mage/cards/s/SilversmoteGhoul.java b/Mage.Sets/src/mage/cards/s/SilversmoteGhoul.java index ceb5b9494f9..e9402b91165 100644 --- a/Mage.Sets/src/mage/cards/s/SilversmoteGhoul.java +++ b/Mage.Sets/src/mage/cards/s/SilversmoteGhoul.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; @@ -39,8 +39,8 @@ public final class SilversmoteGhoul extends CardImpl { // At the beginning of your end step, if you gained 3 or more life this turn, return Silversmote Ghoul from your graveyard to the battlefield tapped. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true), - TargetController.YOU, null, false + Zone.GRAVEYARD, TargetController.YOU, new ReturnSourceFromGraveyardToBattlefieldEffect(true), + false, null ), condition, "At the beginning of your end step, " + "if you gained 3 or more life this turn, return {this} from your graveyard to the battlefield tapped." ).addHint(hint), new PlayerGainedLifeWatcher()); diff --git a/Mage.Sets/src/mage/cards/s/SinisterMonolith.java b/Mage.Sets/src/mage/cards/s/SinisterMonolith.java index 5f9945fd26f..4c509b1b852 100644 --- a/Mage.Sets/src/mage/cards/s/SinisterMonolith.java +++ b/Mage.Sets/src/mage/cards/s/SinisterMonolith.java @@ -12,7 +12,6 @@ import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import java.util.UUID; @@ -26,7 +25,7 @@ public final class SinisterMonolith extends CardImpl { // At the beginning of combat on your turn, each opponent loses 1 life and you gain 1 life. Ability ability = new BeginningOfCombatTriggeredAbility( - new LoseLifeOpponentsEffect(1), false + new LoseLifeOpponentsEffect(1) ); ability.addEffect(new GainLifeEffect(1).concatBy("and")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SireOfInsanity.java b/Mage.Sets/src/mage/cards/s/SireOfInsanity.java index 8e1b19ef579..636dcc7a4fa 100644 --- a/Mage.Sets/src/mage/cards/s/SireOfInsanity.java +++ b/Mage.Sets/src/mage/cards/s/SireOfInsanity.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -29,7 +29,7 @@ public final class SireOfInsanity extends CardImpl { // At the beginning of each end step, each player discards their hand. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new SireOfInsanityEffect(), TargetController.ANY, false + TargetController.ANY, new SireOfInsanityEffect(), false )); } diff --git a/Mage.Sets/src/mage/cards/s/SkeletalSwarming.java b/Mage.Sets/src/mage/cards/s/SkeletalSwarming.java index f4b25ce6b51..629cbef7714 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalSwarming.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalSwarming.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -20,7 +20,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -59,7 +58,7 @@ public final class SkeletalSwarming extends CardImpl { new CreateTokenEffect(new SkeletonToken(), 1, true, false), MorbidCondition.instance, "create a tapped 1/1 black Skeleton creature token. " + "If a creature died this turn, create two of those tokens instead" - ), TargetController.YOU, false + ) ).addHint(MorbidHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/Skizzik.java b/Mage.Sets/src/mage/cards/s/Skizzik.java index bbee5fbc16b..ba22598c761 100644 --- a/Mage.Sets/src/mage/cards/s/Skizzik.java +++ b/Mage.Sets/src/mage/cards/s/Skizzik.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -41,7 +41,7 @@ public final class Skizzik extends CardImpl { // At the beginning of the end step, if Skizzik wasn't kicked, sacrifice it. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.NEXT, false), + new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, new SacrificeSourceEffect(), false), new InvertCondition(KickedCondition.ONCE), "At the beginning of the end step, if {this} wasn't kicked, sacrifice it" )); diff --git a/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java b/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java index 1fdd2cf5371..380adff1391 100644 --- a/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java +++ b/Mage.Sets/src/mage/cards/s/SkyriderPatrol.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.target.TargetPermanent; @@ -46,7 +45,7 @@ public final class SkyriderPatrol extends CardImpl { ability.addTarget(new TargetPermanent(StaticFilters.FILTER_ANOTHER_CREATURE_YOU_CONTROL)); this.addAbility(new BeginningOfCombatTriggeredAbility(new DoWhenCostPaid( ability, new ManaCostsImpl<>("{G}{U}"), "Pay {G}{U}?" - ), false)); + ))); } private SkyriderPatrol(final SkyriderPatrol card) { diff --git a/Mage.Sets/src/mage/cards/s/SlimyDualleech.java b/Mage.Sets/src/mage/cards/s/SlimyDualleech.java index 8a1473f56c8..e8707d78d72 100644 --- a/Mage.Sets/src/mage/cards/s/SlimyDualleech.java +++ b/Mage.Sets/src/mage/cards/s/SlimyDualleech.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; @@ -41,8 +40,7 @@ public final class SlimyDualleech extends CardImpl { // At the beginning of combat on your turn, target creature you control with power 2 or less gets +1/+0 and gains deathtouch until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new BoostTargetEffect(1, 0) - .setText("target creature you control with power 2 or less gets +1/+0"), - false + .setText("target creature you control with power 2 or less gets +1/+0") ); ability.addEffect(new GainAbilityTargetEffect(DeathtouchAbility.getInstance()) .setText("and gains deathtouch until end of turn")); diff --git a/Mage.Sets/src/mage/cards/s/SmeagolHelpfulGuide.java b/Mage.Sets/src/mage/cards/s/SmeagolHelpfulGuide.java index 76d6304048c..a93d4b2e843 100644 --- a/Mage.Sets/src/mage/cards/s/SmeagolHelpfulGuide.java +++ b/Mage.Sets/src/mage/cards/s/SmeagolHelpfulGuide.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.TheRingTemptsYouTriggeredAbility; import mage.abilities.condition.common.CreatureDiedControlledCondition; import mage.abilities.effects.OneShotEffect; @@ -34,8 +34,8 @@ public final class SmeagolHelpfulGuide extends CardImpl { // At the beginning of your end step, if a creature died under your control this turn, the Ring tempts you. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new TheRingTemptsYouEffect(), TargetController.YOU, - CreatureDiedControlledCondition.instance, false + TargetController.YOU, new TheRingTemptsYouEffect(), + false, CreatureDiedControlledCondition.instance ).addHint(CreatureDiedControlledCondition.getHint())); // Whenever the Ring tempts you, target opponent reveals cards from the top of their library until they reveal diff --git a/Mage.Sets/src/mage/cards/s/SmugglersShare.java b/Mage.Sets/src/mage/cards/s/SmugglersShare.java index 13c9c7b0c7e..a0c76df073a 100644 --- a/Mage.Sets/src/mage/cards/s/SmugglersShare.java +++ b/Mage.Sets/src/mage/cards/s/SmugglersShare.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; @@ -34,7 +34,7 @@ public final class SmugglersShare extends CardImpl { // At the beginning of each end step, draw a card for each opponent who drew two or more cards this turn, then // create a Treasure token for each opponent who had two or more lands enter the battlefield under their control // this turn. - Ability ability = new BeginningOfEndStepTriggeredAbility(new DrawCardSourceControllerEffect(SmugglersShareDrawValue.instance), TargetController.EACH_PLAYER, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.EACH_PLAYER, new DrawCardSourceControllerEffect(SmugglersShareDrawValue.instance), false); ability.addEffect((new CreateTokenEffect(new TreasureToken(), SmugglersShareTreasureValue.instance)).concatBy(", then")); ability.addWatcher(new CardsAmountDrawnThisTurnWatcher()); ability.addWatcher(new PermanentsEnteredBattlefieldWatcher()); diff --git a/Mage.Sets/src/mage/cards/s/SokenzanSmelter.java b/Mage.Sets/src/mage/cards/s/SokenzanSmelter.java index 680979640d3..83856b0b9bc 100644 --- a/Mage.Sets/src/mage/cards/s/SokenzanSmelter.java +++ b/Mage.Sets/src/mage/cards/s/SokenzanSmelter.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.permanent.token.ConstructRedToken; @@ -37,7 +36,7 @@ public final class SokenzanSmelter extends CardImpl { new GenericManaCost(1), new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN), "pay {1} and sacrifice an artifact" ) - ), false)); + ))); } private SokenzanSmelter(final SokenzanSmelter card) { diff --git a/Mage.Sets/src/mage/cards/s/SolKanarTheTainted.java b/Mage.Sets/src/mage/cards/s/SolKanarTheTainted.java index 412a85341e7..95580c6ef51 100644 --- a/Mage.Sets/src/mage/cards/s/SolKanarTheTainted.java +++ b/Mage.Sets/src/mage/cards/s/SolKanarTheTainted.java @@ -3,7 +3,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Mode; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -50,7 +50,7 @@ public final class SolKanarTheTainted extends CardImpl { // At the beginning of your end step, choose one that hasn't been chosen -- // * Draw a card. Ability ability = new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), TargetController.YOU, false + new DrawCardSourceControllerEffect(1) ); ability.setModeTag("draw"); ability.getModes().setLimitUsageByOnce(false); diff --git a/Mage.Sets/src/mage/cards/s/SolemnRecruit.java b/Mage.Sets/src/mage/cards/s/SolemnRecruit.java index ead1d9f7ad9..430568a5d77 100644 --- a/Mage.Sets/src/mage/cards/s/SolemnRecruit.java +++ b/Mage.Sets/src/mage/cards/s/SolemnRecruit.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -34,9 +34,8 @@ public final class SolemnRecruit extends CardImpl { // Revolt — At the beginning of your end step, if a permanent you controlled left the battlefield this turn, put a +1/+1 counter on Solemn Recruit. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfYourEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - false + new BeginningOfEndStepTriggeredAbility( + new AddCountersSourceEffect(CounterType.P1P1.createInstance()) ), RevoltCondition.instance, "Revolt — At the beginning of your end step, if a permanent you controlled left the battlefield this turn, put a +1/+1 counter on {this}." diff --git a/Mage.Sets/src/mage/cards/s/SongOfCreation.java b/Mage.Sets/src/mage/cards/s/SongOfCreation.java index 6b50c97e950..284199252a5 100644 --- a/Mage.Sets/src/mage/cards/s/SongOfCreation.java +++ b/Mage.Sets/src/mage/cards/s/SongOfCreation.java @@ -1,6 +1,6 @@ package mage.cards.s; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import java.util.UUID; @@ -34,7 +33,7 @@ public final class SongOfCreation extends CardImpl { // At the beginning of your end step, discard your hand. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new DiscardHandControllerEffect(), TargetController.YOU, false + new DiscardHandControllerEffect() )); } diff --git a/Mage.Sets/src/mage/cards/s/Soulherder.java b/Mage.Sets/src/mage/cards/s/Soulherder.java index 00af50aa311..57c5499b6a7 100644 --- a/Mage.Sets/src/mage/cards/s/Soulherder.java +++ b/Mage.Sets/src/mage/cards/s/Soulherder.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.ZoneChangeTriggeredAbility; import mage.abilities.effects.common.ExileThenReturnTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -38,8 +38,8 @@ public final class Soulherder extends CardImpl { this.addAbility(new SoulherderTriggeredAbility()); // At the beginning of your end step, you may exile another target creature you control, then return that card to the battlefield under its owner's control. - Ability ability = new BeginningOfEndStepTriggeredAbility( - new ExileThenReturnTargetEffect(false, true), TargetController.YOU, true + Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, + new ExileThenReturnTargetEffect(false, true), true ); ability.addTarget(new TargetControlledCreaturePermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE_YOU_CONTROL)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SparkTrooper.java b/Mage.Sets/src/mage/cards/s/SparkTrooper.java index f557bbb7411..600545d9732 100644 --- a/Mage.Sets/src/mage/cards/s/SparkTrooper.java +++ b/Mage.Sets/src/mage/cards/s/SparkTrooper.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.LifelinkAbility; @@ -35,7 +35,7 @@ public final class SparkTrooper extends CardImpl { this.addAbility(HasteAbility.getInstance()); // At the beginning of the end step, sacrifice Spark Trooper. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.NEXT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, new SacrificeSourceEffect(), false)); } diff --git a/Mage.Sets/src/mage/cards/s/SpawnbedProtector.java b/Mage.Sets/src/mage/cards/s/SpawnbedProtector.java index 6bd32409a15..bb133dd8c0f 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnbedProtector.java +++ b/Mage.Sets/src/mage/cards/s/SpawnbedProtector.java @@ -2,14 +2,13 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.game.permanent.token.EldraziScionToken; @@ -37,7 +36,7 @@ public final class SpawnbedProtector extends CardImpl { // At the beginning of your end step, return up to one target Eldrazi creature card from your graveyard to your hand. Create two 1/1 colorless Eldrazi Scion creature tokens with "Sacrifice this creature: Add {C}." Ability ability = new BeginningOfEndStepTriggeredAbility( - new ReturnFromGraveyardToHandTargetEffect(), TargetController.YOU, false + new ReturnFromGraveyardToHandTargetEffect() ); ability.addEffect(new CreateTokenEffect(new EldraziScionToken(), 2)); ability.addTarget(new TargetCardInYourGraveyard(0, 1, filter)); diff --git a/Mage.Sets/src/mage/cards/s/SpellbookVendor.java b/Mage.Sets/src/mage/cards/s/SpellbookVendor.java index 65198aba75a..50b92c72853 100644 --- a/Mage.Sets/src/mage/cards/s/SpellbookVendor.java +++ b/Mage.Sets/src/mage/cards/s/SpellbookVendor.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.RoleType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -40,7 +39,7 @@ public final class SpellbookVendor extends CardImpl { ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(new BeginningOfCombatTriggeredAbility(new DoWhenCostPaid( ability, new GenericManaCost(1), "Pay {1}?" - ), false)); + ))); } private SpellbookVendor(final SpellbookVendor card) { diff --git a/Mage.Sets/src/mage/cards/s/SpellpyrePhoenix.java b/Mage.Sets/src/mage/cards/s/SpellpyrePhoenix.java index 91ab06ca19e..997c95da2e7 100644 --- a/Mage.Sets/src/mage/cards/s/SpellpyrePhoenix.java +++ b/Mage.Sets/src/mage/cards/s/SpellpyrePhoenix.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; @@ -56,8 +56,8 @@ public final class SpellpyrePhoenix extends CardImpl { // At the beginning of each end step, if you cycled two or more cards this turn, return Spellpyre Phoenix from your graveyard to your hand. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), - TargetController.ANY, SpellpyrePhoenixCondition.instance, false + Zone.GRAVEYARD, TargetController.ANY, new ReturnSourceFromGraveyardToHandEffect(), + false, SpellpyrePhoenixCondition.instance ).addHint(SpellpyrePhoenixHint.instance), new SpellpyrePhoenixWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/SphinxSovereign.java b/Mage.Sets/src/mage/cards/s/SphinxSovereign.java index b8698a2c07c..8608d812c34 100644 --- a/Mage.Sets/src/mage/cards/s/SphinxSovereign.java +++ b/Mage.Sets/src/mage/cards/s/SphinxSovereign.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; @@ -32,7 +32,7 @@ public final class SphinxSovereign extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // At the beginning of your end step, you gain 3 life if Sphinx Sovereign is untapped. Otherwise, each opponent loses 3 life. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new SphinxSovereignEffect(), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new SphinxSovereignEffect())); } private SphinxSovereign(final SphinxSovereign card) { diff --git a/Mage.Sets/src/mage/cards/s/SpinyStarfish.java b/Mage.Sets/src/mage/cards/s/SpinyStarfish.java index 1ab9736296c..b0bab22a115 100644 --- a/Mage.Sets/src/mage/cards/s/SpinyStarfish.java +++ b/Mage.Sets/src/mage/cards/s/SpinyStarfish.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,10 +41,9 @@ public final class SpinyStarfish extends CardImpl { this.addAbility( new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect( + TargetController.ANY, new CreateTokenEffect( new StarfishToken(), new SpinyStarfishDynamicValue()), - TargetController.ANY, false), SpinyStarfishCondition.instance, "At the beginning of each end step, if {this} regenerated this turn, create a 0/1 blue Starfish creature token for each time it regenerated this turn."), diff --git a/Mage.Sets/src/mage/cards/s/SpiritSistersCall.java b/Mage.Sets/src/mage/cards/s/SpiritSistersCall.java index 667978d40c1..d6414f6bd71 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritSistersCall.java +++ b/Mage.Sets/src/mage/cards/s/SpiritSistersCall.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.ContinuousEffect; @@ -41,7 +41,7 @@ public final class SpiritSistersCall extends CardImpl { // At the beginning of your end step, choose target permanent card in your graveyard. // You may sacrifice a permanent that shares a card type with the chosen card. // If you do, return the chosen card from your graveyard to the battlefield and it gains "If this permanent would leave the battlefield, exile it instead of putting it anywhere else." - Ability ability = new BeginningOfYourEndStepTriggeredAbility(new SpiritSistersCallDoIfEffect(), false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new SpiritSistersCallDoIfEffect()); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SproutbackTrudge.java b/Mage.Sets/src/mage/cards/s/SproutbackTrudge.java index ecc81c8bc9f..b8f91a82c5b 100644 --- a/Mage.Sets/src/mage/cards/s/SproutbackTrudge.java +++ b/Mage.Sets/src/mage/cards/s/SproutbackTrudge.java @@ -2,9 +2,8 @@ package mage.cards.s; import mage.ApprovingObject; import mage.MageInt; -import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; @@ -47,7 +46,7 @@ public final class SproutbackTrudge extends CardImpl { // At the beginning of your end step, if you gained life this turn, you may cast Sproutback Trudge from your graveyard. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.GRAVEYARD, new SproutbackTrudgeEffect(), TargetController.YOU, condition, true + Zone.GRAVEYARD, TargetController.YOU, new SproutbackTrudgeEffect(), true, condition )); } diff --git a/Mage.Sets/src/mage/cards/s/SquadCommander.java b/Mage.Sets/src/mage/cards/s/SquadCommander.java index 36188363751..a4974b9e741 100644 --- a/Mage.Sets/src/mage/cards/s/SquadCommander.java +++ b/Mage.Sets/src/mage/cards/s/SquadCommander.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.permanent.token.KorWarriorToken; @@ -46,7 +45,7 @@ public final class SquadCommander extends CardImpl { new BeginningOfCombatTriggeredAbility( new BoostControlledEffect( 1, 0, Duration.EndOfTurn - ), false + ) ), FullPartyCondition.instance, "At the beginning of combat on your turn, " + "if you have a full party, creatures you control get +1/+0 and gain indestructible until end of turn." ); diff --git a/Mage.Sets/src/mage/cards/s/StalactiteStalker.java b/Mage.Sets/src/mage/cards/s/StalactiteStalker.java index 15ac5396947..e2bd5b37dcc 100644 --- a/Mage.Sets/src/mage/cards/s/StalactiteStalker.java +++ b/Mage.Sets/src/mage/cards/s/StalactiteStalker.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.DescendedThisTurnCondition; import mage.abilities.costs.common.SacrificeSourceCost; @@ -45,8 +45,8 @@ public final class StalactiteStalker extends CardImpl { // At the beginning of your end step, if you descended this turn, put a +1/+1 counter on Stalactite Stalker. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - TargetController.YOU, DescendedThisTurnCondition.instance, false + TargetController.YOU, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), + false, DescendedThisTurnCondition.instance ).addHint(DescendedThisTurnCount.getHint()), new DescendedWatcher()); // {2}{B}, Sacrifice Stalactite Stalker: Target creature gets -X/-X until end of turn, where X is Stalactite Stalker's power. diff --git a/Mage.Sets/src/mage/cards/s/StalwartPathlighter.java b/Mage.Sets/src/mage/cards/s/StalwartPathlighter.java index defdc278802..5bc9270cbb8 100644 --- a/Mage.Sets/src/mage/cards/s/StalwartPathlighter.java +++ b/Mage.Sets/src/mage/cards/s/StalwartPathlighter.java @@ -36,7 +36,7 @@ public final class StalwartPathlighter extends CardImpl { new BeginningOfCombatTriggeredAbility(new GainAbilityControlledEffect( IndestructibleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURE - ), false), CovenCondition.instance, "At the beginning " + + )), CovenCondition.instance, "At the beginning " + "of combat on your turn, if you control three or more creatures with different powers, " + "creatures you control gain indestructible until end of turn." ).addHint(CovenHint.instance).setAbilityWord(AbilityWord.COVEN)); diff --git a/Mage.Sets/src/mage/cards/s/StandOrFall.java b/Mage.Sets/src/mage/cards/s/StandOrFall.java index e2d321104fb..d9aa5f889b3 100644 --- a/Mage.Sets/src/mage/cards/s/StandOrFall.java +++ b/Mage.Sets/src/mage/cards/s/StandOrFall.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -34,7 +33,7 @@ public final class StandOrFall extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); // At the beginning of combat on your turn, for each defending player, separate all creatures that player controls into two piles and that player chooses one. Only creatures in the chosen piles can block this turn. - this.addAbility(new BeginningOfCombatTriggeredAbility(new StandOrFallEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new StandOrFallEffect())); } private StandOrFall(final StandOrFall card) { diff --git a/Mage.Sets/src/mage/cards/s/StarCharter.java b/Mage.Sets/src/mage/cards/s/StarCharter.java index 615b8624d82..75795d52a05 100644 --- a/Mage.Sets/src/mage/cards/s/StarCharter.java +++ b/Mage.Sets/src/mage/cards/s/StarCharter.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.YouGainedOrLostLifeCondition; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.abilities.keyword.FlyingAbility; @@ -39,9 +39,9 @@ public final class StarCharter extends CardImpl { // At the beginning of your end step, if you gained or lost life this turn, look at the top four cards of your library. You may reveal a creature card with power 3 or less from among them and put it into your hand. Put the rest on the bottom of your library in a random order. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new LookLibraryAndPickControllerEffect( + TargetController.YOU, new LookLibraryAndPickControllerEffect( 4, 1, filter, PutCards.HAND, PutCards.BOTTOM_RANDOM - ), TargetController.YOU, YouGainedOrLostLifeCondition.instance, false + ), false, YouGainedOrLostLifeCondition.instance ).addHint(YouGainedOrLostLifeCondition.getHint()), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/StarlightSpectacular.java b/Mage.Sets/src/mage/cards/s/StarlightSpectacular.java index abd460d78d0..32673eef918 100644 --- a/Mage.Sets/src/mage/cards/s/StarlightSpectacular.java +++ b/Mage.Sets/src/mage/cards/s/StarlightSpectacular.java @@ -8,7 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.Game; import mage.players.Player; @@ -28,7 +27,7 @@ public final class StarlightSpectacular extends CardImpl { // Parade! -- At the beginning of combat on your turn, choose creatures you control one at a time until each creature you control has been chosen. Each of those creatures gets +1/+1 until end of turn for each creature chosen before it. this.addAbility(new BeginningOfCombatTriggeredAbility( - new StarlightSpectacularEffect(), false + new StarlightSpectacularEffect() ).withFlavorWord("Parade!")); } diff --git a/Mage.Sets/src/mage/cards/s/StarlitSoothsayer.java b/Mage.Sets/src/mage/cards/s/StarlitSoothsayer.java index f01cf9b6a1e..5f19d273ff6 100644 --- a/Mage.Sets/src/mage/cards/s/StarlitSoothsayer.java +++ b/Mage.Sets/src/mage/cards/s/StarlitSoothsayer.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.YouGainedOrLostLifeCondition; import mage.abilities.effects.keyword.SurveilEffect; import mage.abilities.keyword.FlyingAbility; @@ -32,8 +32,8 @@ public final class StarlitSoothsayer extends CardImpl { // At the beginning of your end step, if you gained or lost life this turn, surveil 1. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new SurveilEffect(1), TargetController.YOU, - YouGainedOrLostLifeCondition.instance, false + TargetController.YOU, new SurveilEffect(1), + false, YouGainedOrLostLifeCondition.instance ).addHint(YouGainedOrLostLifeCondition.getHint()), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/StarseerMentor.java b/Mage.Sets/src/mage/cards/s/StarseerMentor.java index a81cd21fa91..dd0ae2906ae 100644 --- a/Mage.Sets/src/mage/cards/s/StarseerMentor.java +++ b/Mage.Sets/src/mage/cards/s/StarseerMentor.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.YouGainedOrLostLifeCondition; import mage.abilities.costs.OrCost; import mage.abilities.costs.common.DiscardCardCost; @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.target.common.TargetOpponent; import mage.watchers.common.PlayerGainedLifeWatcher; @@ -53,7 +52,7 @@ public final class StarseerMentor extends CardImpl { new DiscardCardCost() ), "Sacrifice a nonland permanent or discard a card to prevent losing 3 life?" - ), TargetController.YOU, false + ) ), YouGainedOrLostLifeCondition.instance, "At the beginning of your end step, if you gained or lost life this turn, " + "target opponent loses 3 life unless they sacrifice a nonland permanent or discard a card." ); diff --git a/Mage.Sets/src/mage/cards/s/StaticPrison.java b/Mage.Sets/src/mage/cards/s/StaticPrison.java index 95fef2517fc..6d2913f9d78 100644 --- a/Mage.Sets/src/mage/cards/s/StaticPrison.java +++ b/Mage.Sets/src/mage/cards/s/StaticPrison.java @@ -10,7 +10,6 @@ import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.target.TargetPermanent; @@ -32,7 +31,7 @@ public final class StaticPrison extends CardImpl { // At the beginning of your precombat main phase, sacrifice Static Prison unless you pay {E}. this.addAbility(new BeginningOfFirstMainTriggeredAbility( - new SacrificeSourceUnlessPaysEffect(new PayEnergyCost(1)), false + new SacrificeSourceUnlessPaysEffect(new PayEnergyCost(1)) )); } diff --git a/Mage.Sets/src/mage/cards/s/SteelDromedary.java b/Mage.Sets/src/mage/cards/s/SteelDromedary.java index 375bf5dc97c..b5385ba31ef 100644 --- a/Mage.Sets/src/mage/cards/s/SteelDromedary.java +++ b/Mage.Sets/src/mage/cards/s/SteelDromedary.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/s/SteelSeraph.java b/Mage.Sets/src/mage/cards/s/SteelSeraph.java index f4ae032169b..b6579c142bc 100644 --- a/Mage.Sets/src/mage/cards/s/SteelSeraph.java +++ b/Mage.Sets/src/mage/cards/s/SteelSeraph.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -37,8 +36,7 @@ public final class SteelSeraph extends CardImpl { // At the beginning of combat on your turn, target creature you control gains your choice of flying, vigilance, or lifelink until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility(new GainsChoiceOfAbilitiesEffect( - FlyingAbility.getInstance(), VigilanceAbility.getInstance(), LifelinkAbility.getInstance()), - false + FlyingAbility.getInstance(), VigilanceAbility.getInstance(), LifelinkAbility.getInstance()) ); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/Stenchskipper.java b/Mage.Sets/src/mage/cards/s/Stenchskipper.java index 2dd8118e19e..0ad37d5ff83 100644 --- a/Mage.Sets/src/mage/cards/s/Stenchskipper.java +++ b/Mage.Sets/src/mage/cards/s/Stenchskipper.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -35,8 +35,8 @@ public final class Stenchskipper extends CardImpl { // At the beginning of the end step, if you control no Goblins, sacrifice Stenchskipper. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new SacrificeSourceEffect(), - TargetController.NEXT, condition, false + TargetController.NEXT, new SacrificeSourceEffect(), + false, condition )); } diff --git a/Mage.Sets/src/mage/cards/s/StensiaUprising.java b/Mage.Sets/src/mage/cards/s/StensiaUprising.java index ee79b894364..594af191131 100644 --- a/Mage.Sets/src/mage/cards/s/StensiaUprising.java +++ b/Mage.Sets/src/mage/cards/s/StensiaUprising.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.delayed.ReflexiveTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -17,7 +17,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.permanent.token.RedHumanToken; import mage.target.common.TargetAnyTarget; @@ -48,7 +47,7 @@ public final class StensiaUprising extends CardImpl { ); reflexiveTrigger.addTarget(new TargetAnyTarget()); Ability ability = new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new RedHumanToken()), TargetController.YOU, false + new CreateTokenEffect(new RedHumanToken()) ); ability.addEffect(new ConditionalOneShotEffect( new DoWhenCostPaid(reflexiveTrigger, new SacrificeSourceCost(), "Sacrifice {this}?"), diff --git a/Mage.Sets/src/mage/cards/s/StoneshakerShaman.java b/Mage.Sets/src/mage/cards/s/StoneshakerShaman.java index 4a32136478f..657fdc8b3cb 100644 --- a/Mage.Sets/src/mage/cards/s/StoneshakerShaman.java +++ b/Mage.Sets/src/mage/cards/s/StoneshakerShaman.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -33,7 +33,7 @@ public final class StoneshakerShaman extends CardImpl { this.toughness = new MageInt(1); // At the beginning of each player's end step, that player sacrifices an untapped land. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeEffect(filter, 1, "that player"), TargetController.EACH_PLAYER, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.EACH_PLAYER, new SacrificeEffect(filter, 1, "that player"), false)); } private StoneshakerShaman(final StoneshakerShaman card) { diff --git a/Mage.Sets/src/mage/cards/s/StormChargedSlasher.java b/Mage.Sets/src/mage/cards/s/StormChargedSlasher.java index 58f0134b33a..1da4c1b1449 100644 --- a/Mage.Sets/src/mage/cards/s/StormChargedSlasher.java +++ b/Mage.Sets/src/mage/cards/s/StormChargedSlasher.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -35,8 +34,7 @@ public final class StormChargedSlasher extends CardImpl { // At the beginning of combat on your turn, target creature you control gets +2/+0 and gains trample and haste until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( new BoostTargetEffect(2, 0) - .setText("target creature you control gets +2/+0"), - false + .setText("target creature you control gets +2/+0") ); ability.addEffect(new GainAbilityTargetEffect( TrampleAbility.getInstance(), Duration.EndOfTurn diff --git a/Mage.Sets/src/mage/cards/s/StormTheVault.java b/Mage.Sets/src/mage/cards/s/StormTheVault.java index 228c4329460..c4ebbe9715b 100644 --- a/Mage.Sets/src/mage/cards/s/StormTheVault.java +++ b/Mage.Sets/src/mage/cards/s/StormTheVault.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DealCombatDamageControlledTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.permanent.token.TreasureToken; @@ -39,7 +38,7 @@ public final class StormTheVault extends CardImpl { // At the beginning of your end step, if you control five or more artifacts, transform Storm the Vault. this.addAbility(new TransformAbility()); this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfEndStepTriggeredAbility(new TransformSourceEffect(), TargetController.YOU, false), + new BeginningOfEndStepTriggeredAbility(new TransformSourceEffect()), new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT, ComparisonType.MORE_THAN, 4), "At the beginning of your end step, if you control five or more artifacts, transform {this}" ).addHint(new ValueHint("Artifacts you control", new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT)))); diff --git a/Mage.Sets/src/mage/cards/s/StrefanMaurerProgenitor.java b/Mage.Sets/src/mage/cards/s/StrefanMaurerProgenitor.java index 2d46b449fdb..9def4f0a77c 100644 --- a/Mage.Sets/src/mage/cards/s/StrefanMaurerProgenitor.java +++ b/Mage.Sets/src/mage/cards/s/StrefanMaurerProgenitor.java @@ -3,7 +3,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.ContinuousEffect; @@ -29,7 +29,6 @@ import mage.game.permanent.token.BloodToken; import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetCardInHand; -import mage.target.common.TargetControlledPermanent; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.PlayerLostLifeWatcher; @@ -66,9 +65,8 @@ public class StrefanMaurerProgenitor extends CardImpl { new BeginningOfEndStepTriggeredAbility( new CreateTokenEffect( new BloodToken(), - StrefanMaurerProgenitorNumberPlayersLostLifeDynamicValue.instance), - TargetController.YOU, - false) + StrefanMaurerProgenitorNumberPlayersLostLifeDynamicValue.instance) + ) .addHint(hint) ); diff --git a/Mage.Sets/src/mage/cards/s/StromkirkBloodthief.java b/Mage.Sets/src/mage/cards/s/StromkirkBloodthief.java index 57b04d46b7b..e2582ea6ed2 100644 --- a/Mage.Sets/src/mage/cards/s/StromkirkBloodthief.java +++ b/Mage.Sets/src/mage/cards/s/StromkirkBloodthief.java @@ -2,7 +2,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.OpponentsLostLifeCondition; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.hint.common.OpponentsLostLifeHint; @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; @@ -36,8 +35,8 @@ public final class StromkirkBloodthief extends CardImpl { // At the beginning of your end step, if an opponent lost life this turn, put a +1/+1 counter on target Vampire you control. Ability ability = new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), - TargetController.YOU, OpponentsLostLifeCondition.instance, false + TargetController.YOU, new AddCountersTargetEffect(CounterType.P1P1.createInstance()), + false, OpponentsLostLifeCondition.instance ); ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability.addHint(OpponentsLostLifeHint.instance)); diff --git a/Mage.Sets/src/mage/cards/s/SurrakTheHuntCaller.java b/Mage.Sets/src/mage/cards/s/SurrakTheHuntCaller.java index 0061fc30d17..1a604ab6d66 100644 --- a/Mage.Sets/src/mage/cards/s/SurrakTheHuntCaller.java +++ b/Mage.Sets/src/mage/cards/s/SurrakTheHuntCaller.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -34,7 +33,7 @@ public final class SurrakTheHuntCaller extends CardImpl { // Formidable — At the beginning of combat on your turn, if creatures you control have total power 8 or greater, target creature you control gains haste until end of turn. Ability ability = new ConditionalInterveningIfTriggeredAbility( - new BeginningOfCombatTriggeredAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), false), + new BeginningOfCombatTriggeredAbility(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn)), FormidableCondition.instance, "Formidable — At the beginning of combat on your turn, if creatures you control have total power 8 or greater, target creature you control gains haste until end of turn."); ability.addTarget(new TargetControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/s/SyggRiverCutthroat.java b/Mage.Sets/src/mage/cards/s/SyggRiverCutthroat.java index 4c7531deefa..81f5e7d623f 100644 --- a/Mage.Sets/src/mage/cards/s/SyggRiverCutthroat.java +++ b/Mage.Sets/src/mage/cards/s/SyggRiverCutthroat.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.OpponentLostLifeCondition; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.hint.ConditionHint; @@ -26,11 +26,9 @@ public final class SyggRiverCutthroat extends CardImpl { this.toughness = new MageInt(3); // At the beginning of each end step, if an opponent lost 3 or more life this turn, you may draw a card. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, - new DrawCardSourceControllerEffect(1), - TargetController.ANY, - new OpponentLostLifeCondition(ComparisonType.OR_GREATER, 3), - true + this.addAbility(new BeginningOfEndStepTriggeredAbility( + TargetController.ANY, new DrawCardSourceControllerEffect(1), + true, new OpponentLostLifeCondition(ComparisonType.OR_GREATER, 3) ).addHint(new ConditionHint( new OpponentLostLifeCondition(ComparisonType.OR_GREATER, 3), "An opponent lost 3 or more life this turn" diff --git a/Mage.Sets/src/mage/cards/s/SyndicateHeavy.java b/Mage.Sets/src/mage/cards/s/SyndicateHeavy.java index 5578a041812..d4858338e36 100644 --- a/Mage.Sets/src/mage/cards/s/SyndicateHeavy.java +++ b/Mage.Sets/src/mage/cards/s/SyndicateHeavy.java @@ -1,7 +1,7 @@ package mage.cards.s; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.dynamicvalue.common.ControllerGainedLifeCount; import mage.abilities.effects.keyword.InvestigateEffect; @@ -31,8 +31,8 @@ public final class SyndicateHeavy extends CardImpl { // At the beginning of each end step, if you gained 4 or more life this turn, investigate. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new InvestigateEffect(), TargetController.ANY, - new YouGainedLifeCondition(ComparisonType.MORE_THAN, 3), false + TargetController.ANY, new InvestigateEffect(), + false, new YouGainedLifeCondition(ComparisonType.MORE_THAN, 3) ).addHint(ControllerGainedLifeCount.getHint()), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/SyrixCarrierOfTheFlame.java b/Mage.Sets/src/mage/cards/s/SyrixCarrierOfTheFlame.java index b6cac498197..049ea1f537e 100644 --- a/Mage.Sets/src/mage/cards/s/SyrixCarrierOfTheFlame.java +++ b/Mage.Sets/src/mage/cards/s/SyrixCarrierOfTheFlame.java @@ -3,7 +3,7 @@ package mage.cards.s; import mage.ApprovingObject; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.OneShotEffect; @@ -51,10 +51,8 @@ public class SyrixCarrierOfTheFlame extends CardImpl { // At the beginning of each end step, if a creature card left your graveyard this turn, // target Phoenix you control deals damage equal to its power to any target. Ability ability = new BeginningOfEndStepTriggeredAbility( - new DamageWithPowerFromOneToAnotherTargetEffect(), - TargetController.ANY, - SyrixCarrierOfTheFlameCondition.instance, - false + TargetController.ANY, new DamageWithPowerFromOneToAnotherTargetEffect(), + false, SyrixCarrierOfTheFlameCondition.instance ); ability.addTarget(new TargetPermanent(phoenixFilter)); ability.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/t/TallymanOfNurgle.java b/Mage.Sets/src/mage/cards/t/TallymanOfNurgle.java index 038ce7dd28c..87feb5bff3b 100644 --- a/Mage.Sets/src/mage/cards/t/TallymanOfNurgle.java +++ b/Mage.Sets/src/mage/cards/t/TallymanOfNurgle.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.game.Game; -import mage.watchers.common.CreaturesDiedWatcher; import java.util.UUID; @@ -39,12 +38,12 @@ public final class TallymanOfNurgle extends CardImpl { // The Seven-fold Chant -- At the beginning of your end step, if a creature died this turn, you draw a card and you lose 1 life. If seven or more creatures died this turn, instead you draw seven cards and you lose 7 life. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ConditionalOneShotEffect( + TargetController.YOU, new ConditionalOneShotEffect( new DrawCardSourceControllerEffect(7), new DrawCardSourceControllerEffect(1), TallymanOfNurgleCondition.instance, "you draw a card and you lose 1 life. " + "If seven or more creatures died this turn, instead you draw seven cards and you lose 7 life" ).addEffect(new LoseLifeSourceControllerEffect(7)).addOtherwiseEffect(new LoseLifeSourceControllerEffect(1)), - TargetController.YOU, MorbidCondition.instance, false + false, MorbidCondition.instance ).withFlavorWord("The Seven-fold Chant").addHint(CreaturesDiedThisTurnHint.instance)); } @@ -65,4 +64,4 @@ enum TallymanOfNurgleCondition implements Condition { public boolean apply(Game game, Ability source) { return CreaturesDiedThisTurnCount.instance.calculate(game, source, null) >= 7; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TeleportationCircle.java b/Mage.Sets/src/mage/cards/t/TeleportationCircle.java index 00fff6f7ab2..480ebb5d168 100644 --- a/Mage.Sets/src/mage/cards/t/TeleportationCircle.java +++ b/Mage.Sets/src/mage/cards/t/TeleportationCircle.java @@ -1,7 +1,7 @@ package mage.cards.t; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.ExileThenReturnTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -32,7 +32,7 @@ public final class TeleportationCircle extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}"); // At the beginning of your end step, exile up to one target artifact or creature you control, then return that card to the battlefield under its owner's control. - Ability ability = new BeginningOfYourEndStepTriggeredAbility(new ExileThenReturnTargetEffect(false, true), false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new ExileThenReturnTargetEffect(false, true)); ability.addTarget(new TargetPermanent(0, 1, filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TemmetVizierOfNaktamun.java b/Mage.Sets/src/mage/cards/t/TemmetVizierOfNaktamun.java index 1fd667454c4..98f060d1a8e 100644 --- a/Mage.Sets/src/mage/cards/t/TemmetVizierOfNaktamun.java +++ b/Mage.Sets/src/mage/cards/t/TemmetVizierOfNaktamun.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.TokenPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -43,7 +42,7 @@ public final class TemmetVizierOfNaktamun extends CardImpl { this.toughness = new MageInt(2); // At the beginning of combat on your turn, target creature token you control gets +1/+1 until end of turn and can't be blocked this turn. - Ability ability = new BeginningOfCombatTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); Effect effect = new CantBeBlockedTargetEffect(); effect.setText(" and can't be blocked this turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/t/TenuousTruce.java b/Mage.Sets/src/mage/cards/t/TenuousTruce.java index 7698773dbb6..cff82aa3cef 100644 --- a/Mage.Sets/src/mage/cards/t/TenuousTruce.java +++ b/Mage.Sets/src/mage/cards/t/TenuousTruce.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.*; import mage.abilities.keyword.EnchantAbility; @@ -36,8 +36,7 @@ public class TenuousTruce extends CardImpl { // At the beginning of enchanted opponent’s end step, you and that player each draw a card. Ability drawAbility = new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1).setText("you "), - TargetController.ENCHANTED, + TargetController.ENCHANTED, new DrawCardSourceControllerEffect(1).setText("you "), false); Effect enchantedPlayerDrawEffect = new DrawCardTargetEffect(1); enchantedPlayerDrawEffect.concatBy("and").setText("that player each draw a card"); diff --git a/Mage.Sets/src/mage/cards/t/TerritorialHellkite.java b/Mage.Sets/src/mage/cards/t/TerritorialHellkite.java index c51f216dc2c..7f15c694321 100644 --- a/Mage.Sets/src/mage/cards/t/TerritorialHellkite.java +++ b/Mage.Sets/src/mage/cards/t/TerritorialHellkite.java @@ -20,7 +20,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; -import mage.constants.TargetController; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; @@ -50,7 +49,7 @@ public final class TerritorialHellkite extends CardImpl { this.addAbility(HasteAbility.getInstance()); // At the beginning of combat on your turn, choose an opponent at random that Territorial Hellkite didn't attack during your last combat. Territorial Hellkite attacks that player this combat if able. If you can't choose an opponent this way, tap Territorial Hellkite. - this.addAbility(new BeginningOfCombatTriggeredAbility(new AttackIfAbleTargetRandoOpponentSourceEffect(), false), new AttackedLastCombatWatcher()); + this.addAbility(new BeginningOfCombatTriggeredAbility(new AttackIfAbleTargetRandoOpponentSourceEffect()), new AttackedLastCombatWatcher()); } private TerritorialHellkite(final TerritorialHellkite card) { diff --git a/Mage.Sets/src/mage/cards/t/TerritorialWitchstalker.java b/Mage.Sets/src/mage/cards/t/TerritorialWitchstalker.java index f0fba7c4910..15e0ca3a6d8 100644 --- a/Mage.Sets/src/mage/cards/t/TerritorialWitchstalker.java +++ b/Mage.Sets/src/mage/cards/t/TerritorialWitchstalker.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; /** * @@ -35,7 +34,7 @@ public final class TerritorialWitchstalker extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // At the beginning of combat on your turn, if you control a creature with power 4 or greater, Territorial Witchstalker gets +1/+0 until end of turn and can attack this turn as though it didn't have defender. - TriggeredAbility ability = new BeginningOfCombatTriggeredAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn), false); + TriggeredAbility ability = new BeginningOfCombatTriggeredAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn)); ability.addEffect(new CanAttackAsThoughItDidntHaveDefenderSourceEffect(Duration.EndOfTurn)); ability.addHint(FerociousHint.instance); this.addAbility(new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/t/TeysaOpulentOligarch.java b/Mage.Sets/src/mage/cards/t/TeysaOpulentOligarch.java index 1af05a3e987..96564365985 100644 --- a/Mage.Sets/src/mage/cards/t/TeysaOpulentOligarch.java +++ b/Mage.Sets/src/mage/cards/t/TeysaOpulentOligarch.java @@ -3,7 +3,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.ZoneChangeAllTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; @@ -53,9 +53,7 @@ public final class TeysaOpulentOligarch extends CardImpl { this.addAbility( new BeginningOfEndStepTriggeredAbility( new InvestigateEffect(TeysaOpulentOligarchDynamicValue.instance) - .setText("investigate for each opponent who lost life this turn"), - TargetController.YOU, - false + .setText("investigate for each opponent who lost life this turn") ).addHint(hint) ); diff --git a/Mage.Sets/src/mage/cards/t/ThalisseReverentMedium.java b/Mage.Sets/src/mage/cards/t/ThalisseReverentMedium.java index f59dd797c25..f8ceaa5fc02 100644 --- a/Mage.Sets/src/mage/cards/t/ThalisseReverentMedium.java +++ b/Mage.Sets/src/mage/cards/t/ThalisseReverentMedium.java @@ -1,7 +1,7 @@ package mage.cards.t; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.common.TokensCreatedThisTurnCount; import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; @@ -30,9 +30,9 @@ public final class ThalisseReverentMedium extends CardImpl { this.toughness = new MageInt(4); // At the beginning of each end step, create X 1/1 white Spirit creature tokens with flying, where X is the number of tokens you created this turn. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect( + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new CreateTokenEffect( new SpiritWhiteToken(), TokensCreatedThisTurnCount.instance - ), TargetController.ANY, false).addHint(TokensCreatedThisTurnCount.getHint()), new CreatedTokenWatcher()); + ), false).addHint(TokensCreatedThisTurnCount.getHint()), new CreatedTokenWatcher()); } private ThalisseReverentMedium(final ThalisseReverentMedium card) { diff --git a/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java b/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java index 157acd6fdff..70c147731d3 100644 --- a/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java +++ b/Mage.Sets/src/mage/cards/t/ThassaDeepDwelling.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; @@ -55,8 +54,7 @@ public final class ThassaDeepDwelling extends CardImpl { // At the beginning of your end step, exile up to one other target creature you control, then return that card to the battlefield under your control. Ability ability = new BeginningOfEndStepTriggeredAbility( - new ExileThenReturnTargetEffect(true, true), - TargetController.YOU, false + new ExileThenReturnTargetEffect(true, true) ); ability.addTarget(new TargetPermanent( 0, 1, filterOther, false diff --git a/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java b/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java index f8ca94370ef..e10d1583d1f 100644 --- a/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java +++ b/Mage.Sets/src/mage/cards/t/ThaumaticCompass.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.costs.common.TapSourceCost; @@ -18,7 +18,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; -import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterLandPermanent; @@ -42,7 +41,7 @@ public final class ThaumaticCompass extends CardImpl { // At the beginning of your end step, if you control seven or more lands, transform Thaumatic Compass. this.addAbility(new TransformAbility()); - TriggeredAbility ability2 = new BeginningOfEndStepTriggeredAbility(new TransformSourceEffect(), TargetController.YOU, false); + TriggeredAbility ability2 = new BeginningOfEndStepTriggeredAbility(new TransformSourceEffect()); this.addAbility(new ConditionalInterveningIfTriggeredAbility( ability2, new PermanentsOnTheBattlefieldCondition(new FilterLandPermanent(), ComparisonType.MORE_THAN, 6, true), diff --git a/Mage.Sets/src/mage/cards/t/TheAnimus.java b/Mage.Sets/src/mage/cards/t/TheAnimus.java index 835512b674e..8d4fa1db8ef 100644 --- a/Mage.Sets/src/mage/cards/t/TheAnimus.java +++ b/Mage.Sets/src/mage/cards/t/TheAnimus.java @@ -1,12 +1,10 @@ package mage.cards.t; -import java.util.List; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; -import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -20,11 +18,8 @@ import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.target.Target; import mage.target.Targets; import mage.target.common.*; -import mage.target.targetpointer.FixedTarget; -import mage.util.functions.EmptyCopyApplier; /** * @@ -46,7 +41,7 @@ public final class TheAnimus extends CardImpl { this.supertype.add(SuperType.LEGENDARY); // At the beginning of your end step, exile up to one target legendary creature card from a graveyard with a memory counter on it. - Ability ability = new BeginningOfEndStepTriggeredAbility(new TheAnimusEffect(), TargetController.YOU, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new TheAnimusEffect()); ability.addTarget(new TargetCardInGraveyard(0, 1, filter)); this.addAbility(ability); @@ -146,4 +141,4 @@ class TheAnimusCopyEffect extends OneShotEffect { } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TheBookOfExaltedDeeds.java b/Mage.Sets/src/mage/cards/t/TheBookOfExaltedDeeds.java index dba00425e69..738792cdec8 100644 --- a/Mage.Sets/src/mage/cards/t/TheBookOfExaltedDeeds.java +++ b/Mage.Sets/src/mage/cards/t/TheBookOfExaltedDeeds.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; @@ -46,7 +46,7 @@ public final class TheBookOfExaltedDeeds extends CardImpl { // At the beginning of your end step, if you gained 3 or more life this turn, create a 3/3 white Angel creature token with flying. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new Angel33Token()), TargetController.YOU, false + new CreateTokenEffect(new Angel33Token()) ), condition, "At the beginning of your end step, " + "if you gained 3 or more life this turn, create a 3/3 white Angel creature token with flying." ).addHint(hint), new PlayerGainedLifeWatcher()); diff --git a/Mage.Sets/src/mage/cards/t/TheBookOfVileDarkness.java b/Mage.Sets/src/mage/cards/t/TheBookOfVileDarkness.java index 64ca4507168..8c3a2c6306f 100644 --- a/Mage.Sets/src/mage/cards/t/TheBookOfVileDarkness.java +++ b/Mage.Sets/src/mage/cards/t/TheBookOfVileDarkness.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.Cost; @@ -44,8 +44,8 @@ public final class TheBookOfVileDarkness extends CardImpl { // At the beginning of your end step, if you lost 2 or more life this turn, create a 2/2 black Zombie creature token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken()), TargetController.YOU, - TheBookOfVileDarknessCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new ZombieToken()), + false, TheBookOfVileDarknessCondition.instance ).addHint(new ConditionHint(TheBookOfVileDarknessCondition.instance, "You lost 2 or more life this turn"))); // {T}, Exile The Book of Vile Darkness and artifacts you control named Eye of Vecna and Hand of Vecna: Create Vecna, a legendary 8/8 black Zombie God creature token with indestructible and all triggered abilities of the exiled cards. diff --git a/Mage.Sets/src/mage/cards/t/TheBrokenSky.java b/Mage.Sets/src/mage/cards/t/TheBrokenSky.java index 614baeb2cf1..934cbd712ea 100644 --- a/Mage.Sets/src/mage/cards/t/TheBrokenSky.java +++ b/Mage.Sets/src/mage/cards/t/TheBrokenSky.java @@ -1,7 +1,7 @@ package mage.cards.t; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.WhiteBlackSpiritToken; @@ -47,8 +46,7 @@ public final class TheBrokenSky extends CardImpl { // At the beginning of your end step, create a 1/1 white and black Spirit creature token with flying. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new WhiteBlackSpiritToken()), - TargetController.YOU, false + new CreateTokenEffect(new WhiteBlackSpiritToken()) )); } diff --git a/Mage.Sets/src/mage/cards/t/TheChainVeil.java b/Mage.Sets/src/mage/cards/t/TheChainVeil.java index c6f58b05566..cee2b0bbeb0 100644 --- a/Mage.Sets/src/mage/cards/t/TheChainVeil.java +++ b/Mage.Sets/src/mage/cards/t/TheChainVeil.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.common.TapSourceCost; @@ -34,8 +34,8 @@ public final class TheChainVeil extends CardImpl { // At the beginning of your end step, if you didn't activate a loyalty ability of a planeswalker this turn, you lose 2 life. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new LoseLifeSourceControllerEffect(2), TargetController.YOU, - TheChainVeilCondition.instance, false + TargetController.YOU, new LoseLifeSourceControllerEffect(2), + false, TheChainVeilCondition.instance ), new ActivatedLoyaltyAbilityWatcher()); // {4}, {T}: For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities had been activated this turn. diff --git a/Mage.Sets/src/mage/cards/t/TheDalekEmperor.java b/Mage.Sets/src/mage/cards/t/TheDalekEmperor.java index 925335387bc..9aebe165240 100644 --- a/Mage.Sets/src/mage/cards/t/TheDalekEmperor.java +++ b/Mage.Sets/src/mage/cards/t/TheDalekEmperor.java @@ -52,7 +52,7 @@ public final class TheDalekEmperor extends CardImpl { // At the beginning of combat on your turn, each opponent faces a villainous choice -- That player sacrifices a creature they control, or you create a 3/3 black Dalek artifact creature token with menace. this.addAbility(new BeginningOfCombatTriggeredAbility( - new TheDalekEmperorEffect(), false + new TheDalekEmperorEffect() )); } diff --git a/Mage.Sets/src/mage/cards/t/TheFifthDoctor.java b/Mage.Sets/src/mage/cards/t/TheFifthDoctor.java index bac63d60da2..fcf5fad195e 100644 --- a/Mage.Sets/src/mage/cards/t/TheFifthDoctor.java +++ b/Mage.Sets/src/mage/cards/t/TheFifthDoctor.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.UntapAllEffect; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.cards.CardImpl; @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; @@ -48,8 +47,7 @@ public final class TheFifthDoctor extends CardImpl { // Peaceful Coexistence -- At the beginning of your end step, put a +1/+1 counter on each creature you control that didn't attack or enter the battlefield this turn. Untap those creatures. Ability ability = new BeginningOfEndStepTriggeredAbility( - new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter), - TargetController.YOU, false + new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter) ); ability.addEffect(new UntapAllEffect(filter).setText("Untap those creatures")); this.addAbility(ability.withFlavorWord("Peaceful Coexistence")); diff --git a/Mage.Sets/src/mage/cards/t/TheGaffer.java b/Mage.Sets/src/mage/cards/t/TheGaffer.java index 4813a51c500..c6f8e9f6c99 100644 --- a/Mage.Sets/src/mage/cards/t/TheGaffer.java +++ b/Mage.Sets/src/mage/cards/t/TheGaffer.java @@ -1,7 +1,7 @@ package mage.cards.t; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.dynamicvalue.common.ControllerGainedLifeCount; @@ -31,7 +31,7 @@ public final class TheGaffer extends CardImpl { // At the beginning of each end step, if you gained 3 or more life this turn, draw a card. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), TargetController.ANY, condition, false + TargetController.ANY, new DrawCardSourceControllerEffect(1), false, condition ).addHint(ControllerGainedLifeCount.getHint()), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java b/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java index b95a895bf99..d0e0299a7a3 100644 --- a/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java +++ b/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.TapTargetCost; @@ -54,9 +54,9 @@ public final class TheLadyOfOtaria extends CardImpl { // At the beginning of each end step, if a land you controlled was put into your graveyard from the battlefield this turn, reveal the top four cards of your library. Put any number of Dwarf cards from among them into your hand and the rest on the bottom of your library in a random order. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new RevealLibraryPickControllerEffect( + TargetController.ANY, new RevealLibraryPickControllerEffect( 4, Integer.MAX_VALUE, filter2, PutCards.HAND, PutCards.BOTTOM_RANDOM, false - ), TargetController.ANY, TheLadyOfOtariaCondition.instance, false + ), false, TheLadyOfOtariaCondition.instance ).addHint(TheLadyOfOtariaCondition.getHint()), new TheLadyOfOtariaWatcher()); } diff --git a/Mage.Sets/src/mage/cards/t/TheMycotyrant.java b/Mage.Sets/src/mage/cards/t/TheMycotyrant.java index 9d56c219644..50694ef889c 100644 --- a/Mage.Sets/src/mage/cards/t/TheMycotyrant.java +++ b/Mage.Sets/src/mage/cards/t/TheMycotyrant.java @@ -1,7 +1,7 @@ package mage.cards.t; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.DescendedThisTurnCount; @@ -58,8 +58,7 @@ public final class TheMycotyrant extends CardImpl { // At the beginning of your end step, create X 1/1 black Fungus creature tokens with "This creature can't block," where X is the number of times you descended this turn. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new FungusCantBlockToken(), DescendedThisTurnCount.instance), - TargetController.YOU, false + new CreateTokenEffect(new FungusCantBlockToken(), DescendedThisTurnCount.instance) ).addHint(DescendedThisTurnCount.getHint()), new DescendedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/t/TheOzolith.java b/Mage.Sets/src/mage/cards/t/TheOzolith.java index 4a0c9987577..54fece77667 100644 --- a/Mage.Sets/src/mage/cards/t/TheOzolith.java +++ b/Mage.Sets/src/mage/cards/t/TheOzolith.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.counters.Counter; import mage.counters.Counters; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/t/TheRavenMan.java b/Mage.Sets/src/mage/cards/t/TheRavenMan.java index f957c6e6238..681e4a9862b 100644 --- a/Mage.Sets/src/mage/cards/t/TheRavenMan.java +++ b/Mage.Sets/src/mage/cards/t/TheRavenMan.java @@ -4,7 +4,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.PlayerDiscardedThisTurnCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,10 +36,8 @@ public final class TheRavenMan extends CardImpl { // At the beginning of each end step, if a player discarded a card this turn, create a 1/1 black Bird creature token with flying and "This creature can't block." this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new BlackBirdToken()), - TargetController.ANY, - PlayerDiscardedThisTurnCondition.instance, - false + TargetController.ANY, new CreateTokenEffect(new BlackBirdToken()), + false, PlayerDiscardedThisTurnCondition.instance ), new DiscardedCardWatcher()); // {3}{B}, {T}: Each opponent discards a card. Activate only as a sorcery. diff --git a/Mage.Sets/src/mage/cards/t/TheThirteenthDoctor.java b/Mage.Sets/src/mage/cards/t/TheThirteenthDoctor.java index 320576b98a5..c2029135b9f 100644 --- a/Mage.Sets/src/mage/cards/t/TheThirteenthDoctor.java +++ b/Mage.Sets/src/mage/cards/t/TheThirteenthDoctor.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.UntapAllEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; @@ -53,7 +53,7 @@ public final class TheThirteenthDoctor extends CardImpl { // Team TARDIS -- At the beginning of your end step, untap each creature you control with a counter on it. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new UntapAllEffect(filter2), TargetController.YOU, false + new UntapAllEffect(filter2) ).withFlavorWord("Team TARDIS")); } diff --git a/Mage.Sets/src/mage/cards/t/ThirstingAxe.java b/Mage.Sets/src/mage/cards/t/ThirstingAxe.java index ffc3461d7d1..1ea9d5706a8 100644 --- a/Mage.Sets/src/mage/cards/t/ThirstingAxe.java +++ b/Mage.Sets/src/mage/cards/t/ThirstingAxe.java @@ -4,7 +4,7 @@ package mage.cards.t; import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.CompoundCondition; import mage.abilities.condition.Condition; @@ -43,7 +43,7 @@ public final class ThirstingAxe extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(4, 0))); // At the beginning of your end step, if equipped creature didn't deal combat damage to a creature this turn, sacrifice it. - TriggeredAbility ability = new BeginningOfYourEndStepTriggeredAbility(new SacrificeEquippedEffect(), false); + TriggeredAbility ability = new BeginningOfEndStepTriggeredAbility(new SacrificeEquippedEffect()); Condition condition = new CompoundCondition( AttachedCondition.instance, new InvertCondition(new EquippedDealtCombatDamageToCreatureCondition())); diff --git a/Mage.Sets/src/mage/cards/t/ThousandMoonsSmithy.java b/Mage.Sets/src/mage/cards/t/ThousandMoonsSmithy.java index 945406d5f37..7a5010aca01 100644 --- a/Mage.Sets/src/mage/cards/t/ThousandMoonsSmithy.java +++ b/Mage.Sets/src/mage/cards/t/ThousandMoonsSmithy.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -51,8 +50,7 @@ public final class ThousandMoonsSmithy extends CardImpl { new DoIfCostPaid( new TransformSourceEffect(), new TapTargetCost(new TargetControlledPermanent(5, filter)) - ), - false + ) )); } diff --git a/Mage.Sets/src/mage/cards/t/ThroneOfTheGodPharaoh.java b/Mage.Sets/src/mage/cards/t/ThroneOfTheGodPharaoh.java index 1708b8179e4..cc57f17f979 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneOfTheGodPharaoh.java +++ b/Mage.Sets/src/mage/cards/t/ThroneOfTheGodPharaoh.java @@ -1,6 +1,6 @@ package mage.cards.t; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.LoseLifeOpponentsEffect; @@ -8,7 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.TappedPredicate; @@ -37,7 +36,7 @@ public final class ThroneOfTheGodPharaoh extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility( new LoseLifeOpponentsEffect(xValue).setText( "each opponent loses life equal to the number of tapped creatures you control" - ), TargetController.YOU, false + ) )); } diff --git a/Mage.Sets/src/mage/cards/t/ThroneWarden.java b/Mage.Sets/src/mage/cards/t/ThroneWarden.java index 8c2631e4c6a..9e6a773adaf 100644 --- a/Mage.Sets/src/mage/cards/t/ThroneWarden.java +++ b/Mage.Sets/src/mage/cards/t/ThroneWarden.java @@ -3,7 +3,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MonarchIsSourceControllerCondition; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.hint.common.MonarchHint; @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.counters.CounterType; /** @@ -30,8 +29,8 @@ public final class ThroneWarden extends CardImpl { this.toughness = new MageInt(2); // At the beginning of your end step, if you're the monarch, put a +1/+1 counter on Throne Warden. - this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - TargetController.YOU, MonarchIsSourceControllerCondition.instance, false) + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), + false, MonarchIsSourceControllerCondition.instance) .addHint(MonarchHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/t/TinybonesTrinketThief.java b/Mage.Sets/src/mage/cards/t/TinybonesTrinketThief.java index 85fc1dce7d9..72189d70295 100644 --- a/Mage.Sets/src/mage/cards/t/TinybonesTrinketThief.java +++ b/Mage.Sets/src/mage/cards/t/TinybonesTrinketThief.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,8 +39,8 @@ public final class TinybonesTrinketThief extends CardImpl { // At the beginning of each end step, if an opponent discarded a card this turn, you draw a card and you lose 1 life. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), - TargetController.EACH_PLAYER, false + TargetController.EACH_PLAYER, new DrawCardSourceControllerEffect(1), + false ), TinybonesTrinketThiefCondition.instance, "At the beginning of each end step, " + "if an opponent discarded a card this turn, you draw a card and you lose 1 life." ); diff --git a/Mage.Sets/src/mage/cards/t/TitanHunter.java b/Mage.Sets/src/mage/cards/t/TitanHunter.java index f48ac958fe5..ad836e76bed 100644 --- a/Mage.Sets/src/mage/cards/t/TitanHunter.java +++ b/Mage.Sets/src/mage/cards/t/TitanHunter.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.InvertCondition; @@ -21,7 +21,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.game.Game; -import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -43,7 +42,7 @@ public final class TitanHunter extends CardImpl { // At the beginning of each player's end step, if no creatures died this turn, Titan Hunter deals 4 damage to that player. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new TitanHunterEffect(), TargetController.EACH_PLAYER, false + TargetController.EACH_PLAYER, new TitanHunterEffect(), false ), condition, "At the beginning of each player's end step, " + "if no creatures died this turn, {this} deals 4 damage to that player." ).addHint(MorbidHint.instance)); diff --git a/Mage.Sets/src/mage/cards/t/TivashGloomSummoner.java b/Mage.Sets/src/mage/cards/t/TivashGloomSummoner.java index 90e68e0c084..22b03a49070 100644 --- a/Mage.Sets/src/mage/cards/t/TivashGloomSummoner.java +++ b/Mage.Sets/src/mage/cards/t/TivashGloomSummoner.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.costs.Cost; @@ -41,8 +41,8 @@ public final class TivashGloomSummoner extends CardImpl { // At the beginning of your end step, if you gained life this turn, you may pay X life, where X is the amount of life you gained this turn. If you do, create an X/X black Demon creature token with flying. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new TivashGloomSummonerEffect(), - TargetController.YOU, condition, false + TargetController.YOU, new TivashGloomSummonerEffect(), + false, condition ).addHint(ControllerGainedLifeCount.getHint()), new PlayerGainedLifeWatcher()); } diff --git a/Mage.Sets/src/mage/cards/t/TolarianContempt.java b/Mage.Sets/src/mage/cards/t/TolarianContempt.java index 330c8f6af5f..f3263351279 100644 --- a/Mage.Sets/src/mage/cards/t/TolarianContempt.java +++ b/Mage.Sets/src/mage/cards/t/TolarianContempt.java @@ -1,7 +1,7 @@ package mage.cards.t; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersAllEffect; @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -46,7 +45,7 @@ public final class TolarianContempt extends CardImpl { )); // At the beginning of your end step, for each opponent, choose up to one target creature they control with a rejection counter on it. That creature's owner puts it on the top or bottom of their library. - Ability ability = new BeginningOfEndStepTriggeredAbility(new TolarianContemptEffect(), TargetController.YOU, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new TolarianContemptEffect()); ability.addTarget(new TargetPermanent(0,1, filterRejection)); ability.setTargetAdjuster(new ForEachOpponentTargetsAdjuster()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ToolcraftExemplar.java b/Mage.Sets/src/mage/cards/t/ToolcraftExemplar.java index d7eebccbb1c..0dc88e49103 100644 --- a/Mage.Sets/src/mage/cards/t/ToolcraftExemplar.java +++ b/Mage.Sets/src/mage/cards/t/ToolcraftExemplar.java @@ -19,7 +19,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.ComparisonType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.filter.common.FilterControlledArtifactPermanent; /** @@ -41,7 +40,7 @@ public final class ToolcraftExemplar extends CardImpl { new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new LockedInCondition(new PermanentsOnTheBattlefieldCondition(new FilterControlledArtifactPermanent(), ComparisonType.MORE_THAN, 2)), null); Ability ability = new ConditionalInterveningIfTriggeredAbility( - new BeginningOfCombatTriggeredAbility(new BoostSourceEffect(2, 1, Duration.EndOfTurn), false), + new BeginningOfCombatTriggeredAbility(new BoostSourceEffect(2, 1, Duration.EndOfTurn)), new PermanentsOnTheBattlefieldCondition(new FilterControlledArtifactPermanent()), "At the beginning of combat on your turn, if you control an artifact, {this} gets +2/+1 until end of turn." + " If you control at least 3 artifacts, it also gains first strike until end of turn."); diff --git a/Mage.Sets/src/mage/cards/t/TortureChamber.java b/Mage.Sets/src/mage/cards/t/TortureChamber.java index 3cff4153cb2..d5b2b0cebf4 100644 --- a/Mage.Sets/src/mage/cards/t/TortureChamber.java +++ b/Mage.Sets/src/mage/cards/t/TortureChamber.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.abilities.Ability; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.RemoveAllCountersSourceCost; @@ -36,7 +36,7 @@ public final class TortureChamber extends CardImpl { )); // At the beginning of your end step, Torture Chamber deals damage to you equal to the number of pain counters on it. - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new TortureChamberEffect1(), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new TortureChamberEffect1())); // {1}, {tap}, Remove all pain counters from Torture Chamber: Torture Chamber deals damage to target creature equal to the number of pain counters removed this way. SimpleActivatedAbility ability = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/t/ToxrillTheCorrosive.java b/Mage.Sets/src/mage/cards/t/ToxrillTheCorrosive.java index b0bd01b7580..d52c43ba704 100644 --- a/Mage.Sets/src/mage/cards/t/ToxrillTheCorrosive.java +++ b/Mage.Sets/src/mage/cards/t/ToxrillTheCorrosive.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -23,7 +23,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SlugToken; -import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -52,9 +51,9 @@ public final class ToxrillTheCorrosive extends CardImpl { this.toughness = new MageInt(7); // At the beginning of each end step, put a slime counter on each creature you don't control. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new AddCountersAllEffect( + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new AddCountersAllEffect( CounterType.SLIME.createInstance(), StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL - ), TargetController.ANY, false)); + ), false)); // Creatures you don't control get -1/-1 for each slime counter on them. this.addAbility(new SimpleStaticAbility(new ToxrillTheCorrosiveEffect())); diff --git a/Mage.Sets/src/mage/cards/t/TriarchStalker.java b/Mage.Sets/src/mage/cards/t/TriarchStalker.java index 4503dcdb4f8..393269fe829 100644 --- a/Mage.Sets/src/mage/cards/t/TriarchStalker.java +++ b/Mage.Sets/src/mage/cards/t/TriarchStalker.java @@ -41,7 +41,7 @@ public final class TriarchStalker extends CardImpl { // Targeting Relay — At the beginning of combat on your turn, choose an opponent. this.addAbility(new BeginningOfCombatTriggeredAbility( - new TriarchStalkerEffect(), false + new TriarchStalkerEffect() ).withFlavorWord("Targeting Relay")); // Creatures attacking the last chosen player have menace. diff --git a/Mage.Sets/src/mage/cards/t/TrostaniDiscordant.java b/Mage.Sets/src/mage/cards/t/TrostaniDiscordant.java index b6127b5b3f3..8fd4bcd5f3c 100644 --- a/Mage.Sets/src/mage/cards/t/TrostaniDiscordant.java +++ b/Mage.Sets/src/mage/cards/t/TrostaniDiscordant.java @@ -1,7 +1,7 @@ package mage.cards.t; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -40,8 +40,7 @@ public final class TrostaniDiscordant extends CardImpl { // At the beginning of your end step, each player gains control of all creatures they own. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new GainControlAllOwnedEffect(StaticFilters.FILTER_PERMANENT_CREATURES), - TargetController.YOU, false + new GainControlAllOwnedEffect(StaticFilters.FILTER_PERMANENT_CREATURES) )); } diff --git a/Mage.Sets/src/mage/cards/t/TroublesomeSpirit.java b/Mage.Sets/src/mage/cards/t/TroublesomeSpirit.java index 00f26365a7f..b5b5f66fb08 100644 --- a/Mage.Sets/src/mage/cards/t/TroublesomeSpirit.java +++ b/Mage.Sets/src/mage/cards/t/TroublesomeSpirit.java @@ -3,14 +3,13 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.TapAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; /** @@ -28,7 +27,7 @@ public final class TroublesomeSpirit extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // At the beginning of your end step, tap all lands you control. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new TapAllEffect(new FilterControlledLandPermanent("lands you control")), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new TapAllEffect(new FilterControlledLandPermanent("lands you control")))); } private TroublesomeSpirit(final TroublesomeSpirit card) { diff --git a/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java b/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java index 858ba7a7231..8da2949c1a3 100644 --- a/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java +++ b/Mage.Sets/src/mage/cards/t/TroveOfTemptation.java @@ -3,7 +3,7 @@ package mage.cards.t; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RequirementEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -30,7 +30,7 @@ public final class TroveOfTemptation extends CardImpl { addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new TroveOfTemptationForceAttackEffect(Duration.WhileOnBattlefield))); // At the beginning of your end step, create a colorless Treasure artifact token with "{t}, Sacrifice this artifact: Add one mana of any color.” - addAbility(new BeginningOfYourEndStepTriggeredAbility(new CreateTokenEffect(new TreasureToken()), false)); + addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new TreasureToken()))); } private TroveOfTemptation(final TroveOfTemptation card) { diff --git a/Mage.Sets/src/mage/cards/t/TrynnChampionOfFreedom.java b/Mage.Sets/src/mage/cards/t/TrynnChampionOfFreedom.java index ea2515c75eb..5d0e4238a8b 100644 --- a/Mage.Sets/src/mage/cards/t/TrynnChampionOfFreedom.java +++ b/Mage.Sets/src/mage/cards/t/TrynnChampionOfFreedom.java @@ -2,7 +2,7 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.RaidCondition; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.hint.common.RaidHint; @@ -37,10 +37,8 @@ public final class TrynnChampionOfFreedom extends CardImpl { // At the beginning of your end step, if you attacked this turn, create a 1/1 white Human Soldier creature token. Ability ability = new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new HumanSoldierToken()), - TargetController.YOU, - RaidCondition.instance, - false + TargetController.YOU, new CreateTokenEffect(new HumanSoldierToken()), + false, RaidCondition.instance ); ability.addHint(RaidHint.instance); this.addAbility(ability, new PlayerAttackedWatcher()); diff --git a/Mage.Sets/src/mage/cards/t/TunnelTipster.java b/Mage.Sets/src/mage/cards/t/TunnelTipster.java index fde225d3703..8f8c63c5aad 100644 --- a/Mage.Sets/src/mage/cards/t/TunnelTipster.java +++ b/Mage.Sets/src/mage/cards/t/TunnelTipster.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.hint.ConditionHint; @@ -39,8 +39,8 @@ public final class TunnelTipster extends CardImpl { // At the beginning of your end step, if a face-down creature entered the battlefield under your control this turn, put a +1/+1 counter on Tunnel Tipster. Ability ability = new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), TargetController.YOU, - TunnelTipsterCondition.instance, false); + TargetController.YOU, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), + false, TunnelTipsterCondition.instance); ability.addHint(new ConditionHint(TunnelTipsterCondition.instance, "a face-down creature entered the battlefield under your control")); this.addAbility(ability, new TunnelTipsterWatcher()); diff --git a/Mage.Sets/src/mage/cards/t/TwinbladeAssassins.java b/Mage.Sets/src/mage/cards/t/TwinbladeAssassins.java index 617b8c13c6f..1aa8139b10c 100644 --- a/Mage.Sets/src/mage/cards/t/TwinbladeAssassins.java +++ b/Mage.Sets/src/mage/cards/t/TwinbladeAssassins.java @@ -1,7 +1,7 @@ package mage.cards.t; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import java.util.UUID; @@ -30,7 +29,7 @@ public final class TwinbladeAssassins extends CardImpl { // At the beginning of your end step, if a creature died this turn, draw a card. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), TargetController.YOU, false + new DrawCardSourceControllerEffect(1) ), MorbidCondition.instance, "At the beginning of your end step, " + "if a creature died this turn, draw a card." ).addHint(MorbidHint.instance)); diff --git a/Mage.Sets/src/mage/cards/u/Uchuulon.java b/Mage.Sets/src/mage/cards/u/Uchuulon.java index ec7754d4ddd..a04561715cd 100644 --- a/Mage.Sets/src/mage/cards/u/Uchuulon.java +++ b/Mage.Sets/src/mage/cards/u/Uchuulon.java @@ -2,7 +2,7 @@ package mage.cards.u; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -55,7 +55,7 @@ public final class Uchuulon extends CardImpl { // Horrific Symbiosis — At the beginning of your end step, exile up to one target creature card from an opponent's graveyard. If you, create a token that's a copy of Uchuulon. Ability ability = new BeginningOfEndStepTriggeredAbility( - new UchuulonEffect(), TargetController.YOU, false + new UchuulonEffect() ); ability.addTarget(new TargetCardInOpponentsGraveyard( 0, 1, StaticFilters.FILTER_CARD_CREATURE diff --git a/Mage.Sets/src/mage/cards/u/UnderworldBreach.java b/Mage.Sets/src/mage/cards/u/UnderworldBreach.java index a4d4f0c8a6d..55a10352164 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldBreach.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldBreach.java @@ -1,7 +1,7 @@ package mage.cards.u; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -28,7 +28,7 @@ public final class UnderworldBreach extends CardImpl { // At the beginning of the end step, sacrifice Underworld Breach. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new SacrificeSourceEffect(), TargetController.NEXT, false + TargetController.NEXT, new SacrificeSourceEffect(), false )); } diff --git a/Mage.Sets/src/mage/cards/u/UnholyFiend.java b/Mage.Sets/src/mage/cards/u/UnholyFiend.java index cc34bae3dea..726ca0db1bb 100644 --- a/Mage.Sets/src/mage/cards/u/UnholyFiend.java +++ b/Mage.Sets/src/mage/cards/u/UnholyFiend.java @@ -3,7 +3,7 @@ package mage.cards.u; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -27,7 +27,7 @@ public final class UnholyFiend extends CardImpl { this.nightCard = true; - this.addAbility(new BeginningOfYourEndStepTriggeredAbility(new LoseLifeSourceControllerEffect(1), false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new LoseLifeSourceControllerEffect(1))); } private UnholyFiend(final UnholyFiend card) { diff --git a/Mage.Sets/src/mage/cards/u/UrabrasksForge.java b/Mage.Sets/src/mage/cards/u/UrabrasksForge.java index 594722bdd58..16a519dd459 100644 --- a/Mage.Sets/src/mage/cards/u/UrabrasksForge.java +++ b/Mage.Sets/src/mage/cards/u/UrabrasksForge.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.token.PhyrexianHorrorRedToken; @@ -31,7 +30,7 @@ public final class UrabrasksForge extends CardImpl { // At the beginning of combat on your turn, put an oil counter on Urabrask's Forge, then create an X/1 red Phyrexian Horror creature token with trample and haste, where X is the number of oil counters on Urabrask's Forge. Sacrifice that token at the beginning of the next end step. Ability ability = new BeginningOfCombatTriggeredAbility( - new AddCountersSourceEffect(CounterType.OIL.createInstance()), false + new AddCountersSourceEffect(CounterType.OIL.createInstance()) ); ability.addEffect(new UrabrasksForgeEffect()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/u/UrtetRemnantOfMemnarch.java b/Mage.Sets/src/mage/cards/u/UrtetRemnantOfMemnarch.java index 3d5eb6c6357..abc2a955b88 100644 --- a/Mage.Sets/src/mage/cards/u/UrtetRemnantOfMemnarch.java +++ b/Mage.Sets/src/mage/cards/u/UrtetRemnantOfMemnarch.java @@ -46,7 +46,7 @@ public final class UrtetRemnantOfMemnarch extends CardImpl { this.addAbility(new SpellCastControllerTriggeredAbility(new CreateTokenEffect(new MyrToken()), filter, false)); //At the beginning of combat on your turn, untap each Myr you control. - this.addAbility(new BeginningOfCombatTriggeredAbility(new UntapAllControllerEffect(filter2, "untap each Myr you control"), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new UntapAllControllerEffect(filter2, "untap each Myr you control"))); // {W}{U}{B}{R}{G}, {T}: Put three +1/+1 counters on each Myr you control. Activate only during your turn. Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.P1P1.createInstance(3), filter2), new ManaCostsImpl<>("{W}{U}{B}{R}{G}"), MyTurnCondition.instance); diff --git a/Mage.Sets/src/mage/cards/u/UrzaChiefArtificer.java b/Mage.Sets/src/mage/cards/u/UrzaChiefArtificer.java index 317302da42d..471d5c8fba2 100644 --- a/Mage.Sets/src/mage/cards/u/UrzaChiefArtificer.java +++ b/Mage.Sets/src/mage/cards/u/UrzaChiefArtificer.java @@ -1,7 +1,7 @@ package mage.cards.u; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.AffinityEffect; @@ -54,7 +54,7 @@ public final class UrzaChiefArtificer extends CardImpl { // At the beginning of your end step, create a 0/0 colorless Construct artifact creature token with "This creature gets +1/+1 for each artifact you control." this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new KarnConstructToken()), TargetController.YOU, false + new CreateTokenEffect(new KarnConstructToken()) )); } diff --git a/Mage.Sets/src/mage/cards/v/ValakutExploration.java b/Mage.Sets/src/mage/cards/v/ValakutExploration.java index 223f9c5e963..a159e3e3cc7 100644 --- a/Mage.Sets/src/mage/cards/v/ValakutExploration.java +++ b/Mage.Sets/src/mage/cards/v/ValakutExploration.java @@ -1,7 +1,7 @@ package mage.cards.v; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.LandfallAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -36,7 +36,7 @@ public final class ValakutExploration extends CardImpl { // At the beginning of your end step, if there are cards exiled with Valakut Exploration, put them into their owner's graveyard, then Valakut Exploration deals that much damage to each opponent. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new ValakutExplorationDamageEffect(), TargetController.YOU, false + new ValakutExplorationDamageEffect() ), ValakutExplorationCondition.instance, "At the beginning of your end step, " + "if there are cards exiled with {this}, put them into their owner's graveyard, " + "then {this} deals that much damage to each opponent." diff --git a/Mage.Sets/src/mage/cards/v/ValdukKeeperOfTheFlame.java b/Mage.Sets/src/mage/cards/v/ValdukKeeperOfTheFlame.java index 0fbf221219c..ffe7acc7e22 100644 --- a/Mage.Sets/src/mage/cards/v/ValdukKeeperOfTheFlame.java +++ b/Mage.Sets/src/mage/cards/v/ValdukKeeperOfTheFlame.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.Elemental31TrampleHasteToken; @@ -36,7 +35,7 @@ public final class ValdukKeeperOfTheFlame extends CardImpl { this.toughness = new MageInt(2); // At the beginning of combat on your turn, for each Aura and Equipment attached to Valduk, Keeper of the Flame, create a 3/1 red Elemental creature token with trample and haste. Exile those tokens at the beginning of the next end step. - this.addAbility(new BeginningOfCombatTriggeredAbility(new ValdukKeeperOfTheFlameEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new ValdukKeeperOfTheFlameEffect())); } private ValdukKeeperOfTheFlame(final ValdukKeeperOfTheFlame card) { diff --git a/Mage.Sets/src/mage/cards/v/ValkyrieHarbinger.java b/Mage.Sets/src/mage/cards/v/ValkyrieHarbinger.java index 8fd9ae39115..41758484d3d 100644 --- a/Mage.Sets/src/mage/cards/v/ValkyrieHarbinger.java +++ b/Mage.Sets/src/mage/cards/v/ValkyrieHarbinger.java @@ -1,7 +1,7 @@ package mage.cards.v; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -44,8 +44,8 @@ public final class ValkyrieHarbinger extends CardImpl { // At the beginning of each end step, if you gained 4 or more life this turn, create a 4/4 white Angel creature token with flying and vigilance. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new AngelVigilanceToken()), - TargetController.ANY, false + TargetController.ANY, new CreateTokenEffect(new AngelVigilanceToken()), + false ), condition, "At the beginning of each end step, if you gained 4 or more life this turn, " + "create a 4/4 white Angel creature token with flying and vigilance." ).addHint(ControllerGainedLifeCount.getHint()), new PlayerGainedLifeWatcher()); diff --git a/Mage.Sets/src/mage/cards/v/ValorSinger.java b/Mage.Sets/src/mage/cards/v/ValorSinger.java index bf193f914e3..c957a6c2a2f 100644 --- a/Mage.Sets/src/mage/cards/v/ValorSinger.java +++ b/Mage.Sets/src/mage/cards/v/ValorSinger.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -29,7 +28,7 @@ public final class ValorSinger extends CardImpl { // Combat Inspiration — At the beginning of combat on your turn, target creature you control gets +1/+0 until end of turn. Ability ability = new BeginningOfCombatTriggeredAbility( - new BoostTargetEffect(1, 0, Duration.EndOfTurn), false + new BoostTargetEffect(1, 0, Duration.EndOfTurn) ); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability.withFlavorWord("Combat Inspiration")); diff --git a/Mage.Sets/src/mage/cards/v/VannifarEvolvedEnigma.java b/Mage.Sets/src/mage/cards/v/VannifarEvolvedEnigma.java index 33c62ecbe4f..9a753facbac 100644 --- a/Mage.Sets/src/mage/cards/v/VannifarEvolvedEnigma.java +++ b/Mage.Sets/src/mage/cards/v/VannifarEvolvedEnigma.java @@ -46,7 +46,7 @@ public final class VannifarEvolvedEnigma extends CardImpl { // At the beginning of combat on your turn, choose one -- // * Cloak a card from your hand. // * Put a +1/+1 counter on each colorless creature you control. - Ability ability = new BeginningOfCombatTriggeredAbility(new VannifarCloakAbility(), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new VannifarCloakAbility()); ability.addMode(new Mode(new AddCountersAllEffect(CounterType.P1P1.createInstance(), filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VashtaNerada.java b/Mage.Sets/src/mage/cards/v/VashtaNerada.java index f0cc148c229..b576fe4a4ac 100644 --- a/Mage.Sets/src/mage/cards/v/VashtaNerada.java +++ b/Mage.Sets/src/mage/cards/v/VashtaNerada.java @@ -1,7 +1,7 @@ package mage.cards.v; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.hint.common.MorbidHint; @@ -38,8 +38,8 @@ public final class VashtaNerada extends CardImpl { // Morbid — At the beginning of each end step, if a creature died this turn, put a +1/+1 counter on Vashta Nerada. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - TargetController.ANY, MorbidCondition.instance, false + TargetController.ANY, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), + false, MorbidCondition.instance ).addHint(MorbidHint.instance).setAbilityWord(AbilityWord.MORBID)); } diff --git a/Mage.Sets/src/mage/cards/v/VentifactBottle.java b/Mage.Sets/src/mage/cards/v/VentifactBottle.java index f91446a44b4..6c7c1114d21 100644 --- a/Mage.Sets/src/mage/cards/v/VentifactBottle.java +++ b/Mage.Sets/src/mage/cards/v/VentifactBottle.java @@ -17,7 +17,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; -import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -41,7 +40,7 @@ public final class VentifactBottle extends CardImpl { ability.addCost(new TapSourceCost()); this.addAbility(ability); // At the beginning of your precombat main phase, if Ventifact Bottle has a charge counter on it, tap it and remove all charge counters from it. Add {C} for each charge counter removed this way. - TriggeredAbility ability2 = new BeginningOfFirstMainTriggeredAbility(new VentifactBottleEffect(), false); + TriggeredAbility ability2 = new BeginningOfFirstMainTriggeredAbility(new VentifactBottleEffect()); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability2, new SourceHasCounterCondition(CounterType.CHARGE, 1, Integer.MAX_VALUE), "At the beginning of your first main phase, " diff --git a/Mage.Sets/src/mage/cards/v/ViashinoCutthroat.java b/Mage.Sets/src/mage/cards/v/ViashinoCutthroat.java index d5de6cba53a..7e633d38b47 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoCutthroat.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoCutthroat.java @@ -3,7 +3,7 @@ package mage.cards.v; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class ViashinoCutthroat extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // At the beginning of the end step, return Viashino Cutthroat to its owner's hand. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ReturnToHandSourceEffect(true), TargetController.NEXT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, new ReturnToHandSourceEffect(true), false)); } private ViashinoCutthroat(final ViashinoCutthroat card) { diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSandscout.java b/Mage.Sets/src/mage/cards/v/ViashinoSandscout.java index c3b00359efb..451b0a824e0 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSandscout.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSandscout.java @@ -3,7 +3,7 @@ package mage.cards.v; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; @@ -29,7 +29,7 @@ public final class ViashinoSandscout extends CardImpl { // Haste this.addAbility(HasteAbility.getInstance()); // At the beginning of the end step, return Viashino Sandscout to its owner's hand. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ReturnToHandSourceEffect(true), TargetController.NEXT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, new ReturnToHandSourceEffect(true), false)); } private ViashinoSandscout(final ViashinoSandscout card) { diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java b/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java index 8c7117c5a6f..a1eb3352a4f 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java @@ -1,7 +1,7 @@ package mage.cards.v; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.CyclingAbility; @@ -36,7 +36,7 @@ public final class ViashinoSandsprinter extends CardImpl { // At the beginning of the end step, return Viashino Sandsprinter to its owner's hand. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ReturnToHandSourceEffect(true), TargetController.NEXT, false + TargetController.NEXT, new ReturnToHandSourceEffect(true), false )); // Cycling {R} diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSandstalker.java b/Mage.Sets/src/mage/cards/v/ViashinoSandstalker.java index a4357de2cd4..febc51002d1 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSandstalker.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSandstalker.java @@ -3,7 +3,7 @@ package mage.cards.v; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; @@ -31,8 +31,8 @@ public final class ViashinoSandstalker extends CardImpl { this.addAbility(HasteAbility.getInstance()); // At the beginning of the end step, return Viashino Sandstalker to its owner's hand. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ReturnToHandSourceEffect(true), - TargetController.ANY, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new ReturnToHandSourceEffect(true), + false)); } private ViashinoSandstalker(final ViashinoSandstalker card) { diff --git a/Mage.Sets/src/mage/cards/v/VihaanGoldwaker.java b/Mage.Sets/src/mage/cards/v/VihaanGoldwaker.java index 3cc7bb983e3..cfb7554ade6 100644 --- a/Mage.Sets/src/mage/cards/v/VihaanGoldwaker.java +++ b/Mage.Sets/src/mage/cards/v/VihaanGoldwaker.java @@ -57,8 +57,7 @@ public final class VihaanGoldwaker extends CardImpl { .withSubType(SubType.CONSTRUCT).withSubType(SubType.ASSASSIN), "", filterTreasures, Duration.EndOfTurn, false ).setText("have Treasures you control become 3/3 Construct Assassin artifact creatures " - + "in addition to their other types until end of turn"), - true + + "in addition to their other types until end of turn"), true )); } diff --git a/Mage.Sets/src/mage/cards/v/VinesoulSpider.java b/Mage.Sets/src/mage/cards/v/VinesoulSpider.java index 6116fd85d29..2f7844aeca3 100644 --- a/Mage.Sets/src/mage/cards/v/VinesoulSpider.java +++ b/Mage.Sets/src/mage/cards/v/VinesoulSpider.java @@ -1,7 +1,7 @@ package mage.cards.v; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.PutRandomCardFromLibraryIntoGraveyardEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.*; @@ -26,7 +26,7 @@ public final class VinesoulSpider extends CardImpl { // At the beginning of your end step, put a random land card from your library into your graveyard. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new PutRandomCardFromLibraryIntoGraveyardEffect(StaticFilters.FILTER_CARD_LAND), TargetController.YOU, false + new PutRandomCardFromLibraryIntoGraveyardEffect(StaticFilters.FILTER_CARD_LAND) )); } @@ -40,7 +40,3 @@ public final class VinesoulSpider extends CardImpl { return new VinesoulSpider(this); } } - - - - diff --git a/Mage.Sets/src/mage/cards/v/VirtueOfLoyalty.java b/Mage.Sets/src/mage/cards/v/VirtueOfLoyalty.java index ad177c01478..34434d15b3c 100644 --- a/Mage.Sets/src/mage/cards/v/VirtueOfLoyalty.java +++ b/Mage.Sets/src/mage/cards/v/VirtueOfLoyalty.java @@ -1,7 +1,7 @@ package mage.cards.v; import mage.abilities.TriggeredAbility; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.UntapAllEffect; import mage.abilities.effects.common.counter.AddCountersAllEffect; @@ -23,9 +23,8 @@ public final class VirtueOfLoyalty extends AdventureCard { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, new CardType[]{CardType.INSTANT}, "{3}{W}{W}", "Ardenvale Fealty", "{1}{W}"); // At the beginning of your end step, put a +1/+1 counter on each creature you control. Untap those creatures. - TriggeredAbility trigger = new BeginningOfYourEndStepTriggeredAbility( - new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURE), - false + TriggeredAbility trigger = new BeginningOfEndStepTriggeredAbility( + new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURE) ); trigger.addEffect(new UntapAllEffect(StaticFilters.FILTER_CONTROLLED_CREATURE).setText("untap those creatures")); this.addAbility(trigger); diff --git a/Mage.Sets/src/mage/cards/v/VisionsOfPhyrexia.java b/Mage.Sets/src/mage/cards/v/VisionsOfPhyrexia.java index d05a8b97f88..3b0ae440c58 100644 --- a/Mage.Sets/src/mage/cards/v/VisionsOfPhyrexia.java +++ b/Mage.Sets/src/mage/cards/v/VisionsOfPhyrexia.java @@ -1,7 +1,7 @@ package mage.cards.v; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.common.CreateTokenEffect; @@ -34,8 +34,8 @@ public final class VisionsOfPhyrexia extends CardImpl { // At the beginning of your end step, if you didn't play a card from exile this turn, create a tapped Powerstone token. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new PowerstoneToken(), 1, true), - TargetController.YOU, VisionsOfPhyrexiaCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new PowerstoneToken(), 1, true), + false, VisionsOfPhyrexiaCondition.instance ), new VisionsOfPhyrexiaWatcher()); } diff --git a/Mage.Sets/src/mage/cards/v/VolrathTheShapestealer.java b/Mage.Sets/src/mage/cards/v/VolrathTheShapestealer.java index 805c2a6d603..e75f0c8be07 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathTheShapestealer.java +++ b/Mage.Sets/src/mage/cards/v/VolrathTheShapestealer.java @@ -48,7 +48,7 @@ public final class VolrathTheShapestealer extends CardImpl { // At the beginning of combat on your turn, put a -1/-1 counter on up to one target creature. Ability ability = new BeginningOfCombatTriggeredAbility( - new AddCountersTargetEffect(CounterType.M1M1.createInstance(), Outcome.Detriment), false + new AddCountersTargetEffect(CounterType.M1M1.createInstance(), Outcome.Detriment) ); ability.addTarget(new TargetCreaturePermanent(0, 1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VoltaicServant.java b/Mage.Sets/src/mage/cards/v/VoltaicServant.java index 44ea916a938..e3f5c35e3a9 100644 --- a/Mage.Sets/src/mage/cards/v/VoltaicServant.java +++ b/Mage.Sets/src/mage/cards/v/VoltaicServant.java @@ -4,13 +4,12 @@ package mage.cards.v; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.UntapTargetEffect; import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.target.common.TargetArtifactPermanent; /** @@ -27,7 +26,7 @@ public final class VoltaicServant extends CardImpl { this.toughness = new MageInt(3); // At the beginning of your end step, untap target artifact. - Ability ability = new BeginningOfEndStepTriggeredAbility(new UntapTargetEffect(), TargetController.YOU, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new UntapTargetEffect()); ability.addTarget(new TargetArtifactPermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/v/VoltstormAngel.java b/Mage.Sets/src/mage/cards/v/VoltstormAngel.java index 92599024aec..a39fa9b5f46 100644 --- a/Mage.Sets/src/mage/cards/v/VoltstormAngel.java +++ b/Mage.Sets/src/mage/cards/v/VoltstormAngel.java @@ -18,7 +18,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import java.util.UUID; @@ -53,8 +52,7 @@ public final class VoltstormAngel extends CardImpl { // * Other creatures you control get +1/+1 until end of turn. reflexive.addMode(new Mode(new BoostControlledEffect(1, 1, Duration.EndOfTurn, true))); this.addAbility(new BeginningOfCombatTriggeredAbility( - new DoWhenCostPaid(reflexive, new PayEnergyCost(2), "Pay {E}{E}?"), - false + new DoWhenCostPaid(reflexive, new PayEnergyCost(2), "Pay {E}{E}?") )); } diff --git a/Mage.Sets/src/mage/cards/v/VoodooDoll.java b/Mage.Sets/src/mage/cards/v/VoodooDoll.java index 001a2859936..c19eec025f0 100644 --- a/Mage.Sets/src/mage/cards/v/VoodooDoll.java +++ b/Mage.Sets/src/mage/cards/v/VoodooDoll.java @@ -1,7 +1,7 @@ package mage.cards.v; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.SourceTappedCondition; @@ -18,7 +18,6 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -42,7 +41,7 @@ public final class VoodooDoll extends CardImpl { // At the beginning of your end step, if Voodoo Doll is untapped, destroy Voodoo Doll and it deals damage to you equal to the number of pin counters on it. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new DestroySourceEffect(), TargetController.YOU, false + new DestroySourceEffect() ), SourceTappedCondition.UNTAPPED, "At the beginning of your end step, " + "if {this} is untapped, destroy {this} and it deals damage to you equal to the number of pin counters on it." ); diff --git a/Mage.Sets/src/mage/cards/v/VrenTheRelentless.java b/Mage.Sets/src/mage/cards/v/VrenTheRelentless.java index 0577b98e14c..90ca31c8068 100644 --- a/Mage.Sets/src/mage/cards/v/VrenTheRelentless.java +++ b/Mage.Sets/src/mage/cards/v/VrenTheRelentless.java @@ -2,7 +2,7 @@ package mage.cards.v; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.DynamicValue; @@ -49,10 +49,10 @@ public final class VrenTheRelentless extends CardImpl { // At the beginning of each end step, create X 1/1 black Rat creature tokens with "This creature gets +1/+1 for each // other Rat you control," where X is the number of creatures your opponents controlled that were exiled this turn. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new CreateTokenEffect(new VrenRatToken(), VrenTheRelentlessCount.instance) + TargetController.ANY, new CreateTokenEffect(new VrenRatToken(), VrenTheRelentlessCount.instance) .setText("create X 1/1 black Rat creature tokens with \"This creature gets +1/+1 for each other Rat you " + "control,\" where X is the number of creatures your opponents controlled that were exiled this turn"), - TargetController.ANY, false + false ).addHint(new ValueHint("Creatures exiled under opponents' control this turn", VrenTheRelentlessCount.instance)), new VrenTheRelentlessWatcher()); } diff --git a/Mage.Sets/src/mage/cards/v/Vrock.java b/Mage.Sets/src/mage/cards/v/Vrock.java index 070191f4054..e1b99f729c4 100644 --- a/Mage.Sets/src/mage/cards/v/Vrock.java +++ b/Mage.Sets/src/mage/cards/v/Vrock.java @@ -1,7 +1,7 @@ package mage.cards.v; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.RevoltCondition; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.abilities.keyword.FlyingAbility; @@ -32,8 +32,8 @@ public final class Vrock extends CardImpl { // Toxic Spores — At the beginning of your end step, if a permanent you controlled left the battlefield this turn, each opponent loses 3 life. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new LoseLifeOpponentsEffect(3), TargetController.YOU, - RevoltCondition.instance, false + TargetController.YOU, new LoseLifeOpponentsEffect(3), + false, RevoltCondition.instance ).withFlavorWord("Toxic Spores").addHint(RevoltCondition.getHint()), new RevoltWatcher()); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfMourning.java b/Mage.Sets/src/mage/cards/w/WallOfMourning.java index 6f0812e05ec..08e3cb0b570 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfMourning.java +++ b/Mage.Sets/src/mage/cards/w/WallOfMourning.java @@ -2,7 +2,7 @@ package mage.cards.w; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.CovenCondition; import mage.abilities.dynamicvalue.common.OpponentsCount; @@ -42,8 +42,8 @@ public final class WallOfMourning extends CardImpl { // Coven — At the beginning of your end step, if you control three or more creatures with different powers, put a card exiled with Wall of Mourning into its owner's hand. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new WallOfMourningReturnEffect(), - TargetController.YOU, CovenCondition.instance, false + TargetController.YOU, new WallOfMourningReturnEffect(), + false, CovenCondition.instance ).addHint(CovenHint.instance).setAbilityWord(AbilityWord.COVEN)); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfResistance.java b/Mage.Sets/src/mage/cards/w/WallOfResistance.java index d03e519d713..80d0a58cc10 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfResistance.java +++ b/Mage.Sets/src/mage/cards/w/WallOfResistance.java @@ -2,7 +2,7 @@ package mage.cards.w; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -40,8 +40,8 @@ public final class WallOfResistance extends CardImpl { // At the beginning of each end step, if Wall of Resistance was dealt damage this turn, put a +0/+1 counter on it. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.P0P1.createInstance()), - TargetController.ANY, false + TargetController.ANY, new AddCountersSourceEffect(CounterType.P0P1.createInstance()), + false ), WallOfResistanceCondition.instance, "At the beginning of each end step, " + "if {this} was dealt damage this turn, put a +0/+1 counter on it." )); diff --git a/Mage.Sets/src/mage/cards/w/WallOfReverence.java b/Mage.Sets/src/mage/cards/w/WallOfReverence.java index df7e1643658..f6b1540bc34 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfReverence.java +++ b/Mage.Sets/src/mage/cards/w/WallOfReverence.java @@ -5,7 +5,7 @@ package mage.cards.w; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.FlyingAbility; @@ -34,7 +34,7 @@ public final class WallOfReverence extends CardImpl { this.toughness = new MageInt(6); this.addAbility(DefenderAbility.getInstance()); this.addAbility(FlyingAbility.getInstance()); - Ability ability = new BeginningOfYourEndStepTriggeredAbility(new WallOfReverenceTriggeredEffect(), true); + Ability ability = new BeginningOfEndStepTriggeredAbility(new WallOfReverenceTriggeredEffect(), true); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); } @@ -75,4 +75,4 @@ class WallOfReverenceTriggeredEffect extends OneShotEffect { return new WallOfReverenceTriggeredEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/w/WanderingTroubadour.java b/Mage.Sets/src/mage/cards/w/WanderingTroubadour.java index b04a532746a..528a864a7d8 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingTroubadour.java +++ b/Mage.Sets/src/mage/cards/w/WanderingTroubadour.java @@ -2,7 +2,7 @@ package mage.cards.w; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.LandfallCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.keyword.VentureIntoTheDungeonEffect; @@ -29,7 +29,7 @@ public final class WanderingTroubadour extends CardImpl { // At the beginning of your end step, if you had a land enter the battlefield under your control this turn, venture into the dungeon. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfYourEndStepTriggeredAbility(new VentureIntoTheDungeonEffect(), false), + new BeginningOfEndStepTriggeredAbility(new VentureIntoTheDungeonEffect()), LandfallCondition.instance, "At the beginning of your end step, if you had a land enter the battlefield under your control this turn, venture into the dungeon." ).addHint(CurrentDungeonHint.instance), new LandfallWatcher()); diff --git a/Mage.Sets/src/mage/cards/w/WarRoomStarWars.java b/Mage.Sets/src/mage/cards/w/WarRoomStarWars.java index 93c33b19b2e..032c2eeb1d0 100644 --- a/Mage.Sets/src/mage/cards/w/WarRoomStarWars.java +++ b/Mage.Sets/src/mage/cards/w/WarRoomStarWars.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.constants.Zone; import mage.game.Game; import mage.target.TargetPlayer; @@ -32,7 +31,7 @@ public class WarRoomStarWars extends CardImpl { //At the beginning of each combat on your turn, target creature can't block this turn. BeginningOfCombatTriggeredAbility beginningOfCombatTriggeredAbility = new BeginningOfCombatTriggeredAbility( new GainAbilityTargetEffect(new CantBlockAbility(), Duration.EndOfTurn) - .setText("target creature can't block this turn"), false); + .setText("target creature can't block this turn")); beginningOfCombatTriggeredAbility.addTarget(new TargetCreaturePermanent()); this.addAbility(beginningOfCombatTriggeredAbility); diff --git a/Mage.Sets/src/mage/cards/w/WargRider.java b/Mage.Sets/src/mage/cards/w/WargRider.java index 7f1c0b1a661..eb072cc2f9c 100644 --- a/Mage.Sets/src/mage/cards/w/WargRider.java +++ b/Mage.Sets/src/mage/cards/w/WargRider.java @@ -55,8 +55,7 @@ public final class WargRider extends CardImpl { // At the beginning of combat on your turn, amass Orcs 2. this.addAbility(new BeginningOfCombatTriggeredAbility( - new AmassEffect(2, SubType.ORC), - false + new AmassEffect(2, SubType.ORC) )); } diff --git a/Mage.Sets/src/mage/cards/w/WarlockClass.java b/Mage.Sets/src/mage/cards/w/WarlockClass.java index 7ed4220adb7..691f06b98cf 100644 --- a/Mage.Sets/src/mage/cards/w/WarlockClass.java +++ b/Mage.Sets/src/mage/cards/w/WarlockClass.java @@ -2,7 +2,7 @@ package mage.cards.w; import mage.abilities.Ability; import mage.abilities.common.BecomesClassLevelTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -38,7 +38,7 @@ public final class WarlockClass extends CardImpl { // At the beginning of your end step, if a creature died this turn, each opponent loses 1 life. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility( - new LoseLifeOpponentsEffect(1), TargetController.YOU, false + new LoseLifeOpponentsEffect(1) ), MorbidCondition.instance, "At the beginning of your end step, " + "if a creature died this turn, each opponent loses 1 life." ).addHint(MorbidHint.instance)); @@ -56,7 +56,7 @@ public final class WarlockClass extends CardImpl { // At the beginning of your end step, each opponent loses life equal to the life they lost this turn. this.addAbility(new SimpleStaticAbility(new GainClassAbilitySourceEffect( new BeginningOfEndStepTriggeredAbility( - new WarlockClassEffect(), TargetController.YOU, false + new WarlockClassEffect() ), 3 ))); } diff --git a/Mage.Sets/src/mage/cards/w/WeddingAnnouncement.java b/Mage.Sets/src/mage/cards/w/WeddingAnnouncement.java index 3a4738eca62..3aeec3b1c6a 100644 --- a/Mage.Sets/src/mage/cards/w/WeddingAnnouncement.java +++ b/Mage.Sets/src/mage/cards/w/WeddingAnnouncement.java @@ -3,7 +3,7 @@ package mage.cards.w; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.SourceHasCounterCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -36,7 +36,7 @@ public final class WeddingAnnouncement extends CardImpl { // Otherwise, create a 1/1 white Human creature token. // Then if Wedding Announcement has three or more invitation counters on it, transform it. this.addAbility(new TransformAbility()); - Ability ability = new BeginningOfYourEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.INVITATION.createInstance()), false); + Ability ability = new BeginningOfEndStepTriggeredAbility(new AddCountersSourceEffect(CounterType.INVITATION.createInstance())); ability.addEffect(new ConditionalOneShotEffect( new DrawCardSourceControllerEffect(1), new CreateTokenEffect(new HumanToken()), diff --git a/Mage.Sets/src/mage/cards/w/WeldfastEngineer.java b/Mage.Sets/src/mage/cards/w/WeldfastEngineer.java index 5258bb4ea2a..6d846d26de7 100644 --- a/Mage.Sets/src/mage/cards/w/WeldfastEngineer.java +++ b/Mage.Sets/src/mage/cards/w/WeldfastEngineer.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; @@ -36,7 +35,7 @@ public final class WeldfastEngineer extends CardImpl { this.toughness = new MageInt(3); // At the beginning of combat on your turn, target artifact creature you control gets +2/+0 until end of turn. - Ability ability = new BeginningOfCombatTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn), false); + Ability ability = new BeginningOfCombatTriggeredAbility(new BoostTargetEffect(2, 0, Duration.EndOfTurn)); ability.addTarget(new TargetControlledPermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WellOfDiscovery.java b/Mage.Sets/src/mage/cards/w/WellOfDiscovery.java index 743bbba2e25..82c184366f2 100644 --- a/Mage.Sets/src/mage/cards/w/WellOfDiscovery.java +++ b/Mage.Sets/src/mage/cards/w/WellOfDiscovery.java @@ -2,7 +2,7 @@ package mage.cards.w; import java.util.UUID; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -10,7 +10,6 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.permanent.TappedPredicate; @@ -31,7 +30,7 @@ public final class WellOfDiscovery extends CardImpl { // At the beginning of your end step, if you control no untapped lands, draw a card. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility( - new DrawCardSourceControllerEffect(1), TargetController.YOU, false), + new DrawCardSourceControllerEffect(1)), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)), "At the beginning of your end step, if you control no untapped lands, draw a card.")); } diff --git a/Mage.Sets/src/mage/cards/w/WellOfLife.java b/Mage.Sets/src/mage/cards/w/WellOfLife.java index 2636b8b9d9a..003a4b691d7 100644 --- a/Mage.Sets/src/mage/cards/w/WellOfLife.java +++ b/Mage.Sets/src/mage/cards/w/WellOfLife.java @@ -2,7 +2,7 @@ package mage.cards.w; import java.util.UUID; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.InvertCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -10,7 +10,6 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.permanent.TappedPredicate; @@ -31,7 +30,7 @@ public final class WellOfLife extends CardImpl { // At the beginning of your end step, if you control no untapped lands, you gain 2 life. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfEndStepTriggeredAbility( - new GainLifeEffect(2), TargetController.YOU, false), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)), + new GainLifeEffect(2)), new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)), "At the beginning of your end step, if you control no untapped lands, you gain 2 life.")); } diff --git a/Mage.Sets/src/mage/cards/w/WestvaleCultLeader.java b/Mage.Sets/src/mage/cards/w/WestvaleCultLeader.java index 4928a9ce409..48a394838ec 100644 --- a/Mage.Sets/src/mage/cards/w/WestvaleCultLeader.java +++ b/Mage.Sets/src/mage/cards/w/WestvaleCultLeader.java @@ -1,7 +1,7 @@ package mage.cards.w; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.CreaturesYouControlCount; import mage.abilities.effects.common.CreateTokenEffect; @@ -35,7 +35,7 @@ public final class WestvaleCultLeader extends CardImpl { .addHint(CreaturesYouControlHint.instance)); // At the beginning of your end step, create a 1/1 white and black Human Cleric creature token. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new HumanClericToken()), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new HumanClericToken()))); } private WestvaleCultLeader(final WestvaleCultLeader card) { diff --git a/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java b/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java index b78fab4bf65..ca9a8348e9a 100644 --- a/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java +++ b/Mage.Sets/src/mage/cards/w/WhisperwoodElemental.java @@ -4,7 +4,7 @@ package mage.cards.w; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; -import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -43,7 +42,7 @@ public final class WhisperwoodElemental extends CardImpl { this.toughness = new MageInt(4); // At the beginning of your end step, manifest the top card of your library. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new ManifestEffect(1), TargetController.YOU, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(new ManifestEffect(1))); // Sacrifice Whisperwood Elemental: Until end of turn, face-up, nontoken creatures you control gain "When this creature dies, manifest the top card of your library." Ability abilityToGain = new DiesSourceTriggeredAbility(new ManifestEffect(1)); diff --git a/Mage.Sets/src/mage/cards/w/WhiteGloveGourmand.java b/Mage.Sets/src/mage/cards/w/WhiteGloveGourmand.java index 4696620b69c..8c8f068c4db 100644 --- a/Mage.Sets/src/mage/cards/w/WhiteGloveGourmand.java +++ b/Mage.Sets/src/mage/cards/w/WhiteGloveGourmand.java @@ -3,7 +3,7 @@ package mage.cards.w; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; @@ -44,7 +43,7 @@ public final class WhiteGloveGourmand extends CardImpl { // At the beginning of your end step, if another Human died under your control this turn, create a Food token. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new FoodToken()), TargetController.YOU, false), + new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new FoodToken())), WhiteGloveGourmandCondition.instance, "At the beginning of your end step, if another Human died under your control this turn, create a Food token." ).addHint(WhiteGloveGourmandCondition.hint), new WhiteGloveGourmandWatcher()); @@ -116,4 +115,4 @@ class WhiteGloveGourmandWatcher extends Watcher { .stream() .anyMatch(mor -> !mor.equals(morSource)); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/w/WildernessReclamation.java b/Mage.Sets/src/mage/cards/w/WildernessReclamation.java index b15ee0e26f3..6f5aabe7954 100644 --- a/Mage.Sets/src/mage/cards/w/WildernessReclamation.java +++ b/Mage.Sets/src/mage/cards/w/WildernessReclamation.java @@ -1,11 +1,10 @@ package mage.cards.w; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.UntapAllControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import java.util.UUID; @@ -20,8 +19,7 @@ public final class WildernessReclamation extends CardImpl { // At the beginning of your end step, untap all lands you control. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new UntapAllControllerEffect(StaticFilters.FILTER_LANDS), - TargetController.YOU, false + new UntapAllControllerEffect(StaticFilters.FILTER_LANDS) )); } diff --git a/Mage.Sets/src/mage/cards/w/WilheltTheRotcleaver.java b/Mage.Sets/src/mage/cards/w/WilheltTheRotcleaver.java index c9daa885fa4..5db99fc71b6 100644 --- a/Mage.Sets/src/mage/cards/w/WilheltTheRotcleaver.java +++ b/Mage.Sets/src/mage/cards/w/WilheltTheRotcleaver.java @@ -1,7 +1,7 @@ package mage.cards.w; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.common.CreateTokenEffect; @@ -13,14 +13,12 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.permanent.token.ZombieDecayedToken; -import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -59,7 +57,7 @@ public final class WilheltTheRotcleaver extends CardImpl { this.addAbility(new BeginningOfEndStepTriggeredAbility(new DoIfCostPaid( new DrawCardSourceControllerEffect(1), new SacrificeTargetCost(filter2) - ), TargetController.YOU, false)); + ))); } private WilheltTheRotcleaver(final WilheltTheRotcleaver card) { diff --git a/Mage.Sets/src/mage/cards/w/WitchHunt.java b/Mage.Sets/src/mage/cards/w/WitchHunt.java index 964df8ea351..24bf9cead9b 100644 --- a/Mage.Sets/src/mage/cards/w/WitchHunt.java +++ b/Mage.Sets/src/mage/cards/w/WitchHunt.java @@ -3,7 +3,7 @@ package mage.cards.w; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -37,7 +37,7 @@ public final class WitchHunt extends CardImpl { // At the beginning of your upkeep, Witch Hunt deals 4 damage to you. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DamageControllerEffect(4))); // At the beginning of your end step, target opponent chosen at random gains control of Witch Hunt. - Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new WitchHuntEffect(), TargetController.YOU, null, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(TargetController.YOU, new WitchHuntEffect(), false, null); Target target = new TargetOpponent(); target.setRandom(true); ability.addTarget(target); diff --git a/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java b/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java index e0f2b8609bf..60bac2d662e 100644 --- a/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java +++ b/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java @@ -2,7 +2,7 @@ package mage.cards.w; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.YouGainedLifeCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; @@ -13,9 +13,7 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.ComparisonType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.target.common.TargetCardInYourGraveyard; import mage.watchers.common.PlayerGainedLifeWatcher; @@ -45,7 +43,7 @@ public final class WitchOfTheMoors extends CardImpl { Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility(new SacrificeOpponentsEffect( StaticFilters.FILTER_PERMANENT_A_CREATURE - ), TargetController.YOU, false), + )), condition, "At the beginning of your end step, if you gained life this turn, " + "each opponent sacrifices a creature and you return up to one target creature card " + "from your graveyard to your hand." diff --git a/Mage.Sets/src/mage/cards/w/WolverineBestThereIs.java b/Mage.Sets/src/mage/cards/w/WolverineBestThereIs.java index fddb4207db7..ccf4cc59261 100644 --- a/Mage.Sets/src/mage/cards/w/WolverineBestThereIs.java +++ b/Mage.Sets/src/mage/cards/w/WolverineBestThereIs.java @@ -3,7 +3,7 @@ package mage.cards.w; import mage.MageInt; import mage.MageObjectReference; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; @@ -45,9 +45,9 @@ public final class WolverineBestThereIs extends CardImpl { // At the beginning of each end step, if Wolverine dealt damage to another creature this turn, put a +1/+1 counter on him. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()) + TargetController.ANY, new AddCountersSourceEffect(CounterType.P1P1.createInstance()) .setText("put a +1/+1 counter on him"), - TargetController.ANY, WolverineBestThereIsCondition.instance, false + false, WolverineBestThereIsCondition.instance ), new WolverineBestThereIsWatcher()); // {1}{G}: Regenerate Wolverine. diff --git a/Mage.Sets/src/mage/cards/w/WondrousCrucible.java b/Mage.Sets/src/mage/cards/w/WondrousCrucible.java index 0661974f424..5e27f5f7396 100644 --- a/Mage.Sets/src/mage/cards/w/WondrousCrucible.java +++ b/Mage.Sets/src/mage/cards/w/WondrousCrucible.java @@ -2,7 +2,7 @@ package mage.cards.w; import mage.ApprovingObject; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; @@ -34,7 +34,7 @@ public final class WondrousCrucible extends CardImpl { // At the beginning of your end step, mill two cards, then exile a nonland card at random from your graveyard. Copy it. You may cast the copy without paying its mana cost. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new WondrousCrucibleEffect(), TargetController.YOU, false + new WondrousCrucibleEffect() )); } diff --git a/Mage.Sets/src/mage/cards/w/WorkshopElders.java b/Mage.Sets/src/mage/cards/w/WorkshopElders.java index 2aad83a3292..7790445f29d 100644 --- a/Mage.Sets/src/mage/cards/w/WorkshopElders.java +++ b/Mage.Sets/src/mage/cards/w/WorkshopElders.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/w/WoundReflection.java b/Mage.Sets/src/mage/cards/w/WoundReflection.java index 58867a99742..514599e9435 100644 --- a/Mage.Sets/src/mage/cards/w/WoundReflection.java +++ b/Mage.Sets/src/mage/cards/w/WoundReflection.java @@ -3,7 +3,7 @@ package mage.cards.w; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class WoundReflection extends CardImpl { // At the beginning of each end step, each opponent loses life equal to the life they lost this turn. - this.addAbility(new BeginningOfEndStepTriggeredAbility(new WoundReflectionEffect(), TargetController.ANY, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new WoundReflectionEffect(), false)); } private WoundReflection(final WoundReflection card) { diff --git a/Mage.Sets/src/mage/cards/w/WranglerOfTheDamned.java b/Mage.Sets/src/mage/cards/w/WranglerOfTheDamned.java index fa7e15c13e7..fe62887fc16 100644 --- a/Mage.Sets/src/mage/cards/w/WranglerOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/w/WranglerOfTheDamned.java @@ -1,7 +1,7 @@ package mage.cards.w; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.HaventCastSpellFromHandThisTurnCondition; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlashAbility; @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; import mage.game.permanent.token.Spirit22Token; import java.util.UUID; @@ -33,8 +32,8 @@ public final class WranglerOfTheDamned extends CardImpl { // At the beginning of your end step, if you haven't cast a spell from your hand this turn, create a 2/2 white Spirit creature token with flying. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new CreateTokenEffect(new Spirit22Token()), - TargetController.YOU, HaventCastSpellFromHandThisTurnCondition.instance, false + TargetController.YOU, new CreateTokenEffect(new Spirit22Token()), + false, HaventCastSpellFromHandThisTurnCondition.instance ).addHint(HaventCastSpellFromHandThisTurnCondition.hint)); } diff --git a/Mage.Sets/src/mage/cards/x/XolatoyacTheSmilingFlood.java b/Mage.Sets/src/mage/cards/x/XolatoyacTheSmilingFlood.java index 9e2747c268f..994b6563d3f 100644 --- a/Mage.Sets/src/mage/cards/x/XolatoyacTheSmilingFlood.java +++ b/Mage.Sets/src/mage/cards/x/XolatoyacTheSmilingFlood.java @@ -3,7 +3,7 @@ package mage.cards.x; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; import mage.abilities.effects.common.UntapAllEffect; import mage.abilities.effects.common.continuous.BecomesBasicLandTargetEffect; @@ -50,8 +50,7 @@ public final class XolatoyacTheSmilingFlood extends CardImpl { // At the beginning of your end step, untap each permanent you control with a counter on it. this.addAbility(new BeginningOfEndStepTriggeredAbility( new UntapAllEffect(filter) - .setText("untap each permanent you control with a counter on it"), - TargetController.YOU, false + .setText("untap each permanent you control with a counter on it") )); } @@ -90,4 +89,4 @@ class XolatoyacTheSmilingFloodEffect extends BecomesBasicLandTargetEffect { } return super.apply(game, source); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java b/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java index ceee7fc8361..165c9c2c20e 100644 --- a/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java +++ b/Mage.Sets/src/mage/cards/y/YasovaDragonclaw.java @@ -56,7 +56,7 @@ public final class YasovaDragonclaw extends CardImpl { effect2.setText(", untap that creature"); effect.addEffect(effect2); effect.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn, ", and it gains haste until end of turn")); - Ability ability = new BeginningOfCombatTriggeredAbility(effect, false); + Ability ability = new BeginningOfCombatTriggeredAbility(effect); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZiatoraTheIncinerator.java b/Mage.Sets/src/mage/cards/z/ZiatoraTheIncinerator.java index 29f452a61a2..a075f3e66bc 100644 --- a/Mage.Sets/src/mage/cards/z/ZiatoraTheIncinerator.java +++ b/Mage.Sets/src/mage/cards/z/ZiatoraTheIncinerator.java @@ -2,7 +2,7 @@ package mage.cards.z; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.delayed.ReflexiveTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -16,9 +16,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.TreasureToken; import mage.players.Player; -import mage.target.TargetPermanent; import mage.target.common.TargetAnyTarget; -import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetSacrifice; import java.util.UUID; @@ -42,7 +40,7 @@ public final class ZiatoraTheIncinerator extends CardImpl { // At the beginning of your end step, you may sacrifice another creature. When you do, Ziatora, the Incinerator deals damage equal to that creature's power to any target and you create three Treasure tokens. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ZiatoraTheIncineratorEffect(), TargetController.YOU, false + new ZiatoraTheIncineratorEffect() )); } diff --git a/Mage.Sets/src/mage/cards/z/ZimoneAllQuestioning.java b/Mage.Sets/src/mage/cards/z/ZimoneAllQuestioning.java index 20366e1ee7d..1c7a39a0cf3 100644 --- a/Mage.Sets/src/mage/cards/z/ZimoneAllQuestioning.java +++ b/Mage.Sets/src/mage/cards/z/ZimoneAllQuestioning.java @@ -2,7 +2,7 @@ package mage.cards.z; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -35,8 +35,8 @@ public final class ZimoneAllQuestioning extends CardImpl { // At the beginning of your end step, if a land entered the battlefield under your control this turn and you control a prime number of lands, create Primo, the Indivisible, a legendary 0/0 green and blue Fractal creature token, then put that many +1/+1 counters on it. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ZimoneAllQuestioningEffect(), TargetController.YOU, - ZimoneAllQuestioningCondition.instance, false + TargetController.YOU, new ZimoneAllQuestioningEffect(), + false, ZimoneAllQuestioningCondition.instance ), new LandfallWatcher()); } diff --git a/Mage.Sets/src/mage/cards/z/ZndrspltEyeOfWisdom.java b/Mage.Sets/src/mage/cards/z/ZndrspltEyeOfWisdom.java index 702bef43c4a..6457b2a160c 100644 --- a/Mage.Sets/src/mage/cards/z/ZndrspltEyeOfWisdom.java +++ b/Mage.Sets/src/mage/cards/z/ZndrspltEyeOfWisdom.java @@ -13,7 +13,6 @@ import mage.constants.SuperType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TargetController; /** * @@ -33,7 +32,7 @@ public final class ZndrspltEyeOfWisdom extends CardImpl { this.addAbility(new PartnerWithAbility("Okaun, Eye of Chaos", true)); // At the beginning of combat on your turn, flip a coin until you lose a flip. - this.addAbility(new BeginningOfCombatTriggeredAbility(new FlipUntilLoseEffect(), false)); + this.addAbility(new BeginningOfCombatTriggeredAbility(new FlipUntilLoseEffect())); // Whenever a player wins a coin flip, draw a card. this.addAbility(new WinsCoinFlipTriggeredAbility(new DrawCardSourceControllerEffect(1))); diff --git a/Mage.Sets/src/mage/cards/z/ZombieOgre.java b/Mage.Sets/src/mage/cards/z/ZombieOgre.java index 89ff6becde8..b2c7aafecb2 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieOgre.java +++ b/Mage.Sets/src/mage/cards/z/ZombieOgre.java @@ -1,7 +1,7 @@ package mage.cards.z; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.MorbidCondition; import mage.abilities.effects.keyword.VentureIntoTheDungeonEffect; import mage.abilities.hint.common.CurrentDungeonHint; @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.constants.Zone; import java.util.UUID; @@ -30,8 +29,8 @@ public final class ZombieOgre extends CardImpl { // At the beginning of your end step, if a creature died this turn, venture into the dungeon. this.addAbility(new BeginningOfEndStepTriggeredAbility( - Zone.BATTLEFIELD, new VentureIntoTheDungeonEffect(), - TargetController.YOU, MorbidCondition.instance, false + TargetController.YOU, new VentureIntoTheDungeonEffect(), + false, MorbidCondition.instance ).addHint(MorbidHint.instance).addHint(CurrentDungeonHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/z/ZoyowaLavaTongue.java b/Mage.Sets/src/mage/cards/z/ZoyowaLavaTongue.java index ef56a3ac7f2..c96119efc1f 100644 --- a/Mage.Sets/src/mage/cards/z/ZoyowaLavaTongue.java +++ b/Mage.Sets/src/mage/cards/z/ZoyowaLavaTongue.java @@ -2,7 +2,7 @@ package mage.cards.z; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.common.DescendedThisTurnCondition; import mage.abilities.costs.Cost; import mage.abilities.costs.OrCost; @@ -43,8 +43,8 @@ public final class ZoyowaLavaTongue extends CardImpl { // At the beginning of your end step, if you descended this turn, each opponent may discard a card or sacrifice a permanent. Zoyowa Lava-Tongue deals 3 damage to each opponent who didn't. this.addAbility(new BeginningOfEndStepTriggeredAbility( - new ZoyowaLavaTongueEffect(), TargetController.YOU, - DescendedThisTurnCondition.instance, false + TargetController.YOU, new ZoyowaLavaTongueEffect(), + false, DescendedThisTurnCondition.instance ).addHint(DescendedThisTurnCount.getHint()), new DescendedWatcher()); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/znr/MoraugFuryOfAkoumTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/znr/MoraugFuryOfAkoumTest.java index 0c8eea0d755..b06601a4bed 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/znr/MoraugFuryOfAkoumTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/znr/MoraugFuryOfAkoumTest.java @@ -3,7 +3,6 @@ package org.mage.test.cards.single.znr; import mage.abilities.triggers.BeginningOfCombatTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.constants.PhaseStep; -import mage.constants.TargetController; import mage.constants.Zone; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -24,7 +23,7 @@ public class MoraugFuryOfAkoumTest extends CardTestPlayerBase { addCustomCardWithAbility( "Combat Counter", playerA, new BeginningOfCombatTriggeredAbility( - new GainLifeEffect(1), false + new GainLifeEffect(1) ) ); } diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java index 165a164188c..29030e2bf3f 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java @@ -250,13 +250,15 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge if (interveningIfCondition != null) { String conditionText = interveningIfCondition.toString(); - if (replaceRuleText && triggerPhrase != null && triggerPhrase.contains("{this}")) { - conditionText = conditionText.replace("{this}", "it"); + if (!conditionText.isEmpty()) { // e.g. CaseSolveAbility + if (replaceRuleText && triggerPhrase != null && triggerPhrase.contains("{this}")) { + conditionText = conditionText.replace("{this}", "it"); + } + if (!conditionText.startsWith("if ")) { + sb.append("if "); + } + sb.append(conditionText).append(", "); } - if (!conditionText.startsWith("if ")) { - sb.append("if "); - } - sb.append(conditionText).append(", "); } String superRule = super.getRule(true); diff --git a/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java deleted file mode 100644 index 84cbf8962f7..00000000000 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java +++ /dev/null @@ -1,155 +0,0 @@ -package mage.abilities.common; - -import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.condition.Condition; -import mage.abilities.effects.Effect; -import mage.constants.TargetController; -import mage.constants.Zone; -import mage.game.Game; -import mage.game.events.GameEvent; -import mage.game.permanent.Permanent; -import mage.target.targetpointer.FixedTarget; - -public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { - - private final TargetController targetController; - private final Condition interveningIfClauseCondition; - - public BeginningOfEndStepTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) { - this(effect, targetController, null, isOptional); - } - - public BeginningOfEndStepTriggeredAbility(Effect effect, TargetController targetController, Condition interveningIfClauseCondition, boolean isOptional) { - this(Zone.BATTLEFIELD, effect, targetController, interveningIfClauseCondition, isOptional); - } - - public BeginningOfEndStepTriggeredAbility(Zone zone, Effect effect, TargetController targetController, Condition interveningIfClauseCondition, boolean isOptional) { - super(zone, effect, isOptional); - this.targetController = targetController; - this.interveningIfClauseCondition = interveningIfClauseCondition; - setTriggerPhrase(generateTriggerPhrase()); - } - - protected BeginningOfEndStepTriggeredAbility(final BeginningOfEndStepTriggeredAbility ability) { - super(ability); - this.targetController = ability.targetController; - this.interveningIfClauseCondition = ability.interveningIfClauseCondition; - } - - @Override - public BeginningOfEndStepTriggeredAbility copy() { - return new BeginningOfEndStepTriggeredAbility(this); - } - - @Override - public boolean checkEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.END_TURN_STEP_PRE; - } - - @Override - public boolean checkTrigger(GameEvent event, Game game) { - switch (targetController) { - case YOU: - boolean yours = event.getPlayerId().equals(this.controllerId); - if (yours && getTargets().isEmpty()) { - this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId())); - } - return yours; - case OPPONENT: - if (game.getPlayer(this.controllerId).hasOpponent(event.getPlayerId(), game)) { - if (getTargets().isEmpty()) { - this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId())); - } - return true; - } - break; - case ANY: - case EACH_PLAYER: - case NEXT: - if (getTargets().isEmpty()) { - this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId())); - } - return true; - case CONTROLLER_ATTACHED_TO: - Permanent attachment = game.getPermanent(sourceId); - if (attachment == null || attachment.getAttachedTo() == null) { - break; - } - Permanent attachedTo = game.getPermanent(attachment.getAttachedTo()); - if (attachedTo == null || !attachedTo.isControlledBy(event.getPlayerId())) { - break; - } - if (getTargets().isEmpty()) { - this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId())); - } - return true; - case ENCHANTED: - Permanent permanent = getSourcePermanentIfItStillExists(game); - if (permanent == null || !game.isActivePlayer(permanent.getAttachedTo())) { - break; - } - if (getTargets().isEmpty()) { - this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId())); - } - return true; - case MONARCH: - if (!event.getPlayerId().equals(game.getMonarchId())) { - break; - } - if (getTargets().isEmpty()) { - this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId())); - } - return true; - } - return false; - } - - @Override - public boolean checkInterveningIfClause(Game game) { - if (interveningIfClauseCondition != null) { - return interveningIfClauseCondition.apply(game, this); - } - return true; - } - - private String generateTriggerPhrase() { - switch (targetController) { - case YOU: - return "At the beginning of your end step, " + generateConditionString(); - case NEXT: - return "At the beginning of the end step, " + generateConditionString(); - case OPPONENT: - return "At the beginning of each opponent's end step, " + generateConditionString(); - case ANY: - return "At the beginning of each end step, " + generateConditionString(); - case EACH_PLAYER: - return "At the beginning of each player's end step, " + generateConditionString(); - case CONTROLLER_ATTACHED_TO: - return "At the beginning of the end step of enchanted permanent's controller, " + generateConditionString(); - case ENCHANTED: - return "At the beginning of enchanted player's end step, " + generateConditionString(); - case MONARCH: - return "At the beginning of the monarch's end step, " + generateConditionString(); - } - return ""; - } - - private String generateConditionString() { - if (interveningIfClauseCondition == null) { - if (getZone() == Zone.GRAVEYARD) { - return "if {this} is in your graveyard, "; - } - return ""; - } - String clauseText = interveningIfClauseCondition.toString(); - if (clauseText.startsWith("if")) { - // Fixes punctuation on multiple sentence if-then construction - // see -- Colfenor's Urn - if (clauseText.endsWith(".")) { - return clauseText + " "; - } - return clauseText + ", "; - } - return "if " + clauseText + ", "; - } -} diff --git a/Mage/src/main/java/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java deleted file mode 100644 index d808105a25d..00000000000 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java +++ /dev/null @@ -1,42 +0,0 @@ -package mage.abilities.common; - -import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.Effect; -import mage.constants.Zone; -import mage.game.Game; -import mage.game.events.GameEvent; - -/** - * Beginning of controlled end step triggered ability - * - * @author Loki - */ -public class BeginningOfYourEndStepTriggeredAbility extends TriggeredAbilityImpl { - public BeginningOfYourEndStepTriggeredAbility(Effect effect, boolean optional) { - this(Zone.BATTLEFIELD, effect, optional); - } - - public BeginningOfYourEndStepTriggeredAbility(Zone zone, Effect effect, boolean optional) { - super(zone, effect, optional); - setTriggerPhrase("At the beginning of your end step, "); - } - - protected BeginningOfYourEndStepTriggeredAbility(final BeginningOfYourEndStepTriggeredAbility ability) { - super(ability); - } - - @Override - public BeginningOfYourEndStepTriggeredAbility copy() { - return new BeginningOfYourEndStepTriggeredAbility(this); - } - - @Override - public boolean checkEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.END_TURN_STEP_PRE; - } - - @Override - public boolean checkTrigger(GameEvent event, Game game) { - return event.getPlayerId().equals(this.controllerId); - } -} diff --git a/Mage/src/main/java/mage/abilities/common/CaseAbility.java b/Mage/src/main/java/mage/abilities/common/CaseAbility.java index 3eb53d35b5e..2e40b823ca0 100644 --- a/Mage/src/main/java/mage/abilities/common/CaseAbility.java +++ b/Mage/src/main/java/mage/abilities/common/CaseAbility.java @@ -11,6 +11,7 @@ import mage.abilities.decorator.ConditionalReplacementEffect; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; @@ -114,8 +115,8 @@ public class CaseAbility extends SimpleStaticAbility { class CaseSolveAbility extends BeginningOfEndStepTriggeredAbility { CaseSolveAbility(Condition condition) { - super(new SolveEffect(), TargetController.YOU, - new CompoundCondition(condition, SolvedSourceCondition.UNSOLVED), false); + super(TargetController.YOU, new SolveEffect(), + false, new CompoundCondition(condition, SolvedSourceCondition.UNSOLVED)); withFlavorWord("To solve"); // TODO: technically this shouldn't be italicized setTriggerPhrase(CardUtil.getTextWithFirstCharUpperCase(trimIf(condition.toString()))); } diff --git a/Mage/src/main/java/mage/abilities/keyword/ImpendingAbility.java b/Mage/src/main/java/mage/abilities/keyword/ImpendingAbility.java index 4d02211948b..63cf3019712 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ImpendingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ImpendingAbility.java @@ -1,7 +1,7 @@ package mage.abilities.keyword; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; @@ -47,8 +47,8 @@ public class ImpendingAbility extends AlternativeSourceCostsImpl { ), "").setRuleVisible(false)); this.addSubAbility(new SimpleStaticAbility(new ImpendingAbilityTypeEffect()).setRuleVisible(false)); Ability ability = new BeginningOfEndStepTriggeredAbility( - new RemoveCounterSourceEffect(CounterType.TIME.createInstance()), - TargetController.YOU, ImpendingCondition.instance, false + TargetController.YOU, new RemoveCounterSourceEffect(CounterType.TIME.createInstance()), + false, ImpendingCondition.instance ); ability.addEffect(new ConditionalOneShotEffect( new AddContinuousEffectToGame(new ImpendingAbilityRemoveEffect()), diff --git a/Mage/src/main/java/mage/abilities/triggers/AtStepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/triggers/AtStepTriggeredAbility.java index 47b6b90775b..4bfc454129b 100644 --- a/Mage/src/main/java/mage/abilities/triggers/AtStepTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/triggers/AtStepTriggeredAbility.java @@ -32,9 +32,6 @@ public abstract class AtStepTriggeredAbility extends TriggeredAbilityImpl { this.setTargetPointer = ability.setTargetPointer; } - // implementing classes must add copy constructor - // implementing classes must override checksEventType - @Override public boolean checkTrigger(GameEvent event, Game game) { if (checkTargetController(event, game)) { @@ -51,7 +48,6 @@ public abstract class AtStepTriggeredAbility extends TriggeredAbilityImpl { case NOT_YOU: return !isControlledBy(event.getPlayerId()); case ANY: - case ACTIVE: case NEXT: case EACH_PLAYER: return true; diff --git a/Mage/src/main/java/mage/abilities/triggers/BeginningOfCombatTriggeredAbility.java b/Mage/src/main/java/mage/abilities/triggers/BeginningOfCombatTriggeredAbility.java index dbe31c066c5..1b91c90ae81 100644 --- a/Mage/src/main/java/mage/abilities/triggers/BeginningOfCombatTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/triggers/BeginningOfCombatTriggeredAbility.java @@ -8,6 +8,13 @@ import mage.game.events.GameEvent; public class BeginningOfCombatTriggeredAbility extends AtStepTriggeredAbility { + /** + * At the beginning of combat on your turn (optional = false) + */ + public BeginningOfCombatTriggeredAbility(Effect effect) { + this(effect, false); + } + /** * At the beginning of combat on your turn */ diff --git a/Mage/src/main/java/mage/abilities/triggers/BeginningOfEndStepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/triggers/BeginningOfEndStepTriggeredAbility.java new file mode 100644 index 00000000000..4cbb95ec011 --- /dev/null +++ b/Mage/src/main/java/mage/abilities/triggers/BeginningOfEndStepTriggeredAbility.java @@ -0,0 +1,77 @@ +package mage.abilities.triggers; + +import mage.abilities.condition.Condition; +import mage.abilities.effects.Effect; +import mage.constants.TargetController; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.events.GameEvent; + +public class BeginningOfEndStepTriggeredAbility extends AtStepTriggeredAbility { + + /** + * At the beginning of your end step (optional = false) + */ + public BeginningOfEndStepTriggeredAbility(Effect effect) { + this(effect, false); + } + + /** + * At the beginning of your end step + */ + public BeginningOfEndStepTriggeredAbility(Effect effect, boolean optional) { + this(TargetController.YOU, effect, optional); + } + + public BeginningOfEndStepTriggeredAbility(TargetController targetController, Effect effect, boolean optional) { + this(targetController, effect, optional, null); + } + + public BeginningOfEndStepTriggeredAbility(TargetController targetController, Effect effect, boolean optional, Condition interveningIfClauseCondition) { + this(Zone.BATTLEFIELD, targetController, effect, optional, interveningIfClauseCondition); + } + + public BeginningOfEndStepTriggeredAbility(Zone zone, TargetController targetController, Effect effect, boolean optional, Condition interveningIfClauseCondition) { + super(zone, targetController, effect, optional); + this.withInterveningIf(interveningIfClauseCondition); + } + + protected BeginningOfEndStepTriggeredAbility(final BeginningOfEndStepTriggeredAbility ability) { + super(ability); + } + + @Override + public BeginningOfEndStepTriggeredAbility copy() { + return new BeginningOfEndStepTriggeredAbility(this); + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == GameEvent.EventType.END_TURN_STEP_PRE; + } + + @Override + protected String generateTriggerPhrase() { + switch (targetController) { + case YOU: + return "At the beginning of your end step, "; + case NEXT: + return "At the beginning of the end step, "; + case OPPONENT: + return "At the beginning of each opponent's end step, "; + case ANY: + return "At the beginning of each end step, "; + case EACH_PLAYER: + return "At the beginning of each player's end step, "; + case CONTROLLER_ATTACHED_TO: + return "At the beginning of the end step of enchanted permanent's controller, "; + case ENCHANTED: + return "At the beginning of enchanted player's end step, "; + case MONARCH: + return "At the beginning of the monarch's end step, "; + default: + throw new UnsupportedOperationException("Unsupported TargetController in BeginningOfEndStepTriggeredAbility: " + targetController); + } + } + +} diff --git a/Mage/src/main/java/mage/abilities/triggers/BeginningOfFirstMainTriggeredAbility.java b/Mage/src/main/java/mage/abilities/triggers/BeginningOfFirstMainTriggeredAbility.java index 41847c045b9..098a04cbe8d 100644 --- a/Mage/src/main/java/mage/abilities/triggers/BeginningOfFirstMainTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/triggers/BeginningOfFirstMainTriggeredAbility.java @@ -11,6 +11,13 @@ import mage.game.events.GameEvent; */ public class BeginningOfFirstMainTriggeredAbility extends AtStepTriggeredAbility { + /** + * At the beginning of your first main phase (optional = false) + */ + public BeginningOfFirstMainTriggeredAbility(Effect effect) { + this(effect, false); + } + /** * At the beginning of your first main phase */ diff --git a/Mage/src/main/java/mage/designations/Monarch.java b/Mage/src/main/java/mage/designations/Monarch.java index 96a50b48e54..01666c62460 100644 --- a/Mage/src/main/java/mage/designations/Monarch.java +++ b/Mage/src/main/java/mage/designations/Monarch.java @@ -2,7 +2,7 @@ package mage.designations; import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.BecomesMonarchTargetEffect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.constants.TargetController; @@ -38,7 +38,7 @@ public class Monarch extends Designation { class MonarchDrawTriggeredAbility extends BeginningOfEndStepTriggeredAbility { public MonarchDrawTriggeredAbility() { - super(Zone.ALL, new DrawCardTargetEffect(1), TargetController.ANY, null, false); + super(Zone.ALL, TargetController.ANY, new DrawCardTargetEffect(1), false, null); } protected MonarchDrawTriggeredAbility(final MonarchDrawTriggeredAbility ability) { diff --git a/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java index 7aeea7d6df0..6eb1729ca9c 100644 --- a/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/AjaniAdversaryOfTyrantsEmblem.java @@ -1,6 +1,6 @@ package mage.game.command.emblems; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.TargetController; import mage.constants.Zone; @@ -16,8 +16,8 @@ public final class AjaniAdversaryOfTyrantsEmblem extends Emblem { public AjaniAdversaryOfTyrantsEmblem() { super("Emblem Ajani"); this.getAbilities().add(new BeginningOfEndStepTriggeredAbility( - Zone.COMMAND, new CreateTokenEffect(new CatToken2(), 3), - TargetController.YOU, null, false + Zone.COMMAND, TargetController.YOU, new CreateTokenEffect(new CatToken2(), 3), + false, null )); } diff --git a/Mage/src/main/java/mage/game/command/emblems/DomriChaosBringerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/DomriChaosBringerEmblem.java index 2f2cbd641f2..1149279808a 100644 --- a/Mage/src/main/java/mage/game/command/emblems/DomriChaosBringerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/DomriChaosBringerEmblem.java @@ -1,6 +1,6 @@ package mage.game.command.emblems; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.TargetController; import mage.constants.Zone; @@ -16,8 +16,8 @@ public final class DomriChaosBringerEmblem extends Emblem { public DomriChaosBringerEmblem() { super("Emblem Domri"); this.getAbilities().add(new BeginningOfEndStepTriggeredAbility( - Zone.COMMAND, new CreateTokenEffect(new RedGreenBeastToken()), - TargetController.ANY, null, false + Zone.COMMAND, TargetController.ANY, new CreateTokenEffect(new RedGreenBeastToken()), + false, null )); } diff --git a/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java b/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java index 3ae58931f18..74a87497358 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java @@ -1,8 +1,9 @@ package mage.game.command.emblems; -import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; +import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.command.Emblem; @@ -15,7 +16,7 @@ public class GarrukUnleashedEmblem extends Emblem { super("Emblem Garruk"); Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), false) .setText("search your library for a creature card, put it onto the battlefield, then shuffle"); - this.getAbilities().add(new BeginningOfYourEndStepTriggeredAbility(Zone.COMMAND, effect, true)); + this.getAbilities().add(new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, TargetController.YOU, effect, true, null)); } private GarrukUnleashedEmblem(final GarrukUnleashedEmblem card) { diff --git a/Mage/src/main/java/mage/game/command/emblems/KioraEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KioraEmblem.java index 4c46a27bf1c..087b4a7f5bb 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KioraEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KioraEmblem.java @@ -1,7 +1,7 @@ package mage.game.command.emblems; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.constants.TargetController; import mage.constants.Zone; @@ -20,7 +20,7 @@ public final class KioraEmblem extends Emblem { public KioraEmblem() { super("Emblem Kiora"); - Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, new CreateTokenEffect(new Kraken99Token()), TargetController.YOU, null, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, TargetController.YOU, new CreateTokenEffect(new Kraken99Token()), false, null); this.getAbilities().add(ability); } diff --git a/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java index b968fee6d4c..c520b088aaf 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java @@ -1,7 +1,7 @@ package mage.game.command.emblems; import mage.abilities.Ability; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; @@ -21,8 +21,8 @@ public final class LilianaTheLastHopeEmblem extends Emblem { // "At the beginning of your end step, create X 2/2 black Zombie creature tokens, where X is two plus the number of Zombies you control." public LilianaTheLastHopeEmblem() { super("Emblem Liliana"); - Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, new CreateTokenEffect(new ZombieToken(), LilianaZombiesCount.instance), - TargetController.YOU, null, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, TargetController.YOU, new CreateTokenEffect(new ZombieToken(), LilianaZombiesCount.instance), + false, null); this.getAbilities().add(ability); } diff --git a/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java index aea4d02d133..33ef604646b 100644 --- a/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java @@ -1,7 +1,7 @@ package mage.game.command.emblems; import mage.abilities.triggers.BeginningOfDrawTriggeredAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.discard.DiscardHandControllerEffect; import mage.constants.TargetController; @@ -17,7 +17,7 @@ public final class SarkhanTheDragonspeakerEmblem extends Emblem { super("Emblem Sarkhan"); this.getAbilities().add(new BeginningOfDrawTriggeredAbility(Zone.COMMAND, TargetController.YOU, new DrawCardSourceControllerEffect(2).setText("draw two additional cards"), false)); - this.getAbilities().add(new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, new DiscardHandControllerEffect(), TargetController.YOU, null, false)); + this.getAbilities().add(new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, TargetController.YOU, new DiscardHandControllerEffect(), false, null)); } private SarkhanTheDragonspeakerEmblem(final SarkhanTheDragonspeakerEmblem card) { diff --git a/Mage/src/main/java/mage/game/command/emblems/TezzeretArtificeMasterEmblem.java b/Mage/src/main/java/mage/game/command/emblems/TezzeretArtificeMasterEmblem.java index 8853e8e2688..3e3c01cf726 100644 --- a/Mage/src/main/java/mage/game/command/emblems/TezzeretArtificeMasterEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/TezzeretArtificeMasterEmblem.java @@ -1,6 +1,6 @@ package mage.game.command.emblems; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.constants.TargetController; import mage.constants.Zone; @@ -18,9 +18,9 @@ public final class TezzeretArtificeMasterEmblem extends Emblem { super("Emblem Tezzeret"); this.getAbilities().add(new BeginningOfEndStepTriggeredAbility( Zone.COMMAND, - new SearchLibraryPutInPlayEffect( + TargetController.YOU, new SearchLibraryPutInPlayEffect( new TargetCardInLibrary(new FilterPermanentCard()) - ), TargetController.YOU, null, false + ), false, null )); } diff --git a/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java b/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java index 8d1d910ae9a..338c2876aae 100644 --- a/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java @@ -2,7 +2,7 @@ package mage.game.command.planes; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.MainPhaseStackEmptyCondition; @@ -37,7 +37,7 @@ public class AcademyAtTolariaWestPlane extends Plane { this.setPlaneType(Planes.PLANE_ACADEMY_AT_TOLARIA_WEST); // At the beginning of your end step, if you have 0 cards in hand, draw seven cards - Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, new DrawCardsActivePlayerEffect(7), TargetController.ANY, HellbentAPCondition.instance, false); + Ability ability = new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, TargetController.ANY, new DrawCardsActivePlayerEffect(7), false, HellbentAPCondition.instance); this.getAbilities().add(ability); // Active player can roll the planar die: Whenever you roll {CHAOS}, discard your hand diff --git a/Mage/src/main/java/mage/game/permanent/token/AshiokWickedManipulatorNightmareToken.java b/Mage/src/main/java/mage/game/permanent/token/AshiokWickedManipulatorNightmareToken.java index d315d03125f..4e2812f731c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AshiokWickedManipulatorNightmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/AshiokWickedManipulatorNightmareToken.java @@ -9,7 +9,6 @@ import mage.abilities.hint.ConditionHint; import mage.abilities.hint.Hint; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.TargetController; import mage.counters.CounterType; /** @@ -32,8 +31,7 @@ public final class AshiokWickedManipulatorNightmareToken extends TokenImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfCombatTriggeredAbility( - new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - false + new AddCountersSourceEffect(CounterType.P1P1.createInstance()) ), WasCardExiledThisTurnCondition.instance, "At the beginning of combat on your turn, if a card was put into exile " diff --git a/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java b/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java index a0560fbafd7..22367048240 100644 --- a/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/LightningRagerToken.java @@ -1,7 +1,7 @@ package mage.game.permanent.token; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; @@ -25,7 +25,7 @@ public final class LightningRagerToken extends TokenImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.NEXT, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.NEXT, new SacrificeSourceEffect(), false)); } private LightningRagerToken(final LightningRagerToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java index 1d8ee2cbd47..d1e0e675254 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SparkElementalToken.java @@ -1,7 +1,7 @@ package mage.game.permanent.token; import mage.MageInt; -import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.triggers.BeginningOfEndStepTriggeredAbility; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.TrampleAbility; @@ -24,7 +24,7 @@ public final class SparkElementalToken extends TokenImpl { this.addAbility(TrampleAbility.getInstance()); this.addAbility(HasteAbility.getInstance()); - this.addAbility(new BeginningOfEndStepTriggeredAbility(new SacrificeSourceEffect(), TargetController.ANY, false)); + this.addAbility(new BeginningOfEndStepTriggeredAbility(TargetController.ANY, new SacrificeSourceEffect(), false)); } private SparkElementalToken(final SparkElementalToken token) {