diff --git a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java index fa9436b5993..30caf6a8b34 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("{Scale=98%}"+DateFormat.getDateInstance().format(header.saveDate) + " " + DateFormat.getTimeInstance(DateFormat.SHORT).format(header.saveDate)); + previewDate.setText("[%99]"+DateFormat.getDateInstance(DateFormat.SHORT).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 4384ae2e903..8aa5f758e65 100644 --- a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java +++ b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java @@ -122,12 +122,12 @@ public class GameHUD extends Stage { lifePoints = ui.findActor("lifePoints"); shards = ui.findActor("shards"); money = ui.findActor("money"); - shards.setText("{Scale=80%}0/0"); - lifePoints.setText("{Scale=80%}20/20"); - AdventurePlayer.current().onLifeChange(() -> lifePoints.setText("{Scale=80%}"+AdventurePlayer.current().getLife() + "/" + AdventurePlayer.current().getMaxLife())); - AdventurePlayer.current().onShardsChange(() -> shards.setText("{Scale=80%}"+AdventurePlayer.current().getShards())); + 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())); - WorldSave.getCurrentSave().getPlayer().onGoldChange(() -> money.setText("{Scale=80%}"+String.valueOf(AdventurePlayer.current().getGold()))); + WorldSave.getCurrentSave().getPlayer().onGoldChange(() -> money.setText("[%80]"+String.valueOf(AdventurePlayer.current().getGold()))); addActor(ui); addActor(miniMapPlayer); console = new Console(); diff --git a/forge-gui-mobile/src/forge/adventure/util/Controls.java b/forge-gui-mobile/src/forge/adventure/util/Controls.java index e318fb1983d..c4d35d838ba 100644 --- a/forge-gui-mobile/src/forge/adventure/util/Controls.java +++ b/forge-gui-mobile/src/forge/adventure/util/Controls.java @@ -395,9 +395,8 @@ public class Controls { { if(textraFont==null) { - textraFont=new Font(getSkin().getFont("default")); + textraFont=new Font(getSkin().getFont("default"), 0f, 1.5f, 0f, 0f); textraFont.addAtlas(Config.instance().getAtlas(Paths.ITEMS_ATLAS)); - textraFont.adjustLineHeight(0.8f);//not sure why this is needed maybe the font is bad } return textraFont; } diff --git a/forge-gui-mobile/src/forge/adventure/util/KeyBinding.java b/forge-gui-mobile/src/forge/adventure/util/KeyBinding.java index 910400a7a79..14fd8c908f3 100644 --- a/forge-gui-mobile/src/forge/adventure/util/KeyBinding.java +++ b/forge-gui-mobile/src/forge/adventure/util/KeyBinding.java @@ -44,13 +44,13 @@ public enum KeyBinding { public String getLabelText(boolean pressed) { if(Controllers.getCurrent()!=null) { - return "{Scale=125%}[+"+controllerPrefix+Input.Keys.toString(bindingController).replace(" Button","")+(pressed?"_pressed]":"]"); + return "[%125][+"+controllerPrefix+Input.Keys.toString(bindingController).replace(" Button","")+(pressed?"_pressed]":"]"); } else { if(GuiBase.isAndroid()) return ""; - return "{Scale=125%}[+"+Input.Keys.toString(binding)+(pressed?"_pressed]":"]"); + return "[%125][+"+Input.Keys.toString(binding)+(pressed?"_pressed]":"]"); } } diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml index dc9a0f53aca..7e881636de3 100644 --- a/forge-gui/pom.xml +++ b/forge-gui/pom.xml @@ -43,7 +43,7 @@ com.github.tommyettinger textratypist - 0.7.2 + 0.7.6 com.thoughtworks.xstream diff --git a/forge-gui/res/adventure/Shandalar/ui/hud.json b/forge-gui/res/adventure/Shandalar/ui/hud.json index 661e84274a4..7163d5c595c 100644 --- a/forge-gui/res/adventure/Shandalar/ui/hud.json +++ b/forge-gui/res/adventure/Shandalar/ui/hud.json @@ -86,18 +86,18 @@ "type": "TextButton", "name": "exittoworldmap", "style":"menu", - "text": "{Scale=200%}[+ExitToWorldMap]", + "text": "[%125][+ExitToWorldMap]", "binding": "ExitToWorldMap", "width": 48, "height": 36, "x": 424, "y": 66 - } + }, { "type": "TextButton", "name": "deck", "style":"menu", - "text": "{Scale=200%}[+Deck]", + "text": "[%125][+Deck]", "binding": "Deck", "width": 48, "height": 36, @@ -108,7 +108,7 @@ "type": "TextButton", "name": "inventory", "style":"menu", - "text": "{Scale=200%}[+Item]", + "text": "[%125][+Item]", "binding": "Inventory", "width": 48, "height": 36, @@ -120,7 +120,7 @@ "type": "TextButton", "name": "statistic", "style":"menu", - "text": "{Scale=200%}[+Status]", + "text": "[%125][+Status]", "binding": "Status", "width": 48, "height": 36, @@ -131,7 +131,7 @@ "type": "TextButton", "name": "menu", "style":"menu", - "text": "{Scale=200%}[+Menu]", + "text": "[%125][+Menu]", "binding": "Menu", "width": 48, "height": 36, @@ -141,7 +141,7 @@ { "type": "TextButton", "name": "openmap", - "text": "{Scale=80%}tr(lblZoom)", + "text": "[=][%150]tr(lblZoom)", "binding": "Map", "width": 80, "height": 18, diff --git a/forge-gui/res/adventure/Shandalar/ui/hud_landscape.json b/forge-gui/res/adventure/Shandalar/ui/hud_landscape.json index 8eeb1b5ac50..ae731b7de13 100644 --- a/forge-gui/res/adventure/Shandalar/ui/hud_landscape.json +++ b/forge-gui/res/adventure/Shandalar/ui/hud_landscape.json @@ -86,7 +86,7 @@ "type": "TextButton", "name": "deck", "style":"menu", - "text": "{Scale=200%}[+Deck]", + "text": "[%125][+Deck]", "binding": "Deck", "width": 64, "height": 36, @@ -97,7 +97,7 @@ "type": "TextButton", "name": "inventory", "style":"menu", - "text": "{Scale=200%}[+Item]", + "text": "[%125][+Item]", "binding": "Inventory", "width": 64, "height": 36, @@ -109,7 +109,7 @@ "type": "TextButton", "name": "statistic", "style":"menu", - "text": "{Scale=200%}[+Status]", + "text": "[%125][+Status]", "binding": "Status", "width": 64, "height": 36, @@ -120,7 +120,7 @@ "type": "TextButton", "name": "menu", "style":"menu", - "text": "{Scale=200%}[+Menu]", + "text": "[%125][+Menu]", "binding": "Menu", "width": 64, "height": 36, @@ -130,7 +130,7 @@ { "type": "TextButton", "name": "openmap", - "text": "{Scale=80%}tr(lblZoom)", + "text": "[=][%150]tr(lblZoom)", "binding": "Map", "width": 80, "height": 18, @@ -141,7 +141,7 @@ "type": "TextButton", "name": "exittoworldmap", "style":"menu", - "text": "{Scale=200%}[+ExitToWorldMap]", + "text": "[%125][+ExitToWorldMap]", "binding": "ExitToWorldMap", "width": 64, "height": 32, diff --git a/forge-gui/res/adventure/Shandalar/ui/hud_portrait.json b/forge-gui/res/adventure/Shandalar/ui/hud_portrait.json index 39e0dbd4745..ef068021af9 100644 --- a/forge-gui/res/adventure/Shandalar/ui/hud_portrait.json +++ b/forge-gui/res/adventure/Shandalar/ui/hud_portrait.json @@ -85,7 +85,7 @@ "type": "TextButton", "name": "deck", "style":"menu", - "text": "{Scale=200%}[+Deck]", + "text": "[%125][+Deck]", "binding": "Deck", "width": 64, "height": 32, @@ -96,7 +96,7 @@ "type": "TextButton", "name": "inventory", "style":"menu", - "text": "{Scale=200%}[+Item]", + "text": "[%125][+Item]", "binding": "Inventory", "width": 64, "height": 32, @@ -108,7 +108,7 @@ "type": "TextButton", "name": "statistic", "style":"menu", - "text": "{Scale=200%}[+Status]", + "text": "[%125][+Status]", "binding": "Status", "width": 64, "height": 32, @@ -119,7 +119,7 @@ "type": "TextButton", "name": "menu", "style":"menu", - "text": "{Scale=200%}[+Menu]", + "text": "[%125][+Menu]", "binding": "Menu", "width": 64, "height": 32, @@ -129,7 +129,7 @@ { "type": "TextButton", "name": "openmap", - "text": "{Scale=80%}tr(lblZoom)", + "text": "[=][%150]tr(lblZoom)", "binding": "Map", "width": 80, "height": 18, @@ -140,7 +140,7 @@ "type": "TextButton", "name": "exittoworldmap", "style":"menu", - "text": "{Scale=200%}[+ExitToWorldMap]", + "text": "[%125][+ExitToWorldMap]", "binding": "ExitToWorldMap", "width": 64, "height": 32, diff --git a/forge-gui/res/adventure/Shandalar/ui/new_game.json b/forge-gui/res/adventure/Shandalar/ui/new_game.json index 998cb0e0fd3..f04fb21b09e 100644 --- a/forge-gui/res/adventure/Shandalar/ui/new_game.json +++ b/forge-gui/res/adventure/Shandalar/ui/new_game.json @@ -21,7 +21,7 @@ { "type": "Label", "name" : "titleL", - "text": "{SIZE=150%}[BLACK]tr(lblCreateACharacter)", + "text": "[%150][BLACK]tr(lblCreateACharacter)", "width": 128, "height": 16, "scale": 2, diff --git a/forge-gui/res/adventure/Shandalar/ui/new_game_portrait.json b/forge-gui/res/adventure/Shandalar/ui/new_game_portrait.json index fbda10b86f3..487387c6aa9 100644 --- a/forge-gui/res/adventure/Shandalar/ui/new_game_portrait.json +++ b/forge-gui/res/adventure/Shandalar/ui/new_game_portrait.json @@ -21,7 +21,7 @@ { "type": "Label", "name" : "titleL", - "text": "{SIZE=150%}[BLACK]tr(lblCreateACharacter)", + "text": "[%150][BLACK]tr(lblCreateACharacter)", "width": 128, "height": 32, "scale": 2,