External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 06:22:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

more text fixes

Browse source
This commit is contained in:
xenohedron 2024-11-03 22:03:44 -05:00
parent a98ff3867c
commit e3d654dcb0
39 changed files with 65 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/a/AhnCropInvader.java
View file

@ -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));

2
Mage.Sets/src/mage/cards/a/AngryMob.java
View file

@ -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));
}

9
Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java
View file

@ -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
));
}

2
Mage.Sets/src/mage/cards/b/BedrockTortoise.java
View file

@ -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.

2
Mage.Sets/src/mage/cards/d/DaggersailAeronaut.java
View file

@ -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));
}

2
Mage.Sets/src/mage/cards/e/EmberethSkyblazer.java
View file

@ -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.

2
Mage.Sets/src/mage/cards/f/FecundGreenshell.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/f/FreshFacedRecruit.java
View file

@ -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));
}

2
Mage.Sets/src/mage/cards/g/GideonBlackblade.java
View file

@ -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));

4
Mage.Sets/src/mage/cards/g/GloryOfWarfare.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/g/GruulSpellbreaker.java
View file

@ -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(

2
Mage.Sets/src/mage/cards/h/HardyVeteran.java
View file

@ -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);

2
Mage.Sets/src/mage/cards/h/HarvestriteHost.java
View file

@ -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());
}

2
Mage.Sets/src/mage/cards/j/JoustingLance.java
View file

@ -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}

2
Mage.Sets/src/mage/cards/n/NahiriStormOfStone.java
View file

@ -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(

4
Mage.Sets/src/mage/cards/o/OakStreetInnkeeper.java
View file

@ -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);
}
}
}

15
Mage.Sets/src/mage/cards/o/OverseerOfVault76.java
View file

@ -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

2
Mage.Sets/src/mage/cards/p/PlumecreedMentor.java
View file

@ -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);

2
Mage.Sets/src/mage/cards/p/PouncingLynx.java
View file

@ -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));

2
Mage.Sets/src/mage/cards/p/Prickleboar.java
View file

@ -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),

2
Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java
View file

@ -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.

2
Mage.Sets/src/mage/cards/r/RatcatcherTrainee.java
View file

@ -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

6
Mage.Sets/src/mage/cards/r/RestlessSpire.java
View file

@ -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}")));

2
Mage.Sets/src/mage/cards/r/ReturnThePast.java
View file

@ -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";
}

6
Mage.Sets/src/mage/cards/s/SalvationSwan.java
View file

@ -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;
}
}
}

6
Mage.Sets/src/mage/cards/s/SaradocMasterOfBuckland.java
View file

@ -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.

4
Mage.Sets/src/mage/cards/s/Six.java
View file

@ -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);
}
}
}

2
Mage.Sets/src/mage/cards/s/SorinVengefulBloodlord.java
View file

@ -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));

2
Mage.Sets/src/mage/cards/s/SpartanVeteran.java
View file

@ -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.

2
Mage.Sets/src/mage/cards/s/SpitefulPrankster.java
View file

@ -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.

2
Mage.Sets/src/mage/cards/s/StreetRiot.java
View file

@ -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(

2
Mage.Sets/src/mage/cards/s/SunlitHoplite.java
View file

@ -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.

5
Mage.Sets/src/mage/cards/s/SwoopingPteranodon.java
View file

@ -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."));

2
Mage.Sets/src/mage/cards/t/ThrunBreakerOfSilence.java
View file

@ -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));
}

2
Mage.Sets/src/mage/cards/t/TriumphantAdventurer.java
View file

@ -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.

6
Mage.Sets/src/mage/cards/v/VaultbornTyrant.java
View file

@ -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);

4
Mage.Sets/src/mage/cards/v/VibratingSphere.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/w/WardenOfTheWall.java
View file

@ -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));
}

3
Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java
View file

@ -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 + ", "