github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Refactored BlocksTriggeredAbility to BlocksSourceTriggeredAbility

Browse source
This commit is contained in:
jeffwadsworth 2020-08-10 11:49:03 -05:00
parent 12c50420bf
commit 3b90c48c75
46 changed files with 157 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/cards/a/AetherMembrane.java
View file

@ -3,7 +3,7 @@ package mage.cards.a;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
@ -36,7 +36,7 @@ public final class AetherMembrane extends CardImpl {
// Whenever Aether Membrane blocks a creature, return that creature to its owner's hand at end of combat. // Whenever Aether Membrane blocks a creature, return that creature to its owner's hand at end of combat.
Effect effect = new ReturnToHandTargetEffect(); Effect effect = new ReturnToHandTargetEffect();
effect.setText("return that creature to its owner's hand at end of combat"); effect.setText("return that creature to its owner's hand at end of combat");
this.addAbility(new BlocksTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(effect)), false, true)); this.addAbility(new BlocksSourceTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(effect)), false, true));
} }
public AetherMembrane(final AetherMembrane card) { public AetherMembrane(final AetherMembrane card) {

4
Mage.Sets/src/mage/cards/a/Aetherplasm.java
View file

@ -3,7 +3,7 @@ package mage.cards.a;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.costs.common.ReturnToHandFromBattlefieldSourceCost; import mage.abilities.costs.common.ReturnToHandFromBattlefieldSourceCost;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DoIfCostPaid;
@ -35,7 +35,7 @@ public final class Aetherplasm extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Whenever Aetherplasm blocks a creature, you may return Aetherplasm to its owner's hand. If you do, you may put a creature card from your hand onto the battlefield blocking that creature. // Whenever Aetherplasm blocks a creature, you may return Aetherplasm to its owner's hand. If you do, you may put a creature card from your hand onto the battlefield blocking that creature.
this.addAbility(new BlocksTriggeredAbility(new DoIfCostPaid(new AetherplasmEffect(), new ReturnToHandFromBattlefieldSourceCost()), false, true)); this.addAbility(new BlocksSourceTriggeredAbility(new DoIfCostPaid(new AetherplasmEffect(), new ReturnToHandFromBattlefieldSourceCost()), false, true));
} }
public Aetherplasm(final Aetherplasm card) { public Aetherplasm(final Aetherplasm card) {

4
Mage.Sets/src/mage/cards/a/AgelessSentinels.java
View file

@ -4,7 +4,7 @@ package mage.cards.a;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.LoseAbilitySourceEffect; import mage.abilities.effects.common.continuous.LoseAbilitySourceEffect;
@ -41,7 +41,7 @@ public final class AgelessSentinels extends CardImpl {
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// When Ageless Sentinels blocks, it becomes a Bird Giant, and it loses defender. // When Ageless Sentinels blocks, it becomes a Bird Giant, and it loses defender.
Ability ability = new BlocksTriggeredAbility(new AgelessSentinelsEffect(), false, false, true); Ability ability = new BlocksSourceTriggeredAbility(new AgelessSentinelsEffect(), false, false, true);
Effect effect = new LoseAbilitySourceEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield); Effect effect = new LoseAbilitySourceEffect(DefenderAbility.getInstance(), Duration.WhileOnBattlefield);
effect.setText("and it loses defender"); effect.setText("and it loses defender");
ability.addEffect(effect); ability.addEffect(effect);

4
Mage.Sets/src/mage/cards/a/AlabornZealot.java
View file

@ -4,7 +4,7 @@ package mage.cards.a;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.DestroySourceEffect; import mage.abilities.effects.common.DestroySourceEffect;
import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect;
import mage.constants.SubType; import mage.constants.SubType;
@ -27,7 +27,7 @@ public final class AlabornZealot extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// When Alaborn Zealot blocks a creature, destroy that creature and Alaborn Zealot. // When Alaborn Zealot blocks a creature, destroy that creature and Alaborn Zealot.
Ability ability = new BlocksTriggeredAbility(new DestroyTargetEffect().setText("destroy that creature"), false, true, true); Ability ability = new BlocksSourceTriggeredAbility(new DestroyTargetEffect().setText("destroy that creature"), false, true, true);
ability.addEffect(new DestroySourceEffect().setText("and {this}")); ability.addEffect(new DestroySourceEffect().setText("and {this}"));
this.addAbility(ability); this.addAbility(ability);
} }

4
Mage.Sets/src/mage/cards/b/BrimazKingOfOreskos.java
View file

