github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Kindly Stranger - Fixed that it did not allow destroying creature on transform (fixes #1888).

Browse source
This commit is contained in:
LevelX2 2016-04-20 15:40:15 +02:00
parent eaae3cc9b0
commit 9cc1c3edd5
2 changed files with 48 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Mage.Sets/src/mage/sets/shadowsoverinnistrad/DemonPossessedWitch.java
View file

@ -29,12 +29,18 @@ package mage.sets.shadowsoverinnistrad;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.common.InfoEffect; import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.Target;
import mage.target.TargetPermanent;
/** /**
* *
@ -57,7 +63,7 @@ public class DemonPossessedWitch extends CardImpl {
this.nightCard = true; this.nightCard = true;
// When this creature transforms into Demon-Possessed Witch, you may destroy target creature. // When this creature transforms into Demon-Possessed Witch, you may destroy target creature.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect(rule))); this.addAbility(new DemonPossessedWitchAbility());
} }
public DemonPossessedWitch(final DemonPossessedWitch card) { public DemonPossessedWitch(final DemonPossessedWitch card) {
@ -69,3 +75,42 @@ public class DemonPossessedWitch extends CardImpl {
return new DemonPossessedWitch(this); return new DemonPossessedWitch(this);
} }
} }
class DemonPossessedWitchAbility extends TriggeredAbilityImpl {
public DemonPossessedWitchAbility() {
super(Zone.BATTLEFIELD, new DestroyTargetEffect(), true);
Target target = new TargetPermanent(new FilterCreaturePermanent());
this.addTarget(target);
}
public DemonPossessedWitchAbility(final DemonPossessedWitchAbility ability) {
super(ability);
}
@Override
public DemonPossessedWitchAbility copy() {
return new DemonPossessedWitchAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TRANSFORMED;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getTargetId().equals(sourceId)) {
Permanent permanent = game.getPermanent(sourceId);
if (permanent != null && permanent.isTransformed()) {
return true;
}
}
return false;
}
@Override
public String getRule() {
return "When this creature transforms into Demon-Possessed Witch, you may destroy target creature.";
}
}

52
Mage.Sets/src/mage/sets/shadowsoverinnistrad/KindlyStranger.java
View file

@ -29,23 +29,15 @@ package mage.sets.shadowsoverinnistrad;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.condition.common.DeliriumCondition; import mage.abilities.condition.common.DeliriumCondition;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.decorator.ConditionalActivatedAbility;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.effects.common.TransformSourceEffect;
import mage.abilities.keyword.TransformAbility; import mage.abilities.keyword.TransformAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.Target;
import mage.target.TargetPermanent;
/** /**
* *
@ -67,9 +59,6 @@ public class KindlyStranger extends CardImpl {
this.addAbility(new TransformAbility()); this.addAbility(new TransformAbility());
this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD, this.addAbility(new ConditionalActivatedAbility(Zone.BATTLEFIELD,
new TransformSourceEffect(true), new ManaCostsImpl<>("{2}{B}"), DeliriumCondition.getInstance())); new TransformSourceEffect(true), new ManaCostsImpl<>("{2}{B}"), DeliriumCondition.getInstance()));
// When this creature transforms into Demon-Possessed Witch, you may destroy target creature.
this.addAbility(new DemonPossessedWitchAbility());
} }
public KindlyStranger(final KindlyStranger card) { public KindlyStranger(final KindlyStranger card) {
@ -81,44 +70,3 @@ public class KindlyStranger extends CardImpl {
return new KindlyStranger(this); return new KindlyStranger(this);
} }
} }
class DemonPossessedWitchAbility extends TriggeredAbilityImpl {
public DemonPossessedWitchAbility() {
super(Zone.BATTLEFIELD, new DestroyTargetEffect(), true);
Target target = new TargetPermanent(new FilterCreaturePermanent());
this.addTarget(target);
// Rule only shown on the night side
this.setRuleVisible(false);
}
public DemonPossessedWitchAbility(final DemonPossessedWitchAbility ability) {
super(ability);
}
@Override
public DemonPossessedWitchAbility copy() {
return new DemonPossessedWitchAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TRANSFORMED;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getTargetId().equals(sourceId)) {
Permanent permanent = game.getPermanent(sourceId);
if (permanent != null && permanent.isTransformed()) {
return true;
}
}
return false;
}
@Override
public String getRule() {
return "When this creature transforms into Demon-Possessed Witch, you may destroy target creature.";
}
}