diff --git a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java index 30caf6a8b34..e3793c860dd 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java @@ -175,7 +175,7 @@ public class SaveLoadScene extends UIScene { previewImage.setVisible(true); previewDate.setVisible(true); if (header.saveDate != null) - previewDate.setText("[%99]"+DateFormat.getDateInstance(DateFormat.SHORT).format(header.saveDate) + " " + DateFormat.getTimeInstance(DateFormat.SHORT).format(header.saveDate)); + previewDate.setText("[%98]"+DateFormat.getDateInstance().format(header.saveDate) + " " + DateFormat.getTimeInstance(DateFormat.SHORT).format(header.saveDate)); else previewDate.setText(""); if (header.name.contains(Character.toString(ASCII_179))) { diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java index 8aa5f758e65..1fd912fa97b 100644 --- a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java +++ b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java @@ -122,12 +122,13 @@ public class GameHUD extends Stage { lifePoints = ui.findActor("lifePoints"); shards = ui.findActor("shards"); money = ui.findActor("money"); - shards.setText("[%80]0/0"); - lifePoints.setText("[%80]20/20"); - AdventurePlayer.current().onLifeChange(() -> lifePoints.setText("[%80]"+AdventurePlayer.current().getLife() + "/" + AdventurePlayer.current().getMaxLife())); - AdventurePlayer.current().onShardsChange(() -> shards.setText("[%80]"+AdventurePlayer.current().getShards())); + shards.setText("[%95][+Shards] 0"); + money.setText("[%95][+Gold] "); + lifePoints.setText("[%95][+Life] 20/20"); + AdventurePlayer.current().onLifeChange(() -> lifePoints.setText("[%95][+Life] "+AdventurePlayer.current().getLife() + "/" + AdventurePlayer.current().getMaxLife())); + AdventurePlayer.current().onShardsChange(() -> shards.setText("[%95][+Shards] "+AdventurePlayer.current().getShards())); - WorldSave.getCurrentSave().getPlayer().onGoldChange(() -> money.setText("[%80]"+String.valueOf(AdventurePlayer.current().getGold()))); + WorldSave.getCurrentSave().getPlayer().onGoldChange(() -> money.setText("[%95][+Gold] "+String.valueOf(AdventurePlayer.current().getGold()))); addActor(ui); addActor(miniMapPlayer); console = new Console(); @@ -247,12 +248,12 @@ public class GameHUD extends Stage { //colored lifepoints if (Current.player().getLife() >= Current.player().getMaxLife()) { //color green if max life - lifePoints.setColor(Color.GREEN); + lifePoints.setText("[%95][+Life] [GREEN]"+AdventurePlayer.current().getLife() + "/" + AdventurePlayer.current().getMaxLife()); } else if (Current.player().getLife() <= 5) { //color red if critical - lifePoints.setColor(Color.RED); + lifePoints.setText("[%95][+Life] [RED]"+AdventurePlayer.current().getLife() + "/" + AdventurePlayer.current().getMaxLife()); } else { - lifePoints.setColor(Color.WHITE); + lifePoints.setText("[%95][+Life] "+AdventurePlayer.current().getLife() + "/" + AdventurePlayer.current().getMaxLife()); } } diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml index 7e881636de3..dc9a0f53aca 100644 --- a/forge-gui/pom.xml +++ b/forge-gui/pom.xml @@ -43,7 +43,7 @@ com.github.tommyettinger textratypist - 0.7.6 + 0.7.2 com.thoughtworks.xstream diff --git a/forge-gui/res/adventure/Shandalar/ui/hud.json b/forge-gui/res/adventure/Shandalar/ui/hud.json index 7163d5c595c..cd5cd4a7e2d 100644 --- a/forge-gui/res/adventure/Shandalar/ui/hud.json +++ b/forge-gui/res/adventure/Shandalar/ui/hud.json @@ -61,7 +61,7 @@ "font": "default", "width": 64, "height": 16, - "x": 442, + "x": 427, "y": 56 }, { @@ -70,7 +70,7 @@ "font": "default", "width": 64, "height": 16, - "x": 442, + "x": 427, "y": 73 }, { @@ -79,7 +79,7 @@ "font": "default", "width": 64, "height": 16, - "x": 442, + "x": 427, "y": 90 }, { @@ -141,7 +141,7 @@ { "type": "TextButton", "name": "openmap", - "text": "[=][%150]tr(lblZoom)", + "text": "[%80]tr(lblZoom)", "binding": "Map", "width": 80, "height": 18, diff --git a/forge-gui/res/adventure/Shandalar/ui/hud.png b/forge-gui/res/adventure/Shandalar/ui/hud.png index 760b385f38a..fc69db03b52 100644 Binary files a/forge-gui/res/adventure/Shandalar/ui/hud.png and b/forge-gui/res/adventure/Shandalar/ui/hud.png differ diff --git a/forge-gui/res/adventure/Shandalar/ui/hud_landscape.json b/forge-gui/res/adventure/Shandalar/ui/hud_landscape.json index ae731b7de13..03cb65e7c5b 100644 --- a/forge-gui/res/adventure/Shandalar/ui/hud_landscape.json +++ b/forge-gui/res/adventure/Shandalar/ui/hud_landscape.json @@ -61,7 +61,7 @@ "font": "default", "width": 64, "height": 16, - "x": 442, + "x": 419, "y": 56 }, { @@ -70,7 +70,7 @@ "font": "default", "width": 64, "height": 16, - "x": 442, + "x": 419, "y": 73 }, { @@ -79,7 +79,7 @@ "font": "default", "width": 64, "height": 16, - "x": 442, + "x": 419, "y": 90 }, { @@ -130,7 +130,7 @@ { "type": "TextButton", "name": "openmap", - "text": "[=][%150]tr(lblZoom)", + "text": "[%80]tr(lblZoom)", "binding": "Map", "width": 80, "height": 18, diff --git a/forge-gui/res/adventure/Shandalar/ui/hud_portrait.json b/forge-gui/res/adventure/Shandalar/ui/hud_portrait.json index ef068021af9..01cbbea1d40 100644 --- a/forge-gui/res/adventure/Shandalar/ui/hud_portrait.json +++ b/forge-gui/res/adventure/Shandalar/ui/hud_portrait.json @@ -60,7 +60,7 @@ "name": "lifePoints", "width": 48, "height": 3, - "x": 234, + "x": 209, "y": 62 }, { @@ -69,7 +69,7 @@ "font": "default", "width": 48, "height": 3, - "x": 234, + "x": 209, "y": 76 }, { @@ -78,7 +78,7 @@ "font": "default", "width": 48, "height": 3, - "x": 234, + "x": 209, "y": 90 }, { @@ -129,7 +129,7 @@ { "type": "TextButton", "name": "openmap", - "text": "[=][%150]tr(lblZoom)", + "text": "[%80]tr(lblZoom)", "binding": "Map", "width": 80, "height": 18, diff --git a/forge-gui/res/adventure/Shandalar/ui/hud_portrait.png b/forge-gui/res/adventure/Shandalar/ui/hud_portrait.png index f79b5162f67..10f31a239ed 100644 Binary files a/forge-gui/res/adventure/Shandalar/ui/hud_portrait.png and b/forge-gui/res/adventure/Shandalar/ui/hud_portrait.png differ