github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

put into a graveyard from battlefield -> dies and 2 NPH

Browse source
This commit is contained in:
Loki 2011-07-23 21:47:19 +03:00
parent f399db14a9
commit a61cddbca8
57 changed files with 264 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/apocalypse/PenumbraBobcat.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl;
import mage.game.permanent.token.Token;
@ -49,7 +49,7 @@ public class PenumbraBobcat extends CardImpl<PenumbraBobcat> {
this.color.setGreen(true);
this.power = new MageInt(2);
this.toughness = new MageInt(1);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new PenumbraBobcatToken(), 1), false));
this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraBobcatToken(), 1), false));
}
public PenumbraBobcat(final PenumbraBobcat card) {

4
Mage.Sets/src/mage/sets/apocalypse/PenumbraKavu.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl;
import mage.game.permanent.token.Token;
@ -49,7 +49,7 @@ public class PenumbraKavu extends CardImpl<PenumbraKavu> {
this.color.setGreen(true);
this.power = new MageInt(3);
this.toughness = new MageInt(3);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new PenumbraKavuToken(), 1), false));
this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraKavuToken(), 1), false));
}
public PenumbraKavu(final PenumbraKavu card) {

4
Mage.Sets/src/mage/sets/apocalypse/PenumbraWurm.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl;
@ -51,7 +51,7 @@ public class PenumbraWurm extends CardImpl<PenumbraWurm> {
this.power = new MageInt(6);
this.toughness = new MageInt(6);
this.addAbility(TrampleAbility.getInstance());
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new PenumbraWurmToken(), 1), false));
this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new PenumbraWurmToken(), 1), false));
}
public PenumbraWurm(final PenumbraWurm card) {

4
Mage.Sets/src/mage/sets/championsofkamigawa/AshenSkinZubera.java
View file

@ -35,7 +35,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.common.DiscardTargetEffect;
import mage.cards.Card;
@ -60,7 +60,7 @@ public class AshenSkinZubera extends CardImpl<AshenSkinZubera> {
this.color.setBlack(true);
this.power = new MageInt(1);
this.toughness = new MageInt(2);
Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new DiscardTargetEffect(new AshenSkinZuberaDynamicValue()));
Ability ability = new DiesTriggeredAbility(new DiscardTargetEffect(new AshenSkinZuberaDynamicValue()));
ability.addTarget(new TargetOpponent());
this.addAbility(ability);
this.watchers.add(new AshenSkinZuberaWatcher(ownerId));

9
Mage.Sets/src/mage/sets/championsofkamigawa/DeathcurseOgre.java
View file

@ -30,17 +30,12 @@ package mage.sets.championsofkamigawa;
import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.LoseLifePlayersEffect;
import mage.cards.CardImpl;
import mage.game.Game;
import mage.players.Player;
/**
*
@ -56,7 +51,7 @@ public class DeathcurseOgre extends CardImpl<DeathcurseOgre> {
this.color.setBlack(true);
this.power = new MageInt(3);
this.toughness = new MageInt(3);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new LoseLifePlayersEffect(3)));
this.addAbility(new DiesTriggeredAbility(new LoseLifePlayersEffect(3)));
}
public DeathcurseOgre (final DeathcurseOgre card) {

4
Mage.Sets/src/mage/sets/championsofkamigawa/DrippingTongueZubera.java
View file

@ -35,7 +35,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.Card;
@ -61,7 +61,7 @@ public class DrippingTongueZubera extends CardImpl<DrippingTongueZubera> {
this.color.setGreen(true);
this.power = new MageInt(1);
this.toughness = new MageInt(2);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new DrippingTongueZuberaDynamicValue()), false));
this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritToken(), new DrippingTongueZuberaDynamicValue()), false));
this.watchers.add(new DrippingTongueZuberaWatcher(ownerId));
}

4
Mage.Sets/src/mage/sets/championsofkamigawa/EmberFistZubera.java
View file

@ -35,7 +35,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.Card;
@ -61,7 +61,7 @@ public class EmberFistZubera extends CardImpl<EmberFistZubera> {
this.color.setRed(true);
this.power = new MageInt(1);
this.toughness = new MageInt(2);
Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new DamageTargetEffect(new EmberFistZuberaDynamicValue()));
Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(new EmberFistZuberaDynamicValue()));
ability.addTarget(new TargetCreatureOrPlayer());
this.addAbility(ability);
this.watchers.add(new EmberFistZuberaWatcher(ownerId));

4
Mage.Sets/src/mage/sets/championsofkamigawa/FloatingDreamZubera.java
View file

@ -35,7 +35,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.common.DrawCardControllerEffect;
import mage.cards.Card;
@ -59,7 +59,7 @@ public class FloatingDreamZubera extends CardImpl<FloatingDreamZubera> {
this.color.setBlue(true);
this.power = new MageInt(1);
this.toughness = new MageInt(2);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(new FloatingDreamZuberaDynamicValue())));
this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(new FloatingDreamZuberaDynamicValue())));
this.watchers.add(new FloatingDreamZuberaWatcher(ownerId));
}

6
Mage.Sets/src/mage/sets/championsofkamigawa/KeigaTheTideStar.java
View file

@ -35,14 +35,12 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.continious.GainControlTargetEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.target.common.TargetCreaturePermanent;
import javax.xml.transform.Source;
/**
* @author Loki
*/
@ -58,7 +56,7 @@ public class KeigaTheTideStar extends CardImpl<KeigaTheTideStar> {
this.power = new MageInt(5);
this.toughness = new MageInt(5);
this.addAbility(FlyingAbility.getInstance());
Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new GainControlTargetEffect(Constants.Duration.Custom));
Ability ability = new DiesTriggeredAbility(new GainControlTargetEffect(Constants.Duration.Custom));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
}

