diff --git a/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java b/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java index 54112d9f87..8cd0b4281c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java +++ b/Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java @@ -28,18 +28,18 @@ package mage.sets.zendikar; import java.util.UUID; + +import mage.constants.CardType; +import mage.constants.Rarity; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.Condition; -import mage.abilities.condition.common.TenOrLessLifeCondition; +import mage.abilities.condition.common.EquippedCondition; import mage.abilities.decorator.ConditionalContinousEffect; import mage.abilities.effects.common.continious.BoostSourceEffect; import mage.abilities.effects.common.continious.GainAbilitySourceEffect; import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; -import mage.constants.CardType; import mage.constants.Duration; -import mage.constants.Rarity; import mage.constants.Zone; /** @@ -48,8 +48,8 @@ import mage.constants.Zone; */ public class GuulDrazVampire extends CardImpl { - private static final String rule1 = "As long as an opponent has 10 or less life, {this} gets +2/+1"; - private static final String rule2 = "As long as an opponent has 10 or less life, {this} has intimidate"; + private static final String rule1 = "As long as {this} is equipped, it gets +2/+1"; + private static final String rule2 = "As long as {this} is equipped, it has intimidate"; public GuulDrazVampire(UUID ownerId) { super(ownerId, 93, "Guul Draz Vampire", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}"); @@ -61,11 +61,9 @@ public class GuulDrazVampire extends CardImpl { this.power = new MageInt(1); this.toughness = new MageInt(1); - // As long as an opponent has 10 or less life, Guul Draz Vampire gets +2/+1 and has intimidate. (It can't be blocked except by artifact creatures and/or creatures that share a color with it.) - Condition condition = new TenOrLessLifeCondition(TenOrLessLifeCondition.CheckType.AN_OPPONENT); - ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), condition, rule1); + ConditionalContinousEffect effect1 = new ConditionalContinousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), EquippedCondition.getInstance(), rule1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1)); - ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(IntimidateAbility.getInstance(), Duration.WhileOnBattlefield), condition, rule2); + ConditionalContinousEffect effect2 = new ConditionalContinousEffect(new GainAbilitySourceEffect(IntimidateAbility.getInstance()), EquippedCondition.getInstance(), rule2); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2)); } diff --git a/Mage/src/mage/abilities/effects/common/WinGameEffect.java b/Mage/src/mage/abilities/effects/common/WinGameEffect.java index 9c663c8ed9..031f3ba029 100644 --- a/Mage/src/mage/abilities/effects/common/WinGameEffect.java +++ b/Mage/src/mage/abilities/effects/common/WinGameEffect.java @@ -28,9 +28,9 @@ package mage.abilities.effects.common; +import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; @@ -65,4 +65,4 @@ public class WinGameEffect extends OneShotEffect { } return false; } -} +} \ No newline at end of file