@ -5,7 +5,7 @@ import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.keyword.VigilanceAbility; import mage.abilities.keyword.VigilanceAbility;
@ -44,7 +44,7 @@ public final class BrimazKingOfOreskos extends CardImpl {
this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new CatSoldierCreatureToken(), 1, false, true), false)); this.addAbility(new AttacksTriggeredAbility(new CreateTokenEffect(new CatSoldierCreatureToken(), 1, false, true), false));
// Whenever Brimaz blocks a creature, create a 1/1 white Cat Soldier creature token with vigilance blocking that creature. // Whenever Brimaz blocks a creature, create a 1/1 white Cat Soldier creature token with vigilance blocking that creature.
this.addAbility(new BlocksTriggeredAbility(new BrimazKingOfOreskosEffect(), false, true)); this.addAbility(new BlocksSourceTriggeredAbility(new BrimazKingOfOreskosEffect(), false, true));
} }
public BrimazKingOfOreskos(final BrimazKingOfOreskos card) { public BrimazKingOfOreskos(final BrimazKingOfOreskos card) {

4
Mage.Sets/src/mage/cards/c/CinderWall.java
View file

@ -3,7 +3,7 @@ package mage.cards.c;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
import mage.abilities.effects.common.DestroySourceEffect; import mage.abilities.effects.common.DestroySourceEffect;
@ -29,7 +29,7 @@ public final class CinderWall extends CardImpl {
// Defender // Defender
this.addAbility(DefenderAbility.getInstance()); this.addAbility(DefenderAbility.getInstance());
// When Cinder Wall blocks, destroy it at end of combat. // When Cinder Wall blocks, destroy it at end of combat.
this.addAbility(new BlocksTriggeredAbility( this.addAbility(new BlocksSourceTriggeredAbility(
new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(new DestroySourceEffect())), new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(new DestroySourceEffect())),
false, false, true false, false, true
)); ));

4
Mage.Sets/src/mage/cards/e/ElderLandWurm.java
View file

@ -3,7 +3,7 @@ package mage.cards.e;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.continuous.LoseAbilitySourceEffect; import mage.abilities.effects.common.continuous.LoseAbilitySourceEffect;
import mage.constants.SubType; import mage.constants.SubType;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
@ -34,7 +34,7 @@ public final class ElderLandWurm extends CardImpl {
this.addAbility(TrampleAbility.getInstance()); this.addAbility(TrampleAbility.getInstance());
// When Elder Land Wurm blocks, it loses defender. // When Elder Land Wurm blocks, it loses defender.
this.addAbility(new BlocksTriggeredAbility(new LoseAbilitySourceEffect(DefenderAbility.getInstance(), Duration.Custom), false, false, true)); this.addAbility(new BlocksSourceTriggeredAbility(new LoseAbilitySourceEffect(DefenderAbility.getInstance(), Duration.Custom), false, false, true));
} }
public ElderLandWurm(final ElderLandWurm card) { public ElderLandWurm(final ElderLandWurm card) {

4
Mage.Sets/src/mage/cards/e/EliteJavelineer.java
View file

@ -4,7 +4,7 @@ package mage.cards.e;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -28,7 +28,7 @@ public final class EliteJavelineer extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever Elite Javelineer blocks, it deals 1 damage to target attacking creature. // Whenever Elite Javelineer blocks, it deals 1 damage to target attacking creature.
Ability ability = new BlocksTriggeredAbility(new DamageTargetEffect(1, "it"), false); Ability ability = new BlocksSourceTriggeredAbility(new DamageTargetEffect(1, "it"), false);
ability.addTarget(new TargetCreaturePermanent(new FilterAttackingCreature())); ability.addTarget(new TargetCreaturePermanent(new FilterAttackingCreature()));
this.addAbility(ability); this.addAbility(ability);
} }

4
Mage.Sets/src/mage/cards/f/FolkOfAnHavva.java
View file

