External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-23 03:39:54 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added EntersBattlefieldOrDiesSourceTriggeredAbility.

Browse source
This commit is contained in:
LevelX2 2013-09-12 13:53:39 +02:00
parent acd52e2a61
commit d7677ff3d1
5 changed files with 94 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Mage.Sets/src/mage/sets/timespiral/MoggWarMarshal.java
View file

@ -29,17 +29,12 @@ package mage.sets.timespiral;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.EntersBattlefieldOrDiesSourceTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.keyword.EchoAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.token.GoblinToken;
/**
@ -61,7 +56,7 @@ public class MoggWarMarshal extends CardImpl<MoggWarMarshal> {
// Echo {1}{R}
this.addAbility(new EchoAbility("{1}{R}"));
// When Mogg War Marshal enters the battlefield or dies, put a 1/1 red Goblin creature token onto the battlefield.
this.addAbility(new MoggWarMarshallTriggeredAbility());
this.addAbility(new EntersBattlefieldOrDiesSourceTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 1), false));
}
public MoggWarMarshal(final MoggWarMarshal card) {
@ -73,39 +68,3 @@ public class MoggWarMarshal extends CardImpl<MoggWarMarshal> {
return new MoggWarMarshal(this);
}
}
class MoggWarMarshallTriggeredAbility extends TriggeredAbilityImpl<MoggWarMarshallTriggeredAbility> {
public MoggWarMarshallTriggeredAbility() {
super(Zone.BATTLEFIELD, new CreateTokenEffect(new GoblinToken(), 1), false);
}
public MoggWarMarshallTriggeredAbility(final MoggWarMarshallTriggeredAbility ability) {
super(ability);
}
@Override
public MoggWarMarshallTriggeredAbility copy() {
return new MoggWarMarshallTriggeredAbility(this);
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD
&& event.getTargetId().equals(getSourceId())) {
return true;
}
if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId())) {
ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
if (zEvent.getFromZone().equals(Zone.BATTLEFIELD) && zEvent.getToZone().equals(Zone.GRAVEYARD)) {
return true;
}
}
return false;
}
@Override
public String getRule() {
return "When Mogg War Marshal enters the battlefield or dies, " + super.getRule();
}
}

12
Mage.Sets/src/mage/sets/urzasdestiny/GoblinMarshal.java
View file

@ -28,15 +28,14 @@
package mage.sets.urzasdestiny;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.EntersBattlefieldOrDiesSourceTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.keyword.EchoAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.game.permanent.token.GoblinToken;
/**
@ -56,11 +55,8 @@ public class GoblinMarshal extends CardImpl<GoblinMarshal> {
this.addAbility(new EchoAbility("{4}{R}{R}"));
// When Goblin Marshal enters the battlefield or dies, put two 1/1 red Goblin creature tokens onto the battlefield.
Ability enterAbility = new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 2), false);
Ability enterAbility = new EntersBattlefieldOrDiesSourceTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 2), false);
this.addAbility(enterAbility);
// When Goblin Marshal enters the battlefield or dies, put two 1/1 red Goblin creature tokens onto the battlefield.
Ability diesAbility = new DiesTriggeredAbility(new CreateTokenEffect(new GoblinToken(), 2), false);
this.addAbility(diesAbility);
}
public GoblinMarshal(final GoblinMarshal card) {

15
Mage.Sets/src/mage/sets/urzasdestiny/HuntingMoa.java
View file

@ -28,15 +28,14 @@
package mage.sets.urzasdestiny;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.EntersBattlefieldOrDiesSourceTriggeredAbility;
import mage.abilities.effects.common.counter.AddCountersTargetEffect;
import mage.abilities.keyword.EchoAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.counters.CounterType;
import mage.target.common.TargetCreaturePermanent;
@ -57,13 +56,9 @@ public class HuntingMoa extends CardImpl<HuntingMoa> {
this.addAbility(new EchoAbility("{2}{G}"));
// When Hunting Moa enters the battlefield or dies, put a +1/+1 counter on target creature.
Ability enterAbility = new EntersBattlefieldTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false);
enterAbility.addTarget(new TargetCreaturePermanent());
Ability enterAbility = new EntersBattlefieldOrDiesSourceTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false);
enterAbility.addTarget(new TargetCreaturePermanent(true));
this.addAbility(enterAbility);
// When Hunting Moa enters the battlefield or dies, put a +1/+1 counter on target creature.
Ability diesAbility = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), false);
diesAbility.addTarget(new TargetCreaturePermanent());
this.addAbility(diesAbility);
}
public HuntingMoa(final HuntingMoa card) {