4
Mage.Sets/src/mage/sets/championsofkamigawa/KokushoTheEveningStar.java
View file

@ -35,7 +35,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
@ -56,7 +56,7 @@ public class KokushoTheEveningStar extends CardImpl<KokushoTheEveningStar> {
this.power = new MageInt(5);
this.toughness = new MageInt(5);
this.addAbility(FlyingAbility.getInstance());
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new KokushoTheEveningStarEffect(), false));
this.addAbility(new DiesTriggeredAbility(new KokushoTheEveningStarEffect(), false));
}
public KokushoTheEveningStar(final KokushoTheEveningStar card) {

4
Mage.Sets/src/mage/sets/championsofkamigawa/RyuseiTheFallingStar.java
View file

@ -30,7 +30,7 @@ package mage.sets.championsofkamigawa;
import mage.Constants;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DamageAllEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
@ -60,7 +60,7 @@ public class RyuseiTheFallingStar extends CardImpl<RyuseiTheFallingStar> {
this.power = new MageInt(5);
this.toughness = new MageInt(5);
this.addAbility(FlyingAbility.getInstance());
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DamageAllEffect(5, filter)));
this.addAbility(new DiesTriggeredAbility(new DamageAllEffect(5, filter)));
}
public RyuseiTheFallingStar(final RyuseiTheFallingStar card) {

4
Mage.Sets/src/mage/sets/championsofkamigawa/SilentChantZubera.java
View file

@ -35,7 +35,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.common.GainLifeEffect;
import mage.cards.Card;
@ -60,7 +60,7 @@ public class SilentChantZubera extends CardImpl<SilentChantZubera> {
this.color.setWhite(true);
this.power = new MageInt(1);
this.toughness = new MageInt(2);
Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new GainLifeEffect(new SilentChantZuberaDynamicValue()));
Ability ability = new DiesTriggeredAbility(new GainLifeEffect(new SilentChantZuberaDynamicValue()));
this.addAbility(ability);
this.watchers.add(new AshenSkinZuberaWatcher(ownerId));
}

4
Mage.Sets/src/mage/sets/conflux/TukatongueThallid.java
View file

@ -32,7 +32,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl;
import mage.game.permanent.token.Token;
@ -51,7 +51,7 @@ public class TukatongueThallid extends CardImpl<TukatongueThallid> {
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), false));
this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SaprolingToken()), false));
}
public TukatongueThallid(final TukatongueThallid card) {

4
Mage.Sets/src/mage/sets/darksteel/MyrMoonvessel.java
View file

@ -34,7 +34,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.Mana;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.BasicManaEffect;
import mage.cards.CardImpl;
@ -49,7 +49,7 @@ public class MyrMoonvessel extends CardImpl<MyrMoonvessel> {
this.subtype.add("Myr");
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 1, 0))));
this.addAbility(new DiesTriggeredAbility(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 1, 0))));
}
public MyrMoonvessel(final MyrMoonvessel card) {

4
Mage.Sets/src/mage/sets/eventide/ArchonOfJustice.java
View file

@ -32,7 +32,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.ExileTargetEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
@ -54,7 +54,7 @@ public class ArchonOfJustice extends CardImpl<ArchonOfJustice> {
this.toughness = new MageInt(4);
this.addAbility(FlyingAbility.getInstance());
Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new ExileTargetEffect(), false);
Ability ability = new DiesTriggeredAbility(new ExileTargetEffect(), false);
ability.addTarget(new TargetPermanent());
this.addAbility(ability);
}

