From 219cfdc583e275fcecc038ad965b5ae7e79ad826 Mon Sep 17 00:00:00 2001 From: Andre Cabaca Date: Fri, 21 Aug 2020 12:41:27 +0100 Subject: [PATCH 1/3] Fixed BarrinTolarianArchmage oracle in #6643 Fixed all the "return up to one (...) to **their** owners and" to "return up to one (...) to **its** owners and" found in cards like Teferi Time Raveler or Barrin Tolarian Archmage Signed-off-by: Andre Cabaca --- .../src/mage/cards/b/BarrinTolarianArchmage.java | 2 +- .../effects/common/ReturnToHandTargetEffect.java | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java b/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java index 7bdf6f46fda..840a3a3efc7 100644 --- a/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java +++ b/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java @@ -29,7 +29,7 @@ import java.util.UUID; public final class BarrinTolarianArchmage extends CardImpl { private static final FilterCreatureOrPlaneswalkerPermanent filter - = new FilterCreatureOrPlaneswalkerPermanent("other target creature or planeswalker"); + = new FilterCreatureOrPlaneswalkerPermanent(" other target creature or planeswalker"); static { filter.add(AnotherPredicate.instance); 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 6f932960ff0..e5f2e70597b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java @@ -90,15 +90,13 @@ public class ReturnToHandTargetEffect extends OneShotEffect { } Target target = mode.getTargets().get(0); StringBuilder sb = new StringBuilder("return "); - if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) { + if (target.getMinNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) { sb.append("up to "); sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())); if (!target.getTargetName().contains("target")) { sb.append(" target "); } sb.append(target.getTargetName()); - sb.append(" to their owners' hand"); - return sb.toString(); } else { if (target.getNumberOfTargets() > 1) { sb.append(CardUtil.numberToText(target.getNumberOfTargets())).append(' '); @@ -106,9 +104,14 @@ public class ReturnToHandTargetEffect extends OneShotEffect { if (!target.getTargetName().startsWith("another")) { sb.append("target "); } - sb.append(target.getTargetName()).append(" to its owner's hand"); - return sb.toString(); } + if(target.getMaxNumberOfTargets() > 1) { + sb.append(" to their owners' hand"); + } + else { + sb.append(target.getTargetName()).append(" to its owner's hand"); + } + return sb.toString(); } } From c069cf42354069e673bf946f76a15395b67a3c98 Mon Sep 17 00:00:00 2001 From: Andre Cabaca Date: Fri, 21 Aug 2020 13:22:52 +0100 Subject: [PATCH 2/3] Fixed Caged Zombie in issue #6643 Fixed also cards with the same condition in an activated ability like Skirsdag High Priest Signed-off-by: Andre Cabaca --- .../abilities/common/ActivateIfConditionActivatedAbility.java | 3 ++- .../mage/abilities/decorator/ConditionalActivatedAbility.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/common/ActivateIfConditionActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/ActivateIfConditionActivatedAbility.java index 2d6fe3a254e..425baedf81a 100644 --- a/Mage/src/main/java/mage/abilities/common/ActivateIfConditionActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ActivateIfConditionActivatedAbility.java @@ -37,7 +37,8 @@ public class ActivateIfConditionActivatedAbility extends ActivatedAbilityImpl { sb.append(" Activate this ability only "); } if (!condition.toString().startsWith("during") - && !condition.toString().startsWith("before")) { + && !condition.toString().startsWith("before") + && !condition.toString().startsWith("if")) { sb.append("if "); } sb.append(condition.toString()).append('.'); diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java index b7532805385..79173cd9f4c 100644 --- a/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java @@ -73,7 +73,9 @@ public class ConditionalActivatedAbility extends ActivatedAbilityImpl { } String conditionText = condition.toString(); String additionalText = "if "; - if (conditionText.startsWith("during")) { + if (conditionText.startsWith("during") + || conditionText.startsWith("before") + || conditionText.startsWith("if")) { additionalText = ""; } return super.getRule() + " Activate this ability only " + additionalText + condition.toString() + "."; From 1e889c6a6d68d1a2ca549acf1d89eb0175a9428a Mon Sep 17 00:00:00 2001 From: Andre Cabaca Date: Fri, 21 Aug 2020 13:55:26 +0100 Subject: [PATCH 3/3] Fixed KaervekTheSpiteful's oracle in #6643 Signed-off-by: Andre Cabaca --- Mage.Sets/src/mage/cards/k/KaervekTheSpiteful.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/k/KaervekTheSpiteful.java b/Mage.Sets/src/mage/cards/k/KaervekTheSpiteful.java index 7f95219b038..66e8124b6ff 100644 --- a/Mage.Sets/src/mage/cards/k/KaervekTheSpiteful.java +++ b/Mage.Sets/src/mage/cards/k/KaervekTheSpiteful.java @@ -29,7 +29,7 @@ public final class KaervekTheSpiteful extends CardImpl { // Other creatures get -1/-1. this.addAbility(new SimpleStaticAbility(new BoostAllEffect( -1, -1, Duration.WhileOnBattlefield, true - ).setText("other creatures get +1/+1"))); + ).setText("other creatures get -1/-1"))); } private KaervekTheSpiteful(final KaervekTheSpiteful card) {