external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor strings enclosed in parentheses, transform P/T to strings

Browse Source
This commit is contained in:
kevlahnota
2017-09-03 02:01:34 +00:00
parent 0fa826f926
commit 8b3ff137d1
7 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
forge-core/src/main/java/forge/util/TextUtil.java
View File

@@ -205,4 +205,22 @@ public class TextUtil {
} }
return sb.toString(); 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();
}
} }

2
forge-game/src/main/java/forge/game/GameLogFormatter.java
View File

@@ -182,7 +182,7 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
@Override @Override
public GameLogEntry visit(GameEventTurnBegan event) { 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); return new GameLogEntry(GameLogEntryType.TURN, message);
} }

6
forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
View File

@@ -106,12 +106,14 @@ public abstract class SpellAbilityEffect {
if (sa.hasParam("Announce")) { if (sa.hasParam("Announce")) {
String svar = sa.getParam("Announce"); String svar = sa.getParam("Announce");
int amount = CardFactoryUtil.xCount(sa.getHostCard(), sa.getSVar(svar)); 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{ } else{
if (sa.getPayCosts() != null && sa.getPayCosts().getCostMana() != null && if (sa.getPayCosts() != null && sa.getPayCosts().getCostMana() != null &&
sa.getPayCosts().getCostMana().getAmountOfX() > 0) { sa.getPayCosts().getCostMana().getAmountOfX() > 0) {
int amount = sa.getHostCard().getXManaCostPaid(); int amount = sa.getHostCard().getXManaCostPaid();
sb.append(TextUtil.concatNoSpace(" (","X","="+amount+")")); sb.append(" ");
sb.append(TextUtil.enclosedParen(TextUtil.concatNoSpace("X","=",String.valueOf(amount))));
} }
} }

4
forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java
View File

@@ -37,9 +37,9 @@ public class GameEventCardStatsChanged extends GameEvent {
if ( null == card ) if ( null == card )
return "Card state changes: (empty list)"; return "Card state changes: (empty list)";
if( cards.size() == 1) 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 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");
} }
} }

2
forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java
View File

@@ -24,6 +24,6 @@ public class GameEventTurnBegan extends GameEvent {
*/ */
@Override @Override
public String toString() { public String toString() {
return TextUtil.concatWithSpace("Turn", String.valueOf(turnNumber), "("+turnOwner.toString()+")"); return TextUtil.concatWithSpace("Turn", String.valueOf(turnNumber), TextUtil.enclosedParen(turnOwner.toString()));
} }
} }

2
forge-game/src/main/java/forge/game/keyword/Keyword.java
View File

@@ -218,7 +218,7 @@ public enum Keyword {
} }
public String getDescription() { public String getDescription() {
return TextUtil.concatWithSpace(displayName," ("+reminderText+")"); return TextUtil.concatWithSpace(displayName,TextUtil.enclosedParen(reminderText));
} }
public static List<Keyword> getAllKeywords() { public static List<Keyword> getAllKeywords() {

4
forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
View File

@@ -242,8 +242,8 @@ public class ReplacementHandler {
Card cardForUi = host.getCardForUi(); Card cardForUi = host.getCardForUi();
String effectDesc = replacementEffect.toString().replace("CARDNAME", cardForUi.getName()); String effectDesc = replacementEffect.toString().replace("CARDNAME", cardForUi.getName());
final String question = replacementEffect instanceof ReplaceDiscard 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(), "to", runParams.get("Card").toString()+"?", "\r\n", TextUtil.enclosedParen(effectDesc))
: TextUtil.concatWithSpace("Apply replacement effect of", cardForUi.toString()+"?", "\r\n(", effectDesc+")"); : TextUtil.concatWithSpace("Apply replacement effect of", cardForUi.toString()+"?", "\r\n", TextUtil.enclosedParen(effectDesc));
boolean confirmed = optDecider.getController().confirmReplacementEffect(replacementEffect, effectSA, question); boolean confirmed = optDecider.getController().confirmReplacementEffect(replacementEffect, effectSA, question);
if (!confirmed) { if (!confirmed) {
return ReplacementResult.NotReplaced; return ReplacementResult.NotReplaced;