4
Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java
View file

@ -31,7 +31,7 @@ package mage.sets.guildpact;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DrawCardControllerEffect;
import mage.cards.CardImpl;
@ -45,7 +45,7 @@ public class HatchingPlans extends CardImpl<HatchingPlans> {
super(ownerId, 27, "Hatching Plans", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}");
this.expansionSetCode = "GPT";
this.color.setBlue(true);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(3)));
this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(3)));
}
public HatchingPlans (final HatchingPlans card) {

4
Mage.Sets/src/mage/sets/magic2010/MagmaPhoenix.java
View file

@ -33,7 +33,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.DamageEverythingEffect;
@ -56,7 +56,7 @@ public class MagmaPhoenix extends CardImpl<MagmaPhoenix> {
this.toughness = new MageInt(3);
this.addAbility(FlyingAbility.getInstance());
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DamageEverythingEffect(3), false));
this.addAbility(new DiesTriggeredAbility(new DamageEverythingEffect(3), false));
this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{3}{R}{R}")));
}

4
Mage.Sets/src/mage/sets/magic2011/HoardingDragon.java
View file

@ -36,7 +36,7 @@ import mage.Constants.Zone;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.ReturnFromExileEffect;
import mage.abilities.keyword.FlyingAbility;
@ -69,7 +69,7 @@ public class HoardingDragon extends CardImpl<HoardingDragon> {
this.addAbility(FlyingAbility.getInstance());
this.addAbility(new EntersBattlefieldTriggeredAbility(new HoardingDragonEffect(this.getId()), true));
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnFromExileEffect(this.getId(), Zone.BATTLEFIELD), false));
this.addAbility(new DiesTriggeredAbility(new ReturnFromExileEffect(this.getId(), Zone.BATTLEFIELD), false));
}
public HoardingDragon(final HoardingDragon card) {

6
Mage.Sets/src/mage/sets/magic2011/MitoticSlime.java
View file

@ -32,7 +32,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl;
import mage.game.permanent.token.Token;
@ -51,7 +51,7 @@ public class MitoticSlime extends CardImpl<MitoticSlime> {
this.power = new MageInt(4);
this.toughness = new MageInt(4);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new Ooze2Token(), 2), false));
this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new Ooze2Token(), 2), false));
}
public MitoticSlime(final MitoticSlime card) {
@ -74,7 +74,7 @@ class Ooze2Token extends Token {
color.setGreen(true);
power = new MageInt(2);
toughness = new MageInt(2);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new Ooze1Token(), 2), false));
this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new Ooze1Token(), 2), false));
}
}

4
Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java
View file

@ -39,7 +39,7 @@ import mage.Constants.TargetController;
import mage.Constants.Zone;
import mage.abilities.Ability;
import mage.abilities.common.OnEventTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.OneShotEffect;
@ -113,7 +113,7 @@ class NecroticPlagueEffect extends ContinuousEffectImpl<NecroticPlagueEffect> {
case AbilityAddingRemovingEffects_6:
if (sublayer == SubLayer.NA) {
creature.addAbility(new OnEventTriggeredAbility(EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new SacrificeSourceEffect()));
creature.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new NecroticPlagueEffect2(source.getSourceId()), false));
creature.addAbility(new DiesTriggeredAbility(new NecroticPlagueEffect2(source.getSourceId()), false));
}
break;
}

4
Mage.Sets/src/mage/sets/magic2011/RocEgg.java
View file

