Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

text fixes [WOE] etc. (#11035)

Browse source 
* Fix Callous Sell Sword text

* simple text fixes

* fix some target texts
This commit is contained in:
Susucre 2023-08-27 01:34:49 +02:00 • committed by GitHub
parent c4e48a6f95
commit a9870b6ff8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 58 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
View file

@ -178,7 +178,10 @@ public class DamageTargetEffect extends OneShotEffect {
sb.append(' ');
}
}
sb.append("target ").append(targetName);
if (!targetName.contains("target ")) {
sb.append("target ");
}
sb.append(targetName);
}
} else {
sb.append("that target");

8
Mage/src/main/java/mage/abilities/effects/common/PreventNextDamageFromChosenSourceToTargetEffect.java
View file

@ -70,8 +70,12 @@ public class PreventNextDamageFromChosenSourceToTargetEffect extends PreventionE
@Override
public String getText(Mode mode) {
StringBuilder sb = new StringBuilder("The next time a ").append(targetSource.getFilter().getMessage());
sb.append(" of your choice would deal damage to target ");
sb.append(mode.getTargets().get(0).getTargetName());
sb.append(" of your choice would deal damage to ");
String targetName = mode.getTargets().get(0).getTargetName();
if (!targetName.contains("target ") && !targetName.endsWith("any target")) {
sb.append("target ");
}
sb.append(targetName);
if (duration == Duration.EndOfTurn) {
sb.append(" this turn");
}

14
Mage/src/main/java/mage/target/TargetImpl.java
View file

@ -119,7 +119,19 @@ public abstract class TargetImpl implements Target {
sb.append(CardUtil.numberToText(max));
sb.append(' ');
}
if (!isNotTarget() && !getTargetName().contains("target ") && !getTargetName().endsWith("any target")) {
boolean addTargetWord = false;
if (!isNotTarget()) {
addTargetWord = true;
if (getTargetName().contains("target ")) {
addTargetWord = false;
} else if (getTargetName().endsWith("any target")
|| getTargetName().endsWith("any other target")) {
addTargetWord = false;
}
// endsWith needs to be specific.
// e.g. "spell with a single target" => need to prefix with "target ".
}
if (addTargetWord) {
sb.append("target ");
}
if (isNotTarget() && min == 1 && max == 1) {

6
Mage/src/main/java/mage/target/common/TargetAnyTarget.java
View file

@ -7,7 +7,7 @@ import mage.filter.common.FilterAnyTarget;
*/
public class TargetAnyTarget extends TargetPermanentOrPlayer {
private static final FilterAnyTarget filter = new FilterAnyTarget();
private static final FilterAnyTarget defaultFilter = new FilterAnyTarget();
public TargetAnyTarget() {
this(1);
@ -18,6 +18,10 @@ public class TargetAnyTarget extends TargetPermanentOrPlayer {
}
public TargetAnyTarget(int minNumTargets, int maxNumTargets) {
this(minNumTargets, maxNumTargets, defaultFilter);
}
public TargetAnyTarget(int minNumTargets, int maxNumTargets, FilterAnyTarget filter) {
super(minNumTargets, maxNumTargets, filter, false);
}