diff --git a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java index f8c7ef0f4ba..12c33f6e5f7 100644 --- a/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java @@ -122,7 +122,7 @@ public class PlayerControllerHuman extends PlayerController { if (enabled) { hasEnabled = true; } - GuiUtils.addMenuItem(menu, FSkin.encodeSymbols(ab.toString()), + GuiUtils.addMenuItem(menu, FSkin.encodeSymbols(ab.toString(), true), shortcut > 0 ? KeyStroke.getKeyStroke(shortcut, 0) : null, new Runnable() { @Override diff --git a/forge-gui/src/main/java/forge/gui/CardDetailPanel.java b/forge-gui/src/main/java/forge/gui/CardDetailPanel.java index 08975a0093f..ac944fff26f 100644 --- a/forge-gui/src/main/java/forge/gui/CardDetailPanel.java +++ b/forge-gui/src/main/java/forge/gui/CardDetailPanel.java @@ -229,7 +229,7 @@ public class CardDetailPanel extends FPanel { if ( card.isSplitCard() && card.getCurState() == CardCharacteristicName.Original) { manaCost = card.getRules().getMainPart().getManaCost().toString() + " // " + card.getRules().getOtherPart().getManaCost().toString(); } - this.nameCostLabel.setText(FSkin.encodeSymbols(card.getName() + " - " + manaCost)); + this.nameCostLabel.setText(FSkin.encodeSymbols(card.getName() + " - " + manaCost, true)); } this.typeLabel.setText(formatCardType(card)); @@ -600,7 +600,7 @@ public class CardDetailPanel extends FPanel { String mustBlockThese = Lang.joinHomogenous(card.getMustBlockCards()); area.append("Must block " + mustBlockThese); } - return FSkin.encodeSymbols(area.toString()); + return FSkin.encodeSymbols(area.toString(), true); } /** @return JLabel */ diff --git a/forge-gui/src/main/java/forge/gui/input/InputBase.java b/forge-gui/src/main/java/forge/gui/input/InputBase.java index 4edaeee8e45..81fc8c0b63f 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputBase.java +++ b/forge-gui/src/main/java/forge/gui/input/InputBase.java @@ -95,8 +95,8 @@ public abstract class InputBase implements java.io.Serializable, Input { final PhaseHandler ph = game.getPhaseHandler(); final StringBuilder sb = new StringBuilder(); - sb.append("Priority: ").append(ph.getPriorityPlayer()).append("\n").append("\n"); - sb.append("Turn : ").append(ph.getPlayerTurn()).append("\n"); + sb.append("Priority: ").append(ph.getPriorityPlayer()).append("\n"); + sb.append("Turn ").append(ph.getTurn()).append(" (").append(ph.getPlayerTurn()).append(")\n"); sb.append("Phase: ").append(ph.getPhase().nameForUi).append("\n"); sb.append("Stack: "); if (!game.getStack().isEmpty()) { diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CMessage.java b/forge-gui/src/main/java/forge/gui/match/controllers/CMessage.java index 34932d375a1..be8c1783858 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CMessage.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CMessage.java @@ -97,7 +97,7 @@ public enum CMessage implements ICDoc { /** @param s0   {@link java.lang.String} */ public void setMessage(String s0) { - view.getTarMessage().setText(FSkin.encodeSymbols(s0)); + view.getTarMessage().setText(FSkin.encodeSymbols(s0, false)); } /** Flashes animation on input panel if play is currently waiting on input. */ diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java index d64ab1d838f..82e6916ae6b 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java @@ -1653,12 +1653,16 @@ public enum FSkin { getImage(skinProp).save(path, 13, 13); } - public static String encodeSymbols(String str) { - //format reminder text in italics (or hide if preference set) - String pattern = "\\((.+)\\)"; - String replacement = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_HIDE_REMINDER_TEXT) ? - "" : "\\($1\\)"; - str = str.replaceAll(pattern, replacement); + public static String encodeSymbols(String str, boolean formatReminderText) { + String pattern, replacement; + + if (formatReminderText) { + //format reminder text in italics (or hide if preference set) + pattern = "\\((.+)\\)"; + replacement = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_HIDE_REMINDER_TEXT) ? + "" : "\\($1\\)"; + str = str.replaceAll(pattern, replacement); + } //format mana symbols to display as icons pattern = "\\{([A-Z0-9]+)\\}|\\{([A-Z0-9]+)/([A-Z0-9]+)\\}"; //fancy pattern needed so "/" can be omitted from replacement