@ -32,7 +32,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.keyword.DefenderAbility;
import mage.abilities.keyword.FlyingAbility;
@ -56,7 +56,7 @@ public class RocEgg extends CardImpl<RocEgg> {
this.toughness = new MageInt(3);
this.addAbility(DefenderAbility.getInstance());
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(rocEggToken, 1), false));
this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(rocEggToken, 1), false));
}
public RocEgg(final RocEgg card) {

6
Mage.Sets/src/mage/sets/magic2012/SolemnSimulacrum.java
View file

@ -31,14 +31,12 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DrawCardControllerEffect;
import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
import mage.cards.CardImpl;
import mage.filter.common.FilterBasicLandCard;
import mage.target.common.TargetBasicLandCard;
import mage.target.common.TargetCardInLibrary;
/**
@ -56,7 +54,7 @@ public class SolemnSimulacrum extends CardImpl<SolemnSimulacrum> {
this.power = new MageInt(2);
this.toughness = new MageInt(2);
this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true), true));
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), true));
this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1), true));
}
public SolemnSimulacrum(final SolemnSimulacrum card) {

4
Mage.Sets/src/mage/sets/mirrodin/Cathodion.java
View file

@ -32,7 +32,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.Mana;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.BasicManaEffect;
import mage.cards.CardImpl;
@ -48,7 +48,7 @@ public class Cathodion extends CardImpl<Cathodion> {
this.subtype.add("Construct");
this.power = new MageInt(3);
this.toughness = new MageInt(3);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 3, 0)), false));
this.addAbility(new DiesTriggeredAbility(new BasicManaEffect(new Mana(0, 0, 0, 0, 0, 3, 0)), false));
}
public Cathodion(final Cathodion card) {

4
Mage.Sets/src/mage/sets/mirrodinbesieged/CausticHound.java
View file

@ -33,7 +33,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.LoseLifePlayersEffect;
import mage.cards.CardImpl;
@ -50,7 +50,7 @@ public class CausticHound extends CardImpl<CausticHound> {
this.color.setBlack(true);
this.power = new MageInt(4);
this.toughness = new MageInt(4);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new LoseLifePlayersEffect(4)));
this.addAbility(new DiesTriggeredAbility(new LoseLifePlayersEffect(4)));
}
public CausticHound (final CausticHound card) {

4
Mage.Sets/src/mage/sets/mirrodinbesieged/CoreProwler.java
View file

@ -32,7 +32,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.counter.ProliferateEffect;
import mage.abilities.keyword.InfectAbility;
import mage.cards.CardImpl;
@ -50,7 +50,7 @@ public class CoreProwler extends CardImpl<CoreProwler> {
this.power = new MageInt(2);
this.toughness = new MageInt(2);
this.addAbility(InfectAbility.getInstance());
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ProliferateEffect()));
this.addAbility(new DiesTriggeredAbility(new ProliferateEffect()));
}
public CoreProwler (final CoreProwler card) {

4
Mage.Sets/src/mage/sets/mirrodinbesieged/IchorWellspring.java
View file

@ -31,7 +31,7 @@ package mage.sets.mirrodinbesieged;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DrawCardControllerEffect;
import mage.cards.CardImpl;
@ -46,7 +46,7 @@ public class IchorWellspring extends CardImpl<IchorWellspring> {
super(ownerId, 110, "Ichor Wellspring", Rarity.COMMON, new CardType[]{CardType.ARTIFACT}, "{2}");
this.expansionSetCode = "MBS";
this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardControllerEffect(1)));
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(1)));
this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1)));
}
public IchorWellspring(final IchorWellspring card) {

4
Mage.Sets/src/mage/sets/mirrodinbesieged/MyrSire.java
View file

@ -32,7 +32,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl;
import mage.game.permanent.token.MyrToken;
@ -49,7 +49,7 @@ public class MyrSire extends CardImpl<MyrSire> {
this.subtype.add("Myr");
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new MyrToken())));
this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new MyrToken())));
}
public MyrSire (final MyrSire card) {

4
Mage.Sets/src/mage/sets/mirrodinbesieged/Oculus.java
View file

@ -32,7 +32,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DrawCardControllerEffect;
import mage.cards.CardImpl;
@ -49,7 +49,7 @@ public class Oculus extends CardImpl<Oculus> {
this.color.setBlue(true);
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), true));
this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1), true));
}
public Oculus (final Oculus card) {

4
Mage.Sets/src/mage/sets/mirrodinbesieged/SerumRaker.java
View file

@ -32,7 +32,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DiscardEachPlayerEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
@ -51,7 +51,7 @@ public class SerumRaker extends CardImpl<SerumRaker> {
this.power = new MageInt(3);
this.toughness = new MageInt(2);
this.addAbility(FlyingAbility.getInstance());
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DiscardEachPlayerEffect()));
this.addAbility(new DiesTriggeredAbility(new DiscardEachPlayerEffect()));
}
public SerumRaker (final SerumRaker card) {

4
Mage.Sets/src/mage/sets/mirrodinbesieged/SpineOfIshSah.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.effects.common.ReturnToHandSourceEffect;
import mage.cards.CardImpl;
@ -50,7 +50,7 @@ public class SpineOfIshSah extends CardImpl<SpineOfIshSah> {
EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
ability.addTarget(new TargetPermanent());
this.addAbility(ability);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect()));
this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect()));
}
public SpineOfIshSah(final SpineOfIshSah card) {

4
Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianEmissary.java
View file

@ -32,7 +32,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
import mage.cards.CardImpl;
import mage.filter.common.FilterBasicLandCard;
@ -52,7 +52,7 @@ public class ViridianEmissary extends CardImpl<ViridianEmissary> {
this.color.setGreen(true);
this.power = new MageInt(2);
this.toughness = new MageInt(1);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterBasicLandCard()), true), true));
this.addAbility(new DiesTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterBasicLandCard()), true), true));
}
public ViridianEmissary (final ViridianEmissary card) {

5
Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java
View file

@ -32,10 +32,9 @@ import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.AttachEffect;
@ -68,7 +67,7 @@ public class GlisteningOil extends CardImpl<GlisteningOil> {
this.addAbility(ability);
this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), Constants.AttachmentType.AURA)));
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GlisteningOilEffect(), Constants.TargetController.YOU, false));
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect()));
this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect()));
}
public GlisteningOil(final GlisteningOil card) {

72
Mage.Sets/src/mage/sets/newphyrexia/InquisitorExarch.java Normal file
View file

@ -0,0 +1,72 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.newphyrexia;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.GainLifeEffect;
import mage.abilities.effects.common.LoseLifeTargetEffect;
import mage.cards.CardImpl;
import mage.target.TargetPlayer;
/**
*
* @author Loki
*/
public class InquisitorExarch extends CardImpl<InquisitorExarch> {
public InquisitorExarch(UUID ownerId) {
super(ownerId, 12, "Inquisitor Exarch", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{W}");
this.expansionSetCode = "NPH";
this.subtype.add("Cleric");
this.color.setWhite(true);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
Ability ability = new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2));
Mode mode = new Mode();
mode.getEffects().add(new LoseLifeTargetEffect(2));
mode.getTargets().add(new TargetPlayer());
ability.addMode(mode);
this.addAbility(ability);
}
public InquisitorExarch(final InquisitorExarch card) {
super(card);
}
@Override
public InquisitorExarch copy() {
return new InquisitorExarch(this);
}
}

