github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

updated fight effect text

Browse source
This commit is contained in:
Evan Kranzler 2021-11-13 18:30:42 -05:00
parent b286d70447
commit 652dd49940
7 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/b/BrashTaunter.java
View file

@ -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);

3
Mage.Sets/src/mage/cards/f/FoeRazerRegent.java
View file

@ -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);

4
Mage.Sets/src/mage/cards/m/MarkovEnforcer.java
View file

@ -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);

2
Mage.Sets/src/mage/cards/n/NessianWildsRavager.java
View file

@ -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) {

2
Mage.Sets/src/mage/cards/p/PolukranosUnchained.java
View file

@ -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);

2
Mage.Sets/src/mage/cards/s/SomberwaldStag.java
View file

@ -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);

15
Mage/src/main/java/mage/abilities/effects/common/FightTargetSourceEffect.java
View file

@ -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();
}
}