From cae39848b91491dbb9ef5076467112c2392b2003 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 13 Apr 2020 18:18:55 -0400 Subject: [PATCH] updated Raid text --- Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java | 4 ++-- Mage.Sets/src/mage/cards/c/ChartACourse.java | 11 +++++------ Mage.Sets/src/mage/cards/d/DeadeyeRigHauler.java | 4 ++-- Mage.Sets/src/mage/cards/d/DeadeyeTormentor.java | 4 ++-- Mage.Sets/src/mage/cards/f/FirecannonBlast.java | 4 ++-- Mage.Sets/src/mage/cards/m/MaraudingLooter.java | 4 ++-- Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java | 4 ++-- Mage.Sets/src/mage/cards/m/MarduHordechief.java | 4 ++-- Mage.Sets/src/mage/cards/m/MarduSkullhunter.java | 4 ++-- Mage.Sets/src/mage/cards/m/MarduWarshrieker.java | 4 ++-- Mage.Sets/src/mage/cards/n/NavigatorsRuin.java | 2 +- Mage.Sets/src/mage/cards/r/RaidersWake.java | 4 ++-- Mage.Sets/src/mage/cards/r/RepeatingBarrage.java | 2 +- Mage.Sets/src/mage/cards/r/RiggingRunner.java | 4 ++-- Mage.Sets/src/mage/cards/r/RuinRaider.java | 4 ++-- Mage.Sets/src/mage/cards/s/ShipwreckLooter.java | 4 ++-- Mage.Sets/src/mage/cards/s/SirenReaver.java | 2 +- Mage.Sets/src/mage/cards/s/StormFleetAerialist.java | 4 ++-- Mage.Sets/src/mage/cards/s/StormFleetArsonist.java | 4 ++-- Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java | 4 ++-- Mage.Sets/src/mage/cards/s/StormFleetSpy.java | 4 ++-- Mage.Sets/src/mage/cards/s/SwaggeringCorsair.java | 4 ++-- Mage.Sets/src/mage/cards/t/TimelyHordemate.java | 2 +- Mage.Sets/src/mage/cards/w/WarNameAspirant.java | 4 ++-- Mage.Sets/src/mage/cards/w/WingmateRoc.java | 4 ++-- .../abilities/condition/common/RaidCondition.java | 2 +- .../java/mage/abilities/keyword/MeleeAbility.java | 4 ++-- 27 files changed, 52 insertions(+), 53 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java b/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java index a2feaca2e75..b1f95878923 100644 --- a/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java +++ b/Mage.Sets/src/mage/cards/b/BloodsoakedChampion.java @@ -32,13 +32,13 @@ public final class BloodsoakedChampion extends CardImpl { // Bloodstained Brave can't block. this.addAbility(new CantBlockAbility()); - // Raid — {1}{B}: Return Bloodstained Brave from your graveyard to the battlefield. Activate this ability only if you attacked with a creature this turn. + // Raid — {1}{B}: Return Bloodstained Brave from your graveyard to the battlefield. Activate this ability only if you attacked this turn. Ability ability = new ConditionalActivatedAbility( Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl<>("{1}{B}"), RaidCondition.instance, - "Raid — {1}{B}: Return {this} from your graveyard to the battlefield. Activate this ability only if you attacked with a creature this turn"); + "Raid — {1}{B}: Return {this} from your graveyard to the battlefield. Activate this ability only if you attacked this turn"); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/c/ChartACourse.java b/Mage.Sets/src/mage/cards/c/ChartACourse.java index 6b7b8a25201..8f2d39d08ba 100644 --- a/Mage.Sets/src/mage/cards/c/ChartACourse.java +++ b/Mage.Sets/src/mage/cards/c/ChartACourse.java @@ -1,7 +1,5 @@ - package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.RaidCondition; import mage.abilities.effects.OneShotEffect; @@ -14,8 +12,9 @@ import mage.game.Game; import mage.players.Player; import mage.watchers.common.PlayerAttackedWatcher; +import java.util.UUID; + /** - * * @author TheElk801 */ public final class ChartACourse extends CardImpl { @@ -29,7 +28,7 @@ public final class ChartACourse extends CardImpl { this.getSpellAbility().addWatcher(new PlayerAttackedWatcher()); } - public ChartACourse(final ChartACourse card) { + private ChartACourse(final ChartACourse card) { super(card); } @@ -43,10 +42,10 @@ class ChartACourseEffect extends OneShotEffect { ChartACourseEffect() { super(Outcome.Neutral); - this.staticText = "Then discard a card unless you attacked with a creature this turn."; + this.staticText = "Then discard a card unless you attacked this turn."; } - ChartACourseEffect(final ChartACourseEffect effect) { + private ChartACourseEffect(final ChartACourseEffect effect) { super(effect); } diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeRigHauler.java b/Mage.Sets/src/mage/cards/d/DeadeyeRigHauler.java index 96cba582c90..6db9b629c51 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeRigHauler.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeRigHauler.java @@ -29,9 +29,9 @@ public final class DeadeyeRigHauler extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // Raid— When Deadeye Rig-Hauler enters the battlefield, if you attacked with a creature this turn, you may return target creature to its owner's hand. + // Raid— When Deadeye Rig-Hauler enters the battlefield, if you attacked this turn, you may return target creature to its owner's hand. Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, you may return target creature to its owner's hand."); + "Raid — When {this} enters the battlefield, if you attacked this turn, you may return target creature to its owner's hand."); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeTormentor.java b/Mage.Sets/src/mage/cards/d/DeadeyeTormentor.java index 2a7df4690c6..becab534009 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeTormentor.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeTormentor.java @@ -29,9 +29,9 @@ public final class DeadeyeTormentor extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Raid — When Deadeye Tormentor enters the battlefield, if you attacked with a creature this turn, target opponent discards a card. + // Raid — When Deadeye Tormentor enters the battlefield, if you attacked this turn, target opponent discards a card. Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(1)), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, target opponent discards a card."); + "Raid — When {this} enters the battlefield, if you attacked this turn, target opponent discards a card."); ability.addTarget(new TargetOpponent()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/f/FirecannonBlast.java b/Mage.Sets/src/mage/cards/f/FirecannonBlast.java index ae1daf34610..0cc5613abaa 100644 --- a/Mage.Sets/src/mage/cards/f/FirecannonBlast.java +++ b/Mage.Sets/src/mage/cards/f/FirecannonBlast.java @@ -22,12 +22,12 @@ public final class FirecannonBlast extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); // Firecannon Blast deals 3 damage to target creature. - // Raid - Firecannon Blast deals 6 damage to that creature instead if you attacked with a creature this turn. + // Raid - Firecannon Blast deals 6 damage to that creature instead if you attacked this turn. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new DamageTargetEffect(6), new DamageTargetEffect(3), RaidCondition.instance, - "{this} deals 3 damage to target creature.
Raid — {this} deals 6 damage instead if you attacked with a creature this turn")); + "{this} deals 3 damage to target creature.
Raid — {this} deals 6 damage instead if you attacked this turn")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addWatcher(new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MaraudingLooter.java b/Mage.Sets/src/mage/cards/m/MaraudingLooter.java index 97f12cf25a0..61d6bafce63 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingLooter.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingLooter.java @@ -29,12 +29,12 @@ public final class MaraudingLooter extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(3); - // Raid - At the beginning of your end step, if you attacked with a creature this turn, you may draw a card. If you do, discard a card. + // Raid - At the beginning of your end step, if you attacked this turn, you may draw a card. If you do, discard a card. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility(new DrawDiscardControllerEffect(1, 1, true), TargetController.YOU, false), RaidCondition.instance, "Raid — At the beginning of your end step, " - + "if you attacked with a creature this turn, " + + "if you attacked this turn, " + "you may draw a card. If you do, discard a card."); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java b/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java index 2be60fad5a5..1c7a68b9f2f 100644 --- a/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java +++ b/Mage.Sets/src/mage/cards/m/MarduHeartPiercer.java @@ -29,9 +29,9 @@ public final class MarduHeartPiercer extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // Raid - When Mardu Heart-Piercer enters the battlefield, if you attacked with a creature this turn, Mardu Heart-Piercer deals 2 damage to any target. + // Raid - When Mardu Heart-Piercer enters the battlefield, if you attacked this turn, Mardu Heart-Piercer deals 2 damage to any target. Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2)), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, {this} deals 2 damage to any target."); + "Raid — When {this} enters the battlefield, if you attacked this turn, {this} deals 2 damage to any target."); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MarduHordechief.java b/Mage.Sets/src/mage/cards/m/MarduHordechief.java index 7c01254d9f4..3aba8225636 100644 --- a/Mage.Sets/src/mage/cards/m/MarduHordechief.java +++ b/Mage.Sets/src/mage/cards/m/MarduHordechief.java @@ -28,9 +28,9 @@ public final class MarduHordechief extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - // Raid — When Mardu Hordechief enters the battlefield, if you attacked with a creature this turn, create a 1/1 white Warrior creature token + // Raid — When Mardu Hordechief enters the battlefield, if you attacked this turn, create a 1/1 white Warrior creature token this.addAbility(new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WarriorToken())), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, create a 1/1 white Warrior creature token."), + "Raid — When {this} enters the battlefield, if you attacked this turn, create a 1/1 white Warrior creature token."), new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MarduSkullhunter.java b/Mage.Sets/src/mage/cards/m/MarduSkullhunter.java index bfbafab3142..a5b80760826 100644 --- a/Mage.Sets/src/mage/cards/m/MarduSkullhunter.java +++ b/Mage.Sets/src/mage/cards/m/MarduSkullhunter.java @@ -33,9 +33,9 @@ public final class MarduSkullhunter extends CardImpl { // Mardu Skullhunter enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); - // Raid - When Mardu Skullhunter enters the battlefield, if you attacked with a creature this turn, target opponent discards a card. + // Raid - When Mardu Skullhunter enters the battlefield, if you attacked this turn, target opponent discards a card. Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(1)), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, target opponent discards a card."); + "Raid — When {this} enters the battlefield, if you attacked this turn, target opponent discards a card."); ability.addTarget(new TargetOpponent()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/m/MarduWarshrieker.java b/Mage.Sets/src/mage/cards/m/MarduWarshrieker.java index c5730481146..e9b550f83c5 100644 --- a/Mage.Sets/src/mage/cards/m/MarduWarshrieker.java +++ b/Mage.Sets/src/mage/cards/m/MarduWarshrieker.java @@ -28,9 +28,9 @@ public final class MarduWarshrieker extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // Raid - When Mardu Warshrieker enters the battlefield, if you attacked with a creature this turn, add {R}{W}{B}. + // Raid - When Mardu Warshrieker enters the battlefield, if you attacked this turn, add {R}{W}{B}. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new AddManaToManaPoolSourceControllerEffect(new Mana(1, 0, 0, 1, 1, 0, 0, 0))), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, add {R}{W}{B}."), + "Raid — When {this} enters the battlefield, if you attacked this turn, add {R}{W}{B}."), new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java b/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java index d7ce59cf37d..2b3ecb389c3 100644 --- a/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java +++ b/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java @@ -27,7 +27,7 @@ public final class NavigatorsRuin extends CardImpl { Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility(new PutLibraryIntoGraveTargetEffect(4), TargetController.YOU, false), RaidCondition.instance, - "Raid — At the beginning of your end step, if you attacked with a creature this turn, target opponent puts the top four cards of their library into their graveyard."); + "Raid — At the beginning of your end step, if you attacked this turn, target opponent puts the top four cards of their library into their graveyard."); ability.addTarget(new TargetOpponent()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/r/RaidersWake.java b/Mage.Sets/src/mage/cards/r/RaidersWake.java index 3fafbd93f9f..36fad0226c5 100644 --- a/Mage.Sets/src/mage/cards/r/RaidersWake.java +++ b/Mage.Sets/src/mage/cards/r/RaidersWake.java @@ -29,10 +29,10 @@ public final class RaidersWake extends CardImpl { // Whenever an opponent discards a card, that player loses 2 life. this.addAbility(new DiscardsACardOpponentTriggeredAbility(new LoseLifeTargetEffect(2), false, SetTargetPointer.PLAYER)); - // Raid — At the beginning of your end step, if you attacked with a creature this turn, target opponent discards a card. + // Raid — At the beginning of your end step, if you attacked this turn, target opponent discards a card. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility(new DiscardTargetEffect(1), TargetController.YOU, false), RaidCondition.instance, - "Raid — At the beginning of your end step, if you attacked with a creature this turn, target opponent discards a card."); + "Raid — At the beginning of your end step, if you attacked this turn, target opponent discards a card."); ability.addTarget(new TargetOpponent()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java b/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java index f574aae4f85..e0c8ba253da 100644 --- a/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java +++ b/Mage.Sets/src/mage/cards/r/RepeatingBarrage.java @@ -29,7 +29,7 @@ public final class RepeatingBarrage extends CardImpl { this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetAnyTarget()); - // Raid — {3}{R}{R}: Return Repeating Barrage from your graveyard to your hand. Activate this ability only if you attacked with a creature this turn. + // Raid — {3}{R}{R}: Return Repeating Barrage from your graveyard to your hand. Activate this ability only if you attacked this turn. Ability ability = new ConditionalActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToHandEffect(), new ManaCostsImpl("{3}{R}{R}"), diff --git a/Mage.Sets/src/mage/cards/r/RiggingRunner.java b/Mage.Sets/src/mage/cards/r/RiggingRunner.java index 6214bfe6669..2e753acd2b1 100644 --- a/Mage.Sets/src/mage/cards/r/RiggingRunner.java +++ b/Mage.Sets/src/mage/cards/r/RiggingRunner.java @@ -31,10 +31,10 @@ public final class RiggingRunner extends CardImpl { // First strike this.addAbility(FirstStrikeAbility.getInstance()); - // Raid — Rigging Runner enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn. + // Raid — Rigging Runner enters the battlefield with a +1/+1 counter on it if you attacked this turn. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1), false), RaidCondition.instance, - "Raid — {this} enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.", + "Raid — {this} enters the battlefield with a +1/+1 counter on it if you attacked this turn.", "{this} enters the battlefield with a +1/+1 counter"), new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/r/RuinRaider.java b/Mage.Sets/src/mage/cards/r/RuinRaider.java index 60ccfd72691..6b1f4e6896e 100644 --- a/Mage.Sets/src/mage/cards/r/RuinRaider.java +++ b/Mage.Sets/src/mage/cards/r/RuinRaider.java @@ -36,11 +36,11 @@ public final class RuinRaider extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // Raid — At the beginning of your end step, if you attacked with a creature this turn, reveal the top card of your library and put that card into your hand. You lose life equal to the card's converted mana cost. + // Raid — At the beginning of your end step, if you attacked this turn, reveal the top card of your library and put that card into your hand. You lose life equal to the card's converted mana cost. Ability ability = new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility(new RuinRaiderEffect(), TargetController.YOU, false), RaidCondition.instance, - "Raid — At the beginning of your end step, if you attacked with a creature this turn, " + "Raid — At the beginning of your end step, if you attacked this turn, " + "reveal the top card of your library and put that card into your hand. " + "You lose life equal to the card's converted mana cost."); this.addAbility(ability, new PlayerAttackedWatcher()); diff --git a/Mage.Sets/src/mage/cards/s/ShipwreckLooter.java b/Mage.Sets/src/mage/cards/s/ShipwreckLooter.java index 03ae7cef4b1..f78eb33da0f 100644 --- a/Mage.Sets/src/mage/cards/s/ShipwreckLooter.java +++ b/Mage.Sets/src/mage/cards/s/ShipwreckLooter.java @@ -28,11 +28,11 @@ public final class ShipwreckLooter extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - // Raid - When Shipwreck Looter enters the battlefield,if you attacked with a creature this turn, you may draw a card. If you do, discard a card. + // Raid - When Shipwreck Looter enters the battlefield,if you attacked this turn, you may draw a card. If you do, discard a card. Ability ability = new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldTriggeredAbility(new DrawDiscardControllerEffect(1, 1, true)), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, you may draw a card. If you do, discard a card."); + "Raid — When {this} enters the battlefield, if you attacked this turn, you may draw a card. If you do, discard a card."); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/SirenReaver.java b/Mage.Sets/src/mage/cards/s/SirenReaver.java index 517e0923650..a9c1fea7ba2 100644 --- a/Mage.Sets/src/mage/cards/s/SirenReaver.java +++ b/Mage.Sets/src/mage/cards/s/SirenReaver.java @@ -30,7 +30,7 @@ public final class SirenReaver extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // Raid — Siren Reaver costs {1} less to cast if you attacked with a creature this turn. + // Raid — Siren Reaver costs {1} less to cast if you attacked this turn. Ability ability = new SimpleStaticAbility(Zone.STACK, new SpellCostReductionSourceEffect(1, RaidCondition.instance)); ability.setAbilityWord(AbilityWord.RAID); ability.setRuleAtTheTop(true); diff --git a/Mage.Sets/src/mage/cards/s/StormFleetAerialist.java b/Mage.Sets/src/mage/cards/s/StormFleetAerialist.java index 5b872311a20..842d33e58c6 100644 --- a/Mage.Sets/src/mage/cards/s/StormFleetAerialist.java +++ b/Mage.Sets/src/mage/cards/s/StormFleetAerialist.java @@ -31,10 +31,10 @@ public final class StormFleetAerialist extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Raid - Storm Fleet Aerialist enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn. + // Raid - Storm Fleet Aerialist enters the battlefield with a +1/+1 counter on it if you attacked this turn. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1), false), RaidCondition.instance, - "Raid — {this} enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.", + "Raid — {this} enters the battlefield with a +1/+1 counter on it if you attacked this turn.", "{this} enters the battlefield with a +1/+1 counter"), new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/StormFleetArsonist.java b/Mage.Sets/src/mage/cards/s/StormFleetArsonist.java index cee0f71bf46..f11256b5d05 100644 --- a/Mage.Sets/src/mage/cards/s/StormFleetArsonist.java +++ b/Mage.Sets/src/mage/cards/s/StormFleetArsonist.java @@ -30,11 +30,11 @@ public final class StormFleetArsonist extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - // Raid - When Storm Fleet Arsonist enters the battlefield, if you attacked with a creature this turn, target opponent sacrifices a permanent. + // Raid - When Storm Fleet Arsonist enters the battlefield, if you attacked this turn, target opponent sacrifices a permanent. Ability ability = new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldTriggeredAbility(new SacrificeEffect(new FilterPermanent(), 1, "Target opponent")), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, target opponent sacrifices a permanent."); + "Raid — When {this} enters the battlefield, if you attacked this turn, target opponent sacrifices a permanent."); ability.addTarget(new TargetOpponent()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java b/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java index ee368746844..89c606b7bcd 100644 --- a/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java +++ b/Mage.Sets/src/mage/cards/s/StormFleetPyromancer.java @@ -30,11 +30,11 @@ public final class StormFleetPyromancer extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(2); - // Raid - When Storm Fleet Pyromancer enters the battlefield, if you attacked with a creature this turn, Storm Fleet Pyromancer deals 2 damage to any target. + // Raid - When Storm Fleet Pyromancer enters the battlefield, if you attacked this turn, Storm Fleet Pyromancer deals 2 damage to any target. Ability ability = new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(2)), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, {this} deals 2 damage to any target."); + "Raid — When {this} enters the battlefield, if you attacked this turn, {this} deals 2 damage to any target."); ability.addTarget(new TargetAnyTarget()); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/StormFleetSpy.java b/Mage.Sets/src/mage/cards/s/StormFleetSpy.java index c3b029d4266..e5d919829c1 100644 --- a/Mage.Sets/src/mage/cards/s/StormFleetSpy.java +++ b/Mage.Sets/src/mage/cards/s/StormFleetSpy.java @@ -28,11 +28,11 @@ public final class StormFleetSpy extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Raid — When Storm Fleet Spy enters the battlefield, if you attacked with a creature this turn, draw a card. + // Raid — When Storm Fleet Spy enters the battlefield, if you attacked this turn, draw a card. Ability ability = new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1)), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, draw a card."); + "Raid — When {this} enters the battlefield, if you attacked this turn, draw a card."); this.addAbility(ability, new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/SwaggeringCorsair.java b/Mage.Sets/src/mage/cards/s/SwaggeringCorsair.java index 8d99797da8d..01ab2ba6a7a 100644 --- a/Mage.Sets/src/mage/cards/s/SwaggeringCorsair.java +++ b/Mage.Sets/src/mage/cards/s/SwaggeringCorsair.java @@ -27,11 +27,11 @@ public final class SwaggeringCorsair extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - // Raid — Swaggering Corsair enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn. + // Raid — Swaggering Corsair enters the battlefield with a +1/+1 counter on it if you attacked this turn. this.addAbility(new EntersBattlefieldAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance(1)), RaidCondition.instance, - "Raid — {this} enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.", "" + "Raid — {this} enters the battlefield with a +1/+1 counter on it if you attacked this turn.", "" ), new PlayerAttackedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/t/TimelyHordemate.java b/Mage.Sets/src/mage/cards/t/TimelyHordemate.java index bdf734ed072..6fede85dbe9 100644 --- a/Mage.Sets/src/mage/cards/t/TimelyHordemate.java +++ b/Mage.Sets/src/mage/cards/t/TimelyHordemate.java @@ -40,7 +40,7 @@ public final class TimelyHordemate extends CardImpl { // Raid — When Timely Hordemate enters the battlefield, if you attacked this turn, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield. Ability ability = new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect()), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield."); + "Raid — When {this} enters the battlefield, if you attacked this turn, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield."); ability.addTarget(new TargetCardInYourGraveyard(filter)); this.addAbility(ability, new PlayerAttackedWatcher()); diff --git a/Mage.Sets/src/mage/cards/w/WarNameAspirant.java b/Mage.Sets/src/mage/cards/w/WarNameAspirant.java index f5739239d18..1c541c03797 100644 --- a/Mage.Sets/src/mage/cards/w/WarNameAspirant.java +++ b/Mage.Sets/src/mage/cards/w/WarNameAspirant.java @@ -39,10 +39,10 @@ public final class WarNameAspirant extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(1); - // Raid — War-Name Aspirant enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn. + // Raid — War-Name Aspirant enters the battlefield with a +1/+1 counter on it if you attacked this turn. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(1), false), RaidCondition.instance, - "Raid — {this} enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn", + "Raid — {this} enters the battlefield with a +1/+1 counter on it if you attacked this turn", "{this} enters the battlefield with a +1/+1 counter"), new PlayerAttackedWatcher()); diff --git a/Mage.Sets/src/mage/cards/w/WingmateRoc.java b/Mage.Sets/src/mage/cards/w/WingmateRoc.java index 04d872751dd..9d2e4b27e23 100644 --- a/Mage.Sets/src/mage/cards/w/WingmateRoc.java +++ b/Mage.Sets/src/mage/cards/w/WingmateRoc.java @@ -35,9 +35,9 @@ public final class WingmateRoc extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - // Raid - When Wingmate Roc enters the battlefield, if you attacked with a creature this turn, create a 3/4 white Bird creature token with flying. + // Raid - When Wingmate Roc enters the battlefield, if you attacked this turn, create a 3/4 white Bird creature token with flying. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new WingmateRocToken())), RaidCondition.instance, - "Raid — When {this} enters the battlefield, if you attacked with a creature this turn, create a 3/4 white Bird creature token with flying."), + "Raid — When {this} enters the battlefield, if you attacked this turn, create a 3/4 white Bird creature token with flying."), new PlayerAttackedWatcher()); // Whenever Wingmate Roc attacks, you gain 1 life for each attacking creature. diff --git a/Mage/src/main/java/mage/abilities/condition/common/RaidCondition.java b/Mage/src/main/java/mage/abilities/condition/common/RaidCondition.java index efb29099f6d..8c03dd92b39 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/RaidCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/RaidCondition.java @@ -21,6 +21,6 @@ public enum RaidCondition implements Condition { @Override public String toString() { - return "if you attacked with a creature this turn"; + return "if you attacked this turn"; } } diff --git a/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java b/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java index 2e4f406775f..af26a6192c4 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java @@ -19,7 +19,7 @@ import mage.watchers.Watcher; * * @author emerald000 */ -public class MeleeAbility extends AttacksTriggeredAbility { +public class MeleeAbility extends AttacksTriggeredAbility { public MeleeAbility() { super(new BoostSourceEffect(new MeleeDynamicValue(), new MeleeDynamicValue(), Duration.EndOfTurn), false); @@ -37,7 +37,7 @@ public class MeleeAbility extends AttacksTriggeredAbility { @Override public String getRule() { - return "Melee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked with a creature this combat.)"; + return "Melee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)"; } }