diff --git a/Mage.Sets/src/mage/cards/a/ArchelosLagoonMystic.java b/Mage.Sets/src/mage/cards/a/ArchelosLagoonMystic.java index c7c8872e7fe..e8518bf64d4 100644 --- a/Mage.Sets/src/mage/cards/a/ArchelosLagoonMystic.java +++ b/Mage.Sets/src/mage/cards/a/ArchelosLagoonMystic.java @@ -53,7 +53,7 @@ class ArchelosLagoonMysticEffect extends ReplacementEffectImpl { super(Duration.WhileOnBattlefield, Outcome.Benefit); this.tapped = tapped; staticText = "as long as {this} is " - + (tapped ? "" : "un") + "tapped, other permanents enter the battlefield " + + (tapped ? "" : "un") + "tapped, other permanents enter " + (tapped ? "" : "un") + "tapped"; } diff --git a/Mage.Sets/src/mage/cards/c/ChandrasPyreling.java b/Mage.Sets/src/mage/cards/c/ChandrasPyreling.java index 7bb6954b745..8eaf21d8798 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasPyreling.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasPyreling.java @@ -28,8 +28,8 @@ public final class ChandrasPyreling extends CardImpl { this.toughness = new MageInt(3); // Whenever a source you control deals noncombat damage to an opponent, Chandra's Pyreling gets +1/+0 and gains double strike until end of turn. - Ability ability = new SourceDealsNoncombatDamageToOpponentTriggeredAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn).setText(" this creature gets +1/+0")); - ability.addEffect(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn).setText("gains double strike until end of turn").concatBy("and")); + Ability ability = new SourceDealsNoncombatDamageToOpponentTriggeredAbility(new BoostSourceEffect(1, 0, Duration.EndOfTurn).setText("this creature gets +1/+0")); + ability.addEffect(new GainAbilitySourceEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn).setText("and gains double strike until end of turn")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WelcomingVampire.java b/Mage.Sets/src/mage/cards/w/WelcomingVampire.java index 1b3ffd7a0c2..507783572ea 100644 --- a/Mage.Sets/src/mage/cards/w/WelcomingVampire.java +++ b/Mage.Sets/src/mage/cards/w/WelcomingVampire.java @@ -21,7 +21,7 @@ import java.util.UUID; */ public final class WelcomingVampire extends CardImpl { - private static final FilterPermanent filter = new FilterControlledCreaturePermanent("one or more other creatures with power 2 or less"); + private static final FilterPermanent filter = new FilterControlledCreaturePermanent("one or more other creatures you control with power 2 or less"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java index 0000eafc3ba..b3e20a2d92b 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java @@ -333,7 +333,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge } } if (replaceRuleText && triggerPhrase != null) { - superRule = superRule.replaceFirst("^((?:you may )?sacrifice |(put|remove) [^ ]+ [^ ]+ counters? (on|from) |return |transform |untap |regenerate )?\\{this\\}", "$1it"); + superRule = superRule.replaceFirst("^((?:you may )?sacrifice |(put|remove) [^ ]+ [^ ]+ counters? (on|from) |return |transform |untap |regenerate |attach )?\\{this\\}", "$1it"); } sb.append(superRule); if (triggerLimitEachTurn != Integer.MAX_VALUE) { diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAttachToTarget.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAttachToTarget.java index 91a0e644e63..3c3195d00d8 100644 --- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAttachToTarget.java +++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAttachToTarget.java @@ -17,6 +17,7 @@ public class EntersBattlefieldAttachToTarget extends EntersBattlefieldTriggeredA public EntersBattlefieldAttachToTarget(FilterPermanent filter) { super(new AttachEffect(Outcome.BoostCreature, "attach {this} to target " + filter.getMessage())); + this.withRuleTextReplacement(true); // default "it" but a few exceptions this.addTarget(new TargetPermanent(filter)); }