From 652dd4994007960d369396aa1f0e439e3ada4495 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sat, 13 Nov 2021 18:30:42 -0500 Subject: [PATCH] updated fight effect text --- Mage.Sets/src/mage/cards/b/BrashTaunter.java | 2 +- Mage.Sets/src/mage/cards/f/FoeRazerRegent.java | 3 +-- Mage.Sets/src/mage/cards/m/MarkovEnforcer.java | 4 +++- .../src/mage/cards/n/NessianWildsRavager.java | 2 +- .../src/mage/cards/p/PolukranosUnchained.java | 2 +- Mage.Sets/src/mage/cards/s/SomberwaldStag.java | 2 +- .../effects/common/FightTargetSourceEffect.java | 15 +++++++++++---- 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BrashTaunter.java b/Mage.Sets/src/mage/cards/b/BrashTaunter.java index 44bd96e3dc..ca83be0f18 100644 --- a/Mage.Sets/src/mage/cards/b/BrashTaunter.java +++ b/Mage.Sets/src/mage/cards/b/BrashTaunter.java @@ -31,7 +31,7 @@ import java.util.UUID; public final class BrashTaunter extends CardImpl { - private static final FilterPermanent filter = new FilterCreaturePermanent(); + private static final FilterPermanent filter = new FilterCreaturePermanent("another target creature"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java b/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java index 188274190a..1f2b30ccf9 100644 --- a/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java +++ b/Mage.Sets/src/mage/cards/f/FoeRazerRegent.java @@ -19,7 +19,6 @@ import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; @@ -41,7 +40,7 @@ public final class FoeRazerRegent extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Foe-Razer Regent enters the battlefield, you may have it fight target creature you don't control. - Ability ability = new EntersBattlefieldTriggeredAbility(new FightTargetSourceEffect(), true); + Ability ability = new EntersBattlefieldTriggeredAbility(new FightTargetSourceEffect().setText("you may have it fight target creature you don't control"), true); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MarkovEnforcer.java b/Mage.Sets/src/mage/cards/m/MarkovEnforcer.java index 8070df95cd..8f4d494c6c 100644 --- a/Mage.Sets/src/mage/cards/m/MarkovEnforcer.java +++ b/Mage.Sets/src/mage/cards/m/MarkovEnforcer.java @@ -33,7 +33,9 @@ public final class MarkovEnforcer extends CardImpl { this.toughness = new MageInt(6); // Whenever Markov Enforcer or another Vampire enters the battlefield under your control, Markov Enforcer fights up to one target creature an opponent controls. - Ability ability = new EntersBattlefieldThisOrAnotherTriggeredAbility(new FightTargetSourceEffect(), filter); + Ability ability = new EntersBattlefieldThisOrAnotherTriggeredAbility( + new FightTargetSourceEffect(), filter, false, true + ); ability.addTarget(new TargetOpponentsCreaturePermanent(0, 1)); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java b/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java index 2d3609755e..39546a067c 100644 --- a/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java +++ b/Mage.Sets/src/mage/cards/n/NessianWildsRavager.java @@ -41,7 +41,7 @@ public final class NessianWildsRavager extends CardImpl { TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new FightTargetSourceEffect(), true); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, TributeNotPaidCondition.instance, - "When {this} enters the battlefield, if its tribute wasn't paid, you may have {this} fight another target creature.")); + "When {this} enters the battlefield, if tribute wasn't paid, you may have {this} fight another target creature.")); } private NessianWildsRavager(final NessianWildsRavager card) { diff --git a/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java b/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java index 5831803e51..01457a08f4 100644 --- a/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java +++ b/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java @@ -32,7 +32,7 @@ import java.util.UUID; */ public final class PolukranosUnchained extends CardImpl { - private static final FilterPermanent filter = new FilterCreaturePermanent(); + private static final FilterPermanent filter = new FilterCreaturePermanent("another target creature"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/s/SomberwaldStag.java b/Mage.Sets/src/mage/cards/s/SomberwaldStag.java index 4bf30c5e7c..3d3e33fda4 100644 --- a/Mage.Sets/src/mage/cards/s/SomberwaldStag.java +++ b/Mage.Sets/src/mage/cards/s/SomberwaldStag.java @@ -27,7 +27,7 @@ public final class SomberwaldStag extends CardImpl { // When Somberwald Stag enters the battlefield, you may have it fight target creature you don't control. Effect effect = new FightTargetSourceEffect(); - effect.setText("have it fight target creature you don't control"); + effect.setText("you may have it fight target creature you don't control"); Ability ability = new EntersBattlefieldTriggeredAbility(effect, true); ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL)); this.addAbility(ability); diff --git a/Mage/src/main/java/mage/abilities/effects/common/FightTargetSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FightTargetSourceEffect.java index 045dd07ce4..ad0858af48 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/FightTargetSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/FightTargetSourceEffect.java @@ -1,4 +1,3 @@ - package mage.abilities.effects.common; import mage.MageObject; @@ -8,9 +7,9 @@ import mage.abilities.effects.OneShotEffect; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; +import mage.target.Target; /** - * * @author LevelX2 */ public class FightTargetSourceEffect extends OneShotEffect { @@ -52,7 +51,15 @@ public class FightTargetSourceEffect extends OneShotEffect { if (staticText != null && !staticText.isEmpty()) { return staticText; } - return new StringBuilder("{this} fights another target ").append(mode.getTargets().get(0).getTargetName()).toString(); + Target target = mode.getTargets().get(0); + StringBuilder sb = new StringBuilder("{this} fights "); + if (target.getMinNumberOfTargets() == 0 && target.getMaxNumberOfTargets() == 1) { + sb.append("up to one "); + } + if (!target.getTargetName().contains("other")) { + sb.append("target "); + } + sb.append(target.getTargetName()); + return sb.toString(); } - }