From 7286593c64eb7118df5c060fad29058bdf1e8d85 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sun, 31 Jan 2021 11:55:33 -0500 Subject: [PATCH] some more counter text changes --- .../abilities/costs/common/RemoveCounterCost.java | 2 +- .../costs/common/RemoveCountersSourceCost.java | 9 ++++----- .../AddRemoveAllTimeSuspentCountersEffect.java | 11 ++++++----- .../common/counter/RemoveCounterSourceEffect.java | 4 ++-- .../common/counter/RemoveCounterTargetEffect.java | 9 +++++---- .../common/counter/RemoveCountersAttachedEffect.java | 7 +++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java index 16970dbf91c..bd88c8185d6 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RemoveCounterCost.java @@ -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()); } diff --git a/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java b/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java index dd9365f575a..d041d2368b5 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/RemoveCountersSourceCost.java @@ -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(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java index cfee9a8cb52..7bcfbd5a518 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddRemoveAllTimeSuspentCountersEffect.java @@ -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(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java index 402af0ab2a7..4050cf49d90 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterSourceEffect.java @@ -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}"; } } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java index 9f23c8e522a..a1b8b2c250f 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java @@ -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()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCountersAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCountersAttachedEffect.java index 2d6c154b165..c4a81872b85 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCountersAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCountersAttachedEffect.java @@ -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);