various text fixes

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

@@ -14,7 +14,7 @@ public class DiscardedByOpponentTriggeredAbility extends TriggeredAbilityImpl {
 
     public DiscardedByOpponentTriggeredAbility(Effect effect) {
         super(Zone.GRAVEYARD, effect, false);
-        setTriggerPhrase("When a spell or ability an opponent controls causes you to discard this card");
+        setTriggerPhrase("When a spell or ability an opponent controls causes you to discard this card, ");
     }
 
     protected DiscardedByOpponentTriggeredAbility(final DiscardedByOpponentTriggeredAbility ability) {

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

@@ -40,7 +40,7 @@ public class EndOfCombatTriggeredAbility extends AtStepTriggeredAbility {
             case ANY:
                 return "At end of combat, ";
             case YOU:
-                return "At the end of combat on your turn, ";
+                return "At end of combat on your turn, ";
             default:
                 throw new UnsupportedOperationException("Unsupported TargetController in EndOfCombatTriggeredAbility: " + targetController);
         }

Mage/src/main/java/mage/abilities/condition/common/AddendumCondition.java

@@ -27,4 +27,9 @@ public enum AddendumCondition implements Condition {
         Spell spell = game.getSpell(source.getSourceId());
         return spell != null && !spell.isCopy(); // copies are not casted
     }
+
+    @Override
+    public String toString() {
+        return "you cast it during your main phase";
+    }
 }

Mage/src/main/java/mage/abilities/condition/common/SourceAttackingPlayerWithMostLifeCondition.java

@@ -31,6 +31,6 @@ public enum SourceAttackingPlayerWithMostLifeCondition implements Condition {
 
     @Override
     public String toString() {
-        return "{this} is attacking the player with the most life or tied for most life";
+        return "it's attacking the player with the most life or tied for most life";
     }
 }

Mage/src/main/java/mage/abilities/condition/common/SourceEnteredThisTurnCondition.java

@@ -25,6 +25,6 @@ public enum SourceEnteredThisTurnCondition implements Condition {
 
     @Override
     public String toString() {
-        return "{this} " + (flag ? "entered" : "didn't enter") + " the battlefield this turn";
+        return "{this} " + (flag ? "entered" : "didn't enter the battlefield") + " this turn";
     }
 }

Mage/src/main/java/mage/abilities/condition/common/SourceInExileCondition.java

@@ -20,6 +20,6 @@ public enum SourceInExileCondition implements Condition {
 
     @Override
     public String toString() {
-        return "{this} is exiled";
+        return "this card is exiled";
     }
 }

Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java

@@ -43,7 +43,6 @@ public enum SuspendedCondition implements Condition {
 
     @Override
     public String toString() {
-        return "{this} is suspended";
+        return "this card is suspended";
     }
-
 }

Mage/src/main/java/mage/abilities/effects/CreateTokenCopySourceEffect.java

@@ -6,6 +6,7 @@ import mage.constants.Outcome;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.target.targetpointer.FixedTarget;
+import mage.util.CardUtil;
 
 /**
  * Created by glerman on 20/6/15.
@@ -27,7 +28,7 @@ public class CreateTokenCopySourceEffect extends OneShotEffect {
         super(Outcome.PutCreatureInPlay);
         this.number = copies;
         this.tapped = tapped;
-        staticText = "create " + (copies > 1 ? copies : "a") + " " + (tapped ? "tapped " : "")
+        staticText = "create " + CardUtil.numberToText(copies, "a") + " " + (tapped ? "tapped " : "")
                 + (copies > 1 ? "tokens that are" : "token that's") + " a copy of {this}";
     }
 

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

@@ -41,7 +41,7 @@ public class MeldEffect extends OneShotEffect {
         this.meldWithName = meldWithName;
         this.meldIntoName = meldIntoName;
         this.attacking = attacking;
-        this.staticText = "exile them, then meld them into " + meldWithName;
+        this.staticText = "exile them, then meld them into " + meldIntoName;
     }
 
     protected MeldEffect(final MeldEffect effect) {

Mage/src/main/java/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java

@@ -19,7 +19,7 @@ public class MustBeBlockedByAllTargetEffect extends RequirementEffect {
 
     public MustBeBlockedByAllTargetEffect(Duration duration) {
         super(duration);
-        staticText = "All creatures able to block target creature " +
+        staticText = "all creatures able to block target creature " +
                 (this.getDuration() == Duration.EndOfTurn ? "this turn " : "") +
                 "do so";
     }

Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityControllerEffect.java

@@ -2,12 +2,12 @@
 
 package mage.abilities.effects.common.continuous;
 
+import mage.abilities.Ability;
+import mage.abilities.effects.ContinuousEffectImpl;
 import mage.constants.Duration;
 import mage.constants.Layer;
 import mage.constants.Outcome;
 import mage.constants.SubLayer;
-import mage.abilities.Ability;
-import mage.abilities.effects.ContinuousEffectImpl;
 import mage.game.Game;
 import mage.players.Player;
 
@@ -34,7 +34,7 @@ public class GainAbilityControllerEffect extends ContinuousEffectImpl {
     public GainAbilityControllerEffect(Ability ability, Duration duration) {
         super(duration, Layer.PlayerEffects, SubLayer.NA, Outcome.AddAbility);
         this.ability = ability;
-        staticText = "You have " + ability.getRule();
+        staticText = "you " + (duration == Duration.WhileOnBattlefield ? "have" : "gain") + ability.getRule();
         if (!duration.toString().isEmpty()) {
             staticText += ' ' + duration.toString();
         }

Mage/src/main/java/mage/abilities/effects/common/cost/CastFromHandForFreeEffect.java

@@ -24,7 +24,7 @@ public class CastFromHandForFreeEffect extends OneShotEffect {
     public CastFromHandForFreeEffect(FilterCard filter) {
         super(Outcome.PlayForFree);
         this.filter = filter;
-        this.staticText = "you may cast " + filter.getMessage() + " from your hand without paying its mana cost";
+        this.staticText = "you may cast " + filter.getMessage() + (filter.getMessage().contains("your hand") ? "" : " from your hand") + " without paying its mana cost";
     }
 
     protected CastFromHandForFreeEffect(final CastFromHandForFreeEffect effect) {

Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java

@@ -150,7 +150,7 @@ public class AddManaInAnyCombinationEffect extends ManaEffect {
     }
 
     private String setText() {
-        StringBuilder sb = new StringBuilder("Add ");
+        StringBuilder sb = new StringBuilder("add ");
         String amountString = CardUtil.numberToText(amount.toString());
         sb.append(amountString);
         sb.append(" mana in any combination of ");

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

@@ -12,7 +12,7 @@ import mage.constants.SubType;
 public final class QueenMarchesaAssassinToken extends TokenImpl {
 
     public QueenMarchesaAssassinToken() {
-        super("Assassin Token", "1/1 black Assassin creature tokens with deathtouch and haste");
+        super("Assassin Token", "1/1 black Assassin creature token with deathtouch and haste");
         cardType.add(CardType.CREATURE);
         color.setBlack(true);
         subtype.add(SubType.ASSASSIN);

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

@@ -10,7 +10,7 @@ import mage.constants.SubType;
 public final class SandWarriorToken extends TokenImpl {
 
     public SandWarriorToken() {
-        super("Sand Warrior Token", "1/1 red, green, and white Sand Warrior creature tokens");
+        super("Sand Warrior Token", "1/1 red, green, and white Sand Warrior creature token");
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         color.setGreen(true);

Mage/src/main/java/mage/util/CardUtil.java

@@ -85,7 +85,7 @@ public final class CardUtil {
     public static final SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss.SSS");
 
     private static final List<String> costWords = Arrays.asList(
-            "put", "return", "exile", "discard", "sacrifice", "remove", "tap", "reveal", "pay", "collect", "forage"
+            "put", "return", "exile", "discard", "mill", "sacrifice", "remove", "tap", "reveal", "pay", "have", "collect", "forage"
     );
 
     // search set code in commands like "set_code-card_name"