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

Show turn number in prompt message

Browse Source
This commit is contained in:
drdev
2013-11-29 03:54:04 +00:00
parent e3851e3f1d
commit 91fe7b516c
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java
View File

@@ -122,7 +122,7 @@ public class PlayerControllerHuman extends PlayerController {
if (enabled) { if (enabled) {
hasEnabled = true; hasEnabled = true;
} }
GuiUtils.addMenuItem(menu, FSkin.encodeSymbols(ab.toString()), GuiUtils.addMenuItem(menu, FSkin.encodeSymbols(ab.toString(), true),
shortcut > 0 ? KeyStroke.getKeyStroke(shortcut, 0) : null, shortcut > 0 ? KeyStroke.getKeyStroke(shortcut, 0) : null,
new Runnable() { new Runnable() {
@Override @Override

4
forge-gui/src/main/java/forge/gui/CardDetailPanel.java
View File

@@ -229,7 +229,7 @@ public class CardDetailPanel extends FPanel {
if ( card.isSplitCard() && card.getCurState() == CardCharacteristicName.Original) { if ( card.isSplitCard() && card.getCurState() == CardCharacteristicName.Original) {
manaCost = card.getRules().getMainPart().getManaCost().toString() + " // " + card.getRules().getOtherPart().getManaCost().toString(); 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)); this.typeLabel.setText(formatCardType(card));
@@ -600,7 +600,7 @@ public class CardDetailPanel extends FPanel {
String mustBlockThese = Lang.joinHomogenous(card.getMustBlockCards()); String mustBlockThese = Lang.joinHomogenous(card.getMustBlockCards());
area.append("Must block " + mustBlockThese); area.append("Must block " + mustBlockThese);
} }
return FSkin.encodeSymbols(area.toString()); return FSkin.encodeSymbols(area.toString(), true);
} }
/** @return JLabel */ /** @return JLabel */

4
forge-gui/src/main/java/forge/gui/input/InputBase.java
View File

@@ -95,8 +95,8 @@ public abstract class InputBase implements java.io.Serializable, Input {
final PhaseHandler ph = game.getPhaseHandler(); final PhaseHandler ph = game.getPhaseHandler();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append("Priority: ").append(ph.getPriorityPlayer()).append("\n").append("\n"); sb.append("Priority: ").append(ph.getPriorityPlayer()).append("\n");
sb.append("Turn : ").append(ph.getPlayerTurn()).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("Phase: ").append(ph.getPhase().nameForUi).append("\n");
sb.append("Stack: "); sb.append("Stack: ");
if (!game.getStack().isEmpty()) { if (!game.getStack().isEmpty()) {

2
forge-gui/src/main/java/forge/gui/match/controllers/CMessage.java
View File

@@ -97,7 +97,7 @@ public enum CMessage implements ICDoc {
/** @param s0   {@link java.lang.String} */ /** @param s0   {@link java.lang.String} */
public void setMessage(String s0) { 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. */ /** Flashes animation on input panel if play is currently waiting on input. */

16
forge-gui/src/main/java/forge/gui/toolbox/FSkin.java
View File

@@ -1653,12 +1653,16 @@ public enum FSkin {
getImage(skinProp).save(path, 13, 13); getImage(skinProp).save(path, 13, 13);
} }
public static String encodeSymbols(String str) { public static String encodeSymbols(String str, boolean formatReminderText) {
//format reminder text in italics (or hide if preference set) String pattern, replacement;
String pattern = "\\((.+)\\)";
String replacement = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_HIDE_REMINDER_TEXT) ? if (formatReminderText) {
"" : "<i>\\($1\\)</i>"; //format reminder text in italics (or hide if preference set)
str = str.replaceAll(pattern, replacement); pattern = "\\((.+)\\)";
replacement = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_HIDE_REMINDER_TEXT) ?
"" : "<i>\\($1\\)</i>";
str = str.replaceAll(pattern, replacement);
}
//format mana symbols to display as icons //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 pattern = "\\{([A-Z0-9]+)\\}|\\{([A-Z0-9]+)/([A-Z0-9]+)\\}"; //fancy pattern needed so "/" can be omitted from replacement