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

some more counter text changes

Browse source
This commit is contained in:
Evan Kranzler 2021-01-31 11:55:33 -05:00
parent f76107702f
commit 7286593c64
6 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,7 +129,7 @@ public class RemoveCounterCost extends CostImpl {
private String setText() {
StringBuilder sb = new StringBuilder("Remove ");
sb.append(CardUtil.numberToText(countersToRemove, "a")).append(' ');
sb.append(CardUtil.numberToText(countersToRemove, counterTypeToRemove.getArticle())).append(' ');
if (counterTypeToRemove != null) {
sb.append(counterTypeToRemove.getName());
}

9
Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java
View file

@ -1,18 +1,17 @@
package mage.abilities.costs.common;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.costs.Cost;
import mage.abilities.costs.CostImpl;
import mage.counters.Counter;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.util.CardUtil;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public class RemoveCountersSourceCost extends CostImpl {
@ -23,7 +22,7 @@ public class RemoveCountersSourceCost extends CostImpl {
public RemoveCountersSourceCost(Counter counter) {
this.amount = counter.getCount();
this.name = counter.getName();
this.text = new StringBuilder("remove ").append((amount == 1 ? "a" : CardUtil.numberToText(amount)))
this.text = new StringBuilder("remove ").append((amount == 1 ? CounterType.findArticle(counter.getName()) : CardUtil.numberToText(amount)))
.append(' ').append(name).append(" counter").append((amount != 1 ? "s" : ""))
.append(" from {this}").toString();

11
Mage/src/main/java/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java
View file

@ -1,21 +1,22 @@
package mage.abilities.effects.common.counter;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.constants.Outcome;
import mage.counters.Counter;
import mage.counters.CounterType;
import mage.filter.Filter;
import mage.game.Game;
import mage.players.Player;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
/**
*
* @author Gal Lerman
*/
public class AddRemoveAllTimeSuspentCountersEffect extends OneShotEffect {
@ -87,7 +88,7 @@ public class AddRemoveAllTimeSuspentCountersEffect extends OneShotEffect {
if (counter.getCount() > 1) {
sb.append(Integer.toString(counter.getCount())).append(' ').append(counter.getName().toLowerCase(Locale.ENGLISH)).append(" counters on each ");
} else {
sb.append("a ").append(counter.getName().toLowerCase(Locale.ENGLISH)).append(" counter on each ");
sb.append(CounterType.findArticle(counter.getName())).append(' ').append(counter.getName().toLowerCase(Locale.ENGLISH)).append(" counter on each ");
}
sb.append(filter.getMessage());
staticText = sb.toString();

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

@ -5,11 +5,11 @@ import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.constants.Outcome;
import mage.counters.Counter;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
/**
*
* @author Loki
*/
public class RemoveCounterSourceEffect extends OneShotEffect {
@ -69,7 +69,7 @@ public class RemoveCounterSourceEffect extends OneShotEffect {
sb.append("remove ").append(Integer.toString(counter.getCount())).append(' ').append(counter.getName()).append(" counters from {this}");
staticText = sb.toString();
} else {
staticText = "remove a " + counter.getName() + " counter from {this}";
staticText = "remove " + CounterType.findArticle(counter.getName()) + " " + counter.getName() + " counter from {this}";
}
}
}

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

@ -1,8 +1,6 @@
package mage.abilities.effects.common.counter;
import java.util.HashSet;
import java.util.Set;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.effects.OneShotEffect;
@ -11,13 +9,16 @@ import mage.choices.Choice;
import mage.choices.ChoiceImpl;
import mage.constants.Outcome;
import mage.counters.Counter;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.util.CardUtil;
import java.util.HashSet;
import java.util.Set;
/**
*
* @author LevelX2
*/
public class RemoveCounterTargetEffect extends OneShotEffect {
@ -111,7 +112,7 @@ public class RemoveCounterTargetEffect extends OneShotEffect {
if (counter == null) {
text += "a counter";
} else {
text += CardUtil.numberToText(counter.getCount(), "a") + ' ' + counter.getName();
text += CardUtil.numberToText(counter.getCount(), CounterType.findArticle(counter.getName())) + ' ' + counter.getName();
text += counter.getCount() > 1 ? " counters" : " counter";
}
text += " from target " + (mode.getTargets().isEmpty() ? " object" : mode.getTargets().get(0).getTargetName());

7
Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCountersAttachedEffect.java
View file

@ -7,6 +7,7 @@ import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.counters.Counter;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.util.CardUtil;
@ -14,7 +15,6 @@ import mage.util.CardUtil;
import java.util.Locale;
/**
*
* @author noahg
*/
public class RemoveCountersAttachedEffect extends OneShotEffect {
@ -28,9 +28,8 @@ public class RemoveCountersAttachedEffect extends OneShotEffect {
}
/**
*
* @param counter
* @param amount this amount will be added to the counter instances
* @param amount this amount will be added to the counter instances
* @param textEnchanted text used for the enchanted permanent in rule text
*/
public RemoveCountersAttachedEffect(Counter counter, DynamicValue amount, String textEnchanted) {
@ -73,7 +72,7 @@ public class RemoveCountersAttachedEffect extends OneShotEffect {
sb.append(CardUtil.numberToText(counter.getCount())).append(' ');
sb.append(counter.getName().toLowerCase(Locale.ENGLISH)).append(" counters from ");
} else {
sb.append("a ");
sb.append(CounterType.findArticle(counter.getName())).append(' ');
sb.append(counter.getName().toLowerCase(Locale.ENGLISH)).append(" counter from ");
}
sb.append(textEnchanted);