From 98cffcd796fcaeda4dafe0f1e5b55f85136be3df Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sat, 11 Feb 2023 22:20:54 +0800 Subject: [PATCH] fix text/effect/map layout - revert textratypist to 0.7.2 to fix effect/map dialog - update GameHUD --- .../forge/adventure/scene/SaveLoadScene.java | 2 +- .../src/forge/adventure/stage/GameHUD.java | 17 +++++++++-------- forge-gui/pom.xml | 2 +- forge-gui/res/adventure/Shandalar/ui/hud.json | 8 ++++---- forge-gui/res/adventure/Shandalar/ui/hud.png | Bin 9133 -> 2784 bytes .../adventure/Shandalar/ui/hud_landscape.json | 8 ++++---- .../adventure/Shandalar/ui/hud_portrait.json | 8 ++++---- .../adventure/Shandalar/ui/hud_portrait.png | Bin 11183 -> 2466 bytes 8 files changed, 23 insertions(+), 22 deletions(-) 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 760b385f38a16ddd36a3ca9610967216b0173bd7..fc69db03b52ccebdf3113f7fb963538afea3fdde 100644 GIT binary patch delta 1555 zcmZ4M{y=ns@?=3dQ6~0+$woZ>j0%&Rcyt{cQ}UBi6(W2C6rA&mQWebf40MwX42%@a zE%gk|OpMJ8bQFvXj12S*jPwnSbqx%y49u;Jj1-_i$!_v79;eA%ymFIuc=aa7@!C&b z$g4B?BCp!y-@K+=3Kh9IdBs*0xdoH$`NSqS@NzIJO*Y}vp4`vpH~9gdv}$UarKNe2 zNvdv=WvZcWlBtP_u4QtPiEd(wWwJqvGA7%K3IP_s$7i zziqp&RN`96%%ICUSd~c2azP!EsoP6TTzkem$r(8Py`t$eM@^jVqFS6TO z(juB(FVp>E(Xvyk%D3yMGhg+d-n-#i&+anbKR^GjR=>}){d>K4K@9WD;DCSMf@j>c z^vU;Md9pI#d9f}>Kr@5sKh`gIZ>!~=bJp$A`&`DEd+zx53*mBkGx?Q^XH{{wZR`8s zH2d?6&->&={&fmlPd9r$nYmZ_n&kzKm6n^?L|USmPfo4p4Y#}2VAY$wa7M7ex*5g1 zOji^fdg~b_W;PVKJu~?##Iy4D4MXpT zvQn%MtxQTZx3`%lFzlL=wg87w7nWW*Sn0ridxfM0zXStgmcRlw<@#WOb0_93i(|4f z;W|{B@ggXXH~RoXiRM`c!{rJwhR>x~Rya1yTFl^nJ45x9*(;!fE+}7iG+ou4b%iHn zF`GjJP{F|yA}z*7%U4cs_}9=>@RzYFCHk} znioN@9@s2s&b`7@KZl*Cfx#3QoD(%E_72dBIS~wgIh-IzOZ{guFk*bzb0+hZ>VwIa zvNcA_K^CIfR}T!o`*Xtt-tE5pr!FBof|>2XcV-eo@Yvpoy)UmYF59l|=yrOg<@{??)s^f4jKzmG}RZ|9ZdfX7Ka=4PXBK>j~dF<5jS?yGBIev5mRc&sfRM iZT72vxk>QatdFvCugaw_wccrA00K`}KbLh*2~7ZxxJd2* literal 9133 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 RoY-*CK=+_dv6fx%{{i}IW6uBp 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 f79b5162f67d2e7772baf364626014ad225a8f67..10f31a239ed393faf0d7514e3dfa3944c2550eef 100644 GIT binary patch delta 1368 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 Yx33wkFZkP%n-D->`;68j4abQ80QaIZ@&Et;