From 665528b2512a9fb3eea3c7e7bb69a8bedea6831d Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Wed, 7 Oct 2020 09:28:12 -0400
Subject: [PATCH] [M21] some more text fixes

---
 Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java     |  2 +-
 Mage.Sets/src/mage/cards/s/SanguineIndulgence.java    |  1 +
 Mage.Sets/src/mage/cards/s/StormwingEntity.java       | 10 ++++++++--
 .../effects/common/ReturnToHandTargetEffect.java      | 11 ++++++-----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java b/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java
index 5bf4ad432d2..431d697ef0b 100644
--- a/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java
+++ b/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java
@@ -51,7 +51,7 @@ public final class AlpineHoundmaster extends CardImpl {
         // Whenever Alpine Houndmaster attacks, it gets +X/+0 until end of turn, where X is the number of other attacking creatures.
         this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(
                 xValue, StaticValue.get(0), Duration.EndOfTurn, true
-        ), false));
+        ).setText("it gets +X/+0 until end of turn, where X is the number of other attacking creatures"), false));
     }
 
     private AlpineHoundmaster(final AlpineHoundmaster card) {
diff --git a/Mage.Sets/src/mage/cards/s/SanguineIndulgence.java b/Mage.Sets/src/mage/cards/s/SanguineIndulgence.java
index 1b17df6ac34..e8a59ffcc9e 100644
--- a/Mage.Sets/src/mage/cards/s/SanguineIndulgence.java
+++ b/Mage.Sets/src/mage/cards/s/SanguineIndulgence.java
@@ -32,6 +32,7 @@ public final class SanguineIndulgence extends CardImpl {
         // This spell costs {3} less to cast if you've gained 3 or more life this turn.
         this.addAbility(new SimpleStaticAbility(
                         Zone.ALL, new SpellCostReductionSourceEffect(3, condition)
+                        .setText("this spell costs {3} less to cast if you've gained 3 or more life this turn")
                 ).addHint(hint).setRuleAtTheTop(true),
                 new PlayerGainedLifeWatcher());
 
diff --git a/Mage.Sets/src/mage/cards/s/StormwingEntity.java b/Mage.Sets/src/mage/cards/s/StormwingEntity.java
index d5c107d3f8d..12d426aae51 100644
--- a/Mage.Sets/src/mage/cards/s/StormwingEntity.java
+++ b/Mage.Sets/src/mage/cards/s/StormwingEntity.java
@@ -1,7 +1,5 @@
 package mage.cards.s;
 
-import java.util.List;
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@@ -22,6 +20,9 @@ import mage.game.Game;
 import mage.game.stack.Spell;
 import mage.watchers.common.SpellsCastWatcher;
 
+import java.util.List;
+import java.util.UUID;
+
 /**
  * @author TheElk801
  */
@@ -84,4 +85,9 @@ enum StormwingEntityCondition implements Condition {
         }
         return false;
     }
+
+    @Override
+    public String toString() {
+        return "you've cast an instant or sorcery spell this turn";
+    }
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java
index 300ebeefea6..34bba39ab00 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java
@@ -93,18 +93,19 @@ public class ReturnToHandTargetEffect extends OneShotEffect {
         if (target.getMinNumberOfTargets() == 0 && target.getMaxNumberOfTargets() >= 1) {
             sb.append("up to ");
             sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" ");
-        }
-        else if (!(target.getMinNumberOfTargets() == 1 || target.getMaxNumberOfTargets() == 1)) {
+        } else if (!(target.getMinNumberOfTargets() == 1 || target.getMaxNumberOfTargets() == 1)) {
             sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" ");
         }
         if (!target.getTargetName().contains("target")) {
             sb.append("target ");
         }
         sb.append(target.getTargetName());
-        if(target.getMaxNumberOfTargets() > 1) {
-            sb.append(" to their owners' hands");
+        if (target.getMaxNumberOfTargets() > 1 && !target.getTargetName().endsWith("s")) {
+            sb.append('s');
         }
-        else {
+        if (target.getMaxNumberOfTargets() > 1) {
+            sb.append(" to their owners' hands");
+        } else {
             sb.append(" to its owner's hand");
         }
         return sb.toString();