Text fixes [M10] [M11] [M12] [M13] [M14] [M15] [ORI] (#10630)

* Text fixes M10-ORI core sets, part 1

* Text fixes M10-ORI core sets, part 2

* Text fixes M10-ORI core sets, part 3

* another text fix

Mage/src/main/java/mage/abilities/common/BeginningOfCombatTriggeredAbility.java

@@ -80,7 +80,7 @@ public class BeginningOfCombatTriggeredAbility extends TriggeredAbilityImpl {
             case YOU:
                 return "At the beginning of combat on your turn, " + generateZoneString();
             case OPPONENT:
-                return "At the beginning of each opponent's combat step, " + generateZoneString();
+                return "At the beginning of combat on each opponent's turn, " + generateZoneString();
             case EACH_PLAYER:
                 return "At the beginning of combat on each player's turn, " + generateZoneString();
             case ANY:

Mage/src/main/java/mage/abilities/effects/common/CantBeCounteredControlledEffect.java

@@ -82,6 +82,9 @@ public class CantBeCounteredControlledEffect extends ContinuousRuleModifyingEffe
         if (filterSource != null) {
             sb.append(" by ").append(filterSource.getMessage());
         }
+        if (duration == Duration.EndOfTurn) {
+            sb.append(" this turn");
+        }
         staticText = sb.toString();
     }
 

Mage/src/main/java/mage/abilities/effects/common/CantBeTargetedAllEffect.java

@@ -90,7 +90,9 @@ public class CantBeTargetedAllEffect extends ContinuousRuleModifyingEffectImpl {
         } else {
             sb.append("spells");
         }
-        if (!duration.toString().isEmpty()) {
+        if (duration == Duration.EndOfTurn) {
+            sb.append(" this turn");
+        } else if (!duration.toString().isEmpty()) {
             sb.append(' ').append(duration.toString());
         }
         staticText = sb.toString();

Mage/src/main/java/mage/abilities/effects/common/CantBeTargetedSourceEffect.java

@@ -68,7 +68,9 @@ public class CantBeTargetedSourceEffect extends ContinuousRuleModifyingEffectImp
         StringBuilder sb = new StringBuilder();
         sb.append("{this} can't be the target of ");
         sb.append(filterSource.getMessage());
-        sb.append(' ').append(duration.toString());
+        if (!duration.toString().isEmpty()) {
+            sb.append(' ').append(duration.toString());
+        }
         staticText = sb.toString();
     }
 

Mage/src/main/java/mage/abilities/effects/common/ChangeATargetOfTargetSpellAbilityToSourceEffect.java

@@ -22,7 +22,7 @@ public class ChangeATargetOfTargetSpellAbilityToSourceEffect extends OneShotEffe
 
     public ChangeATargetOfTargetSpellAbilityToSourceEffect() {
         super(Outcome.Neutral);
-        staticText = "Change a target of target spell or ability to {this}";
+        staticText = "change a target of target spell or ability to {this}";
     }
 
     public ChangeATargetOfTargetSpellAbilityToSourceEffect(final ChangeATargetOfTargetSpellAbilityToSourceEffect effect) {

Mage/src/main/java/mage/abilities/effects/common/ExileAndReturnSourceEffect.java

@@ -92,6 +92,7 @@ public class ExileAndReturnSourceEffect extends OneShotEffect {
         }
         return "exile {this}, then return " + pronoun.getObjective() + ' ' +
                 putCards.getMessage(false, false).replace("onto", "to") + " under " +
-                (this.returnUnderYourControl ? "your" : pronoun.getPossessive() + ' ' + "owner's") + " control";
+                (returnUnderYourControl ? "your" : pronoun.getPossessive() + " owner's") + " control"
+                + (additionalEffect == null ? "" : ". If you do, " + additionalEffect.getText(mode));
     }
 }

Mage/src/main/java/mage/abilities/keyword/ProtectionAbility.java

@@ -11,7 +11,6 @@ import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.game.stack.Spell;
-import mage.game.stack.StackObject;
 import mage.players.Player;
 import mage.util.CardUtil;
 
@@ -74,7 +73,7 @@ public class ProtectionAbility extends StaticAbility {
 
     @Override
     public String getRule() {
-        return "protection from " + filter.getMessage() + (removeAuras ? "" : ". This effect doesn't remove auras.");
+        return "protection from " + filter.getMessage() + (removeAuras ? "" : ". This effect doesn't remove Auras.");
     }
 
     public boolean canTarget(MageObject source, Game game) {

Mage/src/main/java/mage/filter/StaticFilters.java

@@ -26,6 +26,10 @@ import mage.filter.predicate.permanent.TokenPredicate;
  */
 public final class StaticFilters {
 
+    // Hide constructor - not to be instantiated
+    private StaticFilters() {
+    }
+
     public static final FilterSpiritOrArcaneCard FILTER_SPIRIT_OR_ARCANE_CARD = new FilterSpiritOrArcaneCard();
 
     static {
@@ -261,7 +265,6 @@ public final class StaticFilters {
         FILTER_PERMANENT_ENCHANTMENT.setLockedFilter(true);
     }
 
-
     public static final FilterEnchantmentPermanent FILTER_PERMANENT_ENCHANTMENTS = new FilterEnchantmentPermanent("enchantments");
 
     static {

Mage/src/main/java/mage/game/command/emblems/GarrukApexPredatorEmblem.java

@@ -28,7 +28,7 @@ public final class GarrukApexPredatorEmblem extends Emblem {
         effect.setText("it gets +5/+5");
         Ability ability = new AttackedByCreatureTriggeredAbility(Zone.COMMAND, effect, false, SetTargetPointer.PERMANENT);
         effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn);
-        ability.addEffect(effect.concatBy("and"));
+        ability.addEffect(effect.setText("and gains trample until end of turn"));
         this.getAbilities().add(ability);
     }
 

Mage/src/main/java/mage/game/permanent/token/SquidToken.java

@@ -11,7 +11,7 @@ import mage.constants.SubType;
 public final class SquidToken extends TokenImpl {
 
     public SquidToken() {
-        super("Squid Token", "1/1 blue Squid creature token with Islandwalk");
+        super("Squid Token", "1/1 blue Squid creature token with islandwalk");
         cardType.add(CardType.CREATURE);
         color.setBlue(true);
         subtype.add(SubType.SQUID);