* Warren Weirding - Fixed that only Goblins could be sacrificed instead of correctly all subtypes of creatures.

This commit is contained in:
LevelX2 2013-08-12 18:46:35 +02:00
parent 55007fca29
commit 98a49cc39b

View file

@ -40,12 +40,12 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.game.permanent.token.Token; import mage.game.permanent.token.Token;
@ -85,6 +85,10 @@ public class WarrenWeirding extends CardImpl<WarrenWeirding> {
class WarrenWeirdingEffect extends OneShotEffect<WarrenWeirdingEffect> { class WarrenWeirdingEffect extends OneShotEffect<WarrenWeirdingEffect> {
private static final FilterCreaturePermanent filterGoblin = new FilterCreaturePermanent("creature an opponent controls");
static {
filterGoblin.add(new SubtypePredicate("Goblin"));
}
WarrenWeirdingEffect ( ) { WarrenWeirdingEffect ( ) {
super(Outcome.Sacrifice); super(Outcome.Sacrifice);
staticText = "Target player sacrifices a creature. If a Goblin is sacrificed this way, that player puts two 1/1 black Goblin Rogue creature tokens onto the battlefield, and those tokens gain haste until end of turn"; staticText = "Target player sacrifices a creature. If a Goblin is sacrificed this way, that player puts two 1/1 black Goblin Rogue creature tokens onto the battlefield, and those tokens gain haste until end of turn";
@ -109,12 +113,14 @@ class WarrenWeirdingEffect extends OneShotEffect<WarrenWeirdingEffect> {
if (target.canChoose(player.getId(), game)) { if (target.canChoose(player.getId(), game)) {
player.choose(Outcome.Sacrifice, target, source.getSourceId(), game); player.choose(Outcome.Sacrifice, target, source.getSourceId(), game);
Permanent permanent = game.getPermanent(target.getFirstTarget()); Permanent permanent = game.getPermanent(target.getFirstTarget());
if (permanent != null && permanent.getSubtype().contains("Goblin")) { if (permanent != null) {
permanent.sacrifice(source.getSourceId(), game); permanent.sacrifice(source.getSourceId(), game);
if (filterGoblin.match(permanent, game)) {
Effect effect = new CreateTokenTargetEffect(new WarrenWeirdingBlackGoblinRogueToken(), 2); Effect effect = new CreateTokenTargetEffect(new WarrenWeirdingBlackGoblinRogueToken(), 2);
effect.setTargetPointer(new FixedTarget(player.getId())); effect.setTargetPointer(new FixedTarget(player.getId()));
effect.apply(game, source); effect.apply(game, source);
} }
}
return true; return true;
} }
return false; return false;