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

Remove unnecessary custom effects from cards that work the same way as Wall of tears.

Browse source
This commit is contained in:
LoneFox 2015-12-25 20:49:03 +02:00
parent 2b09bd0b7c
commit 8ce49ad9b9
2 changed files with 15 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Mage.Sets/src/mage/sets/betrayersofkamigawa/KaijinOfTheVanishingTouch.java
View file

@ -28,20 +28,16 @@
package mage.sets.betrayersofkamigawa; package mage.sets.betrayersofkamigawa;
import java.util.UUID; import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.BlocksCreatureTriggeredAbility; import mage.abilities.common.BlocksCreatureTriggeredAbility;
import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.game.Game; import mage.constants.CardType;
import mage.game.permanent.Permanent; import mage.constants.Rarity;
import mage.target.targetpointer.FixedTarget;
/** /**
* *
@ -59,11 +55,11 @@ public class KaijinOfTheVanishingTouch extends CardImpl {
// Defender (This creature can't attack.) // Defender (This creature can't attack.)
this.addAbility(DefenderAbility.getInstance()); this.addAbility(DefenderAbility.getInstance());
// Whenever Kaijin of the Vanishing Touch blocks a creature, return that creature to its owner's hand at end of combat. (Return it only if it's on the battlefield.) // Whenever Kaijin of the Vanishing Touch blocks a creature, return that creature to its owner's hand at end of combat. (Return it only if it's on the battlefield.)
Ability ability = new BlocksCreatureTriggeredAbility(new KaijinOfTheVanishingTouchEffect(), false, true); Effect effect = new ReturnToHandTargetEffect();
this.addAbility(ability); effect.setText("return that creature to its owner's hand at end of combat");
this.addAbility(new BlocksCreatureTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(
new AtTheEndOfCombatDelayedTriggeredAbility(effect)), false, true));
} }
public KaijinOfTheVanishingTouch(final KaijinOfTheVanishingTouch card) { public KaijinOfTheVanishingTouch(final KaijinOfTheVanishingTouch card) {
@ -75,35 +71,3 @@ public class KaijinOfTheVanishingTouch extends CardImpl {
return new KaijinOfTheVanishingTouch(this); return new KaijinOfTheVanishingTouch(this);
} }
} }
class KaijinOfTheVanishingTouchEffect extends OneShotEffect {
KaijinOfTheVanishingTouchEffect() {
super(Outcome.ReturnToHand);
staticText = "return that creature to its owner's hand at end of combat";
}
KaijinOfTheVanishingTouchEffect(final KaijinOfTheVanishingTouchEffect effect) {
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
Permanent targetCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source));
if (targetCreature != null) {
AtTheEndOfCombatDelayedTriggeredAbility delayedAbility = new AtTheEndOfCombatDelayedTriggeredAbility(new ReturnToHandTargetEffect());
delayedAbility.setSourceId(source.getSourceId());
delayedAbility.setControllerId(source.getControllerId());
delayedAbility.setSourceObject(source.getSourceObject(game), game);
delayedAbility.getEffects().get(0).setTargetPointer(new FixedTarget(targetCreature.getId()));
game.addDelayedTriggeredAbility(delayedAbility);
return true;
}
return false;
}
@Override
public KaijinOfTheVanishingTouchEffect copy() {
return new KaijinOfTheVanishingTouchEffect(this);
}
}

50
Mage.Sets/src/mage/sets/venservskoth/AEtherMembrane.java
View file

@ -27,23 +27,18 @@
*/ */
package mage.sets.venservskoth; package mage.sets.venservskoth;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.BlocksCreatureTriggeredAbility; import mage.abilities.common.BlocksCreatureTriggeredAbility;
import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.abilities.keyword.DefenderAbility; import mage.abilities.keyword.DefenderAbility;
import mage.abilities.keyword.ReachAbility; import mage.abilities.keyword.ReachAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
import java.util.UUID;
/** /**
* *
@ -63,7 +58,10 @@ public class AEtherMembrane extends CardImpl {
this.addAbility(DefenderAbility.getInstance()); this.addAbility(DefenderAbility.getInstance());
// 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.
this.addAbility(new BlocksCreatureTriggeredAbility(new AEtherMembraneEffect(), false, true)); Effect effect = new ReturnToHandTargetEffect();
effect.setText("return that creature to its owner's hand at end of combat");
this.addAbility(new BlocksCreatureTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(
new AtTheEndOfCombatDelayedTriggeredAbility(effect)), false, true));
} }
public AEtherMembrane(final AEtherMembrane card) { public AEtherMembrane(final AEtherMembrane card) {
@ -75,37 +73,3 @@ public class AEtherMembrane extends CardImpl {
return new AEtherMembrane(this); return new AEtherMembrane(this);
} }
} }
// @klayhamn: This is identical to the effect of KaijinOfTheVanishingTouch but there's only 2 cards with this effect
// and it's not generic enough to be extracted, imho
class AEtherMembraneEffect extends OneShotEffect {
AEtherMembraneEffect() {
super(Outcome.ReturnToHand);
staticText = "return that creature to its owner's hand at end of combat";
}
AEtherMembraneEffect(final AEtherMembraneEffect effect) {
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
Permanent targetCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source));
if (targetCreature != null) {
AtTheEndOfCombatDelayedTriggeredAbility delayedAbility = new AtTheEndOfCombatDelayedTriggeredAbility(new ReturnToHandTargetEffect());
delayedAbility.setSourceId(source.getSourceId());
delayedAbility.setControllerId(source.getControllerId());
delayedAbility.setSourceObject(source.getSourceObject(game), game);
delayedAbility.getEffects().get(0).setTargetPointer(new FixedTarget(targetCreature.getId()));
game.addDelayedTriggeredAbility(delayedAbility);
return true;
}
return false;
}
@Override
public AEtherMembraneEffect copy() {
return new AEtherMembraneEffect(this);
}
}