4
Mage.Sets/src/mage/sets/newphyrexia/MortisDogs.java
View file

@ -35,7 +35,7 @@ import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continious.BoostSourceEffect;
import mage.cards.CardImpl;
@ -60,7 +60,7 @@ public class MortisDogs extends CardImpl<MortisDogs> {
this.toughness = new MageInt(2);
this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(2, 0, Duration.EndOfTurn), false));
Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new MortisDogsEffect());
Ability ability = new DiesTriggeredAbility(new MortisDogsEffect());
ability.addTarget(new TargetPlayer());
this.addAbility(ability);
}

4
Mage.Sets/src/mage/sets/newphyrexia/MycosynthWellspring.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.search.SearchLibraryRevealPutInHandEffect;
import mage.cards.CardImpl;
import mage.filter.common.FilterBasicLandCard;
@ -50,7 +50,7 @@ public class MycosynthWellspring extends CardImpl<MycosynthWellspring> {
this.expansionSetCode = "NPH";
this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryRevealPutInHandEffect(new TargetCardInLibrary(filter))));
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new SearchLibraryRevealPutInHandEffect(new TargetCardInLibrary(filter))));
this.addAbility(new DiesTriggeredAbility(new SearchLibraryRevealPutInHandEffect(new TargetCardInLibrary(filter))));
}
public MycosynthWellspring(final MycosynthWellspring card) {

75
Mage.Sets/src/mage/sets/newphyrexia/TormentorExarch.java Normal file
View file

@ -0,0 +1,75 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.newphyrexia;
import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.continious.BoostTargetEffect;
import mage.cards.CardImpl;
import mage.target.common.TargetCreaturePermanent;
/**
*
* @author Loki
*/
public class TormentorExarch extends CardImpl<TormentorExarch> {
public TormentorExarch(UUID ownerId) {
super(ownerId, 97, "Tormentor Exarch", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}");
this.expansionSetCode = "NPH";
this.subtype.add("Cleric");
this.color.setRed(true);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(2, 0, Constants.Duration.EndOfTurn), false);
ability.addTarget(new TargetCreaturePermanent());
Mode mode = new Mode();
mode.getEffects().add(new BoostTargetEffect(0, -2, Constants.Duration.EndOfTurn));
mode.getTargets().add(new TargetCreaturePermanent());
ability.addMode(mode);
ability.addMode(mode);
this.addAbility(ability);
}
public TormentorExarch(final TormentorExarch card) {
super(card);
}
@Override
public TormentorExarch copy() {
return new TormentorExarch(this);
}
}

