github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-16 09:16:26 -09:00
Code Issues Projects Releases Packages Wiki Activity

Rename BecomesTappedTriggeredAbility -> BecomesTappedSourceTriggeredAbility

Browse source
This commit is contained in:
LoneFox 2015-11-11 09:49:25 +02:00
parent bddb9999aa
commit f133854db1
7 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/lorwyn/Fallowsage.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BecomesTappedTriggeredAbility; import mage.abilities.common.BecomesTappedSourceTriggeredAbility;
import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -51,7 +51,7 @@ public class Fallowsage extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever Fallowsage becomes tapped, you may draw a card. // Whenever Fallowsage becomes tapped, you may draw a card.
this.addAbility(new BecomesTappedTriggeredAbility(new DrawCardSourceControllerEffect(1))); this.addAbility(new BecomesTappedSourceTriggeredAbility(new DrawCardSourceControllerEffect(1)));
} }
public Fallowsage(final Fallowsage card) { public Fallowsage(final Fallowsage card) {

4
Mage.Sets/src/mage/sets/lorwyn/Surgespanner.java
View file

@ -32,7 +32,7 @@ import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BecomesTappedTriggeredAbility; import mage.abilities.common.BecomesTappedSourceTriggeredAbility;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DoIfCostPaid;
import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect;
@ -55,7 +55,7 @@ public class Surgespanner extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever Surgespanner becomes tapped, you may pay {1}{U}. If you do, return target permanent to its owner's hand. // Whenever Surgespanner becomes tapped, you may pay {1}{U}. If you do, return target permanent to its owner's hand.
Ability ability = new BecomesTappedTriggeredAbility(new DoIfCostPaid(new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{U}"))); Ability ability = new BecomesTappedSourceTriggeredAbility(new DoIfCostPaid(new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{U}")));
ability.addTarget(new TargetPermanent()); ability.addTarget(new TargetPermanent());
this.addAbility(ability); this.addAbility(ability);
} }

40
Mage.Sets/src/mage/sets/morningtide/GrimoireThief.java
View file

