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

Added filter possibility to CreatureEntersBattlefieldTriggeredAbility.

Browse source
This commit is contained in:
LevelX2 2012-11-17 20:15:51 +01:00
parent 45316daf88
commit 19d7b62996
1 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Mage/src/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java
View file

@ -31,6 +31,7 @@ import mage.Constants.CardType;
import mage.Constants.Zone; import mage.Constants.Zone;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
@ -47,6 +48,7 @@ import mage.target.common.TargetCreaturePermanent;
public class CreatureEntersBattlefieldTriggeredAbility extends TriggeredAbilityImpl<CreatureEntersBattlefieldTriggeredAbility> { public class CreatureEntersBattlefieldTriggeredAbility extends TriggeredAbilityImpl<CreatureEntersBattlefieldTriggeredAbility> {
private boolean opponentController; private boolean opponentController;
protected FilterCreaturePermanent filter = new FilterCreaturePermanent();
/** /**
* optional = false<br> * optional = false<br>
@ -75,13 +77,41 @@ public class CreatureEntersBattlefieldTriggeredAbility extends TriggeredAbilityI
* @param opponentController * @param opponentController
*/ */
public CreatureEntersBattlefieldTriggeredAbility(Effect effect, boolean optional, boolean opponentController) { public CreatureEntersBattlefieldTriggeredAbility(Effect effect, boolean optional, boolean opponentController) {
super(Zone.BATTLEFIELD, effect, optional); this(Zone.BATTLEFIELD, effect, optional, opponentController);
this.opponentController = opponentController; this.opponentController = opponentController;
} }
/**
* @param zone
* @param effect
* @param optional
* @param opponentController
*/
public CreatureEntersBattlefieldTriggeredAbility(Zone zone, Effect effect, boolean optional, boolean opponentController) {
this(zone, effect, null, optional, opponentController);
}
/**
* @param zone
* @param effect
* @param filter filter the triggering creatures
* @param optional
* @param opponentController
*/
public CreatureEntersBattlefieldTriggeredAbility(Zone zone, Effect effect, FilterCreaturePermanent filter, boolean optional, boolean opponentController) {
super(zone, effect, optional);
this.opponentController = opponentController;
if (filter != null) {
this.filter = filter;
}
}
public CreatureEntersBattlefieldTriggeredAbility(CreatureEntersBattlefieldTriggeredAbility ability) { public CreatureEntersBattlefieldTriggeredAbility(CreatureEntersBattlefieldTriggeredAbility ability) {
super(ability); super(ability);
this.opponentController = ability.opponentController; this.opponentController = ability.opponentController;
this.filter = ability.filter;
} }
@Override @Override
@ -89,7 +119,7 @@ public class CreatureEntersBattlefieldTriggeredAbility extends TriggeredAbilityI
if (event.getType() == EventType.ZONE_CHANGE) { if (event.getType() == EventType.ZONE_CHANGE) {
Permanent permanent = game.getPermanent(event.getTargetId()); Permanent permanent = game.getPermanent(event.getTargetId());
if (((ZoneChangeEvent) event).getToZone() == Zone.BATTLEFIELD if (((ZoneChangeEvent) event).getToZone() == Zone.BATTLEFIELD
&& permanent.getCardType().contains(CardType.CREATURE) && filter.match(permanent, sourceId, controllerId, game)
&& (permanent.getControllerId().equals(this.controllerId) ^ opponentController)) { && (permanent.getControllerId().equals(this.controllerId) ^ opponentController)) {
if (!this.getTargets().isEmpty()) { if (!this.getTargets().isEmpty()) {
Target target = this.getTargets().get(0); Target target = this.getTargets().get(0);
@ -108,7 +138,7 @@ public class CreatureEntersBattlefieldTriggeredAbility extends TriggeredAbilityI
@Override @Override
public String getRule() { public String getRule() {
return "Whenever a creature enters the battlefield under " return "Whenever a " + filter.getMessage() +" enters the battlefield under "
+ (opponentController ? "an opponent's control, " : "your control, ") + (opponentController ? "an opponent's control, " : "your control, ")
+ super.getRule(); + super.getRule();
} }