4
Mage.Sets/src/mage/sets/planechase/BogardanFirefiend.java
View file

@ -32,7 +32,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl;
import mage.target.common.TargetCreatureOrPlayer;
@ -51,7 +51,7 @@ public class BogardanFirefiend extends CardImpl<BogardanFirefiend> {
this.color.setRed(true);
this.power = new MageInt(2);
this.toughness = new MageInt(1);
Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new DamageTargetEffect(2), false);
Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(2), false);
ability.addTarget(new TargetCreatureOrPlayer());
this.addAbility(ability);
}

4
Mage.Sets/src/mage/sets/planechase/FesteringGoblin.java
View file

@ -34,7 +34,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.continious.BoostTargetEffect;
import mage.cards.CardImpl;
import mage.target.common.TargetCreaturePermanent;
@ -53,7 +53,7 @@ public class FesteringGoblin extends CardImpl<FesteringGoblin> {
this.color.setBlack(true);
this.power = new MageInt(1);
this.toughness = new MageInt(1);
Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn), false);
Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-1, -1, Constants.Duration.EndOfTurn), false);
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
}

4
Mage.Sets/src/mage/sets/riseoftheeldrazi/EnatuGolem.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.GainLifeEffect;
import mage.cards.CardImpl;
@ -49,7 +49,7 @@ public class EnatuGolem extends CardImpl<EnatuGolem> {
this.power = new MageInt(3);
this.toughness = new MageInt(5);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new GainLifeEffect(4), false));
this.addAbility(new DiesTriggeredAbility(new GainLifeEffect(4), false));
}
public EnatuGolem(final EnatuGolem card) {

4
Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinArsonist.java
View file

@ -33,7 +33,7 @@ import mage.Constants.Outcome;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.game.Game;
@ -57,7 +57,7 @@ public class GoblinArsonist extends CardImpl<GoblinArsonist> {
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new GoblinArsonistEffect(), true));
this.addAbility(new DiesTriggeredAbility(new GoblinArsonistEffect(), true));
}
public GoblinArsonist(final GoblinArsonist card) {

4
Mage.Sets/src/mage/sets/riseoftheeldrazi/PelakkaWurm.java
View file

@ -32,7 +32,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DrawCardControllerEffect;
import mage.abilities.effects.common.GainLifeEffect;
import mage.abilities.keyword.TrampleAbility;
@ -55,7 +55,7 @@ public class PelakkaWurm extends CardImpl<PelakkaWurm> {
this.addAbility(TrampleAbility.getInstance());
this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(7), false));
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false));
this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1), false));
}
public PelakkaWurm(final PelakkaWurm card) {

4
Mage.Sets/src/mage/sets/riseoftheeldrazi/RunedServitor.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DrawCardAllEffect;
import mage.cards.CardImpl;
@ -47,7 +47,7 @@ public class RunedServitor extends CardImpl<RunedServitor> {
this.subtype.add("Construct");
this.power = new MageInt(2);
this.toughness = new MageInt(2);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardAllEffect(1), false));
this.addAbility(new DiesTriggeredAbility(new DrawCardAllEffect(1), false));
}
public RunedServitor(final RunedServitor card) {

4
Mage.Sets/src/mage/sets/riseoftheeldrazi/TuktukTheExplorer.java
View file

@ -32,7 +32,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.keyword.HasteAbility;
import mage.cards.CardImpl;
@ -53,7 +53,7 @@ public class TuktukTheExplorer extends CardImpl<TuktukTheExplorer> {
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.addAbility(HasteAbility.getInstance());
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new TuktukTheReturnedToken())));
this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new TuktukTheReturnedToken())));
}
public TuktukTheExplorer (final TuktukTheExplorer card) {

4
Mage.Sets/src/mage/sets/scarsofmirrodin/Blistergrub.java
View file

@ -35,7 +35,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.game.Game;
@ -54,7 +54,7 @@ public class Blistergrub extends CardImpl<Blistergrub> {
this.color.setBlack(true);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new BlistergrubEffect(), false));
this.addAbility(new DiesTriggeredAbility(new BlistergrubEffect(), false));
}
public Blistergrub (final Blistergrub card) {

4
Mage.Sets/src/mage/sets/scarsofmirrodin/DarkslickDrake.java
View file

@ -31,7 +31,7 @@ package mage.sets.scarsofmirrodin;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DrawCardControllerEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
@ -52,7 +52,7 @@ public class DarkslickDrake extends CardImpl<DarkslickDrake> {
this.power = new MageInt(2);
this.toughness = new MageInt(4);
this.addAbility(FlyingAbility.getInstance());
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(1), false));
this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(1), false));
}
public DarkslickDrake (final DarkslickDrake card) {

4
Mage.Sets/src/mage/sets/scarsofmirrodin/FlightSpellbomb.java
View file

@ -34,7 +34,7 @@ import mage.Constants.Duration;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.common.TapSourceCost;
@ -59,7 +59,7 @@ public class FlightSpellbomb extends CardImpl<FlightSpellbomb> {
ability.addCost(new SacrificeSourceCost());
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{U}")), false));
this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{U}")), false));
}
public FlightSpellbomb (final FlightSpellbomb card) {

4
Mage.Sets/src/mage/sets/scarsofmirrodin/HorizonSpellbomb.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.common.TapSourceCost;
@ -63,7 +63,7 @@ public class HorizonSpellbomb extends CardImpl<HorizonSpellbomb> {
ability.addCost(new SacrificeSourceCost());
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{G}")), false));
this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{G}")), false));
}
public HorizonSpellbomb(final HorizonSpellbomb card) {

4
Mage.Sets/src/mage/sets/scarsofmirrodin/Necropede.java
View file

@ -33,7 +33,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.counter.AddCountersTargetEffect;
import mage.abilities.keyword.InfectAbility;
import mage.cards.CardImpl;
@ -53,7 +53,7 @@ public class Necropede extends CardImpl<Necropede> {
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.addAbility(InfectAbility.getInstance());
Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), true);
Ability ability = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.M1M1.createInstance()), true);
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
}

