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

[ELD] various text fixes

Browse source
This commit is contained in:
Evan Kranzler 2020-10-07 20:57:43 -04:00
parent 6a3240fad3
commit 50a0954606
29 changed files with 80 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
View file

@ -136,9 +136,10 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
case OPPONENT:
return sb.insert(0, generateZoneString()).insert(0, "At the beginning of each opponent's upkeep, ").toString();
case ANY:
return sb.insert(0, generateZoneString()).insert(0, "At the beginning of each player's upkeep, ").toString();
case ACTIVE:
return sb.insert(0, generateZoneString()).insert(0, "At the beginning of each player's upkeep, ").toString();
case EACH_PLAYER:
return sb.insert(0, generateZoneString()).insert(0, "At the beginning of each upkeep, ").toString();
case CONTROLLER_ATTACHED_TO:
return sb.insert(0, generateZoneString()).insert(0, "At the beginning of the upkeep of enchanted creature's controller, ").toString();
}

2
Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java
View file

@ -23,7 +23,7 @@ public class TapTargetCost extends CostImpl {
this.target.setNotTarget(true); // costs are never targeted
this.target.setRequired(false); // can be cancel by user
this.text
= new StringBuilder("Tap ")
= new StringBuilder("tap ")
.append((target.getTargetName().startsWith("a ") || target.getTargetName().startsWith("an ") || target.getTargetName().startsWith("another"))
? "" : CardUtil.numberToText(target.getMaxNumberOfTargets()) + ' ')
.append(target.getTargetName()).toString();

9
Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java
View file

@ -71,8 +71,7 @@ public class CreateTokenTargetEffect extends OneShotEffect {
if (mode.getTargets().isEmpty()) {
sb.append("that player");
}
else {
} else {
sb.append("target ").append(mode.getTargets().get(0).getTargetName());
}
@ -90,11 +89,11 @@ public class CreateTokenTargetEffect extends OneShotEffect {
}
sb.append(token.getDescription());
if (token.getDescription().endsWith("token")) {
sb.append("s ");
sb.append("s");
}
int tokenLocation = sb.indexOf("token ");
int tokenLocation = sb.indexOf("token");
if (tokenLocation != -1) {
sb.replace(tokenLocation, tokenLocation + 6, "tokens ");
sb.replace(tokenLocation, tokenLocation + 6, "tokens");
}
}
if (attacking) {

1
Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java
View file

@ -160,6 +160,7 @@ public class DoIfCostPaid extends OneShotEffect {
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("discard")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("sacrifice")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("remove")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("tap")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("pay")) {
sb.append("pay ");
}

1
Mage/src/main/java/mage/abilities/effects/common/DoWhenCostPaid.java
View file

@ -86,6 +86,7 @@ public class DoWhenCostPaid extends OneShotEffect {
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("discard")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("sacrifice")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("remove")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("tap")
&& !costText.toLowerCase(Locale.ENGLISH).startsWith("pay")) {
sb.append("pay ");
}

3
Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java
View file

@ -88,7 +88,8 @@ public class SacrificeAllEffect extends OneShotEffect {
sb.append(amount.toString());
sb.append(' ');
} else if (!filter.getMessage().startsWith("a ")) {
sb.append(CardUtil.numberToText(amount.toString(), "a "));
sb.append(CardUtil.numberToText(amount.toString(), "a"));
sb.append(' ');
}
sb.append(filter.getMessage());
staticText = sb.toString();

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

@ -1,6 +1,5 @@
package mage.abilities.effects.common;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
@ -15,8 +14,9 @@ import mage.target.Target;
import mage.target.TargetPermanent;
import mage.util.CardUtil;
import java.util.UUID;
/**
*
* @author maurer.it_at_gmail.com
*/
public class SacrificeEffect extends OneShotEffect {
@ -98,7 +98,9 @@ public class SacrificeEffect extends OneShotEffect {
sb.append(" sacrifice ");
}
}
sb.append(CardUtil.numberToText(count.toString(), "a")).append(' ');
if (!filter.getMessage().startsWith("another")) {
sb.append(CardUtil.numberToText(count.toString(), "a")).append(' ');
}
sb.append(filter.getMessage());
staticText = sb.toString();
}