diff --git a/Mage.Sets/src/mage/cards/s/SublimeArchangel.java b/Mage.Sets/src/mage/cards/s/SublimeArchangel.java index b9c9c37f9f5..c6ff6133e43 100644 --- a/Mage.Sets/src/mage/cards/s/SublimeArchangel.java +++ b/Mage.Sets/src/mage/cards/s/SublimeArchangel.java @@ -34,7 +34,7 @@ public final class SublimeArchangel extends CardImpl { this.addAbility(new ExaltedAbility()); // Other creatures you control have exalted. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, - new GainAbilityControlledEffect(new ExaltedAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, true))); + new GainAbilityControlledEffect(new ExaltedAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); } private SublimeArchangel(final SublimeArchangel card) { diff --git a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java index 6d35732454d..68f63371231 100644 --- a/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java +++ b/Mage.Sets/src/mage/cards/v/VelaTheNightClad.java @@ -45,7 +45,7 @@ public final class VelaTheNightClad extends CardImpl { this.addAbility(new SimpleStaticAbility( Zone.BATTLEFIELD, new GainAbilityControlledEffect(IntimidateAbility.getInstance(), - Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, true))); + Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, true))); // Whenever Vela the Night-Clad or another creature you control leaves the battlefield, each opponent loses 1 life. Ability ability = new ZoneChangeAllTriggeredAbility( Zone.BATTLEFIELD, diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java index 081d8a82e77..0f64b2c6a5a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityAllEffect.java @@ -154,7 +154,7 @@ public class GainAbilityAllEffect extends ContinuousEffectImpl { } if (quotes) { sb.append('"'); - sb.append(CardUtil.getTextWithFirstCharUpperCase(ability.getRule())); + sb.append(CardUtil.stripReminderText(CardUtil.getTextWithFirstCharUpperCase(ability.getRule()))); sb.append('"'); } else { sb.append(ability.getRule()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java index 3d1e18f1bfb..e3f49dec782 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControlledEffect.java @@ -12,6 +12,7 @@ import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; +import mage.util.CardUtil; import java.util.Iterator; @@ -123,7 +124,7 @@ public class GainAbilityControlledEffect extends ContinuousEffectImpl { if (excludeSource) { sb.append("other "); } - String gainedAbility = ability.getRule(); + String gainedAbility = CardUtil.stripReminderText(ability.getRule()); sb.append(filter.getMessage()).append(" you control "); if (duration == Duration.WhileOnBattlefield || duration == Duration.EndOfGame) { sb.append("have "); diff --git a/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java b/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java index ab4eee7ef30..0d907951e67 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java @@ -21,7 +21,6 @@ import mage.players.Player; import mage.target.common.TargetControlledPermanent; import mage.util.CardUtil; -import java.util.Iterator; import java.util.Objects; import java.util.UUID; @@ -63,8 +62,8 @@ public class ConspireAbility extends StaticAbility implements OptionalAdditional } public String getReminder() { - return "as you cast this spell, you may tap two untapped creatures you control " + - "that share a color with it. When you do, copy it" + message; + return "As you cast this spell, you may tap two untapped creatures you control " + + "that share a color with it. When you do, copy it" + message + "."; } } @@ -132,8 +131,7 @@ public class ConspireAbility extends StaticAbility implements OptionalAdditional return; } ability.getAllEffects().setValue("ConspireActivation" + conspireId + addedById, true); - for (Iterator it = ((Costs) conspireCost).iterator(); it.hasNext(); ) { - Cost cost = (Cost) it.next(); + for (Cost cost : (Costs) conspireCost) { if (cost instanceof ManaCostsImpl) { ability.getManaCostsToPay().add((ManaCostsImpl) cost.copy()); } else { diff --git a/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java b/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java index 2c35e7f17df..5dba56d6a3b 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CrewAbility.java @@ -70,7 +70,7 @@ public class CrewAbility extends SimpleActivatedAbility { @Override public String getRule() { - return "Crew " + value + " (Tap any number of creatures you control with total power " + return "crew " + value + " (Tap any number of creatures you control with total power " + value + " or more: This Vehicle becomes an artifact creature until end of turn.)"; } } diff --git a/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java b/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java index 4caf6ce7a30..334fac1a17c 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java @@ -91,7 +91,7 @@ public class EvolveAbility extends EntersBattlefieldAllTriggeredAbility { @Override public String getRule() { - return "Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)"; + return "evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)"; } @Override