4
Mage.Sets/src/mage/sets/scarsofmirrodin/NihilSpellbomb.java
View file

@ -34,7 +34,7 @@ import mage.Constants.Outcome;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.common.TapSourceCost;
@ -61,7 +61,7 @@ public class NihilSpellbomb extends CardImpl<NihilSpellbomb> {
ability.addCost(new SacrificeSourceCost());
ability.addTarget(new TargetPlayer());
this.addAbility(ability);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{B}")), false));
this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{B}")), false));
}
public NihilSpellbomb(final NihilSpellbomb card) {

5
Mage.Sets/src/mage/sets/scarsofmirrodin/OriginSpellbomb.java
View file

@ -30,11 +30,10 @@ package mage.sets.scarsofmirrodin;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.common.TapSourceCost;
@ -59,7 +58,7 @@ public class OriginSpellbomb extends CardImpl<OriginSpellbomb> {
ability.addCost(new TapSourceCost());
ability.addCost(new SacrificeSourceCost());
this.addAbility(ability);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{W}")), false));
this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{W}")), false));
}
public OriginSpellbomb (final OriginSpellbomb card) {

4
Mage.Sets/src/mage/sets/scarsofmirrodin/PanicSpellbomb.java
View file

@ -34,7 +34,7 @@ import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.abilities.Ability;
import mage.abilities.common.CantBlockAbility;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.common.TapSourceCost;
@ -59,7 +59,7 @@ public class PanicSpellbomb extends CardImpl<PanicSpellbomb> {
ability.addCost(new SacrificeSourceCost());
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{R}")), false));
this.addAbility(new DiesTriggeredAbility(new DoIfCostPaid(new DrawCardControllerEffect(1), new ManaCostsImpl("{R}")), false));
}
public PanicSpellbomb(final PanicSpellbomb card) {

4
Mage.Sets/src/mage/sets/scarsofmirrodin/PerilousMyr.java
View file

@ -33,7 +33,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl;
import mage.target.common.TargetCreatureOrPlayer;
@ -50,7 +50,7 @@ public class PerilousMyr extends CardImpl<PerilousMyr> {
this.subtype.add("Myr");
this.power = new MageInt(1);
this.toughness = new MageInt(1);
Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new DamageTargetEffect(2), false);
Ability ability = new DiesTriggeredAbility(new DamageTargetEffect(2), false);
ability.addTarget(new TargetCreatureOrPlayer());
this.addAbility(ability);
}

4
Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokLifestaff.java
View file

@ -33,7 +33,7 @@ import mage.Constants.CardType;
import mage.Constants.Outcome;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.common.GainLifeEffect;
@ -54,7 +54,7 @@ public class SylvokLifestaff extends CardImpl<SylvokLifestaff> {
this.subtype.add("Equipment");
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0)));
PutIntoGraveFromBattlefieldTriggeredAbility ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new GainLifeEffect(3));
DiesTriggeredAbility ability = new DiesTriggeredAbility(new GainLifeEffect(3));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT)));
this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1)));
}