@ -3,7 +3,7 @@ package mage.cards.f;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -24,7 +24,7 @@ public final class FolkOfAnHavva extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Whenever Folk of An-Havva blocks, it gets +2/+0 until end of turn. // Whenever Folk of An-Havva blocks, it gets +2/+0 until end of turn.
this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), false)); this.addAbility(new BlocksSourceTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), false));
} }
public FolkOfAnHavva(final FolkOfAnHavva card) { public FolkOfAnHavva(final FolkOfAnHavva card) {

4
Mage.Sets/src/mage/cards/f/FortressCyclops.java
View file

@ -4,7 +4,7 @@ package mage.cards.f;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -29,7 +29,7 @@ public final class FortressCyclops extends CardImpl {
// Whenever Fortress Cyclops attacks, it gets +3/+0 until end of turn. // Whenever Fortress Cyclops attacks, it gets +3/+0 until end of turn.
this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(3,0, Duration.EndOfTurn), false)); this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(3,0, Duration.EndOfTurn), false));
// Whenever Fortress Cyclops blocks, it gets +0/+3 until end of turn. // Whenever Fortress Cyclops blocks, it gets +0/+3 until end of turn.
this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(0,3, Duration.EndOfTurn), false)); this.addAbility(new BlocksSourceTriggeredAbility(new BoostSourceEffect(0,3, Duration.EndOfTurn), false));
} }
public FortressCyclops(final FortressCyclops card) { public FortressCyclops(final FortressCyclops card) {

4
Mage.Sets/src/mage/cards/g/GiantBadger.java
View file

@ -3,7 +3,7 @@ package mage.cards.g;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -25,7 +25,7 @@ public final class GiantBadger extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever Giant Badger blocks, it gets +2/+2 until end of turn. // Whenever Giant Badger blocks, it gets +2/+2 until end of turn.
this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false)); this.addAbility(new BlocksSourceTriggeredAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false));
} }
public GiantBadger(final GiantBadger card) { public GiantBadger(final GiantBadger card) {

4
Mage.Sets/src/mage/cards/g/GoblinSnowman.java
View file

@ -4,7 +4,7 @@ package mage.cards.g;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
@ -37,7 +37,7 @@ public final class GoblinSnowman extends CardImpl {
//Whenever Goblin Snowman blocks, prevent all combat damage that would be dealt to and dealt by it this turn. //Whenever Goblin Snowman blocks, prevent all combat damage that would be dealt to and dealt by it this turn.
Effect effect = new PreventCombatDamageBySourceEffect(Duration.EndOfTurn); Effect effect = new PreventCombatDamageBySourceEffect(Duration.EndOfTurn);
effect.setText("prevent all combat damage that would be dealt to"); effect.setText("prevent all combat damage that would be dealt to");
Ability ability = new BlocksTriggeredAbility(effect, false); Ability ability = new BlocksSourceTriggeredAbility(effect, false);
effect = new PreventCombatDamageToSourceEffect(Duration.EndOfTurn); effect = new PreventCombatDamageToSourceEffect(Duration.EndOfTurn);
effect.setText("and dealt by it this turn"); effect.setText("and dealt by it this turn");
ability.addEffect(effect); ability.addEffect(effect);

4
Mage.Sets/src/mage/cards/g/GoldenglowMoth.java
View file

@ -4,7 +4,7 @@ package mage.cards.g;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.GainLifeEffect;
import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -28,7 +28,7 @@ public final class GoldenglowMoth extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// Whenever Goldenglow Moth blocks, you may gain 4 life. // Whenever Goldenglow Moth blocks, you may gain 4 life.
this.addAbility(new BlocksTriggeredAbility(new GainLifeEffect(4), true)); this.addAbility(new BlocksSourceTriggeredAbility(new GainLifeEffect(4), true));
} }

4
Mage.Sets/src/mage/cards/g/GuardianOfTheGateless.java
View file

@ -3,7 +3,7 @@ package mage.cards.g;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.combat.CanBlockAdditionalCreatureEffect; import mage.abilities.effects.common.combat.CanBlockAdditionalCreatureEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
@ -35,7 +35,7 @@ public final class GuardianOfTheGateless extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect(0)));
// Whenever Guardian of the Gateless blocks, it gets +1/+1 until end of turn for each creature it's blocking. // Whenever Guardian of the Gateless blocks, it gets +1/+1 until end of turn for each creature it's blocking.
this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(1,1, Duration.EndOfTurn),false)); this.addAbility(new BlocksSourceTriggeredAbility(new BoostSourceEffect(1,1, Duration.EndOfTurn),false));
} }
public GuardianOfTheGateless(final GuardianOfTheGateless card) { public GuardianOfTheGateless(final GuardianOfTheGateless card) {

4
Mage.Sets/src/mage/cards/h/HordeAmbusher.java
View file

@ -5,7 +5,7 @@ import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.ObjectColor; import mage.ObjectColor;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility;
import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.costs.common.RevealTargetFromHandCost;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
@ -42,7 +42,7 @@ public final class HordeAmbusher extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever Horde Ambusher blocks, it deals 1 damage to you. // Whenever Horde Ambusher blocks, it deals 1 damage to you.
this.addAbility(new BlocksTriggeredAbility(new DamageControllerEffect(1, "it"), false)); this.addAbility(new BlocksSourceTriggeredAbility(new DamageControllerEffect(1, "it"), false));
// Morph - Reveal a red card in your hand. // Morph - Reveal a red card in your hand.
this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter)))); this.addAbility(new MorphAbility(this, new RevealTargetFromHandCost(new TargetCardInHand(filter))));

4
Mage.Sets/src/mage/cards/i/InfernalMedusa.java
View file

@ -4,7 +4,7 @@ package mage.cards.i;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
@ -37,7 +37,7 @@ public final class InfernalMedusa extends CardImpl {
// Whenever Infernal Medusa blocks a creature, destroy that creature at end of combat. // Whenever Infernal Medusa blocks a creature, destroy that creature at end of combat.
Effect effect = new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect()), true); Effect effect = new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(new DestroyTargetEffect()), true);
effect.setText("destroy that creature at end of combat"); effect.setText("destroy that creature at end of combat");
this.addAbility(new BlocksTriggeredAbility(effect, false, true)); this.addAbility(new BlocksSourceTriggeredAbility(effect, false, true));
// Whenever Infernal Medusa becomes blocked by a non-Wall creature, destroy that creature at end of combat. // Whenever Infernal Medusa becomes blocked by a non-Wall creature, destroy that creature at end of combat.
this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(effect, filter, false)); this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(effect, filter, false));
} }

4
Mage.Sets/src/mage/cards/j/JarethLeonineTitan.java
View file

@ -4,7 +4,7 @@ package mage.cards.j;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
@ -33,7 +33,7 @@ public final class JarethLeonineTitan extends CardImpl {
this.toughness = new MageInt(7); this.toughness = new MageInt(7);
// Whenever Jareth, Leonine Titan blocks, it gets +7/+7 until end of turn. // Whenever Jareth, Leonine Titan blocks, it gets +7/+7 until end of turn.
this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(7,7,Duration.EndOfTurn), false)); this.addAbility(new BlocksSourceTriggeredAbility(new BoostSourceEffect(7,7,Duration.EndOfTurn), false));
// {W}: Jareth gains protection from the color of your choice until end of turn. // {W}: Jareth gains protection from the color of your choice until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{W}")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainProtectionFromColorSourceEffect(Duration.EndOfTurn), new ManaCostsImpl("{W}"));
this.addAbility(ability); this.addAbility(ability);

