diff --git a/Mage.Sets/src/mage/cards/a/AlleyGrifters.java b/Mage.Sets/src/mage/cards/a/AlleyGrifters.java index 88483704b92..bb0bbe0f547 100644 --- a/Mage.Sets/src/mage/cards/a/AlleyGrifters.java +++ b/Mage.Sets/src/mage/cards/a/AlleyGrifters.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -29,7 +29,7 @@ public final class AlleyGrifters extends CardImpl { this.toughness = new MageInt(2); // Whenever Alley Grifters becomes blocked, defending player discards a card. - this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new AlleyGriftersDiscardEffect(), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new AlleyGriftersDiscardEffect(), false)); } public AlleyGrifters(final AlleyGrifters card) { diff --git a/Mage.Sets/src/mage/cards/a/AsajjVentress.java b/Mage.Sets/src/mage/cards/a/AsajjVentress.java index 3e2aa60f81b..4cf2118aab6 100644 --- a/Mage.Sets/src/mage/cards/a/AsajjVentress.java +++ b/Mage.Sets/src/mage/cards/a/AsajjVentress.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.condition.common.HateCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.dynamicvalue.common.BlockedCreatureCount; @@ -42,7 +42,7 @@ public final class AsajjVentress extends CardImpl { BlockedCreatureCount value = new BlockedCreatureCount(); Effect effect = new BoostSourceEffect(value, value, Duration.EndOfTurn, true); effect.setText("she gets +1/+1 for each creature blocking her until end of turn"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); // Hate — Whenever Asajj Ventress attacks, if an opponent lost life from a source other than combat damage this turn, target creature blocks this turn if able. Ability ability = new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/c/ChamberedNautilus.java b/Mage.Sets/src/mage/cards/c/ChamberedNautilus.java index e3b917be6cc..a4c20b19e11 100644 --- a/Mage.Sets/src/mage/cards/c/ChamberedNautilus.java +++ b/Mage.Sets/src/mage/cards/c/ChamberedNautilus.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class ChamberedNautilus extends CardImpl { this.toughness = new MageInt(2); // Whenever Chambered Nautilus becomes blocked, you may draw a card. - this.addAbility(new BecomesBlockedTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); } public ChamberedNautilus(final ChamberedNautilus card) { diff --git a/Mage.Sets/src/mage/cards/c/CopyEnchantment.java b/Mage.Sets/src/mage/cards/c/CopyEnchantment.java index a17d5da5263..ed3202936db 100644 --- a/Mage.Sets/src/mage/cards/c/CopyEnchantment.java +++ b/Mage.Sets/src/mage/cards/c/CopyEnchantment.java @@ -3,26 +3,12 @@ package mage.cards.c; import java.util.UUID; -import mage.MageObject; -import mage.abilities.Ability; -import mage.abilities.SpellAbility; import mage.abilities.common.EntersBattlefieldAbility; -import mage.abilities.effects.Effect; -import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.CopyPermanentEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.Outcome; -import mage.filter.FilterPermanent; import mage.filter.StaticFilters; -import mage.game.Game; -import mage.game.permanent.Permanent; -import mage.game.permanent.PermanentCard; -import mage.players.Player; -import mage.target.Target; -import mage.util.functions.EmptyApplyToPermanent; /** * @@ -34,7 +20,6 @@ public final class CopyEnchantment extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); // You may have Copy Enchantment enter the battlefield as a copy of any enchantment on the battlefield. - //this.addAbility(new EntersBattlefieldAbility(new CopyEnchantmentEffect(new FilterEnchantmentPermanent("any enchantment")), true)); this.addAbility(new EntersBattlefieldAbility(new CopyPermanentEffect(StaticFilters.FILTER_ENCHANTMENT_PERMANENT), true)); } diff --git a/Mage.Sets/src/mage/cards/c/CorruptOfficial.java b/Mage.Sets/src/mage/cards/c/CorruptOfficial.java index 4c8aed08ecf..c5cdd88794a 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptOfficial.java +++ b/Mage.Sets/src/mage/cards/c/CorruptOfficial.java @@ -1,10 +1,9 @@ - package mage.cards.c; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -16,6 +15,7 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; +import mage.game.combat.Combat; import mage.game.permanent.Permanent; import mage.players.Player; @@ -26,7 +26,7 @@ import mage.players.Player; public final class CorruptOfficial extends CardImpl { public CorruptOfficial(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}"); this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.MINION); this.power = new MageInt(3); @@ -34,9 +34,9 @@ public final class CorruptOfficial extends CardImpl { // {2}{B}: Regenerate Corrupt Official. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{2}{B}"))); - + // Whenever Corrupt Official becomes blocked, defending player discards a card at random. - this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new CorruptOfficialDiscardEffect(), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new CorruptOfficialDiscardEffect(), false)); } public CorruptOfficial(final CorruptOfficial card) { @@ -67,11 +67,12 @@ class CorruptOfficialDiscardEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent blockingCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); - if (blockingCreature != null) { - Player opponent = game.getPlayer(blockingCreature.getControllerId()); - if (opponent != null) { - opponent.discard(1, true, source, game); + Permanent corruptOfficial = game.getPermanent(source.getSourceId()); + if (corruptOfficial != null) { + Combat combat = game.getCombat(); + Player defendingPlayer = game.getPlayer(combat.getDefendingPlayerId(corruptOfficial.getId(), game)); + if (defendingPlayer != null) { + defendingPlayer.discard(1, true, source, game); return true; } } diff --git a/Mage.Sets/src/mage/cards/d/DeeprootWarrior.java b/Mage.Sets/src/mage/cards/d/DeeprootWarrior.java index 42fea81ea0b..e55b432804d 100644 --- a/Mage.Sets/src/mage/cards/d/DeeprootWarrior.java +++ b/Mage.Sets/src/mage/cards/d/DeeprootWarrior.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -29,7 +29,7 @@ public final class DeeprootWarrior extends CardImpl { // Whenever Deeproot Warrior becomes blocked, it gets +1/+1 until end of turn. Effect effect = new BoostSourceEffect(1, 1, Duration.EndOfTurn); effect.setText("it gets +1/+1 until end of turn"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public DeeprootWarrior(final DeeprootWarrior card) { diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodTantiv.java b/Mage.Sets/src/mage/cards/d/DeepwoodTantiv.java index b8f265102f7..a1e0b9d32a7 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodTantiv.java +++ b/Mage.Sets/src/mage/cards/d/DeepwoodTantiv.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class DeepwoodTantiv extends CardImpl { this.toughness = new MageInt(4); // Whenever Deepwood Tantiv becomes blocked, you gain 2 life. - this.addAbility(new BecomesBlockedTriggeredAbility(new GainLifeEffect(2), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new GainLifeEffect(2), false)); } public DeepwoodTantiv(final DeepwoodTantiv card) { diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodWolverine.java b/Mage.Sets/src/mage/cards/d/DeepwoodWolverine.java index f7e364dcff7..7ed887cf9da 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodWolverine.java +++ b/Mage.Sets/src/mage/cards/d/DeepwoodWolverine.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class DeepwoodWolverine extends CardImpl { // Whenever Deepwood Wolverine becomes blocked, it gets +2/+0 until end of turn. Effect effect = new BoostSourceEffect(2, 0, Duration.EndOfTurn); effect.setText("it gets +2/+0 until end of turn"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public DeepwoodWolverine(final DeepwoodWolverine card) { diff --git a/Mage.Sets/src/mage/cards/d/Drelnoch.java b/Mage.Sets/src/mage/cards/d/Drelnoch.java index 21b7ae3e2d9..c82c191d869 100644 --- a/Mage.Sets/src/mage/cards/d/Drelnoch.java +++ b/Mage.Sets/src/mage/cards/d/Drelnoch.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class Drelnoch extends CardImpl { this.toughness = new MageInt(3); // Whenever Drelnoch becomes blocked, you may draw two cards. - this.addAbility(new BecomesBlockedTriggeredAbility(new DrawCardSourceControllerEffect(2), true)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new DrawCardSourceControllerEffect(2), true)); } public Drelnoch(final Drelnoch card) { diff --git a/Mage.Sets/src/mage/cards/d/Duskworker.java b/Mage.Sets/src/mage/cards/d/Duskworker.java index 4dbd6d67139..dade86eb09c 100644 --- a/Mage.Sets/src/mage/cards/d/Duskworker.java +++ b/Mage.Sets/src/mage/cards/d/Duskworker.java @@ -3,7 +3,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.RegenerateSourceEffect; @@ -26,7 +26,7 @@ public final class Duskworker extends CardImpl { this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(2); this.toughness = new MageInt(2); - this.addAbility(new BecomesBlockedTriggeredAbility(new RegenerateSourceEffect(), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new RegenerateSourceEffect(), false)); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/cards/d/DwarvenBerserker.java b/Mage.Sets/src/mage/cards/d/DwarvenBerserker.java index 998ff1a5093..21fe183f8cc 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenBerserker.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenBerserker.java @@ -4,7 +4,7 @@ package mage.cards.d; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -31,7 +31,7 @@ public final class DwarvenBerserker extends CardImpl { // Whenever Dwarven Berserker becomes blocked, it gets +3/+0 and gains trample until end of turn. Effect effect = new BoostSourceEffect(3, 0, Duration.EndOfTurn); effect.setText("it gets +3/+0"); - Ability ability = new BecomesBlockedTriggeredAbility(effect, false); + Ability ability = new BecomesBlockedSourceTriggeredAbility(effect, false); effect = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and gains trample until end of turn"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/e/ElvishBerserker.java b/Mage.Sets/src/mage/cards/e/ElvishBerserker.java index 48aa62ef48a..a85d7e9e763 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishBerserker.java +++ b/Mage.Sets/src/mage/cards/e/ElvishBerserker.java @@ -3,7 +3,7 @@ package mage.cards.e; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.BlockedCreatureCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -30,7 +30,7 @@ public final class ElvishBerserker extends CardImpl { BlockedCreatureCount value = new BlockedCreatureCount(); Effect effect = new BoostSourceEffect(value, value, Duration.EndOfTurn, true); effect.setText("it gets +1/+1 until end of turn for each creature blocking it"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public ElvishBerserker(final ElvishBerserker card) { diff --git a/Mage.Sets/src/mage/cards/f/FireJuggler.java b/Mage.Sets/src/mage/cards/f/FireJuggler.java index 87cd678002d..d2ede0bfae9 100644 --- a/Mage.Sets/src/mage/cards/f/FireJuggler.java +++ b/Mage.Sets/src/mage/cards/f/FireJuggler.java @@ -3,7 +3,7 @@ package mage.cards.f; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; import mage.abilities.effects.common.DoIfClashWonEffect; import mage.cards.CardImpl; @@ -30,7 +30,7 @@ public final class FireJuggler extends CardImpl { // Whenever Fire Juggler becomes blocked, clash with an opponent. If you win, Fire Juggler deals 4 damage to each creature blocking it. FilterPermanent filter = new FilterPermanent("each creature blocking it"); filter.add(new BlockingAttackerIdPredicate(this.getId())); - this.addAbility(new BecomesBlockedTriggeredAbility(new DoIfClashWonEffect(new DamageAllEffect(4,filter)),false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new DoIfClashWonEffect(new DamageAllEffect(4,filter)),false)); } public FireJuggler(final FireJuggler card) { diff --git a/Mage.Sets/src/mage/cards/g/GangOfElk.java b/Mage.Sets/src/mage/cards/g/GangOfElk.java index 3a9ce2c366c..5372dfaedc6 100644 --- a/Mage.Sets/src/mage/cards/g/GangOfElk.java +++ b/Mage.Sets/src/mage/cards/g/GangOfElk.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.MultipliedValue; import mage.abilities.dynamicvalue.common.BlockedCreatureCount; @@ -33,7 +33,7 @@ public final class GangOfElk extends CardImpl { DynamicValue value = new MultipliedValue(new BlockedCreatureCount(), 2); Effect effect = new BoostSourceEffect(value, value, Duration.EndOfTurn, true); effect.setText("it gets +2/+2 until end of turn for each creature blocking it"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public GangOfElk(final GangOfElk card) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinSwineRider.java b/Mage.Sets/src/mage/cards/g/GoblinSwineRider.java index 44cd1c855b6..97d586821bd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSwineRider.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSwineRider.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.DamageAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class GoblinSwineRider extends CardImpl { this.toughness = new MageInt(1); // Whenever Goblin Swine-Rider becomes blocked, it deals 2 damage to each attacking creature and each blocking creature. - this.addAbility(new BecomesBlockedTriggeredAbility(new DamageAllEffect(2, "it", new FilterAttackingOrBlockingCreature("attacking creature and each blocking creature")), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new DamageAllEffect(2, "it", new FilterAttackingOrBlockingCreature("attacking creature and each blocking creature")), false)); } public GoblinSwineRider(final GoblinSwineRider card) { diff --git a/Mage.Sets/src/mage/cards/g/Groffskithur.java b/Mage.Sets/src/mage/cards/g/Groffskithur.java index 3a5bd1e9985..e11f64f130e 100644 --- a/Mage.Sets/src/mage/cards/g/Groffskithur.java +++ b/Mage.Sets/src/mage/cards/g/Groffskithur.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -33,7 +33,7 @@ public final class Groffskithur extends CardImpl { this.toughness = new MageInt(3); // Whenever Groffskithur becomes blocked, you may return target card named Groffskithur from your graveyard to your hand. - Ability ability = new BecomesBlockedTriggeredAbility(new ReturnToHandTargetEffect(), true); + Ability ability = new BecomesBlockedSourceTriggeredAbility(new ReturnToHandTargetEffect(), true); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GustcloakCavalier.java b/Mage.Sets/src/mage/cards/g/GustcloakCavalier.java index b8049a75f3d..335994260c0 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakCavalier.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakCavalier.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.RemoveFromCombatSourceEffect; import mage.abilities.effects.common.TapTargetEffect; @@ -39,7 +39,7 @@ public final class GustcloakCavalier extends CardImpl { this.addAbility(ability); // Whenever Gustcloak Cavalier becomes blocked, you may untap Gustcloak Cavalier and remove it from combat. - Ability ability2 = new BecomesBlockedTriggeredAbility(new UntapSourceEffect(), true); + Ability ability2 = new BecomesBlockedSourceTriggeredAbility(new UntapSourceEffect(), true); Effect effect = new RemoveFromCombatSourceEffect(); effect.setText("and remove it from combat"); ability2.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GustcloakHarrier.java b/Mage.Sets/src/mage/cards/g/GustcloakHarrier.java index fbc6a66b813..51c59a07049 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakHarrier.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakHarrier.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.RemoveFromCombatSourceEffect; import mage.abilities.effects.common.UntapSourceEffect; @@ -31,7 +31,7 @@ public final class GustcloakHarrier extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Gustcloak Harrier becomes blocked, you may untap it and remove it from combat. - Ability ability = new BecomesBlockedTriggeredAbility(new UntapSourceEffect(), true); + Ability ability = new BecomesBlockedSourceTriggeredAbility(new UntapSourceEffect(), true); Effect effect = new RemoveFromCombatSourceEffect(); effect.setText("and remove it from combat"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GustcloakRunner.java b/Mage.Sets/src/mage/cards/g/GustcloakRunner.java index d7364a23363..924a806fbf9 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakRunner.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakRunner.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.RemoveFromCombatSourceEffect; import mage.abilities.effects.common.UntapSourceEffect; @@ -27,7 +27,7 @@ public final class GustcloakRunner extends CardImpl { this.toughness = new MageInt(1); // Whenever Gustcloak Runner becomes blocked, you may untap it and remove it from combat. - Ability ability = new BecomesBlockedTriggeredAbility(new UntapSourceEffect(), true); + Ability ability = new BecomesBlockedSourceTriggeredAbility(new UntapSourceEffect(), true); Effect effect = new RemoveFromCombatSourceEffect(); effect.setText("and remove it from combat"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GustcloakSentinel.java b/Mage.Sets/src/mage/cards/g/GustcloakSentinel.java index 1b7a699fac7..276ce6da8c9 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakSentinel.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakSentinel.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.RemoveFromCombatSourceEffect; import mage.abilities.effects.common.UntapSourceEffect; @@ -28,7 +28,7 @@ public final class GustcloakSentinel extends CardImpl { this.toughness = new MageInt(3); // Whenever Gustcloak Sentinel becomes blocked, you may untap it and remove it from combat. - Ability ability = new BecomesBlockedTriggeredAbility(new UntapSourceEffect(), true); + Ability ability = new BecomesBlockedSourceTriggeredAbility(new UntapSourceEffect(), true); Effect effect = new RemoveFromCombatSourceEffect(); effect.setText("and remove it from combat"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/g/GustcloakSkirmisher.java b/Mage.Sets/src/mage/cards/g/GustcloakSkirmisher.java index 5520f5979af..732e2cd3e08 100644 --- a/Mage.Sets/src/mage/cards/g/GustcloakSkirmisher.java +++ b/Mage.Sets/src/mage/cards/g/GustcloakSkirmisher.java @@ -4,7 +4,7 @@ package mage.cards.g; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.RemoveFromCombatSourceEffect; import mage.abilities.effects.common.UntapSourceEffect; @@ -31,7 +31,7 @@ public final class GustcloakSkirmisher extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Whenever Gustcloak Skirmisher becomes blocked, you may untap it and remove it from combat. - Ability ability = new BecomesBlockedTriggeredAbility(new UntapSourceEffect(), true); + Ability ability = new BecomesBlockedSourceTriggeredAbility(new UntapSourceEffect(), true); Effect effect = new RemoveFromCombatSourceEffect(); effect.setText("and remove it from combat"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/i/IchorclawMyr.java b/Mage.Sets/src/mage/cards/i/IchorclawMyr.java index 51e0308bf3b..388a5e989ea 100644 --- a/Mage.Sets/src/mage/cards/i/IchorclawMyr.java +++ b/Mage.Sets/src/mage/cards/i/IchorclawMyr.java @@ -3,7 +3,7 @@ package mage.cards.i; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class IchorclawMyr extends CardImpl { this.addAbility(InfectAbility.getInstance()); // Whenever Ichorclaw Myr becomes blocked, it gets +2/+2 until end of turn. - this.addAbility(new BecomesBlockedTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false)); } public IchorclawMyr(final IchorclawMyr card) { diff --git a/Mage.Sets/src/mage/cards/i/IgnobleSoldier.java b/Mage.Sets/src/mage/cards/i/IgnobleSoldier.java index 26e90533fbf..859bc1abaf4 100644 --- a/Mage.Sets/src/mage/cards/i/IgnobleSoldier.java +++ b/Mage.Sets/src/mage/cards/i/IgnobleSoldier.java @@ -3,7 +3,7 @@ package mage.cards.i; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.PreventCombatDamageBySourceEffect; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class IgnobleSoldier extends CardImpl { // Whenever Ignoble Soldier becomes blocked, prevent all combat damage that would be dealt by it this turn. Effect effect = new PreventCombatDamageBySourceEffect(Duration.EndOfTurn); effect.setText("prevent all combat damage that would be dealt by it this turn"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public IgnobleSoldier(final IgnobleSoldier card) { diff --git a/Mage.Sets/src/mage/cards/j/JohtullWurm.java b/Mage.Sets/src/mage/cards/j/JohtullWurm.java index 5b0bb8b2f0f..42c171fcced 100644 --- a/Mage.Sets/src/mage/cards/j/JohtullWurm.java +++ b/Mage.Sets/src/mage/cards/j/JohtullWurm.java @@ -3,7 +3,7 @@ package mage.cards.j; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.MultipliedValue; import mage.abilities.dynamicvalue.common.BlockedCreatureCount; @@ -31,7 +31,7 @@ public final class JohtullWurm extends CardImpl { DynamicValue blockedCreatureCount = new BlockedCreatureCount("each creature blocking it beyond the first", true); Effect effect = new BoostSourceEffect(new MultipliedValue(blockedCreatureCount, -2), new MultipliedValue(blockedCreatureCount, -1), Duration.EndOfTurn, true); effect.setText("it gets -2/-1 until end of turn for each creature blocking it beyond the first"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public JohtullWurm(final JohtullWurm card) { diff --git a/Mage.Sets/src/mage/cards/j/JungleWurm.java b/Mage.Sets/src/mage/cards/j/JungleWurm.java index abb6b248d6b..5d885826e73 100644 --- a/Mage.Sets/src/mage/cards/j/JungleWurm.java +++ b/Mage.Sets/src/mage/cards/j/JungleWurm.java @@ -3,7 +3,7 @@ package mage.cards.j; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.MultipliedValue; import mage.abilities.dynamicvalue.common.BlockedCreatureCount; @@ -32,7 +32,7 @@ public final class JungleWurm extends CardImpl { DynamicValue value = new MultipliedValue(blockedCreatureCount, -1); Effect effect = new BoostSourceEffect(value, value, Duration.EndOfTurn, true); effect.setText("it gets -1/-1 until end of turn for each creature blocking it beyond the first"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public JungleWurm(final JungleWurm card) { diff --git a/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java b/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java index daa070e71a0..d6e8cec8d39 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanWolverine.java @@ -4,7 +4,7 @@ package mage.cards.k; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -28,7 +28,7 @@ public final class KarplusanWolverine extends CardImpl { this.toughness = new MageInt(1); // Whenever Karplusan Wolverine becomes blocked, you may have it deal 1 damage to any target. - Ability ability = new BecomesBlockedTriggeredAbility(new DamageTargetEffect(1), true); + Ability ability = new BecomesBlockedSourceTriggeredAbility(new DamageTargetEffect(1), true); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java b/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java index da5b92c4fc3..7a53d2f08e2 100644 --- a/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java +++ b/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java @@ -54,7 +54,9 @@ class KheruSpellsnatcherEffect extends OneShotEffect { KheruSpellsnatcherEffect() { super(Outcome.Benefit); - this.staticText = "counter target spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. You may cast that card without paying its mana cost as long as it remains exiled"; + this.staticText = "counter target spell. If that spell is countered this way, " + + "exile it instead of putting it into its owner's graveyard. " + + "You may cast that card without paying its mana cost as long as it remains exiled"; } KheruSpellsnatcherEffect(final KheruSpellsnatcherEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LaccolithGrunt.java b/Mage.Sets/src/mage/cards/l/LaccolithGrunt.java index 6c0570f65a3..98c271a2e8f 100644 --- a/Mage.Sets/src/mage/cards/l/LaccolithGrunt.java +++ b/Mage.Sets/src/mage/cards/l/LaccolithGrunt.java @@ -4,7 +4,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.AssignNoCombatDamageSourceEffect; import mage.cards.CardImpl; @@ -32,7 +32,7 @@ public final class LaccolithGrunt extends CardImpl { this.toughness = new MageInt(2); // Whenever Laccolith Grunt becomes blocked, you may have it deal damage equal to its power to target creature. If you do, Laccolith Grunt assigns no combat damage this turn. - Ability ability = new BecomesBlockedTriggeredAbility(new LaccolithEffect().setText("you may have it deal damage equal to its power to target creature"), true); + Ability ability = new BecomesBlockedSourceTriggeredAbility(new LaccolithEffect().setText("you may have it deal damage equal to its power to target creature"), true); ability.addEffect(new AssignNoCombatDamageSourceEffect(Duration.EndOfTurn, true)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LaccolithTitan.java b/Mage.Sets/src/mage/cards/l/LaccolithTitan.java index 2af5b5a8e35..886255e887d 100644 --- a/Mage.Sets/src/mage/cards/l/LaccolithTitan.java +++ b/Mage.Sets/src/mage/cards/l/LaccolithTitan.java @@ -4,7 +4,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.AssignNoCombatDamageSourceEffect; import mage.cards.CardImpl; @@ -32,7 +32,7 @@ public final class LaccolithTitan extends CardImpl { this.toughness = new MageInt(6); // Whenever Laccolith Grunt becomes blocked, you may have it deal damage equal to its power to target creature. If you do, Laccolith Grunt assigns no combat damage this turn. - Ability ability = new BecomesBlockedTriggeredAbility(new LaccolithEffect().setText("you may have it deal damage equal to its power to target creature"), true); + Ability ability = new BecomesBlockedSourceTriggeredAbility(new LaccolithEffect().setText("you may have it deal damage equal to its power to target creature"), true); ability.addEffect(new AssignNoCombatDamageSourceEffect(Duration.EndOfTurn, true)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LaccolithWarrior.java b/Mage.Sets/src/mage/cards/l/LaccolithWarrior.java index 435b53cb719..cb65c938df2 100644 --- a/Mage.Sets/src/mage/cards/l/LaccolithWarrior.java +++ b/Mage.Sets/src/mage/cards/l/LaccolithWarrior.java @@ -4,7 +4,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.AssignNoCombatDamageSourceEffect; import mage.cards.CardImpl; @@ -33,7 +33,7 @@ public final class LaccolithWarrior extends CardImpl { this.toughness = new MageInt(3); // Whenever Laccolith Grunt becomes blocked, you may have it deal damage equal to its power to target creature. If you do, Laccolith Grunt assigns no combat damage this turn. - Ability ability = new BecomesBlockedTriggeredAbility(new LaccolithEffect().setText("you may have it deal damage equal to its power to target creature"), true); + Ability ability = new BecomesBlockedSourceTriggeredAbility(new LaccolithEffect().setText("you may have it deal damage equal to its power to target creature"), true); ability.addEffect(new AssignNoCombatDamageSourceEffect(Duration.EndOfTurn, true)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LaccolithWhelp.java b/Mage.Sets/src/mage/cards/l/LaccolithWhelp.java index 19472a6399e..fe6d96c22a9 100644 --- a/Mage.Sets/src/mage/cards/l/LaccolithWhelp.java +++ b/Mage.Sets/src/mage/cards/l/LaccolithWhelp.java @@ -4,7 +4,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.AssignNoCombatDamageSourceEffect; import mage.cards.CardImpl; @@ -32,7 +32,7 @@ public final class LaccolithWhelp extends CardImpl { this.toughness = new MageInt(1); // Whenever Laccolith Grunt becomes blocked, you may have it deal damage equal to its power to target creature. If you do, Laccolith Grunt assigns no combat damage this turn. - Ability ability = new BecomesBlockedTriggeredAbility(new LaccolithEffect().setText("you may have it deal damage equal to its power to target creature"), true); + Ability ability = new BecomesBlockedSourceTriggeredAbility(new LaccolithEffect().setText("you may have it deal damage equal to its power to target creature"), true); ability.addEffect(new AssignNoCombatDamageSourceEffect(Duration.EndOfTurn, true)); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LeeryFogbeast.java b/Mage.Sets/src/mage/cards/l/LeeryFogbeast.java index 6e9ac41b3a6..9cef5b01847 100644 --- a/Mage.Sets/src/mage/cards/l/LeeryFogbeast.java +++ b/Mage.Sets/src/mage/cards/l/LeeryFogbeast.java @@ -3,7 +3,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class LeeryFogbeast extends CardImpl { this.toughness = new MageInt(2); // Whenever Leery Fogbeast becomes blocked, prevent all combat damage that would be dealt this turn. - this.addAbility(new BecomesBlockedTriggeredAbility(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true), false)); } public LeeryFogbeast(final LeeryFogbeast card) { diff --git a/Mage.Sets/src/mage/cards/l/LimDulsPaladin.java b/Mage.Sets/src/mage/cards/l/LimDulsPaladin.java index 27a88b67f1e..d2187c28db4 100644 --- a/Mage.Sets/src/mage/cards/l/LimDulsPaladin.java +++ b/Mage.Sets/src/mage/cards/l/LimDulsPaladin.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksAndIsNotBlockedTriggeredAbility; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.costs.common.DiscardTargetCost; import mage.abilities.effects.Effect; @@ -44,7 +44,7 @@ public final class LimDulsPaladin extends CardImpl { // At the beginning of your upkeep, you may discard a card. If you don't, sacrifice Lim-Dul's Paladin and draw a card. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new LimDulsPaladinEffect(), TargetController.YOU, false)); // Whenever Lim-Dul's Paladin becomes blocked, it gets +6/+3 until end of turn. - this.addAbility(new BecomesBlockedTriggeredAbility(new BoostSourceEffect(6, 3, Duration.EndOfTurn), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new BoostSourceEffect(6, 3, Duration.EndOfTurn), false)); // Whenever Lim-Dul's Paladin attacks and isn't blocked, it assigns no combat damage to defending player this turn and that player loses 4 life. Effect effect = new AssignNoCombatDamageSourceEffect(Duration.EndOfTurn); effect.setText("it assigns no combat damage this turn"); diff --git a/Mage.Sets/src/mage/cards/n/NorwoodWarrior.java b/Mage.Sets/src/mage/cards/n/NorwoodWarrior.java index 5dcf344868c..d45ecb8603b 100644 --- a/Mage.Sets/src/mage/cards/n/NorwoodWarrior.java +++ b/Mage.Sets/src/mage/cards/n/NorwoodWarrior.java @@ -3,7 +3,7 @@ package mage.cards.n; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class NorwoodWarrior extends CardImpl { // Whenever Norwood Warrior becomes blocked, it gets +1/+1 until end of turn. Effect effect = new BoostSourceEffect(1, 1, Duration.EndOfTurn); effect.setText("it gets +1/+1 until end of turn"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public NorwoodWarrior(final NorwoodWarrior card) { diff --git a/Mage.Sets/src/mage/cards/p/PlagueWight.java b/Mage.Sets/src/mage/cards/p/PlagueWight.java index 433b85b01d5..aa6551c1741 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueWight.java +++ b/Mage.Sets/src/mage/cards/p/PlagueWight.java @@ -2,7 +2,7 @@ package mage.cards.p; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; @@ -32,7 +32,7 @@ public final class PlagueWight extends CardImpl { this.toughness = new MageInt(1); // Whenever Plague Wight becomes blocked, each creature blocking it gets -1/-1 until end of turn. - this.addAbility(new BecomesBlockedTriggeredAbility(new PlagueWightEffect(), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new PlagueWightEffect(), false)); } private PlagueWight(final PlagueWight card) { diff --git a/Mage.Sets/src/mage/cards/r/RabidElephant.java b/Mage.Sets/src/mage/cards/r/RabidElephant.java index 58f07702759..95a69e47ecb 100644 --- a/Mage.Sets/src/mage/cards/r/RabidElephant.java +++ b/Mage.Sets/src/mage/cards/r/RabidElephant.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.MultipliedValue; import mage.abilities.dynamicvalue.common.BlockedCreatureCount; @@ -32,7 +32,7 @@ public final class RabidElephant extends CardImpl { DynamicValue value = new MultipliedValue(new BlockedCreatureCount(), 2); Effect effect = new BoostSourceEffect(value, value, Duration.EndOfTurn, true); effect.setText("it gets +2/+2 until end of turn for each creature blocking it"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public RabidElephant(final RabidElephant card) { diff --git a/Mage.Sets/src/mage/cards/r/RazorclawBear.java b/Mage.Sets/src/mage/cards/r/RazorclawBear.java index 74057a10b8a..1fe1cd2af45 100644 --- a/Mage.Sets/src/mage/cards/r/RazorclawBear.java +++ b/Mage.Sets/src/mage/cards/r/RazorclawBear.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class RazorclawBear extends CardImpl { // Whenever Razorclaw Bear becomes blocked, it gets +2/+2 until end of turn. Effect effect = new BoostSourceEffect(2, 2, Duration.EndOfTurn); effect.setText("it gets +2/+2 until end of turn"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public RazorclawBear(final RazorclawBear card) { diff --git a/Mage.Sets/src/mage/cards/s/SacredPrey.java b/Mage.Sets/src/mage/cards/s/SacredPrey.java index fe1ff1407ab..ce4c023b4d0 100644 --- a/Mage.Sets/src/mage/cards/s/SacredPrey.java +++ b/Mage.Sets/src/mage/cards/s/SacredPrey.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class SacredPrey extends CardImpl { this.toughness = new MageInt(1); // Whenever Sacred Prey becomes blocked, you gain 1 life. - this.addAbility(new BecomesBlockedTriggeredAbility(new GainLifeEffect(1), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new GainLifeEffect(1), false)); } public SacredPrey(final SacredPrey card) { diff --git a/Mage.Sets/src/mage/cards/s/SaprazzanHeir.java b/Mage.Sets/src/mage/cards/s/SaprazzanHeir.java index 3fea5cefbb6..111f4df99c2 100644 --- a/Mage.Sets/src/mage/cards/s/SaprazzanHeir.java +++ b/Mage.Sets/src/mage/cards/s/SaprazzanHeir.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class SaprazzanHeir extends CardImpl { this.toughness = new MageInt(1); // Whenever Saprazzan Heir becomes blocked, you may draw three cards. - this.addAbility(new BecomesBlockedTriggeredAbility(new DrawCardSourceControllerEffect(3), true)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new DrawCardSourceControllerEffect(3), true)); } public SaprazzanHeir(final SaprazzanHeir card) { diff --git a/Mage.Sets/src/mage/cards/s/SaprazzanRaider.java b/Mage.Sets/src/mage/cards/s/SaprazzanRaider.java index 50ab00e49df..cb0d63682f8 100644 --- a/Mage.Sets/src/mage/cards/s/SaprazzanRaider.java +++ b/Mage.Sets/src/mage/cards/s/SaprazzanRaider.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +23,7 @@ public final class SaprazzanRaider extends CardImpl { this.toughness = new MageInt(2); // When Saprazzan Raider becomes blocked, return it to its owner's hand. - this.addAbility(new BecomesBlockedTriggeredAbility(new ReturnToHandSourceEffect(), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new ReturnToHandSourceEffect(), false)); } public SaprazzanRaider(final SaprazzanRaider card) { diff --git a/Mage.Sets/src/mage/cards/s/SilkenfistFighter.java b/Mage.Sets/src/mage/cards/s/SilkenfistFighter.java index 4d8c1d64cb0..bd7c4a52273 100644 --- a/Mage.Sets/src/mage/cards/s/SilkenfistFighter.java +++ b/Mage.Sets/src/mage/cards/s/SilkenfistFighter.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class SilkenfistFighter extends CardImpl { // Whenever Silkenfist Fighter becomes blocked, untap it. Effect effect = new UntapSourceEffect(); effect.setText("untap it"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public SilkenfistFighter(final SilkenfistFighter card) { diff --git a/Mage.Sets/src/mage/cards/s/SilkenfistOrder.java b/Mage.Sets/src/mage/cards/s/SilkenfistOrder.java index 1d6b9ff506d..5f76079d5f8 100644 --- a/Mage.Sets/src/mage/cards/s/SilkenfistOrder.java +++ b/Mage.Sets/src/mage/cards/s/SilkenfistOrder.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.UntapSourceEffect; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class SilkenfistOrder extends CardImpl { // Whenever Silkenfist Order becomes blocked, untap it. Effect effect = new UntapSourceEffect(); effect.setText("untap it"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public SilkenfistOrder(final SilkenfistOrder card) { diff --git a/Mage.Sets/src/mage/cards/s/SlashingTiger.java b/Mage.Sets/src/mage/cards/s/SlashingTiger.java index 6f40799b4ba..a0a963a28d7 100644 --- a/Mage.Sets/src/mage/cards/s/SlashingTiger.java +++ b/Mage.Sets/src/mage/cards/s/SlashingTiger.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class SlashingTiger extends CardImpl { this.toughness = new MageInt(3); // Whenever Slashing Tiger becomes blocked, it gets +2/+2 until end of turn. - this.addAbility(new BecomesBlockedTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false)); } public SlashingTiger(final SlashingTiger card) { diff --git a/Mage.Sets/src/mage/cards/s/SlithStrider.java b/Mage.Sets/src/mage/cards/s/SlithStrider.java index b1b9474e73a..73845b1475e 100644 --- a/Mage.Sets/src/mage/cards/s/SlithStrider.java +++ b/Mage.Sets/src/mage/cards/s/SlithStrider.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; @@ -25,7 +25,7 @@ public final class SlithStrider extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - this.addAbility(new BecomesBlockedTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), false)); } diff --git a/Mage.Sets/src/mage/cards/s/SnortingGahr.java b/Mage.Sets/src/mage/cards/s/SnortingGahr.java index 6a972e4a19e..d830c18f838 100644 --- a/Mage.Sets/src/mage/cards/s/SnortingGahr.java +++ b/Mage.Sets/src/mage/cards/s/SnortingGahr.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -28,7 +28,7 @@ public final class SnortingGahr extends CardImpl { // Whenever Snorting Gahr becomes blocked, it gets +2/+2 until end of turn. Effect effect = new BoostSourceEffect(2, 2, Duration.EndOfTurn); effect.setText("it gets +2/+2 until end of turn"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public SnortingGahr(final SnortingGahr card) { diff --git a/Mage.Sets/src/mage/cards/s/SparringGolem.java b/Mage.Sets/src/mage/cards/s/SparringGolem.java index 8bf7eb23cb0..191eb036734 100644 --- a/Mage.Sets/src/mage/cards/s/SparringGolem.java +++ b/Mage.Sets/src/mage/cards/s/SparringGolem.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.dynamicvalue.common.BlockedCreatureCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -29,7 +29,7 @@ public final class SparringGolem extends CardImpl { BlockedCreatureCount value = new BlockedCreatureCount(); Effect effect = new BoostSourceEffect(value, value, Duration.EndOfTurn, true); effect.setText("it gets +1/+1 until end of turn for each creature blocking it"); - this.addAbility(new BecomesBlockedTriggeredAbility(effect, false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(effect, false)); } public SparringGolem(final SparringGolem card) { diff --git a/Mage.Sets/src/mage/cards/s/StormsurgeKraken.java b/Mage.Sets/src/mage/cards/s/StormsurgeKraken.java index f28520f1816..50b685b9350 100644 --- a/Mage.Sets/src/mage/cards/s/StormsurgeKraken.java +++ b/Mage.Sets/src/mage/cards/s/StormsurgeKraken.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.abilityword.LieutenantAbility; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -32,7 +32,7 @@ public final class StormsurgeKraken extends CardImpl { this.addAbility(HexproofAbility.getInstance()); // Lieutenant - As long as you control your commander, Stormsurge Kraken gets +2/+2 and has "Whenever Stormsurge Kraken becomes blocked, you may draw two cards." - ContinuousEffect effect = new GainAbilitySourceEffect(new BecomesBlockedTriggeredAbility(new DrawCardSourceControllerEffect(2), true), Duration.WhileOnBattlefield); + ContinuousEffect effect = new GainAbilitySourceEffect(new BecomesBlockedSourceTriggeredAbility(new DrawCardSourceControllerEffect(2), true), Duration.WhileOnBattlefield); effect.setText("and has \"Whenever Stormsurge Kraken becomes blocked, you may draw two cards.\""); this.addAbility(new LieutenantAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/t/TrainedCheetah.java b/Mage.Sets/src/mage/cards/t/TrainedCheetah.java index df354300b1d..4b0d1ae3157 100644 --- a/Mage.Sets/src/mage/cards/t/TrainedCheetah.java +++ b/Mage.Sets/src/mage/cards/t/TrainedCheetah.java @@ -3,7 +3,7 @@ package mage.cards.t; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -24,7 +24,7 @@ public final class TrainedCheetah extends CardImpl { this.toughness = new MageInt(2); // Whenever Trained Cheetah becomes blocked, it gets +1/+1 until end of turn. - this.addAbility(new BecomesBlockedTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), false)); } public TrainedCheetah(final TrainedCheetah card) { diff --git a/Mage.Sets/src/mage/cards/v/VedalkenGhoul.java b/Mage.Sets/src/mage/cards/v/VedalkenGhoul.java index b8b15b2d2e0..9911b85d8e4 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenGhoul.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenGhoul.java @@ -3,7 +3,7 @@ package mage.cards.v; import java.util.UUID; import mage.MageInt; -import mage.abilities.common.BecomesBlockedTriggeredAbility; +import mage.abilities.common.BecomesBlockedSourceTriggeredAbility; import mage.abilities.effects.common.LoseLifeDefendingPlayerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -25,7 +25,7 @@ public final class VedalkenGhoul extends CardImpl { this.toughness = new MageInt(1); // Whenever Vedalken Ghoul becomes blocked, defending player loses 4 life. - this.addAbility(new BecomesBlockedTriggeredAbility(new LoseLifeDefendingPlayerEffect(4, true), false)); + this.addAbility(new BecomesBlockedSourceTriggeredAbility(new LoseLifeDefendingPlayerEffect(4, true), false)); } diff --git a/Mage.Sets/src/mage/cards/w/WoebringerDemon.java b/Mage.Sets/src/mage/cards/w/WoebringerDemon.java index 875ec964ae9..d61f395196b 100644 --- a/Mage.Sets/src/mage/cards/w/WoebringerDemon.java +++ b/Mage.Sets/src/mage/cards/w/WoebringerDemon.java @@ -35,8 +35,10 @@ public final class WoebringerDemon extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // At the beginning of each player's upkeep, that player sacrifices a creature. If the player can't, sacrifice Woebringer Demon. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new WoebringerDemonEffect(), TargetController.ANY, false, true)); + // At the beginning of each player's upkeep, that player sacrifices a creature. + // If the player can't, sacrifice Woebringer Demon. + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, + new WoebringerDemonEffect(), TargetController.ANY, false, true)); } public WoebringerDemon(final WoebringerDemon card) {