From 586d3b794d690dc6101b29b91ae60e9c94b5cac2 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 1 Mar 2013 13:01:15 +0100 Subject: [PATCH] Fixed issue #149, Ogre Slumlord triggered ability triggers now for all dying nontoken creatures. --- Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java b/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java index 09681ccc889..be0452eed5b 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java @@ -28,9 +28,10 @@ package mage.sets.gatecrash; import java.util.UUID; -import mage.Constants; 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.common.DiesCreatureTriggeredAbility; @@ -44,7 +45,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; -import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.Token; @@ -54,13 +54,11 @@ import mage.game.permanent.token.Token; */ public class OgreSlumlord extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another nontoken creature you control "); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another nontoken creature"); private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("Rats you control"); static { - filter.add(new ControllerPredicate(Constants.TargetController.YOU)); filter.add(Predicates.not(new TokenPredicate())); filter.add(new AnotherPredicate()); - filter2.add(new SubtypePredicate("Rat")); } @@ -77,10 +75,10 @@ public class OgreSlumlord extends CardImpl { this.color.setBlack(true); - // Whenever another nontoken creature you control dies, put a 1/1 black Rat creature token onto the battlefield. + // Whenever another nontoken creature dies, you may put a 1/1 black Rat creature token onto the battlefield. this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect(new RatToken()), false, filter)); // Rats you control have deathtouch. - this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAllEffect(DeathtouchAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filter2))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield, filter2))); }