diff --git a/Mage.Sets/src/mage/cards/c/CopperCarapace.java b/Mage.Sets/src/mage/cards/c/CopperCarapace.java index 8cca2d1e95b..bef0619b230 100644 --- a/Mage.Sets/src/mage/cards/c/CopperCarapace.java +++ b/Mage.Sets/src/mage/cards/c/CopperCarapace.java @@ -1,7 +1,8 @@ - package mage.cards.c; import java.util.UUID; + +import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.combat.CantBlockAttachedEffect; @@ -13,7 +14,6 @@ import mage.constants.AttachmentType; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Outcome; -import mage.constants.Zone; /** * @@ -26,9 +26,11 @@ public final class CopperCarapace extends CardImpl { this.subtype.add(SubType.EQUIPMENT); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); + // Equipped creature gets +2/+2 and can't block. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttachedEffect(AttachmentType.EQUIPMENT))); + Ability ability = new SimpleStaticAbility(new BoostEquippedEffect(2, 2)); + ability.addEffect(new CantBlockAttachedEffect(AttachmentType.EQUIPMENT).setText("and can't block")); + this.addAbility(ability); } private CopperCarapace(final CopperCarapace card) { diff --git a/Mage.Sets/src/mage/cards/g/GatesAblaze.java b/Mage.Sets/src/mage/cards/g/GatesAblaze.java index 50d06102ccc..bbd1045fba1 100644 --- a/Mage.Sets/src/mage/cards/g/GatesAblaze.java +++ b/Mage.Sets/src/mage/cards/g/GatesAblaze.java @@ -31,7 +31,8 @@ public final class GatesAblaze extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}"); // Gates Ablaze deals X damage to each creature, where X is the number of Gates you control. - this.getSpellAbility().addEffect(new DamageAllEffect(xValue, StaticFilters.FILTER_PERMANENT_CREATURE)); + this.getSpellAbility().addEffect(new DamageAllEffect(xValue, StaticFilters.FILTER_PERMANENT_CREATURE) + .setText("{this} deals X damage to each creature, where X is the number of Gates you control")); } private GatesAblaze(final GatesAblaze card) { diff --git a/Mage.Sets/src/mage/cards/i/IreOfKaminari.java b/Mage.Sets/src/mage/cards/i/IreOfKaminari.java index 02bd3d768cd..573ee91744a 100644 --- a/Mage.Sets/src/mage/cards/i/IreOfKaminari.java +++ b/Mage.Sets/src/mage/cards/i/IreOfKaminari.java @@ -29,7 +29,8 @@ public final class IreOfKaminari extends CardImpl { this.subtype.add(SubType.ARCANE); // Ire of Kaminari deals damage to any target equal to the number of Arcane cards in your graveyard. - this.getSpellAbility().addEffect(new DamageTargetEffect(new CardsInControllerGraveyardCount(filter))); + this.getSpellAbility().addEffect(new DamageTargetEffect(new CardsInControllerGraveyardCount(filter)) + .setText("{this} deals damage to any target equal to the number of Arcane cards in your graveyard")); this.getSpellAbility().addTarget(new TargetAnyTarget()); } diff --git a/Mage.Sets/src/mage/cards/k/KelpieGuide.java b/Mage.Sets/src/mage/cards/k/KelpieGuide.java index cc5d1de32d2..8637b8b6589 100644 --- a/Mage.Sets/src/mage/cards/k/KelpieGuide.java +++ b/Mage.Sets/src/mage/cards/k/KelpieGuide.java @@ -17,6 +17,7 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; +import mage.filter.common.FilterControlledLandPermanent; import mage.target.TargetPermanent; import java.util.UUID; @@ -26,8 +27,9 @@ import java.util.UUID; */ public final class KelpieGuide extends CardImpl { + private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("you control eight or more lands"); private static final Condition condition - = new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND, ComparisonType.MORE_THAN, 7); + = new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 7); public KelpieGuide(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); diff --git a/Mage.Sets/src/mage/cards/s/SeizeTheInitiative.java b/Mage.Sets/src/mage/cards/s/SeizeTheInitiative.java index 5a71a144ce7..66bc1fbc9a0 100644 --- a/Mage.Sets/src/mage/cards/s/SeizeTheInitiative.java +++ b/Mage.Sets/src/mage/cards/s/SeizeTheInitiative.java @@ -21,8 +21,11 @@ public final class SeizeTheInitiative extends CardImpl { public SeizeTheInitiative (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}"); - this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); + // Target creature gets +1/+1 and gains first strike until end of turn. + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 1, Duration.EndOfTurn) + .setText("target creature gets +1/+1")); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn) + .setText("and gains first strike until end of turn")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java b/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java index 97e7f99950a..8951c225dea 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java +++ b/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java @@ -37,7 +37,8 @@ public final class SpawnOfThraxes extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // When Spawn of Thraxes enters the battlefield, it deals damage to any target equal to the number of Mountains you control. - Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter))); + Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)) + .setText("it deals damage to any target equal to the number of Mountains you control")); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TaintedStrike.java b/Mage.Sets/src/mage/cards/t/TaintedStrike.java index 0fc78859de0..fe6b93ea4e2 100644 --- a/Mage.Sets/src/mage/cards/t/TaintedStrike.java +++ b/Mage.Sets/src/mage/cards/t/TaintedStrike.java @@ -21,8 +21,11 @@ public final class TaintedStrike extends CardImpl { public TaintedStrike (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{B}"); - this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn)); - this.getSpellAbility().addEffect(new GainAbilityTargetEffect(InfectAbility.getInstance(), Duration.EndOfTurn)); + // Target creature gets +1/+0 and gains infect until end of turn. + this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn) + .setText("target creature gets +1/+0")); + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(InfectAbility.getInstance(), Duration.EndOfTurn) + .setText("and gains infect until end of turn")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); } diff --git a/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java index ee247a19382..12ebb0e1ed0 100644 --- a/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttackedByCreatureTriggeredAbility.java @@ -13,6 +13,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import mage.util.CardUtil; /** * @author LevelX2 @@ -42,7 +43,7 @@ public class AttackedByCreatureTriggeredAbility extends TriggeredAbilityImpl { super(zone, effect, optional); this.setTargetPointer = setTargetPointer; this.filter = filter; - setTriggerPhrase("Whenever " + filter.getMessage() + " attacks you, "); + setTriggerPhrase("Whenever " + CardUtil.addArticle(filter.getMessage()) + " attacks you, "); } protected AttackedByCreatureTriggeredAbility(final AttackedByCreatureTriggeredAbility ability) {