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

Merge pull request #2613 from kevlahnota/newmaster2

Browse Source 
update textratypist fix
This commit is contained in:
Anthony Calosa
2023-03-05 08:33:22 +08:00
committed by GitHub
parent 3e41dcbb2c 0d7950d6f3
commit 09af6c9b0f
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java
View File

@@ -99,7 +99,7 @@ public class ArenaScene extends UIScene implements IAfterMatch {
} }
private void loose() { private void loose() {
doneButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblLeave")); doneButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblLeave"));
doneButton.layout(); doneButton.layout();
startButton.setDisabled(true); startButton.setDisabled(true);
arenaStarted = false; arenaStarted = false;
@@ -120,9 +120,9 @@ public class ArenaScene extends UIScene implements IAfterMatch {
private void startArena() { private void startArena() {
goldLabel.setVisible(false); goldLabel.setVisible(false);
arenaStarted = true; arenaStarted = true;
startButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblContinue")); startButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblContinue"));
startButton.layout(); startButton.layout();
doneButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblConcede")); doneButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblConcede"));
doneButton.layout(); doneButton.layout();
Forge.setCursor(null, Forge.magnifyToggle ? "1" : "2"); Forge.setCursor(null, Forge.magnifyToggle ? "1" : "2");
Current.player().takeGold(arenaData.entryFee); Current.player().takeGold(arenaData.entryFee);
@@ -164,7 +164,7 @@ public class ArenaScene extends UIScene implements IAfterMatch {
if (roundsWon >= arenaData.rounds) { if (roundsWon >= arenaData.rounds) {
arenaStarted = false; arenaStarted = false;
startButton.setDisabled(true); startButton.setDisabled(true);
doneButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblDone")); doneButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblDone"));
doneButton.layout(); doneButton.layout();
} }
if (!Forge.isLandscapeMode()) if (!Forge.isLandscapeMode())
@@ -240,9 +240,9 @@ public class ArenaScene extends UIScene implements IAfterMatch {
Actor player; Actor player;
public void loadArenaData(ArenaData data, long seed) { public void loadArenaData(ArenaData data, long seed) {
startButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblStart")); startButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblStart"));
startButton.layout(); startButton.layout();
doneButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblDone")); doneButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblDone"));
doneButton.layout(); doneButton.layout();
arenaData = data; arenaData = data;
//rand.setSeed(seed); allow to reshuffle arena enemies for now //rand.setSeed(seed); allow to reshuffle arena enemies for now

2
forge-gui/pom.xml
View File

@@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>com.github.tommyettinger</groupId> <groupId>com.github.tommyettinger</groupId>
<artifactId>textratypist</artifactId> <artifactId>textratypist</artifactId>
<version>7fc2e7c333</version> <version>589215a838</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>

2
forge-gui/res/adventure/Shandalar/ui/hud.json
View File

@@ -141,7 +141,7 @@
{ {
"type": "TextButton", "type": "TextButton",
"name": "openmap", "name": "openmap",
"text": "[=][!][%140]tr(lblZoom)", "text": "[%80]tr(lblZoom)",
"binding": "Map", "binding": "Map",
"width": 80, "width": 80,
"height": 20, "height": 20,

2
forge-gui/res/adventure/Shandalar/ui/hud_landscape.json
View File

@@ -130,7 +130,7 @@
{ {
"type": "TextButton", "type": "TextButton",
"name": "openmap", "name": "openmap",
"text": "[=][!][%140]tr(lblZoom)", "text": "[%80]tr(lblZoom)",
"binding": "Map", "binding": "Map",
"width": 80, "width": 80,
"height": 20, "height": 20,

2
forge-gui/res/adventure/Shandalar/ui/hud_portrait.json
View File

@@ -129,7 +129,7 @@
{ {
"type": "TextButton", "type": "TextButton",
"name": "openmap", "name": "openmap",
"text": "[=][!][%140]tr(lblZoom)", "text": "[%80]tr(lblZoom)",
"binding": "Map", "binding": "Map",
"width": 80, "width": 80,
"height": 20, "height": 20,

2
forge-gui/res/adventure/Shandalar/ui/map.json
View File

@@ -12,7 +12,7 @@
{ {
"type": "TextButton", "type": "TextButton",
"name": "done", "name": "done",
"text": "[=][!][%140]tr(lblBack)", "text": "[%80]tr(lblBack)",
"binding": "Back", "binding": "Back",
"width": 48, "width": 48,
"height": 20, "height": 20,

2
forge-gui/res/adventure/Shandalar/ui/map_portrait.json
View File

@@ -12,7 +12,7 @@
{ {
"type": "TextButton", "type": "TextButton",
"name": "done", "name": "done",
"text": "[=][!][%140]tr(lblBack)", "text": "[%80]tr(lblBack)",
"binding": "Back", "binding": "Back",
"width": 48, "width": 48,
"height": 20, "height": 20,