External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated some fight effect text

Browse source
This commit is contained in:
Evan Kranzler 2021-11-14 15:30:27 -05:00
parent c355834a4e
commit b625aa05c5
19 changed files with 52 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/abilities/effects/common/DamageWithPowerFromOneToAnotherTargetEffect.java
View file

@ -64,10 +64,10 @@ public class DamageWithPowerFromOneToAnotherTargetEffect extends OneShotEffect {
throw new IllegalStateException("It must have two targets, but found " + mode.getTargets().size());
}
String targetName = mode.getTargets().get(1).getTargetName();
// Target creature you control deals damage equal to its power to target creature you don't control
String sb = (this.firstTargetName != null ? this.firstTargetName : "Target " + mode.getTargets().get(0).getTargetName()) +
" deals damage equal to its power to target " +
mode.getTargets().get(1).getTargetName();
" deals damage equal to its power to " + (targetName.contains("other") ? "" : "target ") + targetName;
return sb;
}
}

20
Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java
View file

@ -7,6 +7,7 @@ import mage.cards.Card;
import mage.constants.Outcome;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.Target;
import java.util.UUID;
@ -19,11 +20,6 @@ public class FightTargetsEffect extends OneShotEffect {
super(Outcome.Damage);
}
public FightTargetsEffect(String effectText) {
this();
this.staticText = effectText;
}
public FightTargetsEffect(final FightTargetsEffect effect) {
super(effect);
}
@ -70,18 +66,20 @@ public class FightTargetsEffect extends OneShotEffect {
@Override
public FightTargetsEffect copy() {
return new FightTargetsEffect(this);
}
@Override
public String getText(Mode mode) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
return "target " + mode
.getTargets().get(0).getTargetName() + " fights another target " + mode
.getTargets().get(1).getTargetName();
Target target=mode.getTargets().get(1);
StringBuilder sb=new StringBuilder("target ");
sb.append(mode.getTargets().get(0).getTargetName());
sb.append(" fights ");
if(!target.getTargetName().contains("other")){
sb.append("target ");
}
sb.append(target.getTargetName());return sb.toString();
}
}

7
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -9,6 +9,7 @@ import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.AnotherPredicate;
import mage.filter.predicate.mageobject.KickedSpellPredicate;
import mage.filter.predicate.mageobject.MulticoloredPredicate;
import mage.filter.predicate.other.AnotherTargetPredicate;
import mage.filter.predicate.permanent.AttackingPredicate;
import mage.filter.predicate.permanent.TappedPredicate;
import mage.filter.predicate.permanent.TokenPredicate;
@ -415,6 +416,12 @@ public final class StaticFilters {
FILTER_OPPONENTS_PERMANENT_ARTIFACT_OR_CREATURE.setLockedFilter(true);
}
public static final FilterCreaturePermanent FILTER_ANOTHER_CREATURE_TARGET_2 = new FilterCreaturePermanent("another target creature");
static {
FILTER_ANOTHER_CREATURE_TARGET_2.add(new AnotherTargetPredicate(2));
}
public static final FilterCreaturePermanent FILTER_CREATURE_YOU_DONT_CONTROL = new FilterCreaturePermanent("creature you don't control");
static {