From 8b3ff137d18a89ff9f35015a2b1b86b29668b5cb Mon Sep 17 00:00:00 2001 From: kevlahnota Date: Sun, 3 Sep 2017 02:01:34 +0000 Subject: [PATCH] Refactor strings enclosed in parentheses, transform P/T to strings --- .../src/main/java/forge/util/TextUtil.java | 18 ++++++++++++++++++ .../main/java/forge/game/GameLogFormatter.java | 2 +- .../forge/game/ability/SpellAbilityEffect.java | 6 ++++-- .../game/event/GameEventCardStatsChanged.java | 4 ++-- .../forge/game/event/GameEventTurnBegan.java | 2 +- .../main/java/forge/game/keyword/Keyword.java | 2 +- .../game/replacement/ReplacementHandler.java | 4 ++-- 7 files changed, 29 insertions(+), 9 deletions(-) diff --git a/forge-core/src/main/java/forge/util/TextUtil.java b/forge-core/src/main/java/forge/util/TextUtil.java index 455c13256dc..25849f967e4 100644 --- a/forge-core/src/main/java/forge/util/TextUtil.java +++ b/forge-core/src/main/java/forge/util/TextUtil.java @@ -205,4 +205,22 @@ public class TextUtil { } return sb.toString(); } + + //enclosed in Parentheses + public static String enclosedParen(String s){ + StringBuilder sb = new StringBuilder(); + sb.append("("); + sb.append(s); + sb.append(")"); + return sb.toString(); + } + + //transform to P/T + public static String transformPT(int power, int toughness){ + StringBuilder sb = new StringBuilder(); + sb.append(power); + sb.append("/"); + sb.append(toughness); + return sb.toString(); + } } diff --git a/forge-game/src/main/java/forge/game/GameLogFormatter.java b/forge-game/src/main/java/forge/game/GameLogFormatter.java index 84eee18b131..80c4b6b991d 100644 --- a/forge-game/src/main/java/forge/game/GameLogFormatter.java +++ b/forge-game/src/main/java/forge/game/GameLogFormatter.java @@ -182,7 +182,7 @@ public class GameLogFormatter extends IGameEventVisitor.Base { @Override public GameLogEntry visit(GameEventTurnBegan event) { - String message = TextUtil.concatWithSpace("Turn", String.valueOf(event.turnNumber), "("+event.turnOwner.toString()+")"); + String message = TextUtil.concatWithSpace("Turn", String.valueOf(event.turnNumber), TextUtil.enclosedParen(event.turnOwner.toString())); return new GameLogEntry(GameLogEntryType.TURN, message); } diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java index 336b19fc11d..66b34a815ff 100644 --- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java +++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java @@ -106,12 +106,14 @@ public abstract class SpellAbilityEffect { if (sa.hasParam("Announce")) { String svar = sa.getParam("Announce"); int amount = CardFactoryUtil.xCount(sa.getHostCard(), sa.getSVar(svar)); - sb.append(TextUtil.concatNoSpace(" (", svar,"="+amount+")")); + sb.append(" "); + sb.append(TextUtil.enclosedParen(TextUtil.concatNoSpace(svar,"=",String.valueOf(amount)))); } else{ if (sa.getPayCosts() != null && sa.getPayCosts().getCostMana() != null && sa.getPayCosts().getCostMana().getAmountOfX() > 0) { int amount = sa.getHostCard().getXManaCostPaid(); - sb.append(TextUtil.concatNoSpace(" (","X","="+amount+")")); + sb.append(" "); + sb.append(TextUtil.enclosedParen(TextUtil.concatNoSpace("X","=",String.valueOf(amount)))); } } diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java b/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java index 439033663ff..0dca8f1f2c0 100644 --- a/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java +++ b/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java @@ -37,9 +37,9 @@ public class GameEventCardStatsChanged extends GameEvent { if ( null == card ) return "Card state changes: (empty list)"; if( cards.size() == 1) - return TextUtil.concatWithSpace("Card state changes:", card.getName(), "("+StringUtils.join(card.getType(), ' ')+")", card.getNetPower()+"/"+card.getNetToughness() ); + return TextUtil.concatWithSpace("Card state changes:", card.getName(), TextUtil.enclosedParen(StringUtils.join(card.getType(), ' ')), TextUtil.transformPT(card.getNetPower(),card.getNetToughness()) ); else - return TextUtil.concatWithSpace("Card state changes: %s (%s)", card.getName(), "("+StringUtils.join(card.getType(), ' ')+")", card.getNetPower()+"/"+card.getNetToughness(),"and", cards.size() - 1 +" more"); + return TextUtil.concatWithSpace("Card state changes:", card.getName(), TextUtil.enclosedParen(StringUtils.join(card.getType(), ' ')), TextUtil.transformPT(card.getNetPower(),card.getNetToughness()),"and", String.valueOf(cards.size() - 1), "more"); } } diff --git a/forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java b/forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java index 58336524491..d4bb324416c 100644 --- a/forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java +++ b/forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java @@ -24,6 +24,6 @@ public class GameEventTurnBegan extends GameEvent { */ @Override public String toString() { - return TextUtil.concatWithSpace("Turn", String.valueOf(turnNumber), "("+turnOwner.toString()+")"); + return TextUtil.concatWithSpace("Turn", String.valueOf(turnNumber), TextUtil.enclosedParen(turnOwner.toString())); } } \ No newline at end of file diff --git a/forge-game/src/main/java/forge/game/keyword/Keyword.java b/forge-game/src/main/java/forge/game/keyword/Keyword.java index b49e13b7d44..c6aafe7e39b 100644 --- a/forge-game/src/main/java/forge/game/keyword/Keyword.java +++ b/forge-game/src/main/java/forge/game/keyword/Keyword.java @@ -218,7 +218,7 @@ public enum Keyword { } public String getDescription() { - return TextUtil.concatWithSpace(displayName," ("+reminderText+")"); + return TextUtil.concatWithSpace(displayName,TextUtil.enclosedParen(reminderText)); } public static List getAllKeywords() { diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java index 6bc18b46e64..eb548bbb848 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java @@ -242,8 +242,8 @@ public class ReplacementHandler { Card cardForUi = host.getCardForUi(); String effectDesc = replacementEffect.toString().replace("CARDNAME", cardForUi.getName()); final String question = replacementEffect instanceof ReplaceDiscard - ? TextUtil.concatWithSpace("Apply replacement effect of", cardForUi.toString(), "to", runParams.get("Card").toString()+"?", "\r\n(", effectDesc+")") - : TextUtil.concatWithSpace("Apply replacement effect of", cardForUi.toString()+"?", "\r\n(", effectDesc+")"); + ? TextUtil.concatWithSpace("Apply replacement effect of", cardForUi.toString(), "to", runParams.get("Card").toString()+"?", "\r\n", TextUtil.enclosedParen(effectDesc)) + : TextUtil.concatWithSpace("Apply replacement effect of", cardForUi.toString()+"?", "\r\n", TextUtil.enclosedParen(effectDesc)); boolean confirmed = optDecider.getController().confirmReplacementEffect(replacementEffect, effectSA, question); if (!confirmed) { return ReplacementResult.NotReplaced;