diff --git a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java index 487530958e8..b067f78cde1 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java @@ -14,6 +14,7 @@ import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.IntMap; import forge.Forge; import forge.adventure.player.AdventurePlayer; +import forge.adventure.stage.GameHUD; import forge.adventure.util.Controls; import forge.adventure.util.Current; import forge.gui.GuiBase; @@ -53,6 +54,7 @@ public class DeckSelectScene extends UIScene { } public void back() { + GameHUD.getInstance().getTouchpad().setVisible(false); Forge.switchScene(SceneType.GameScene.instance); } diff --git a/forge-gui-mobile/src/forge/adventure/scene/InnScene.java b/forge-gui-mobile/src/forge/adventure/scene/InnScene.java index f1c0b60282a..062f582b987 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/InnScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/InnScene.java @@ -8,30 +8,27 @@ import forge.adventure.util.Current; /** * Scene for the Inn in towns - * */ -public class InnScene extends UIScene { +public class InnScene extends UIScene { - public InnScene() - { + public InnScene() { super("ui/inn.json"); } - public void done() - { + public void done() { GameHUD.getInstance().getTouchpad().setVisible(false); Forge.switchToLast(); } - public void heal() - { + + public void heal() { Current.player().heal(); } @Override public void act(float delta) { - stage.act(delta); } + @Override public void resLoaded() { super.resLoaded(); @@ -61,10 +58,8 @@ public class InnScene extends UIScene { } @Override - public boolean keyPressed(int keycode) - { - if (keycode == Input.Keys.ESCAPE) - { + public boolean keyPressed(int keycode) { + if (keycode == Input.Keys.ESCAPE) { done(); } return true; diff --git a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java index 188992d9377..96da3b9f8a4 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java @@ -11,6 +11,7 @@ import forge.Forge; import forge.adventure.character.EnemySprite; import forge.adventure.data.EnemyData; import forge.adventure.data.WorldData; +import forge.adventure.stage.GameHUD; import forge.adventure.util.Controls; import forge.adventure.util.Current; import forge.player.GamePlayerUtil; @@ -47,6 +48,7 @@ public class PlayerStatisticScene extends UIScene { } public boolean back() { + GameHUD.getInstance().getTouchpad().setVisible(false); Forge.switchToLast(); return true; } diff --git a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java index 9e87855cc45..062a403be05 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.scenes.scene2d.Actor; import forge.Forge; +import forge.adventure.stage.GameHUD; import forge.adventure.world.WorldSave; import forge.gui.GuiBase; @@ -39,6 +40,7 @@ public class StartScene extends UIScene { public boolean Resume() { //Forge.switchToLast(); + GameHUD.getInstance().getTouchpad().setVisible(false); Forge.switchScene(SceneType.GameScene.instance); return true; } diff --git a/forge-gui/res/adventure/Shandalar/ui/heal.png b/forge-gui/res/adventure/Shandalar/ui/heal.png new file mode 100644 index 00000000000..1c9d6449223 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/ui/heal.png differ diff --git a/forge-gui/res/adventure/Shandalar/ui/inn.json b/forge-gui/res/adventure/Shandalar/ui/inn.json index 9ef4fa3469e..e3f29ce23e8 100644 --- a/forge-gui/res/adventure/Shandalar/ui/inn.json +++ b/forge-gui/res/adventure/Shandalar/ui/inn.json @@ -9,32 +9,56 @@ "width": 480, "height": 270 }, + { + "type": "Image", + "image": "ui/heal.png", + "x": 60, + "y": 85, + "width": 100, + "height": 100 + }, { "type": "TextButton", "name": "heal", "text": "Heal", - "width": 48, - "height": 16, - "x": 420, - "y": 10 + "width": 100, + "height": 30, + "x": 60, + "y": 200 + }, + { + "type": "Image", + "image": "ui/sell.png", + "x": 190, + "y": 85, + "width": 100, + "height": 100 }, { "type": "TextButton", "name": "sell", "text": "Sell cards", - "width": 48, - "height": 16, - "x": 420, - "y": 34 + "width": 100, + "height": 30, + "x": 190, + "y": 200 + }, + { + "type": "Image", + "image": "ui/leave.png", + "x": 320, + "y": 85, + "width": 100, + "height": 100 }, { "type": "TextButton", "name": "done", "text": "Leave", - "width": 48, - "height": 16, - "x": 420, - "y": 58 + "width": 100, + "height": 30, + "x": 320, + "y": 200 } ] } \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/ui/leave.png b/forge-gui/res/adventure/Shandalar/ui/leave.png new file mode 100644 index 00000000000..7c13521c224 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/ui/leave.png differ diff --git a/forge-gui/res/adventure/Shandalar/ui/sell.png b/forge-gui/res/adventure/Shandalar/ui/sell.png new file mode 100644 index 00000000000..bfb51706ea6 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/ui/sell.png differ