4
Mage.Sets/src/mage/cards/k/KaijinOfTheVanishingTouch.java
View file

@ -3,7 +3,7 @@ package mage.cards.k;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
@ -33,7 +33,7 @@ public final class KaijinOfTheVanishingTouch extends CardImpl {
// Whenever Kaijin of the Vanishing Touch blocks a creature, return that creature to its owner's hand at end of combat. // Whenever Kaijin of the Vanishing Touch blocks a creature, return that creature to its owner's hand at end of combat.
Effect effect = new ReturnToHandTargetEffect(); Effect effect = new ReturnToHandTargetEffect();
effect.setText("return that creature to its owner's hand at end of combat"); effect.setText("return that creature to its owner's hand at end of combat");
this.addAbility(new BlocksTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(effect)), false, true)); this.addAbility(new BlocksSourceTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(effect)), false, true));
} }
public KaijinOfTheVanishingTouch(final KaijinOfTheVanishingTouch card) { public KaijinOfTheVanishingTouch(final KaijinOfTheVanishingTouch card) {

4
Mage.Sets/src/mage/cards/l/LabyrinthMinotaur.java
View file

@ -3,7 +3,7 @@ package mage.cards.l;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect;
import mage.constants.SubType; import mage.constants.SubType;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -24,7 +24,7 @@ public final class LabyrinthMinotaur extends CardImpl {
this.toughness = new MageInt(4); this.toughness = new MageInt(4);
// Whenever Labyrinth Minotaur blocks a creature, that creature doesn't untap during its controller's next untap step. // Whenever Labyrinth Minotaur blocks a creature, that creature doesn't untap during its controller's next untap step.
this.addAbility(new BlocksTriggeredAbility(new DontUntapInControllersNextUntapStepTargetEffect("that creature"), false, true)); this.addAbility(new BlocksSourceTriggeredAbility(new DontUntapInControllersNextUntapStepTargetEffect("that creature"), false, true));
} }
public LabyrinthMinotaur(final LabyrinthMinotaur card) { public LabyrinthMinotaur(final LabyrinthMinotaur card) {

4
Mage.Sets/src/mage/cards/l/LoyalSentry.java
View file

@ -4,7 +4,7 @@ package mage.cards.l;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.DestroySourceEffect; import mage.abilities.effects.common.DestroySourceEffect;
import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -27,7 +27,7 @@ public final class LoyalSentry extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// When Loyal Sentry blocks a creature, destroy that creature and Loyal Sentry. // When Loyal Sentry blocks a creature, destroy that creature and Loyal Sentry.
Ability ability = new BlocksTriggeredAbility(new DestroyTargetEffect().setText("destroy that creature"), false, true, true); Ability ability = new BlocksSourceTriggeredAbility(new DestroyTargetEffect().setText("destroy that creature"), false, true, true);
ability.addEffect(new DestroySourceEffect().setText("and {this}")); ability.addEffect(new DestroySourceEffect().setText("and {this}"));
this.addAbility(ability); this.addAbility(ability);
} }

4
Mage.Sets/src/mage/cards/m/MartonStromgald.java
View file

@ -4,7 +4,7 @@ package mage.cards.m;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.effects.common.continuous.BoostAllEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -45,7 +45,7 @@ public final class MartonStromgald extends CardImpl {
// Whenever Marton Stromgald blocks, other blocking creatures get +1/+1 until end of turn for each blocking creature other than Marton Stromgald. // Whenever Marton Stromgald blocks, other blocking creatures get +1/+1 until end of turn for each blocking creature other than Marton Stromgald.
PermanentsOnBattlefieldCount blockingValue = new PermanentsOnBattlefieldCount(blockingFilter); PermanentsOnBattlefieldCount blockingValue = new PermanentsOnBattlefieldCount(blockingFilter);
this.addAbility(new BlocksTriggeredAbility(new BoostAllEffect(blockingValue, blockingValue, Duration.EndOfTurn, new FilterBlockingCreature(), true, null, true), false)); this.addAbility(new BlocksSourceTriggeredAbility(new BoostAllEffect(blockingValue, blockingValue, Duration.EndOfTurn, new FilterBlockingCreature(), true, null, true), false));
} }

4
Mage.Sets/src/mage/cards/m/Meglonoth.java
View file

@ -2,7 +2,7 @@ package mage.cards.m;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.TrampleAbility;
import mage.abilities.keyword.VigilanceAbility; import mage.abilities.keyword.VigilanceAbility;
@ -35,7 +35,7 @@ public final class Meglonoth extends CardImpl {
this.addAbility(TrampleAbility.getInstance()); this.addAbility(TrampleAbility.getInstance());
// Whenever Meglonoth blocks a creature, Meglonoth deals damage to that creature's controller equal to Meglonoth's power. // Whenever Meglonoth blocks a creature, Meglonoth deals damage to that creature's controller equal to Meglonoth's power.
this.addAbility(new BlocksTriggeredAbility(new MeglonothEffect(), false, true)); this.addAbility(new BlocksSourceTriggeredAbility(new MeglonothEffect(), false, true));
} }