@ -34,7 +34,7 @@ import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.MageObject; import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BecomesTappedTriggeredAbility; import mage.abilities.common.BecomesTappedSourceTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.SacrificeSourceCost;
@ -65,9 +65,9 @@ import mage.util.CardUtil;
* @author jeffwadsworth * @author jeffwadsworth
*/ */
public class GrimoireThief extends CardImpl { public class GrimoireThief extends CardImpl {
protected static final String VALUE_PREFIX = "ExileZones"; protected static final String VALUE_PREFIX = "ExileZones";
public GrimoireThief(UUID ownerId) { public GrimoireThief(UUID ownerId) {
super(ownerId, 35, "Grimoire Thief", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{U}{U}"); super(ownerId, 35, "Grimoire Thief", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{U}{U}");
this.expansionSetCode = "MOR"; this.expansionSetCode = "MOR";
@ -77,7 +77,7 @@ public class GrimoireThief extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever Grimoire Thief becomes tapped, exile the top three cards of target opponent's library face down. // Whenever Grimoire Thief becomes tapped, exile the top three cards of target opponent's library face down.
Ability ability = new BecomesTappedTriggeredAbility(new GrimoireThiefExileEffect(), false); Ability ability = new BecomesTappedSourceTriggeredAbility(new GrimoireThiefExileEffect(), false);
ability.addTarget(new TargetOpponent()); ability.addTarget(new TargetOpponent());
this.addAbility(ability); this.addAbility(ability);
@ -88,13 +88,13 @@ public class GrimoireThief extends CardImpl {
Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrimoireThiefCounterspellEffect(), new ManaCostsImpl("{U}")); Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrimoireThiefCounterspellEffect(), new ManaCostsImpl("{U}"));
ability2.addCost(new SacrificeSourceCost()); ability2.addCost(new SacrificeSourceCost());
this.addAbility(ability2); this.addAbility(ability2);
} }
public GrimoireThief(final GrimoireThief card) { public GrimoireThief(final GrimoireThief card) {
super(card); super(card);
} }
@Override @Override
public GrimoireThief copy() { public GrimoireThief copy() {
return new GrimoireThief(this); return new GrimoireThief(this);
@ -102,16 +102,16 @@ public class GrimoireThief extends CardImpl {
} }
class GrimoireThiefExileEffect extends OneShotEffect { class GrimoireThiefExileEffect extends OneShotEffect {
public GrimoireThiefExileEffect() { public GrimoireThiefExileEffect() {
super(Outcome.Discard); super(Outcome.Discard);
staticText = "exile the top three cards of target opponent's library face down"; staticText = "exile the top three cards of target opponent's library face down";
} }
public GrimoireThiefExileEffect(final GrimoireThiefExileEffect effect) { public GrimoireThiefExileEffect(final GrimoireThiefExileEffect effect) {
super(effect); super(effect);
} }
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player targetOpponent = game.getPlayer(source.getFirstTarget()); Player targetOpponent = game.getPlayer(source.getFirstTarget());
@ -138,7 +138,7 @@ class GrimoireThiefExileEffect extends OneShotEffect {
} }
return false; return false;
} }
@Override @Override
public GrimoireThiefExileEffect copy() { public GrimoireThiefExileEffect copy() {
return new GrimoireThiefExileEffect(this); return new GrimoireThiefExileEffect(this);
@ -146,26 +146,26 @@ class GrimoireThiefExileEffect extends OneShotEffect {
} }
class GrimoireThiefLookEffect extends AsThoughEffectImpl { class GrimoireThiefLookEffect extends AsThoughEffectImpl {
public GrimoireThiefLookEffect() { public GrimoireThiefLookEffect() {
super(AsThoughEffectType.LOOK_AT_FACE_DOWN, Duration.EndOfGame, Outcome.Benefit); super(AsThoughEffectType.LOOK_AT_FACE_DOWN, Duration.EndOfGame, Outcome.Benefit);
staticText = "You may look at the cards exiled with {this}"; staticText = "You may look at the cards exiled with {this}";
} }
public GrimoireThiefLookEffect(final GrimoireThiefLookEffect effect) { public GrimoireThiefLookEffect(final GrimoireThiefLookEffect effect) {
super(effect); super(effect);
} }
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
return true; return true;
} }
@Override @Override
public GrimoireThiefLookEffect copy() { public GrimoireThiefLookEffect copy() {
return new GrimoireThiefLookEffect(this); return new GrimoireThiefLookEffect(this);
} }
@Override @Override
public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
if (affectedControllerId.equals(source.getControllerId()) && game.getState().getZone(objectId).equals(Zone.EXILED)) { if (affectedControllerId.equals(source.getControllerId()) && game.getState().getZone(objectId).equals(Zone.EXILED)) {
@ -193,16 +193,16 @@ class GrimoireThiefLookEffect extends AsThoughEffectImpl {
} }
class GrimoireThiefCounterspellEffect extends OneShotEffect { class GrimoireThiefCounterspellEffect extends OneShotEffect {
public GrimoireThiefCounterspellEffect() { public GrimoireThiefCounterspellEffect() {
super(Outcome.Discard); super(Outcome.Discard);
staticText = "Turn all cards exiled with {this} face up. Counter all spells with those names"; staticText = "Turn all cards exiled with {this} face up. Counter all spells with those names";
} }
public GrimoireThiefCounterspellEffect(final GrimoireThiefCounterspellEffect effect) { public GrimoireThiefCounterspellEffect(final GrimoireThiefCounterspellEffect effect) {
super(effect); super(effect);
} }
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Cards cards = new CardsImpl(); Cards cards = new CardsImpl();
@ -245,7 +245,7 @@ class GrimoireThiefCounterspellEffect extends OneShotEffect {
} }
return false; return false;
} }
@Override @Override
public GrimoireThiefCounterspellEffect copy() { public GrimoireThiefCounterspellEffect copy() {
return new GrimoireThiefCounterspellEffect(this); return new GrimoireThiefCounterspellEffect(this);

6
Mage.Sets/src/mage/sets/morningtide/StonybrookSchoolmaster.java
View file

@ -29,7 +29,7 @@ package mage.sets.morningtide;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.BecomesTappedTriggeredAbility; import mage.abilities.common.BecomesTappedSourceTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
@ -51,7 +51,7 @@ public class StonybrookSchoolmaster extends CardImpl {
this.toughness = new MageInt(2); this.toughness = new MageInt(2);
// Whenever Stonybrook Schoolmaster becomes tapped, you may put a 1/1 blue Merfolk Wizard creature token onto the battlefield. // Whenever Stonybrook Schoolmaster becomes tapped, you may put a 1/1 blue Merfolk Wizard creature token onto the battlefield.
this.addAbility(new BecomesTappedTriggeredAbility(new CreateTokenEffect(new MerfolkWizardToken()), true)); this.addAbility(new BecomesTappedSourceTriggeredAbility(new CreateTokenEffect(new MerfolkWizardToken()), true));
} }
public StonybrookSchoolmaster(final StonybrookSchoolmaster card) { public StonybrookSchoolmaster(final StonybrookSchoolmaster card) {
@ -62,4 +62,4 @@ public class StonybrookSchoolmaster extends CardImpl {
public StonybrookSchoolmaster copy() { public StonybrookSchoolmaster copy() {
return new StonybrookSchoolmaster(this); return new StonybrookSchoolmaster(this);
} }
} }

4
Mage.Sets/src/mage/sets/seventhedition/CityOfBrass.java
View file

@ -30,7 +30,7 @@ package mage.sets.seventhedition;
import java.util.UUID; import java.util.UUID;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.abilities.common.BecomesTappedTriggeredAbility; import mage.abilities.common.BecomesTappedSourceTriggeredAbility;
import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.mana.AnyColorManaAbility; import mage.abilities.mana.AnyColorManaAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -46,7 +46,7 @@ public class CityOfBrass extends CardImpl {
this.expansionSetCode = "7ED"; this.expansionSetCode = "7ED";
// Whenever City of Brass becomes tapped, it deals 1 damage to you. // Whenever City of Brass becomes tapped, it deals 1 damage to you.
this.addAbility(new BecomesTappedTriggeredAbility(new DamageControllerEffect(1))); this.addAbility(new BecomesTappedSourceTriggeredAbility(new DamageControllerEffect(1)));
// {tap}: Add one mana of any color to your mana pool. // {tap}: Add one mana of any color to your mana pool.
this.addAbility(new AnyColorManaAbility()); this.addAbility(new AnyColorManaAbility());

4
Mage.Sets/src/mage/sets/urzaslegacy/GoblinMedics.java
View file

@ -32,7 +32,7 @@ import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BecomesTappedTriggeredAbility; import mage.abilities.common.BecomesTappedSourceTriggeredAbility;
import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreatureOrPlayer;
@ -53,7 +53,7 @@ public class GoblinMedics extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Whenever Goblin Medics becomes tapped, it deals 1 damage to target creature or player. // Whenever Goblin Medics becomes tapped, it deals 1 damage to target creature or player.
Ability ability = new BecomesTappedTriggeredAbility(new DamageTargetEffect(1)); Ability ability = new BecomesTappedSourceTriggeredAbility(new DamageTargetEffect(1));
ability.addTarget(new TargetCreatureOrPlayer()); ability.addTarget(new TargetCreatureOrPlayer());
this.addAbility(ability); this.addAbility(ability);
} }

14
Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java → Mage/src/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java
View file

@ -38,23 +38,23 @@ import mage.game.events.GameEvent.EventType;
* *
* @author nantuko * @author nantuko
*/ */
public class BecomesTappedTriggeredAbility extends TriggeredAbilityImpl { public class BecomesTappedSourceTriggeredAbility extends TriggeredAbilityImpl {
public BecomesTappedTriggeredAbility(Effect effect, boolean isOptional) { public BecomesTappedSourceTriggeredAbility(Effect effect, boolean isOptional) {
super(Zone.BATTLEFIELD, effect, isOptional); super(Zone.BATTLEFIELD, effect, isOptional);
} }
public BecomesTappedTriggeredAbility(Effect effect) { public BecomesTappedSourceTriggeredAbility(Effect effect) {
super(Zone.BATTLEFIELD, effect); super(Zone.BATTLEFIELD, effect);
} }
public BecomesTappedTriggeredAbility(final BecomesTappedTriggeredAbility ability) { public BecomesTappedSourceTriggeredAbility(final BecomesTappedSourceTriggeredAbility ability) {
super(ability); super(ability);
} }
@Override @Override
public BecomesTappedTriggeredAbility copy() { public BecomesTappedSourceTriggeredAbility copy() {
return new BecomesTappedTriggeredAbility(this); return new BecomesTappedSourceTriggeredAbility(this);
} }
@Override @Override