github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "* Guul Draz Vampire - Fixed that boost and Intimidate were applied if equiped with an equipment instead correctly an opponent had 10 or less life. "

Browse source 
This reverts commit 9530be8630.
This commit is contained in:
LevelX2 2013-07-23 22:50:15 +02:00
commit 1e59ca2770
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Mage.Sets/src/mage/sets/zendikar/GuulDrazVampire.java
View file

@ -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<GuulDrazVampire> {
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<GuulDrazVampire> {
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));
}

4
Mage/src/mage/abilities/effects/common/WinGameEffect.java
View file

@ -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<WinGameEffect> {
}
return false;
}
}
}