4
Mage.Sets/src/mage/cards/p/PrideGuardian.java
View file

@ -4,7 +4,7 @@ package mage.cards.p;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.GainLifeEffect;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -27,7 +27,7 @@ public final class PrideGuardian extends CardImpl {
this.addAbility(DefenderAbility.getInstance()); this.addAbility(DefenderAbility.getInstance());
// Whenever Pride Guardian blocks, you gain 3 life. // Whenever Pride Guardian blocks, you gain 3 life.
this.addAbility(new BlocksTriggeredAbility(new GainLifeEffect(3), false)); this.addAbility(new BlocksSourceTriggeredAbility(new GainLifeEffect(3), false));
} }
public PrideGuardian(final PrideGuardian card) { public PrideGuardian(final PrideGuardian card) {

4
Mage.Sets/src/mage/cards/p/PsychicMembrane.java
View file

@ -3,7 +3,7 @@ package mage.cards.p;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -26,7 +26,7 @@ public final class PsychicMembrane extends CardImpl {
this.addAbility(DefenderAbility.getInstance()); this.addAbility(DefenderAbility.getInstance());
// Whenever Psychic Membrane blocks, you may draw a card. // Whenever Psychic Membrane blocks, you may draw a card.
this.addAbility(new BlocksTriggeredAbility(new DrawCardSourceControllerEffect(1), true)); this.addAbility(new BlocksSourceTriggeredAbility(new DrawCardSourceControllerEffect(1), true));
} }
public PsychicMembrane(final PsychicMembrane card) { public PsychicMembrane(final PsychicMembrane card) {

4
Mage.Sets/src/mage/cards/r/RootSpider.java
View file

@ -4,7 +4,7 @@ package mage.cards.r;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
@ -32,7 +32,7 @@ public final class RootSpider extends CardImpl {
effect.setText("it gets +1/+0"); effect.setText("it gets +1/+0");
Effect effect2 = new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn); Effect effect2 = new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn);
effect2.setText("and gains first strike until end of turn"); effect2.setText("and gains first strike until end of turn");
Ability ability = new BlocksTriggeredAbility(effect, false); Ability ability = new BlocksSourceTriggeredAbility(effect, false);
ability.addEffect(effect2); ability.addEffect(effect2);
this.addAbility(ability); this.addAbility(ability);
} }

4
Mage.Sets/src/mage/cards/r/RoyalTrooper.java
View file

@ -3,7 +3,7 @@ package mage.cards.r;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -28,7 +28,7 @@ public final class RoyalTrooper extends CardImpl {
// Whenever Royal Trooper blocks, it gets +2/+2 until end of turn. // Whenever Royal Trooper blocks, it gets +2/+2 until end of turn.
Effect effect = new BoostSourceEffect(2, 2, Duration.EndOfTurn); Effect effect = new BoostSourceEffect(2, 2, Duration.EndOfTurn);
effect.setText("it gets +2/+2 until end of turn"); effect.setText("it gets +2/+2 until end of turn");
this.addAbility(new BlocksTriggeredAbility(effect, false)); this.addAbility(new BlocksSourceTriggeredAbility(effect, false));
} }
public RoyalTrooper(final RoyalTrooper card) { public RoyalTrooper(final RoyalTrooper card) {

4
Mage.Sets/src/mage/cards/s/SereneMaster.java
View file

@ -4,7 +4,7 @@ package mage.cards.s;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continuous.SetPowerToughnessTargetEffect; import mage.abilities.effects.common.continuous.SetPowerToughnessTargetEffect;
@ -38,7 +38,7 @@ public final class SereneMaster extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever Serene Master blocks, exchange its power and the power of target creature it's blocking until end of combat. // Whenever Serene Master blocks, exchange its power and the power of target creature it's blocking until end of combat.
this.addAbility(new BlocksTriggeredAbility(new SereneMasterEffect(), false)); this.addAbility(new BlocksSourceTriggeredAbility(new SereneMasterEffect(), false));
} }

4
Mage.Sets/src/mage/cards/s/ShieldSphere.java
View file

