From 0f6b8bbe9e1f0f5dfa6cc606a32a79d9cefceed5 Mon Sep 17 00:00:00 2001 From: Andre Cabaca Date: Sun, 30 Aug 2020 11:54:13 +0100 Subject: [PATCH 1/3] Fixing an issue with the "return to its owner's hand" that was duplicating the target text. Signed-off-by: Andre Cabaca --- .../mage/abilities/effects/common/ReturnToHandTargetEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e5f2e70597b..0ad9ae19121 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java @@ -109,7 +109,7 @@ public class ReturnToHandTargetEffect extends OneShotEffect { sb.append(" to their owners' hand"); } else { - sb.append(target.getTargetName()).append(" to its owner's hand"); + sb.append(" to its owner's hand"); } return sb.toString(); } From 36a3008f4c48c737c57ac759f4689d32bbc722b8 Mon Sep 17 00:00:00 2001 From: Andre Cabaca Date: Sun, 30 Aug 2020 12:49:24 +0100 Subject: [PATCH 2/3] Optimized "Return to hand" effect text Signed-off-by: Andre Cabaca --- .../common/ReturnToHandTargetEffect.java | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) 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 0ad9ae19121..8c5e158eb48 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java @@ -90,21 +90,17 @@ public class ReturnToHandTargetEffect extends OneShotEffect { } Target target = mode.getTargets().get(0); StringBuilder sb = new StringBuilder("return "); - if (target.getMinNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) { + if (target.getMinNumberOfTargets() == 0 && target.getMaxNumberOfTargets() >= 1) { sb.append("up to "); - sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())); - if (!target.getTargetName().contains("target")) { - sb.append(" target "); - } - sb.append(target.getTargetName()); - } else { - if (target.getNumberOfTargets() > 1) { - sb.append(CardUtil.numberToText(target.getNumberOfTargets())).append(' '); - } - if (!target.getTargetName().startsWith("another")) { - sb.append("target "); - } + sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" "); } + 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' hand"); } From 7926c7c7d7a91bde3587ecb0d20ca753b35e8e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Caba=C3=A7a?= <61804801+acabaca24@users.noreply.github.com> Date: Mon, 31 Aug 2020 00:56:30 +0100 Subject: [PATCH 3/3] Missing 's' in effect In the line 'sb.append(" to their owners' hand");' changed "hand" to "hands". --- .../mage/abilities/effects/common/ReturnToHandTargetEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8c5e158eb48..300ebeefea6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java @@ -102,7 +102,7 @@ public class ReturnToHandTargetEffect extends OneShotEffect { } sb.append(target.getTargetName()); if(target.getMaxNumberOfTargets() > 1) { - sb.append(" to their owners' hand"); + sb.append(" to their owners' hands"); } else { sb.append(" to its owner's hand");