mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 11:48:02 +00:00
Merge pull request #2613 from kevlahnota/newmaster2
update textratypist fix
This commit is contained in:
@@ -99,7 +99,7 @@ public class ArenaScene extends UIScene implements IAfterMatch {
|
||||
}
|
||||
|
||||
private void loose() {
|
||||
doneButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblLeave"));
|
||||
doneButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblLeave"));
|
||||
doneButton.layout();
|
||||
startButton.setDisabled(true);
|
||||
arenaStarted = false;
|
||||
@@ -120,9 +120,9 @@ public class ArenaScene extends UIScene implements IAfterMatch {
|
||||
private void startArena() {
|
||||
goldLabel.setVisible(false);
|
||||
arenaStarted = true;
|
||||
startButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblContinue"));
|
||||
startButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblContinue"));
|
||||
startButton.layout();
|
||||
doneButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblConcede"));
|
||||
doneButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblConcede"));
|
||||
doneButton.layout();
|
||||
Forge.setCursor(null, Forge.magnifyToggle ? "1" : "2");
|
||||
Current.player().takeGold(arenaData.entryFee);
|
||||
@@ -164,7 +164,7 @@ public class ArenaScene extends UIScene implements IAfterMatch {
|
||||
if (roundsWon >= arenaData.rounds) {
|
||||
arenaStarted = false;
|
||||
startButton.setDisabled(true);
|
||||
doneButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblDone"));
|
||||
doneButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblDone"));
|
||||
doneButton.layout();
|
||||
}
|
||||
if (!Forge.isLandscapeMode())
|
||||
@@ -240,9 +240,9 @@ public class ArenaScene extends UIScene implements IAfterMatch {
|
||||
Actor player;
|
||||
|
||||
public void loadArenaData(ArenaData data, long seed) {
|
||||
startButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblStart"));
|
||||
startButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblStart"));
|
||||
startButton.layout();
|
||||
doneButton.setText("[=][!][%140]" + Forge.getLocalizer().getMessage("lblDone"));
|
||||
doneButton.setText("[%80]" + Forge.getLocalizer().getMessage("lblDone"));
|
||||
doneButton.layout();
|
||||
arenaData = data;
|
||||
//rand.setSeed(seed); allow to reshuffle arena enemies for now
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
<dependency>
|
||||
<groupId>com.github.tommyettinger</groupId>
|
||||
<artifactId>textratypist</artifactId>
|
||||
<version>7fc2e7c333</version>
|
||||
<version>589215a838</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.thoughtworks.xstream</groupId>
|
||||
|
||||
@@ -141,7 +141,7 @@
|
||||
{
|
||||
"type": "TextButton",
|
||||
"name": "openmap",
|
||||
"text": "[=][!][%140]tr(lblZoom)",
|
||||
"text": "[%80]tr(lblZoom)",
|
||||
"binding": "Map",
|
||||
"width": 80,
|
||||
"height": 20,
|
||||
|
||||
@@ -130,7 +130,7 @@
|
||||
{
|
||||
"type": "TextButton",
|
||||
"name": "openmap",
|
||||
"text": "[=][!][%140]tr(lblZoom)",
|
||||
"text": "[%80]tr(lblZoom)",
|
||||
"binding": "Map",
|
||||
"width": 80,
|
||||
"height": 20,
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
{
|
||||
"type": "TextButton",
|
||||
"name": "openmap",
|
||||
"text": "[=][!][%140]tr(lblZoom)",
|
||||
"text": "[%80]tr(lblZoom)",
|
||||
"binding": "Map",
|
||||
"width": 80,
|
||||
"height": 20,
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
{
|
||||
"type": "TextButton",
|
||||
"name": "done",
|
||||
"text": "[=][!][%140]tr(lblBack)",
|
||||
"text": "[%80]tr(lblBack)",
|
||||
"binding": "Back",
|
||||
"width": 48,
|
||||
"height": 20,
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
{
|
||||
"type": "TextButton",
|
||||
"name": "done",
|
||||
"text": "[=][!][%140]tr(lblBack)",
|
||||
"text": "[%80]tr(lblBack)",
|
||||
"binding": "Back",
|
||||
"width": 48,
|
||||
"height": 20,
|
||||
|
||||
Reference in New Issue
Block a user