@ -3,7 +3,7 @@ package mage.cards.s;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -27,7 +27,7 @@ public final class ShieldSphere extends CardImpl {
// Defender // Defender
this.addAbility(DefenderAbility.getInstance()); this.addAbility(DefenderAbility.getInstance());
// Whenever Shield Sphere blocks, put a -0/-1 counter on it. // Whenever Shield Sphere blocks, put a -0/-1 counter on it.
this.addAbility(new BlocksTriggeredAbility(new AddCountersSourceEffect(new BoostCounter(0, -1)), false)); this.addAbility(new BlocksSourceTriggeredAbility(new AddCountersSourceEffect(new BoostCounter(0, -1)), false));
} }
public ShieldSphere(final ShieldSphere card) { public ShieldSphere(final ShieldSphere card) {

4
Mage.Sets/src/mage/cards/s/ShieldedAetherThief.java
View file

@ -4,7 +4,7 @@ package mage.cards.s;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.PayEnergyCost; import mage.abilities.costs.common.PayEnergyCost;
import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapSourceCost;
@ -35,7 +35,7 @@ public final class ShieldedAetherThief extends CardImpl {
this.addAbility(FlashAbility.getInstance()); this.addAbility(FlashAbility.getInstance());
// Whenever Shield Aether Thief blocks, you get {E}. // Whenever Shield Aether Thief blocks, you get {E}.
this.addAbility(new BlocksTriggeredAbility(new GetEnergyCountersControllerEffect(1), false, true)); this.addAbility(new BlocksSourceTriggeredAbility(new GetEnergyCountersControllerEffect(1), false, true));
// {T}, Pay {E}{E}{E}: Draw a card. // {T}, Pay {E}{E}{E}: Draw a card.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new TapSourceCost());

4
Mage.Sets/src/mage/cards/s/ShuDefender.java
View file

@ -3,7 +3,7 @@ package mage.cards.s;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -25,7 +25,7 @@ public final class ShuDefender extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever Shu Defender blocks, it gets +0/+2 until end of turn. // Whenever Shu Defender blocks, it gets +0/+2 until end of turn.
this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), false)); this.addAbility(new BlocksSourceTriggeredAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), false));
} }
public ShuDefender(final ShuDefender card) { public ShuDefender(final ShuDefender card) {

4
Mage.Sets/src/mage/cards/s/Spincrusher.java
View file

@ -4,7 +4,7 @@ package mage.cards.s;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.costs.common.RemoveCountersSourceCost;
import mage.abilities.effects.common.combat.CantBeBlockedSourceEffect; import mage.abilities.effects.common.combat.CantBeBlockedSourceEffect;
@ -29,7 +29,7 @@ public final class Spincrusher extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever Spincrusher blocks, put a +1/+1 counter on it. // Whenever Spincrusher blocks, put a +1/+1 counter on it.
this.addAbility(new BlocksTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false)); this.addAbility(new BlocksSourceTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false));
// Remove a +1/+1 counter from Spincrusher: Spincrusher can't be blocked this turn. // Remove a +1/+1 counter from Spincrusher: Spincrusher can't be blocked this turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
new CantBeBlockedSourceEffect(Duration.EndOfTurn), new CantBeBlockedSourceEffect(Duration.EndOfTurn),

4
Mage.Sets/src/mage/cards/s/StoicEphemera.java
View file

@ -3,7 +3,7 @@ package mage.cards.s;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.SacrificeSourceEffect;
@ -31,7 +31,7 @@ public final class StoicEphemera extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// When Stoic Ephemera blocks, sacrifice it at end of combat. // When Stoic Ephemera blocks, sacrifice it at end of combat.
this.addAbility(new BlocksTriggeredAbility( this.addAbility(new BlocksSourceTriggeredAbility(
new CreateDelayedTriggeredAbilityEffect( new CreateDelayedTriggeredAbilityEffect(
new AtTheEndOfCombatDelayedTriggeredAbility(new SacrificeSourceEffect()) new AtTheEndOfCombatDelayedTriggeredAbility(new SacrificeSourceEffect())
), false, false, true ), false, false, true

4
Mage.Sets/src/mage/cards/s/SustainerOfTheRealm.java
View file

@ -3,7 +3,7 @@ package mage.cards.s;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -28,7 +28,7 @@ public final class SustainerOfTheRealm extends CardImpl {
// Flying // Flying
this.addAbility(FlyingAbility.getInstance()); this.addAbility(FlyingAbility.getInstance());
// Whenever Sustainer of the Realm blocks, it gets +0/+2 until end of turn. // Whenever Sustainer of the Realm blocks, it gets +0/+2 until end of turn.
this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), false)); this.addAbility(new BlocksSourceTriggeredAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), false));
} }
public SustainerOfTheRealm(final SustainerOfTheRealm card) { public SustainerOfTheRealm(final SustainerOfTheRealm card) {

4
Mage.Sets/src/mage/cards/t/TownSentry.java
View file

@ -3,7 +3,7 @@ package mage.cards.t;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -25,7 +25,7 @@ public final class TownSentry extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever Town Sentry blocks, it gets +0/+2 until end of turn. // Whenever Town Sentry blocks, it gets +0/+2 until end of turn.
this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), false)); this.addAbility(new BlocksSourceTriggeredAbility(new BoostSourceEffect(0, 2, Duration.EndOfTurn), false));
} }
public TownSentry(final TownSentry card) { public TownSentry(final TownSentry card) {

4
Mage.Sets/src/mage/cards/v/VertigoSpawn.java
View file

@ -4,7 +4,7 @@ package mage.cards.v;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect;
import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.TapTargetEffect;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
@ -29,7 +29,7 @@ public final class VertigoSpawn extends CardImpl {
this.addAbility(DefenderAbility.getInstance()); this.addAbility(DefenderAbility.getInstance());
// Whenever Vertigo Spawn blocks a creature, tap that creature. That creature doesn't untap during its controller's next untap step. // Whenever Vertigo Spawn blocks a creature, tap that creature. That creature doesn't untap during its controller's next untap step.
Ability ability = new BlocksTriggeredAbility(new TapTargetEffect("that creature"), false, true); Ability ability = new BlocksSourceTriggeredAbility(new TapTargetEffect("that creature"), false, true);
ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("that creature")); ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("that creature"));
this.addAbility(ability); this.addAbility(ability);
} }

4
Mage.Sets/src/mage/cards/w/WallOfCaltrops.java
View file

