From 87636133994ac80d1f5766a3a309fb200f472d43 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 2 Oct 2014 15:03:52 +0200 Subject: [PATCH] Some minor tooltip and comment changes. --- .../championsofkamigawa/KondasBanner.java | 25 ++----------------- .../SeizanPerverterOfTruth.java | 11 ++++++-- .../mage/sets/gatecrash/FrontlineMedic.java | 6 ++--- .../src/mage/sets/magic2012/ChasmDrake.java | 4 +++ .../sets/planechase/LoxodonWarhammer.java | 19 +++++++++++--- .../mage/sets/urzaslegacy/BrinkOfMadness.java | 2 +- .../sets/worldwake/AbyssalPersecutor.java | 3 +++ 7 files changed, 38 insertions(+), 32 deletions(-) diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java index 1d4790afb2..722cf23171 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KondasBanner.java @@ -33,6 +33,7 @@ import java.util.UUID; import mage.constants.*; import mage.abilities.Ability; +import mage.abilities.common.EmptyEffect; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; @@ -68,7 +69,7 @@ public class KondasBanner extends CardImpl { this.subtype.add("Equipment"); // Konda's Banner can be attached only to a legendary creature. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfoEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmptyEffect("{this} can be attached only to a legendary creature"))); // Creatures that share a color with equipped creature get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KondasBannerColorBoostEffect())); @@ -94,28 +95,6 @@ public class KondasBanner extends CardImpl { } } -class InfoEffect extends OneShotEffect { - - public InfoEffect() { - super(Outcome.Benefit); - this.staticText = "{this} can be attached only to a legendary creature"; - } - - public InfoEffect(final InfoEffect effect) { - super(effect); - } - - @Override - public InfoEffect copy() { - return new InfoEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - return true; - } -} - class KondasBannerTypeBoostEffect extends BoostAllEffect { private static final String effectText = "Creatures that share a creature type with equipped creature get +1/+1"; diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java index 9da38d2b5c..061c69e4fd 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SeizanPerverterOfTruth.java @@ -35,6 +35,7 @@ import mage.constants.Rarity; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardTargetEffect; import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; @@ -55,8 +56,14 @@ public class SeizanPerverterOfTruth extends CardImpl { this.color.setBlack(true); this.power = new MageInt(6); this.toughness = new MageInt(5); - Ability ability = new BeginningOfUpkeepTriggeredAbility(new DrawCardTargetEffect(2), TargetController.ANY, false); - ability.addEffect(new LoseLifeTargetEffect(2)); + + // At the beginning of each player's upkeep, that player loses 2 life and draws two cards. + Effect effect = new LoseLifeTargetEffect(2); + effect.setText("that player loses 2 life"); + Ability ability = new BeginningOfUpkeepTriggeredAbility(effect, TargetController.ANY, false); + effect = new DrawCardTargetEffect(2); + effect.setText("and draws two cards"); + ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/gatecrash/FrontlineMedic.java b/Mage.Sets/src/mage/sets/gatecrash/FrontlineMedic.java index 9a5bab8564..5f562f6a72 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/FrontlineMedic.java +++ b/Mage.Sets/src/mage/sets/gatecrash/FrontlineMedic.java @@ -71,12 +71,12 @@ public class FrontlineMedic extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // Battalion - Whenever Frontline Medic and at least two other creatures attack, creatures you control are indestructible this turn. + // Battalion - Whenever Frontline Medic and at least two other creatures attack, creatures you control gain indestructible until end of turn. Effect effect = new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent(), false); - effect.setText("creatures you control are indestructible this turn"); + effect.setText("creatures you control gain indestructible until end of turn"); this.addAbility(new BattalionAbility(effect)); - // Sacrifice Frontline Medic: Counter target spell with {X} in its mana cost unless its controller pays 3. + // Sacrifice Frontline Medic: Counter target spell with {X} in its mana cost unless its controller pays {3}. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(3)), new SacrificeSourceCost()); ability.addTarget(new TargetSpell(filter)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java b/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java index d5d21f9bc9..8622379ead 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java +++ b/Mage.Sets/src/mage/sets/magic2012/ChasmDrake.java @@ -53,7 +53,11 @@ public class ChasmDrake extends CardImpl { this.color.setBlue(true); this.power = new MageInt(3); this.toughness = new MageInt(3); + + // Flying this.addAbility(FlyingAbility.getInstance()); + + // Whenever Chasm Drake attacks, target creature you control gains flying until end of turn. Ability ability = new AttacksTriggeredAbility(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), false); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/sets/planechase/LoxodonWarhammer.java b/Mage.Sets/src/mage/sets/planechase/LoxodonWarhammer.java index f938905c8f..94f0440e4d 100644 --- a/Mage.Sets/src/mage/sets/planechase/LoxodonWarhammer.java +++ b/Mage.Sets/src/mage/sets/planechase/LoxodonWarhammer.java @@ -28,10 +28,12 @@ package mage.sets.planechase; import java.util.UUID; +import mage.abilities.Ability; import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.Effect; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; import mage.abilities.keyword.EquipAbility; @@ -49,9 +51,20 @@ public class LoxodonWarhammer extends CardImpl { super(ownerId, 118, "Loxodon Warhammer", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{3}"); this.expansionSetCode = "HOP"; this.subtype.add("Equipment"); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(3, 0))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT))); + + // Equipped creature gets +3/+0 and has trample and lifelink. (If the creature would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker. Damage dealt by the creature also causes its controller to gain that much life.) + Effect effect = new BoostEquippedEffect(3, 0); + effect.setText("Equipped creature gets +3/+0"); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + effect = new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.EQUIPMENT); + effect.setText("and has trample"); + ability.addEffect(effect); + effect = new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT); + effect.setText("and lifelink. (If the creature would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker. Damage dealt by the creature also causes its controller to gain that much life.)"); + ability.addEffect(effect); + this.addAbility(ability); + + // Equip (: Attach to target creature you control. Equip only as a sorcery.) this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(3))); } diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java b/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java index 57cc45d3a3..88a869ede7 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/BrinkOfMadness.java @@ -61,7 +61,7 @@ public class BrinkOfMadness extends CardImpl { ability.addEffect(new BrinkOfMadnessEffect()); ability.addTarget(new TargetOpponent()); CardsInHandCondition contition = new CardsInHandCondition(CardsInHandCondition.CountType.EQUAL_TO, 0); - this.addAbility(new ConditionalTriggeredAbility(ability, contition, "At the beginning of your upkeep, if you have no cards in hand, sacrifice {this} and target opponent discards his or her hand")); + this.addAbility(new ConditionalTriggeredAbility(ability, contition, "At the beginning of your upkeep, if you have no cards in hand, sacrifice {this} and target opponent discards his or her hand.")); } diff --git a/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java b/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java index 4236fc9c3f..1986ee19cf 100644 --- a/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java +++ b/Mage.Sets/src/mage/sets/worldwake/AbyssalPersecutor.java @@ -58,8 +58,11 @@ public class AbyssalPersecutor extends CardImpl { this.power = new MageInt(6); this.toughness = new MageInt(6); + // Flying, trample this.addAbility(FlyingAbility.getInstance()); this.addAbility(TrampleAbility.getInstance()); + + // You can't win the game and your opponents can't lose the game. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AbyssalPersecutorCannotWinEffect())); }