7
Mage.Sets/src/mage/sets/scarsofmirrodin/WurmcoilEngine.java
View file

@ -30,13 +30,10 @@ package mage.sets.scarsofmirrodin;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.Ability;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.keyword.DeathtouchAbility;
import mage.abilities.keyword.LifelinkAbility;
@ -57,7 +54,7 @@ public class WurmcoilEngine extends CardImpl<WurmcoilEngine> {
this.toughness = new MageInt(6);
this.addAbility(DeathtouchAbility.getInstance());
this.addAbility(LifelinkAbility.getInstance());
Ability ability = new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new Wurm1Token()), false);
Ability ability = new DiesTriggeredAbility(new CreateTokenEffect(new Wurm1Token()), false);
ability.addEffect(new CreateTokenEffect(new Wurm2Token()));
this.addAbility(ability);
}

4
Mage.Sets/src/mage/sets/shardsofalara/SproutingThrinax.java
View file

@ -32,7 +32,7 @@ import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl;
import mage.game.permanent.token.SaprolingToken;
@ -55,7 +55,7 @@ public class SproutingThrinax extends CardImpl<SproutingThrinax> {
this.power = new MageInt(3);
this.toughness = new MageInt(3);
this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(saprolingToken, 3), false));
this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(saprolingToken, 3), false));
}
public SproutingThrinax(final SproutingThrinax card) {

14
Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java → Mage/src/mage/abilities/common/DiesTriggeredAbility.java
View file

@ -35,23 +35,23 @@ import mage.abilities.effects.Effect;
*
* @author BetaSteward_at_googlemail.com
*/
public class PutIntoGraveFromBattlefieldTriggeredAbility extends ZoneChangeTriggeredAbility<PutIntoGraveFromBattlefieldTriggeredAbility> {
public class DiesTriggeredAbility extends ZoneChangeTriggeredAbility<DiesTriggeredAbility> {
public PutIntoGraveFromBattlefieldTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, Zone.GRAVEYARD, effect, "When {this} is put into a graveyard from the battlefield, ", optional);
public DiesTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, Zone.GRAVEYARD, effect, "When {this} dies, ", optional);
}
public PutIntoGraveFromBattlefieldTriggeredAbility(Effect effect) {
public DiesTriggeredAbility(Effect effect) {
this(effect, false);
}
public PutIntoGraveFromBattlefieldTriggeredAbility(PutIntoGraveFromBattlefieldTriggeredAbility ability) {
public DiesTriggeredAbility(DiesTriggeredAbility ability) {
super(ability);
}
@Override
public PutIntoGraveFromBattlefieldTriggeredAbility copy() {
return new PutIntoGraveFromBattlefieldTriggeredAbility(this);
public DiesTriggeredAbility copy() {
return new DiesTriggeredAbility(this);
}
}

6
Mage/src/mage/abilities/keyword/SoulshiftAbility.java
View file

@ -1,12 +1,12 @@
package mage.abilities.keyword;
import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.filter.Filter;
import mage.filter.FilterCard;
import mage.target.common.TargetCardInYourGraveyard;
public class SoulshiftAbility extends PutIntoGraveFromBattlefieldTriggeredAbility {
public class SoulshiftAbility extends DiesTriggeredAbility {
private int amount;
public SoulshiftAbility(int amount) {
@ -26,7 +26,7 @@ public class SoulshiftAbility extends PutIntoGraveFromBattlefieldTriggeredAbilit
}
@Override
public PutIntoGraveFromBattlefieldTriggeredAbility copy() {
public DiesTriggeredAbility copy() {
return new SoulshiftAbility(this);
}