@ -3,7 +3,7 @@ package mage.cards.w;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
import mage.abilities.keyword.BandingAbility; import mage.abilities.keyword.BandingAbility;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
@ -47,7 +47,7 @@ public final class WallOfCaltrops extends CardImpl {
} }
} }
class WallOfCaltropsAbility extends BlocksTriggeredAbility { class WallOfCaltropsAbility extends BlocksSourceTriggeredAbility {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall creature"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall creature");

4
Mage.Sets/src/mage/cards/w/WallOfDust.java
View file

@ -3,7 +3,7 @@ package mage.cards.w;
import mage.MageInt; import mage.MageInt;
import mage.MageObjectReference; import mage.MageObjectReference;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.RestrictionEffect;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -32,7 +32,7 @@ public final class WallOfDust extends CardImpl {
this.addAbility(DefenderAbility.getInstance()); this.addAbility(DefenderAbility.getInstance());
// Whenever Wall of Dust blocks a creature, that creature can't attack during its controller's next turn. // Whenever Wall of Dust blocks a creature, that creature can't attack during its controller's next turn.
this.addAbility(new BlocksTriggeredAbility(new WallOfDustRestrictionEffect(), false, true)); this.addAbility(new BlocksSourceTriggeredAbility(new WallOfDustRestrictionEffect(), false, true));
} }
private WallOfDust(final WallOfDust card) { private WallOfDust(final WallOfDust card) {

4
Mage.Sets/src/mage/cards/w/WallOfFrost.java
View file

@ -3,7 +3,7 @@ package mage.cards.w;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -27,7 +27,7 @@ public final class WallOfFrost extends CardImpl {
this.addAbility(DefenderAbility.getInstance()); this.addAbility(DefenderAbility.getInstance());
// Whenever Wall of Frost blocks a creature, that creature doesn't untap during its controller's next untap step. // Whenever Wall of Frost blocks a creature, that creature doesn't untap during its controller's next untap step.
this.addAbility(new BlocksTriggeredAbility(new DontUntapInControllersNextUntapStepTargetEffect("that creature"), false, true)); this.addAbility(new BlocksSourceTriggeredAbility(new DontUntapInControllersNextUntapStepTargetEffect("that creature"), false, true));
} }
public WallOfFrost(final WallOfFrost card) { public WallOfFrost(final WallOfFrost card) {

4
Mage.Sets/src/mage/cards/w/WallOfJunk.java
View file

@ -3,7 +3,7 @@ package mage.cards.w;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
@ -33,7 +33,7 @@ public final class WallOfJunk extends CardImpl {
Effect effect = new CreateDelayedTriggeredAbilityEffect( Effect effect = new CreateDelayedTriggeredAbilityEffect(
new AtTheEndOfCombatDelayedTriggeredAbility(new ReturnToHandSourceEffect(true))); new AtTheEndOfCombatDelayedTriggeredAbility(new ReturnToHandSourceEffect(true)));
effect.setText("return it to its owner's hand at end of combat"); effect.setText("return it to its owner's hand at end of combat");
this.addAbility(new BlocksTriggeredAbility(effect, false, false, true)); this.addAbility(new BlocksSourceTriggeredAbility(effect, false, false, true));
} }
public WallOfJunk(final WallOfJunk card) { public WallOfJunk(final WallOfJunk card) {

4
Mage.Sets/src/mage/cards/w/WallOfTears.java
View file

@ -3,7 +3,7 @@ package mage.cards.w;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
@ -32,7 +32,7 @@ public final class WallOfTears extends CardImpl {
// Whenever Wall of Tears blocks a creature, return that creature to its owner's hand at end of combat. // Whenever Wall of Tears blocks a creature, return that creature to its owner's hand at end of combat.
Effect effect = new ReturnToHandTargetEffect(); Effect effect = new ReturnToHandTargetEffect();
effect.setText("return that creature to its owner's hand at end of combat"); effect.setText("return that creature to its owner's hand at end of combat");
this.addAbility(new BlocksTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(effect)), false, true)); this.addAbility(new BlocksSourceTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(effect)), false, true));
} }
public WallOfTears(final WallOfTears card) { public WallOfTears(final WallOfTears card) {

4
Mage.Sets/src/mage/cards/w/WoollyRazorback.java
View file

@ -4,7 +4,7 @@ package mage.cards.w;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.SourceHasCounterCondition; import mage.abilities.condition.common.SourceHasCounterCondition;
@ -48,7 +48,7 @@ public final class WoollyRazorback extends CardImpl {
new SourceHasCounterCondition(CounterType.ICE), "and it has defender")); new SourceHasCounterCondition(CounterType.ICE), "and it has defender"));
this.addAbility(ability); this.addAbility(ability);
// Whenever Woolly Razorback blocks, remove an ice counter from it. // Whenever Woolly Razorback blocks, remove an ice counter from it.
this.addAbility(new BlocksTriggeredAbility(new RemoveCounterSourceEffect(CounterType.ICE.createInstance()), false)); this.addAbility(new BlocksSourceTriggeredAbility(new RemoveCounterSourceEffect(CounterType.ICE.createInstance()), false));
} }
public WoollyRazorback(final WoollyRazorback card) { public WoollyRazorback(final WoollyRazorback card) {

4
Mage.Sets/src/mage/cards/y/YdwenEfreet.java
View file

@ -5,7 +5,7 @@ import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -31,7 +31,7 @@ public final class YdwenEfreet extends CardImpl {
this.toughness = new MageInt(6); this.toughness = new MageInt(6);
// Whenever Ydwen Efreet blocks, flip a coin. If you lose the flip, remove Ydwen Efreet from combat and it can't block this turn. Creatures it was blocking that had become blocked by only Ydwen Efreet this combat become unblocked. // Whenever Ydwen Efreet blocks, flip a coin. If you lose the flip, remove Ydwen Efreet from combat and it can't block this turn. Creatures it was blocking that had become blocked by only Ydwen Efreet this combat become unblocked.
this.addAbility(new BlocksTriggeredAbility(new YdwenEfreetEffect(), false)); this.addAbility(new BlocksSourceTriggeredAbility(new YdwenEfreetEffect(), false));
} }
public YdwenEfreet(final YdwenEfreet card) { public YdwenEfreet(final YdwenEfreet card) {

4
Mage.Sets/src/mage/cards/z/ZephyrSpirit.java
View file

@ -3,7 +3,7 @@ package mage.cards.z;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -24,7 +24,7 @@ public final class ZephyrSpirit extends CardImpl {
this.toughness = new MageInt(6); this.toughness = new MageInt(6);
// When Zephyr Spirit blocks, return it to its owner's hand. // When Zephyr Spirit blocks, return it to its owner's hand.
this.addAbility(new BlocksTriggeredAbility( this.addAbility(new BlocksSourceTriggeredAbility(
new ReturnToHandSourceEffect(true).setText("return it to its owner's hand"), new ReturnToHandSourceEffect(true).setText("return it to its owner's hand"),
false, false, true false, false, true
)); ));

4
Mage.Sets/src/mage/cards/z/ZhaoZilongTigerGeneral.java
View file

@ -3,7 +3,7 @@ package mage.cards.z;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.abilities.keyword.HorsemanshipAbility; import mage.abilities.keyword.HorsemanshipAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -29,7 +29,7 @@ public final class ZhaoZilongTigerGeneral extends CardImpl {
// Horsemanship // Horsemanship
this.addAbility(HorsemanshipAbility.getInstance()); this.addAbility(HorsemanshipAbility.getInstance());
// Whenever Zhao Zilong, Tiger General blocks, it gets +1/+1 until end of turn. // Whenever Zhao Zilong, Tiger General blocks, it gets +1/+1 until end of turn.
this.addAbility(new BlocksTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), false)); this.addAbility(new BlocksSourceTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), false));
} }
public ZhaoZilongTigerGeneral(final ZhaoZilongTigerGeneral card) { public ZhaoZilongTigerGeneral(final ZhaoZilongTigerGeneral card) {

67
Mage/src/main/java/mage/abilities/common/BlocksSourceTriggeredAbility.java Normal file
View file

@ -0,0 +1,67 @@
package mage.abilities.common;
import mage.constants.Zone;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.target.targetpointer.FixedTarget;
/**
*
* @author North
*/
public class BlocksSourceTriggeredAbility extends TriggeredAbilityImpl {
private boolean setTargetPointer;
private boolean once = false;
public BlocksSourceTriggeredAbility(Effect effect, boolean optional) {
this(effect, optional, false);
}
public BlocksSourceTriggeredAbility(Effect effect, boolean optional, boolean setTargetPointer) {
this(effect, optional, setTargetPointer, false);
}
public BlocksSourceTriggeredAbility(Effect effect, boolean optional, boolean setTargetPointer, boolean once) {
super(Zone.BATTLEFIELD, effect, optional);
this.setTargetPointer = setTargetPointer;
this.once = once;
}
public BlocksSourceTriggeredAbility(final BlocksSourceTriggeredAbility ability) {
super(ability);
this.setTargetPointer = ability.setTargetPointer;
this.once = ability.once;
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.BLOCKER_DECLARED;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getSourceId().equals(this.getSourceId())) {
if (setTargetPointer) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getTargetId()));
}
}
return true;
}
return false;
}
@Override
public String getRule() {
return "When" + (once ? "" : "ever") + " {this} blocks" + (setTargetPointer ? " a creature, " : ", ") + super.getRule();
}
@Override
public BlocksSourceTriggeredAbility copy() {
return new BlocksSourceTriggeredAbility(this);
}
}

4
Mage/src/main/java/mage/game/permanent/token/MesmerizingBenthidToken.java
View file

@ -1,7 +1,7 @@
package mage.game.permanent.token; package mage.game.permanent.token;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BlocksTriggeredAbility; import mage.abilities.common.BlocksSourceTriggeredAbility;
import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
@ -20,7 +20,7 @@ public final class MesmerizingBenthidToken extends TokenImpl {
subtype.add(SubType.ILLUSION); subtype.add(SubType.ILLUSION);
power = new MageInt(0); power = new MageInt(0);
toughness = new MageInt(2); toughness = new MageInt(2);
this.addAbility(new BlocksTriggeredAbility( this.addAbility(new BlocksSourceTriggeredAbility(
new DontUntapInControllersNextUntapStepTargetEffect("that creature"), new DontUntapInControllersNextUntapStepTargetEffect("that creature"),
false, true false, true
)); ));