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

Move daynight prompt where it should be

Browse Source
This commit is contained in:
friarsol
2021-11-08 22:08:34 -05:00
parent db81fb9e57
commit bbbf7ec53c
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java
View File

@@ -157,9 +157,7 @@ public class CPrompt implements ICDoc {
matchUI.getGameController().selectButtonCancel(); matchUI.getGameController().selectButtonCancel();
} }
public void setMessage(final String s0) { public void setMessage(final String header) {
String header = FControl.instance.getCurrentScreen().getDaytime() != null ? "[" + Localizer.getInstance().getMessage("lbl"+FControl.instance.getCurrentScreen().getDaytime()) + "]\n\n" : "";
header += s0;
view.getTarMessage().setText(FSkin.encodeSymbols(header, false)); view.getTarMessage().setText(FSkin.encodeSymbols(header, false));
view.setCardView(null); view.setCardView(null);
} }

13
forge-gui/src/main/java/forge/gamemodes/match/input/InputBase.java
View File

@@ -134,7 +134,18 @@ public abstract class InputBase implements java.io.Serializable, Input {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
Localizer localizer = Localizer.getInstance(); Localizer localizer = Localizer.getInstance();
sb.append(localizer.getMessage("lblPriority")).append(": ").append(ph.getPriorityPlayer()).append("\n"); sb.append(localizer.getMessage("lblPriority")).append(": ").append(ph.getPriorityPlayer()).append("\n");
sb.append(localizer.getMessage("lblTurn")).append(": ").append(ph.getTurn()).append(" (").append(ph.getPlayerTurn()).append(")\n"); sb.append(localizer.getMessage("lblTurn")).append(": ").append(ph.getTurn()).append(" (").append(ph.getPlayerTurn()).append(")");
if (!game.isNeitherDayNorNight()) {
sb.append(" [");
String dayLabel = game.isDay() ? "Day" : "Night";
sb.append(Localizer.getInstance().getMessage("lbl" + dayLabel));
sb.append("]");
}
sb.append("\n");
sb.append(localizer.getMessage("lblPhase")).append(": ").append(ph.getPhase().nameForUi).append("\n"); sb.append(localizer.getMessage("lblPhase")).append(": ").append(ph.getPhase().nameForUi).append("\n");
sb.append(localizer.getMessage("lblStack")).append(": "); sb.append(localizer.getMessage("lblStack")).append(": ");
if (!game.getStack().isEmpty()) { if (!game.getStack().isEmpty()) {