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

* Some minor fixes to tooltip texts.

Browse source
This commit is contained in:
LevelX2 2015-07-31 17:55:51 +02:00
parent 5fae4878c0
commit 539603af3d
5 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,7 @@ package mage.sets.zendikar;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.TenOrLessLifeCondition;
@ -49,7 +50,7 @@ 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 rule2 = "and has intimidate. <i>(It can't be blocked except by artifact creatures and/or creatures that share a color with it.)</i>";
public GuulDrazVampire(UUID ownerId) {
super(ownerId, 93, "Guul Draz Vampire", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{B}");
@ -64,9 +65,9 @@ public class GuulDrazVampire extends CardImpl {
// 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);
ConditionalContinuousEffect effect1 = new ConditionalContinuousEffect(new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), condition, rule1);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect1));
ConditionalContinuousEffect effect2 = new ConditionalContinuousEffect(new GainAbilitySourceEffect(IntimidateAbility.getInstance()), condition, rule2);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect2));
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect1);
ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(IntimidateAbility.getInstance()), condition, rule2));
this.addAbility(ability);
}

11
Mage.Sets/src/mage/sets/zendikar/LavaballTrap.java
View file

@ -30,9 +30,6 @@ package mage.sets.zendikar;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.Ability;
import mage.abilities.costs.AlternativeCostImpl;
import mage.abilities.costs.Cost;
@ -40,8 +37,11 @@ import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.DamageAllEffect;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.WatcherScope;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterLandPermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
@ -59,7 +59,6 @@ public class LavaballTrap extends CardImpl {
this.expansionSetCode = "ZEN";
this.subtype.add("Trap");
// If an opponent had two or more lands enter the battlefield under his or her control this turn, you may pay {3}{R}{R} rather than pay Lavaball Trap's mana cost.
this.getSpellAbility().addAlternativeCost(new LavaballTrapAlternativeCost());
this.getSpellAbility().addWatcher(new LavaballTrapWatcher());
@ -67,7 +66,7 @@ public class LavaballTrap extends CardImpl {
// Destroy two target lands. Lavaball Trap deals 4 damage to each creature.
this.getSpellAbility().addEffect(new DestroyTargetEffect());
this.getSpellAbility().addEffect(new DamageAllEffect(4, new FilterCreaturePermanent()));
this.getSpellAbility().addTarget(new TargetLandPermanent(2));
this.getSpellAbility().addTarget(new TargetLandPermanent(2, 2, new FilterLandPermanent("lands"), false));
}
@ -164,4 +163,4 @@ class LavaballTrapAlternativeCost extends AlternativeCostImpl<Cost> {
public String getText() {
return "If an opponent had two or more lands enter the battlefield under his or her control this turn, you may pay {3}{R}{R} rather than pay Lavaball Trap's mana cost";
}
}
}

11
Mage.Sets/src/mage/sets/zendikar/PitfallTrap.java
View file

@ -28,14 +28,14 @@
package mage.sets.zendikar;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.Ability;
import mage.abilities.costs.AlternativeCostImpl;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.filter.common.FilterAttackingCreature;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.AbilityPredicate;
@ -48,7 +48,7 @@ import mage.target.common.TargetAttackingCreature;
*/
public class PitfallTrap extends CardImpl {
private static final FilterAttackingCreature filter = new FilterAttackingCreature("creature without flying");
private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature without flying");
static {
filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class)));
@ -59,10 +59,9 @@ public class PitfallTrap extends CardImpl {
this.expansionSetCode = "ZEN";
this.subtype.add("Trap");
// If exactly one creature is attacking, you may pay {W} rather than pay Pitfall Trap's mana cost.
this.getSpellAbility().addAlternativeCost(new PitfallTrapAlternativeCost());
// Destroy target attacking creature without flying.
this.getSpellAbility().addEffect(new DestroyTargetEffect());
this.getSpellAbility().addTarget(new TargetAttackingCreature(1, 1, filter, false));
@ -106,4 +105,4 @@ class PitfallTrapAlternativeCost extends AlternativeCostImpl {
public String getText() {
return "If exactly one creature is attacking, you may pay {W} rather than pay Pitfall Trap's mana cost";
}
}
}

17
Mage.Sets/src/mage/sets/zendikar/SlaughterCry.java
View file

@ -28,13 +28,14 @@
package mage.sets.zendikar;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.BoostTargetEffect;
import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
import mage.abilities.keyword.FirstStrikeAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.target.common.TargetCreaturePermanent;
/**
@ -47,10 +48,14 @@ public class SlaughterCry extends CardImpl {
super(ownerId, 149, "Slaughter Cry", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}");
this.expansionSetCode = "ZEN";
// Target creature gets +3/+0 and gains first strike until end of turn. (It deals combat damage before creatures without first strike.)
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().addEffect(new BoostTargetEffect(3, 0, Duration.EndOfTurn));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn));
Effect effect = new BoostTargetEffect(3, 0, Duration.EndOfTurn);
effect.setText("Target creature gets +3/+0");
this.getSpellAbility().addEffect(effect);
effect = new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn);
effect.setText("and gains first strike until end of turn. <i>(It deals combat damage before creatures without first strike.)</i>");
this.getSpellAbility().addEffect(effect);
}
public SlaughterCry(final SlaughterCry card) {

12
Mage.Sets/src/mage/sets/zendikar/SpireBarrage.java
View file

@ -27,26 +27,25 @@
*/
package mage.sets.zendikar;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.TargetController;
import java.util.UUID;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.TargetController;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreatureOrPlayer;
import java.util.UUID;
/**
*
* @author North
*/
public class SpireBarrage extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("Mountains");
private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain you control");
static {
filter.add(new SubtypePredicate("Mountain"));
@ -57,7 +56,6 @@ public class SpireBarrage extends CardImpl {
super(ownerId, 150, "Spire Barrage", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{4}{R}");
this.expansionSetCode = "ZEN";
// Spire Barrage deals damage to target creature or player equal to the number of Mountains you control.
this.getSpellAbility().addEffect(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)));
this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());