[STX] more text fixes

This commit is contained in:
Evan Kranzler 2021-04-17 21:56:26 -04:00
parent ef8ee52b94
commit efb2a7f3de
12 changed files with 19 additions and 17 deletions

View file

@ -50,7 +50,7 @@ public final class DraconicIntervention extends CardImpl {
this.getSpellAbility().addWatcher(new DamagedByWatcher(false)); this.getSpellAbility().addWatcher(new DamagedByWatcher(false));
// Exile Draconic Intervention. // Exile Draconic Intervention.
this.getSpellAbility().addEffect(new ExileSpellEffect()); this.getSpellAbility().addEffect(new ExileSpellEffect().concatBy("<br>"));
} }
private DraconicIntervention(final DraconicIntervention card) { private DraconicIntervention(final DraconicIntervention card) {

View file

@ -25,7 +25,7 @@ import mage.target.common.TargetCreaturePermanent;
* @author Loki * @author Loki
*/ */
public final class DualCasting extends CardImpl { public final class DualCasting extends CardImpl {
private static final FilterSpell filter = new FilterSpell("instant or sorcery spell"); private static final FilterSpell filter = new FilterSpell("instant or sorcery spell you control");
static { static {
filter.add(Predicates.or( filter.add(Predicates.or(

View file

@ -58,7 +58,7 @@ public final class FlamescrollCelebrant extends ModalDoubleFacesCard {
this.getRightHalfCard().getSpellAbility().addEffect(new RevelInSilenceEffect()); this.getRightHalfCard().getSpellAbility().addEffect(new RevelInSilenceEffect());
// Exile Revel in Silence. // Exile Revel in Silence.
this.getRightHalfCard().getSpellAbility().addEffect(new ExileSpellEffect()); this.getRightHalfCard().getSpellAbility().addEffect(new ExileSpellEffect().concatBy("<br>"));
} }
private FlamescrollCelebrant(final FlamescrollCelebrant card) { private FlamescrollCelebrant(final FlamescrollCelebrant card) {

View file

@ -55,7 +55,7 @@ public final class ReconstructHistory extends CardImpl {
)); ));
// Exile Reconstruct History. // Exile Reconstruct History.
this.getSpellAbility().addEffect(new ExileSpellEffect()); this.getSpellAbility().addEffect(new ExileSpellEffect().concatBy("<br>"));
} }
private ReconstructHistory(final ReconstructHistory card) { private ReconstructHistory(final ReconstructHistory card) {

View file

@ -39,7 +39,7 @@ public final class StrixhavenStadium extends CardImpl {
// Whenever a creature you control deals combat damage to an opponent, put a point counter on Strixhaven Stadium. Then if it has ten or more point counters on it, remove them all and that player loses the game. // Whenever a creature you control deals combat damage to an opponent, put a point counter on Strixhaven Stadium. Then if it has ten or more point counters on it, remove them all and that player loses the game.
ability = new DealsDamageToAPlayerAllTriggeredAbility( ability = new DealsDamageToAPlayerAllTriggeredAbility(
Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.POINT.createInstance()), Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.POINT.createInstance()),
StaticFilters.FILTER_CONTROLLED_CREATURE, false, SetTargetPointer.PLAYER, StaticFilters.FILTER_CONTROLLED_A_CREATURE, false, SetTargetPointer.PLAYER,
true, true, TargetController.OPPONENT true, true, TargetController.OPPONENT
); );
ability.addEffect(new StrixhavenStadiumEffect()); ability.addEffect(new StrixhavenStadiumEffect());

View file

@ -25,7 +25,7 @@ import java.util.UUID;
public final class TenuredInkcaster extends CardImpl { public final class TenuredInkcaster extends CardImpl {
private static final FilterCreaturePermanent filter private static final FilterCreaturePermanent filter
= new FilterCreaturePermanent("a creature you control with a +1/+1 counter on it"); = new FilterCreaturePermanent("creature you control with a +1/+1 counter on it");
static { static {
filter.add(TargetController.YOU.getControllerPredicate()); filter.add(TargetController.YOU.getControllerPredicate());

View file

@ -1372,7 +1372,7 @@ public class VerifyCardDataTest {
.replace("<i>", "") .replace("<i>", "")
.replace("</i>", ""); .replace("</i>", "");
return newRule; return newRule.trim();
} }
@Test @Test

View file

@ -38,9 +38,7 @@ public class ExileFromGraveCost extends CostImpl {
+ CardUtil.numberToText(target.getMaxNumberOfTargets())) + CardUtil.numberToText(target.getMaxNumberOfTargets()))
+ ' ' + target.getTargetName(); + ' ' + target.getTargetName();
} else { } else {
this.text = "exile " this.text = "exile " + CardUtil.addArticle(target.getTargetName());
+ (target.getTargetName().startsWith("card ") ? "a " : "")
+ target.getTargetName();
} }
if (!this.text.endsWith(" from your graveyard")) { if (!this.text.endsWith(" from your graveyard")) {
this.text = this.text + " from your graveyard"; this.text = this.text + " from your graveyard";

View file

@ -13,7 +13,7 @@ import mage.players.Player;
*/ */
public class ExileSpellEffect extends OneShotEffect { public class ExileSpellEffect extends OneShotEffect {
private ExileSpellEffect() { public ExileSpellEffect() {
super(Outcome.Exile); super(Outcome.Exile);
staticText = "Exile {this}"; staticText = "Exile {this}";
} }

View file

@ -105,10 +105,7 @@ public class SearchLibraryPutInHandEffect extends SearchEffect {
sb.append(" and put them into your hand. If you do, shuffle"); sb.append(" and put them into your hand. If you do, shuffle");
} }
} else { } else {
if (!target.getTargetName().startsWith("a ") && !target.getTargetName().startsWith("an ")) { sb.append(CardUtil.addArticle(target.getTargetName()));
sb.append("a ");
}
sb.append(target.getTargetName());
if (forceShuffle) { if (forceShuffle) {
sb.append(revealCards ? ", reveal it, put it" : ", put that card"); sb.append(revealCards ? ", reveal it, put it" : ", put that card");
sb.append(" into your hand, then shuffle"); sb.append(" into your hand, then shuffle");

View file

@ -73,7 +73,7 @@ public class SearchLibraryPutOnLibraryEffect extends SearchEffect {
if (reveal) { if (reveal) {
sb.append(", reveal it"); sb.append(", reveal it");
} }
sb.append(", then shuffle and put that card on top of it"); sb.append(", then shuffle and put that card on top");
staticText = sb.toString(); staticText = sb.toString();
} }
} }

View file

@ -911,6 +911,13 @@ public final class CardUtil {
} }
} }
public static String addArticle(String text) {
if (text.startsWith("a ") || text.startsWith("an ")) {
return text;
}
return "aeiou".contains("" + text.charAt(0)) ? "an " + text : "a " + text;
}
public static Set<UUID> getAllSelectedTargets(Ability ability, Game game) { public static Set<UUID> getAllSelectedTargets(Ability ability, Game game) {
return ability.getModes().getSelectedModes() return ability.getModes().getSelectedModes()
.stream() .stream()
@ -1275,7 +1282,7 @@ public final class CardUtil {
int res; int res;
try { try {
res = Integer.parseInt(value); res = Integer.parseInt(value);
} catch(NumberFormatException ex) { } catch (NumberFormatException ex) {
res = defaultValue; res = defaultValue;
} }
return res; return res;