diff --git a/Mage.Sets/src/mage/cards/a/AhnCropInvader.java b/Mage.Sets/src/mage/cards/a/AhnCropInvader.java index 8f178b0fdd6..4dc68cf6781 100644 --- a/Mage.Sets/src/mage/cards/a/AhnCropInvader.java +++ b/Mage.Sets/src/mage/cards/a/AhnCropInvader.java @@ -19,7 +19,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -45,7 +44,7 @@ public final class AhnCropInvader extends CardImpl { FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield ), MyTurnCondition.instance, - "As long as it's your turn, " + "During your turn, " + "{this} has first strike." ) ).addHint(MyTurnHint.instance)); diff --git a/Mage.Sets/src/mage/cards/a/AngryMob.java b/Mage.Sets/src/mage/cards/a/AngryMob.java index de233682d08..a85c6468100 100644 --- a/Mage.Sets/src/mage/cards/a/AngryMob.java +++ b/Mage.Sets/src/mage/cards/a/AngryMob.java @@ -42,7 +42,7 @@ public final class AngryMob extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(swamps, swamps, Duration.WhileOnBattlefield), MyTurnCondition.instance, - "As long as it's your turn, Angry Mob's power and toughness are each equal to 2 plus the number of Swamps your opponents control. As long as it's not your turn, Angry Mob's power and toughness are each 2")) + "During your turn, {this}'s power and toughness are each equal to 2 plus the number of Swamps your opponents control. During turns other than yours, {this}'s power and toughness are each 2")) .addHint(MyTurnHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java b/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java index 326e86cfb54..4fb42648e85 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java @@ -1,6 +1,5 @@ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldThisOrAnotherTriggeredAbility; @@ -13,18 +12,20 @@ import mage.constants.Outcome; import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.common.FilterCreaturePermanent; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * @author Loki */ public final class ArchonOfRedemption extends CardImpl { - private static final FilterPermanent filter = new FilterCreaturePermanent("creature with flying"); + private static final FilterPermanent filter = new FilterControlledCreaturePermanent("creature you control with flying"); static { filter.add(new AbilityPredicate(FlyingAbility.class)); @@ -41,7 +42,7 @@ public final class ArchonOfRedemption extends CardImpl { // Whenever Archon of Redemption or another creature with flying you control enters, you may gain life equal to that creature's power. this.addAbility(new EntersBattlefieldThisOrAnotherTriggeredAbility( - new ArchonOfRedemptionEffect(), filter, true, SetTargetPointer.PERMANENT, true + new ArchonOfRedemptionEffect(), filter, true, SetTargetPointer.PERMANENT, false )); } diff --git a/Mage.Sets/src/mage/cards/b/BedrockTortoise.java b/Mage.Sets/src/mage/cards/b/BedrockTortoise.java index d72b3845df0..8b2c8b5542b 100644 --- a/Mage.Sets/src/mage/cards/b/BedrockTortoise.java +++ b/Mage.Sets/src/mage/cards/b/BedrockTortoise.java @@ -41,7 +41,7 @@ public final class BedrockTortoise extends CardImpl { this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_CONTROLLED_CREATURES), MyTurnCondition.instance, - "As long as it's your turn, creatures you control have hexproof" + "During your turn, creatures you control have hexproof" ))); // Each creature you control with toughness greater than its power assigns combat damage equal to its toughness rather than its power. diff --git a/Mage.Sets/src/mage/cards/d/DaggersailAeronaut.java b/Mage.Sets/src/mage/cards/d/DaggersailAeronaut.java index 908a5ae8f25..8760cfdc5b6 100644 --- a/Mage.Sets/src/mage/cards/d/DaggersailAeronaut.java +++ b/Mage.Sets/src/mage/cards/d/DaggersailAeronaut.java @@ -31,7 +31,7 @@ public final class DaggersailAeronaut extends CardImpl { this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect( FlyingAbility.getInstance(), Duration.WhileOnBattlefield - ), MyTurnCondition.instance, "As long as it's your turn, {this} has flying.") + ), MyTurnCondition.instance, "During your turn, {this} has flying.") ).addHint(MyTurnHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/e/EmberethSkyblazer.java b/Mage.Sets/src/mage/cards/e/EmberethSkyblazer.java index 16008a7035d..4a0f75b013e 100644 --- a/Mage.Sets/src/mage/cards/e/EmberethSkyblazer.java +++ b/Mage.Sets/src/mage/cards/e/EmberethSkyblazer.java @@ -38,7 +38,7 @@ public final class EmberethSkyblazer extends CardImpl { // As long as it's your turn, Embereth Skyblazer has flying. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield), - MyTurnCondition.instance, "As long as it's your turn, {this} has flying." + MyTurnCondition.instance, "During your turn, {this} has flying." )).addHint(MyTurnHint.instance)); // Whenever Embereth Skyblazer attacks, you may pay {2}{R}. If you do, creatures you control get +X/+0 until end of turn, where X is the number of opponents you have. diff --git a/Mage.Sets/src/mage/cards/f/FecundGreenshell.java b/Mage.Sets/src/mage/cards/f/FecundGreenshell.java index 3a88f596fd6..995d4fd4828 100644 --- a/Mage.Sets/src/mage/cards/f/FecundGreenshell.java +++ b/Mage.Sets/src/mage/cards/f/FecundGreenshell.java @@ -59,7 +59,7 @@ public final class FecundGreenshell extends CardImpl { // Whenever Fecund Greenshell or another creature you control with toughness greater than its power enters, // look at the top card of your library. If it's a land card, you may put it onto the battlefield tapped. Otherwise, put it into your hand. this.addAbility(new EntersBattlefieldThisOrAnotherTriggeredAbility( - new FecundGreenshellEffect(), filter, false, true)); + new FecundGreenshellEffect(), filter, false, false)); } private FecundGreenshell(final FecundGreenshell card) { diff --git a/Mage.Sets/src/mage/cards/f/FreshFacedRecruit.java b/Mage.Sets/src/mage/cards/f/FreshFacedRecruit.java index 846f2323729..07c1351ba95 100644 --- a/Mage.Sets/src/mage/cards/f/FreshFacedRecruit.java +++ b/Mage.Sets/src/mage/cards/f/FreshFacedRecruit.java @@ -31,7 +31,7 @@ public final class FreshFacedRecruit extends CardImpl { // As long as it's your turn, Fresh-Faced Recruit has first strike. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), - MyTurnCondition.instance, "As long as it's your turn, {this} has first strike." + MyTurnCondition.instance, "During your turn, {this} has first strike." )).addHint(MyTurnHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/g/GideonBlackblade.java b/Mage.Sets/src/mage/cards/g/GideonBlackblade.java index 8fbca0a9ba1..0e781cf7763 100644 --- a/Mage.Sets/src/mage/cards/g/GideonBlackblade.java +++ b/Mage.Sets/src/mage/cards/g/GideonBlackblade.java @@ -52,7 +52,7 @@ public final class GideonBlackblade extends CardImpl { this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BecomesCreatureSourceEffect( new GideonBlackbladeToken(), CardType.PLANESWALKER, Duration.WhileOnBattlefield - ), MyTurnCondition.instance, "As long as it's your turn, " + + ), MyTurnCondition.instance, "During your turn, " + "{this} is a 4/4 Human Soldier creature with indestructible that's still a planeswalker." )).addHint(MyTurnHint.instance)); diff --git a/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java b/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java index f1747a427f7..d643191a444 100644 --- a/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java +++ b/Mage.Sets/src/mage/cards/g/GloryOfWarfare.java @@ -26,14 +26,14 @@ public final class GloryOfWarfare extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield), MyTurnCondition.instance, - "As long as it's your turn, creatures you control get +2/+0")) + "During your turn, creatures you control get +2/+0")) .addHint(MyTurnHint.instance)); // As long as it’s not your turn, creatures you control get +0/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect(0, 2, Duration.WhileOnBattlefield), NotMyTurnCondition.instance, - "As long as it's not your turn, creatures you control get +0/+2"))); + "During turns other than yours, creatures you control get +0/+2"))); } private GloryOfWarfare(final GloryOfWarfare card) { diff --git a/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java b/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java index d8f00b4822f..dce0c0e1c83 100644 --- a/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java +++ b/Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java @@ -46,7 +46,7 @@ public final class GruulSpellbreaker extends CardImpl { new GainAbilityControllerEffect( HexproofAbility.getInstance(), Duration.WhileOnBattlefield - ), MyTurnCondition.instance, "As long as it's your turn, you" + ), MyTurnCondition.instance, "During your turn, you" ) ); ability.addEffect(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/h/HardyVeteran.java b/Mage.Sets/src/mage/cards/h/HardyVeteran.java index 558eb47597a..50abe5c9816 100644 --- a/Mage.Sets/src/mage/cards/h/HardyVeteran.java +++ b/Mage.Sets/src/mage/cards/h/HardyVeteran.java @@ -34,7 +34,7 @@ public final class HardyVeteran extends CardImpl { Effect boostEffect = new ConditionalContinuousEffect( new BoostSourceEffect(0, 2, Duration.WhileOnBattlefield), MyTurnCondition.instance, - "As long as it's your turn, {this} gets +0/+2"); + "During your turn, {this} gets +0/+2"); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, boostEffect); ability.addHint(MyTurnHint.instance); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HarvestriteHost.java b/Mage.Sets/src/mage/cards/h/HarvestriteHost.java index 462fe2edcff..c0091ef9904 100644 --- a/Mage.Sets/src/mage/cards/h/HarvestriteHost.java +++ b/Mage.Sets/src/mage/cards/h/HarvestriteHost.java @@ -37,7 +37,7 @@ public final class HarvestriteHost extends CardImpl { ); ability.addEffect(new IfAbilityHasResolvedXTimesEffect( 2, new DrawCardSourceControllerEffect(1) - )); + ).setText("Then draw a card if this is the second time this ability has resolved this turn")); ability.addTarget(new TargetControlledCreaturePermanent()); this.addAbility(ability, new AbilityResolvedWatcher()); } diff --git a/Mage.Sets/src/mage/cards/j/JoustingLance.java b/Mage.Sets/src/mage/cards/j/JoustingLance.java index bb17edd2086..e264682dd0f 100644 --- a/Mage.Sets/src/mage/cards/j/JoustingLance.java +++ b/Mage.Sets/src/mage/cards/j/JoustingLance.java @@ -32,7 +32,7 @@ public final class JoustingLance extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield), MyTurnCondition.instance, - "As long as it's your turn, equipped creature has first strike.")) + "During your turn, equipped creature has first strike.")) .addHint(MyTurnHint.instance)); // Equip {3} diff --git a/Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java b/Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java index 37046561238..1cb974504e0 100644 --- a/Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java +++ b/Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java @@ -50,7 +50,7 @@ public final class NahiriStormOfStone extends CardImpl { new GainAbilityControlledEffect( FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE - ), MyTurnCondition.instance, "As long as it's your turn, " + + ), MyTurnCondition.instance, "During your turn, " + "creatures you control have first strike" )); ability.addEffect(new ConditionalCostModificationEffect( diff --git a/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java b/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java index e4884d88f54..c88a42b0b68 100644 --- a/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java +++ b/Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java @@ -41,7 +41,7 @@ public final class OakStreetInnkeeper extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityControlledEffect(HexproofAbility.getInstance(), Duration.WhileOnBattlefield, filter), NotMyTurnCondition.instance, - "As long as it's not your turn, tapped creatures you control have hexproof")) + "During turns other than yours, tapped creatures you control have hexproof")) .addHint(NotMyTurnHint.instance)); } @@ -54,4 +54,4 @@ public final class OakStreetInnkeeper extends CardImpl { public OakStreetInnkeeper copy() { return new OakStreetInnkeeper(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/o/OverseerOfVault76.java b/Mage.Sets/src/mage/cards/o/OverseerOfVault76.java index 734d7b37a4f..c0a48f922d7 100644 --- a/Mage.Sets/src/mage/cards/o/OverseerOfVault76.java +++ b/Mage.Sets/src/mage/cards/o/OverseerOfVault76.java @@ -1,9 +1,6 @@ package mage.cards.o; -import java.util.UUID; - import mage.MageInt; -import mage.abilities.triggers.BeginningOfCombatTriggeredAbility; import mage.abilities.common.EntersBattlefieldThisOrAnotherTriggeredAbility; import mage.abilities.common.delayed.ReflexiveTriggeredAbility; import mage.abilities.costs.Cost; @@ -13,21 +10,25 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.VigilanceAbility; -import mage.constants.*; +import mage.abilities.triggers.BeginningOfCombatTriggeredAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.StaticFilters; -import mage.filter.common.FilterCreaturePermanent; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author Cguy7777 */ public final class OverseerOfVault76 extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 3 or less"); + private static final FilterControlledCreaturePermanent filter = + new FilterControlledCreaturePermanent("creature you control with power 3 or less"); static { filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 4)); @@ -45,7 +46,7 @@ public final class OverseerOfVault76 extends CardImpl { // First Contact -- Whenever Overseer of Vault 76 or another creature with power 3 or less // you control enters, put a quest counter on Overseer of Vault 76. this.addAbility(new EntersBattlefieldThisOrAnotherTriggeredAbility( - new AddCountersSourceEffect(CounterType.QUEST.createInstance()), filter, false, true) + new AddCountersSourceEffect(CounterType.QUEST.createInstance()), filter, false, false) .withFlavorWord("First Contact")); // At the beginning of combat on your turn, you may remove three quest counters from diff --git a/Mage.Sets/src/mage/cards/p/PlumecreedMentor.java b/Mage.Sets/src/mage/cards/p/PlumecreedMentor.java index 5eaa9ba3b45..1f3762314d1 100644 --- a/Mage.Sets/src/mage/cards/p/PlumecreedMentor.java +++ b/Mage.Sets/src/mage/cards/p/PlumecreedMentor.java @@ -47,7 +47,7 @@ public final class PlumecreedMentor extends CardImpl { // Whenever Plumecreed Mentor or another creature you control with flying enters, put a +1/+1 counter on target creature you control without flying. Ability ability = new EntersBattlefieldThisOrAnotherTriggeredAbility( new AddCountersTargetEffect(CounterType.P1P1.createInstance()), - filter, false, true + filter, false, false ); ability.addTarget(new TargetPermanent(filter2)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PouncingLynx.java b/Mage.Sets/src/mage/cards/p/PouncingLynx.java index 079c481ebd5..919c4367b7e 100644 --- a/Mage.Sets/src/mage/cards/p/PouncingLynx.java +++ b/Mage.Sets/src/mage/cards/p/PouncingLynx.java @@ -34,7 +34,7 @@ public final class PouncingLynx extends CardImpl { FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield ), MyTurnCondition.instance, - "As long as it's your turn, " + "During your turn, " + "{this} has first strike." ) ).addHint(MyTurnHint.instance)); diff --git a/Mage.Sets/src/mage/cards/p/Prickleboar.java b/Mage.Sets/src/mage/cards/p/Prickleboar.java index 57706f77918..6dc8c8198a9 100644 --- a/Mage.Sets/src/mage/cards/p/Prickleboar.java +++ b/Mage.Sets/src/mage/cards/p/Prickleboar.java @@ -34,7 +34,7 @@ public final class Prickleboar extends CardImpl { Effect boostEffect = new ConditionalContinuousEffect( new BoostSourceEffect(2, 0, Duration.WhileOnBattlefield), MyTurnCondition.instance, - "As long as it's your turn, {this} gets +2/+0"); + "During your turn, {this} gets +2/+0"); // and has first strike. Effect gainAbilityEffect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), diff --git a/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java b/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java index 4d15b5f9f8a..d8ba30712c2 100644 --- a/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java +++ b/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java @@ -42,7 +42,7 @@ public final class RadhaHeartOfKeld extends CardImpl { // As long as it's your turn, Radha, Heart of Keld has first strike. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), - MyTurnCondition.instance, "As long as it's your turn, {this} has first strike." + MyTurnCondition.instance, "During your turn, {this} has first strike." )).addHint(MyTurnHint.instance)); // You may look at the top card of your library any time, and you may play lands from the top of your library. diff --git a/Mage.Sets/src/mage/cards/r/RatcatcherTrainee.java b/Mage.Sets/src/mage/cards/r/RatcatcherTrainee.java index 026a80259da..f61e64e2973 100644 --- a/Mage.Sets/src/mage/cards/r/RatcatcherTrainee.java +++ b/Mage.Sets/src/mage/cards/r/RatcatcherTrainee.java @@ -33,7 +33,7 @@ public final class RatcatcherTrainee extends AdventureCard { // As long as it's your turn, Ratcatcher Trainee has first strike. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), - MyTurnCondition.instance, "As long as it's your turn, {this} has first strike." + MyTurnCondition.instance, "During your turn, {this} has first strike." )).addHint(MyTurnHint.instance)); // Pest Problem diff --git a/Mage.Sets/src/mage/cards/r/RestlessSpire.java b/Mage.Sets/src/mage/cards/r/RestlessSpire.java index f2b13bba9b0..9fb5d277c8d 100644 --- a/Mage.Sets/src/mage/cards/r/RestlessSpire.java +++ b/Mage.Sets/src/mage/cards/r/RestlessSpire.java @@ -38,13 +38,13 @@ public final class RestlessSpire extends CardImpl { this.addAbility(new BlueManaAbility()); this.addAbility(new RedManaAbility()); - // {U}{R}: Until end of turn, Restless Spire becomes a 2/1 blue and red Elemental creature with "As long as it's your turn, this creature has first strike". It's still a land. + // {U}{R}: Until end of turn, Restless Spire becomes a 2/1 blue and red Elemental creature with "During your turn, this creature has first strike". It's still a land. this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect( - new CreatureToken(2, 1, "2/1 blue and red Elemental creature with \"As long as it's your turn, this creature has first strike.\"") + new CreatureToken(2, 1, "2/1 blue and red Elemental creature with \"During your turn, this creature has first strike.\"") .withColor("UR").withSubType(SubType.ELEMENTAL) .withAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), - MyTurnCondition.instance, "As long as it's your turn, this creature has first strike." + MyTurnCondition.instance, "During your turn, this creature has first strike." )).addHint(MyTurnHint.instance)), CardType.LAND, Duration.EndOfTurn ).withDurationRuleAtStart(true), new ManaCostsImpl<>("{U}{R}"))); diff --git a/Mage.Sets/src/mage/cards/r/ReturnThePast.java b/Mage.Sets/src/mage/cards/r/ReturnThePast.java index d7888595238..edb2db6eca8 100644 --- a/Mage.Sets/src/mage/cards/r/ReturnThePast.java +++ b/Mage.Sets/src/mage/cards/r/ReturnThePast.java @@ -44,7 +44,7 @@ class ReturnThePastEffect extends ContinuousEffectImpl { ReturnThePastEffect() { super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); - this.staticText = "As long as it's your turn, each instant and sorcery card in your graveyard has flashback. " + + this.staticText = "During your turn, each instant and sorcery card in your graveyard has flashback. " + "Its flashback cost is equal to its mana cost"; } diff --git a/Mage.Sets/src/mage/cards/s/SalvationSwan.java b/Mage.Sets/src/mage/cards/s/SalvationSwan.java index 029e34a63cf..18ede9d824b 100644 --- a/Mage.Sets/src/mage/cards/s/SalvationSwan.java +++ b/Mage.Sets/src/mage/cards/s/SalvationSwan.java @@ -62,7 +62,7 @@ public final class SalvationSwan extends CardImpl { // Whenever Salvation Swan or another Bird you control enters, exile up to one target creature you control without flying. Return it to the battlefield under its owner's control with a flying counter on it at the beginning of the next end step. Ability ability = new EntersBattlefieldThisOrAnotherTriggeredAbility( - new SalvationSwanTargetEffect(), filterBird, false, true + new SalvationSwanTargetEffect(), filterBird, false, false ); ability.addTarget(new TargetControlledCreaturePermanent(0, 1, filterWithoutFlying, false)); this.addAbility(ability); @@ -83,7 +83,7 @@ class SalvationSwanTargetEffect extends OneShotEffect { SalvationSwanTargetEffect() { super(Outcome.Benefit); - staticText = " exile up to one target creature you control without flying. " + staticText = "exile up to one target creature you control without flying. " + "Return it to the battlefield under its owner's control " + "with a flying counter on it at the beginning of the next end step"; } @@ -134,4 +134,4 @@ class SalvationSwanTargetEffect extends OneShotEffect { return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SaradocMasterOfBuckland.java b/Mage.Sets/src/mage/cards/s/SaradocMasterOfBuckland.java index 89289ec2181..cea7b03b62d 100644 --- a/Mage.Sets/src/mage/cards/s/SaradocMasterOfBuckland.java +++ b/Mage.Sets/src/mage/cards/s/SaradocMasterOfBuckland.java @@ -13,8 +13,8 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.filter.predicate.mageobject.PowerPredicate; import mage.filter.predicate.permanent.TappedPredicate; @@ -30,7 +30,7 @@ import java.util.UUID; public final class SaradocMasterOfBuckland extends CardImpl { private static final FilterPermanent filter - = new FilterCreaturePermanent("nontoken creature with power 2 or less"); + = new FilterControlledCreaturePermanent("nontoken creature you control with power 2 or less"); private static final FilterControlledPermanent filter2 = new FilterControlledPermanent(SubType.HALFLING, "other untapped Halflings you control"); @@ -52,7 +52,7 @@ public final class SaradocMasterOfBuckland extends CardImpl { // Whenever Saradoc, Master of Buckland or another nontoken creature with power 2 or less you control enters, create a 1/1 white Halfling creature token. this.addAbility(new EntersBattlefieldThisOrAnotherTriggeredAbility( - new CreateTokenEffect(new HalflingToken()), filter, false, true + new CreateTokenEffect(new HalflingToken()), filter, false, false )); // Tap two other untapped Halflings you control: Saradoc gets +2/+0 and gains lifelink until end of turn. diff --git a/Mage.Sets/src/mage/cards/s/Six.java b/Mage.Sets/src/mage/cards/s/Six.java index 6d36b54e42e..faa979874b5 100644 --- a/Mage.Sets/src/mage/cards/s/Six.java +++ b/Mage.Sets/src/mage/cards/s/Six.java @@ -54,7 +54,7 @@ public final class Six extends CardImpl { new ConditionalContinuousEffect( new GainRetraceYourGraveyardEffect(filter), MyTurnCondition.instance, - "As long as it's your turn, nonland permanent cards in your graveyard have retrace." + "During your turn, nonland permanent cards in your graveyard have retrace." ) ).addHint(MyTurnHint.instance)); } @@ -67,4 +67,4 @@ public final class Six extends CardImpl { public Six copy() { return new Six(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SorinVengefulBloodlord.java b/Mage.Sets/src/mage/cards/s/SorinVengefulBloodlord.java index 010b3c39b77..83389ff0907 100644 --- a/Mage.Sets/src/mage/cards/s/SorinVengefulBloodlord.java +++ b/Mage.Sets/src/mage/cards/s/SorinVengefulBloodlord.java @@ -40,7 +40,7 @@ public final class SorinVengefulBloodlord extends CardImpl { new GainAbilityControlledEffect( LifelinkAbility.getInstance(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_OR_PLANESWALKER_A - ), MyTurnCondition.instance, "As long as it's your turn, " + + ), MyTurnCondition.instance, "During your turn, " + "creatures and planeswalkers you control have lifelink" )).addHint(MyTurnHint.instance)); diff --git a/Mage.Sets/src/mage/cards/s/SpartanVeteran.java b/Mage.Sets/src/mage/cards/s/SpartanVeteran.java index 41454e02156..407031f2ccc 100644 --- a/Mage.Sets/src/mage/cards/s/SpartanVeteran.java +++ b/Mage.Sets/src/mage/cards/s/SpartanVeteran.java @@ -34,7 +34,7 @@ public final class SpartanVeteran extends CardImpl { // As long as it's your turn, Spartan Veteran has first strike. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), - MyTurnCondition.instance, "As long as it's your turn, {this} has first strike." + MyTurnCondition.instance, "During your turn, {this} has first strike." )).addHint(MyTurnHint.instance)); // {2}: Spartan Veteran gets +1/+0 until end of turn. diff --git a/Mage.Sets/src/mage/cards/s/SpitefulPrankster.java b/Mage.Sets/src/mage/cards/s/SpitefulPrankster.java index b0e11ae8e33..988c5fb4df1 100644 --- a/Mage.Sets/src/mage/cards/s/SpitefulPrankster.java +++ b/Mage.Sets/src/mage/cards/s/SpitefulPrankster.java @@ -34,7 +34,7 @@ public final class SpitefulPrankster extends CardImpl { // As long as it's your turn, Spiteful Prankster has first strike. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), - MyTurnCondition.instance, "As long as it's your turn, {this} has first strike." + MyTurnCondition.instance, "During your turn, {this} has first strike." )).addHint(MyTurnHint.instance)); // Whenever another creature dies, Spiteful Prankster deals 1 damage to target player or planeswalker. diff --git a/Mage.Sets/src/mage/cards/s/StreetRiot.java b/Mage.Sets/src/mage/cards/s/StreetRiot.java index 86dc40afce5..a87b1369aac 100644 --- a/Mage.Sets/src/mage/cards/s/StreetRiot.java +++ b/Mage.Sets/src/mage/cards/s/StreetRiot.java @@ -32,7 +32,7 @@ public final class StreetRiot extends CardImpl { new BoostControlledEffect( 1, 0, Duration.WhileOnBattlefield ), MyTurnCondition.instance, - "As long as it's your turn, " + "During your turn, " + "creatures you control get +1/+0" )); ability.addEffect(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/s/SunlitHoplite.java b/Mage.Sets/src/mage/cards/s/SunlitHoplite.java index 1ed20bb6916..f1e8e8d2ea4 100644 --- a/Mage.Sets/src/mage/cards/s/SunlitHoplite.java +++ b/Mage.Sets/src/mage/cards/s/SunlitHoplite.java @@ -40,7 +40,7 @@ public final class SunlitHoplite extends CardImpl { // As long as it's your turn, Sunlit Hoplite has first strike. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield), - MyTurnCondition.instance, "As long as it's your turn, {this} has first strike." + MyTurnCondition.instance, "During your turn, {this} has first strike." )).addHint(MyTurnHint.instance)); // Sunlit Hoplite gets +1/+0 as long as you control an Elspeth planeswalker. diff --git a/Mage.Sets/src/mage/cards/s/SwoopingPteranodon.java b/Mage.Sets/src/mage/cards/s/SwoopingPteranodon.java index 5380003acf7..488c2e5c6bd 100644 --- a/Mage.Sets/src/mage/cards/s/SwoopingPteranodon.java +++ b/Mage.Sets/src/mage/cards/s/SwoopingPteranodon.java @@ -18,6 +18,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; +import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -31,7 +32,7 @@ import mage.target.targetpointer.FixedTarget; */ public final class SwoopingPteranodon extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent(SubType.DINOSAUR, "Dinosaur with flying"); + private static final FilterPermanent filter = new FilterControlledPermanent(SubType.DINOSAUR, "Dinosaur you control with flying"); static { filter.add(new AbilityPredicate(FlyingAbility.class)); @@ -55,7 +56,7 @@ public final class SwoopingPteranodon extends CardImpl { // It gains flying and haste until end of turn. // At the beginning of the next end step, target land deals 3 damage to that creature. Ability ability = new EntersBattlefieldThisOrAnotherTriggeredAbility( - new GainControlTargetEffect(Duration.EndOfTurn), filter, false, true); + new GainControlTargetEffect(Duration.EndOfTurn), filter, false, false); ability.addEffect(new UntapTargetEffect().setText("Untap that creature")); ability.addEffect(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn).setText("It gains flying")); ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn).setText("and haste until end of turn.")); diff --git a/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java b/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java index 612df87a086..2cc0e24b5a9 100644 --- a/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java +++ b/Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java @@ -47,7 +47,7 @@ public final class ThrunBreakerOfSilence extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield), MyTurnCondition.instance, - "As long as it's your turn, {this} has indestructible")) + "During your turn, {this} has indestructible")) .addHint(MyTurnHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/t/TriumphantAdventurer.java b/Mage.Sets/src/mage/cards/t/TriumphantAdventurer.java index 6a562cf14b9..12ed0f8b8bc 100644 --- a/Mage.Sets/src/mage/cards/t/TriumphantAdventurer.java +++ b/Mage.Sets/src/mage/cards/t/TriumphantAdventurer.java @@ -39,7 +39,7 @@ public final class TriumphantAdventurer extends CardImpl { this.addAbility(new SimpleStaticAbility( new ConditionalContinuousEffect(new GainAbilitySourceEffect( FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield - ), MyTurnCondition.instance, "As long as it's your turn, {this} has first strike.") + ), MyTurnCondition.instance, "During your turn, {this} has first strike.") ).addHint(MyTurnHint.instance)); // Whenever Triumphant Adventurer attacks, venture into the dungeon. diff --git a/Mage.Sets/src/mage/cards/v/VaultbornTyrant.java b/Mage.Sets/src/mage/cards/v/VaultbornTyrant.java index 5789f7b7b53..5229e88a3e0 100644 --- a/Mage.Sets/src/mage/cards/v/VaultbornTyrant.java +++ b/Mage.Sets/src/mage/cards/v/VaultbornTyrant.java @@ -17,7 +17,7 @@ import mage.constants.ComparisonType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.common.FilterCreaturePermanent; +import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -31,7 +31,7 @@ import java.util.UUID; */ public final class VaultbornTyrant extends CardImpl { - private static final FilterPermanent filter = new FilterCreaturePermanent("creature with power 4 or greater"); + private static final FilterPermanent filter = new FilterControlledCreaturePermanent("creature you control with power 4 or greater"); static { filter.add(new PowerPredicate(ComparisonType.OR_GREATER, 4)); @@ -49,7 +49,7 @@ public final class VaultbornTyrant extends CardImpl { // Whenever Vaultborn Tyrant or another creature with power 4 or greater you control enters, you gain 3 life and draw a card. Ability ability = new EntersBattlefieldThisOrAnotherTriggeredAbility( - new GainLifeEffect(3), filter, false, true + new GainLifeEffect(3), filter, false, false ); ability.addEffect(new DrawCardSourceControllerEffect(1).concatBy("and")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/VibratingSphere.java b/Mage.Sets/src/mage/cards/v/VibratingSphere.java index 95e5c7fc804..d03a6877c97 100644 --- a/Mage.Sets/src/mage/cards/v/VibratingSphere.java +++ b/Mage.Sets/src/mage/cards/v/VibratingSphere.java @@ -26,14 +26,14 @@ public final class VibratingSphere extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect(2, 0, Duration.WhileOnBattlefield), MyTurnCondition.instance, - "As long as it's your turn, creatures you control get +2/+0")) + "During your turn, creatures you control get +2/+0")) .addHint(MyTurnHint.instance)); // As long as it's not your turn, creatures you control get -0/-2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostControlledEffect(0, -2, Duration.WhileOnBattlefield), NotMyTurnCondition.instance, - "As long as it's not your turn, creatures you control get -0/-2"))); + "During turns other than yours, creatures you control get -0/-2"))); } private VibratingSphere(final VibratingSphere card) { diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java index 39f10205568..0fa60be344c 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheWall.java @@ -37,7 +37,7 @@ public final class WardenOfTheWall extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BecomesCreatureSourceEffect(new GargoyleToken(), CardType.ARTIFACT, Duration.WhileOnBattlefield), NotMyTurnCondition.instance, - "As long as it's not your turn, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying")) + "During turns other than yours, Warden of the Wall is a 2/3 Gargoyle artifact creature with flying")) .addHint(NotMyTurnHint.instance)); } diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java index c533c05c686..59dd6d41ec0 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java @@ -113,7 +113,8 @@ public class ConditionalOneShotEffect extends OneShotEffect { if (otherwiseEffects.isEmpty()) { if (withConditionTextAtEnd) { - return CardUtil.getTextWithFirstCharLowerCase(effects.getText(mode)) + String effectText = effects.getText(mode); + return CardUtil.getTextWithFirstCharLowerCase(effectText.substring(0, effectText.length() - 1)) + " if " + conditionText; } else { return "if " + conditionText + ", "