summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android/assets/data/ui.atlas18
-rw-r--r--assets/ui/bg.9.png (renamed from assets/ui/typewriter.9.png)bin4780 -> 4780 bytes
-rw-r--r--core/src/ch/asynk/rustanddust/RustAndDust.java6
-rw-r--r--core/src/ch/asynk/rustanddust/game/Hud.java4
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java2
-rw-r--r--core/src/ch/asynk/rustanddust/menu/MainMenu.java2
-rw-r--r--core/src/ch/asynk/rustanddust/menu/OptionsMenu.java2
-rw-r--r--core/src/ch/asynk/rustanddust/menu/PlayMenu.java4
-rw-r--r--core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java2
-rw-r--r--core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java2
-rw-r--r--core/src/ch/asynk/rustanddust/ui/Menu.java4
14 files changed, 26 insertions, 26 deletions
diff --git a/android/assets/data/ui.atlas b/android/assets/data/ui.atlas
index 55a7be1..08849b1 100644
--- a/android/assets/data/ui.atlas
+++ b/android/assets/data/ui.atlas
@@ -4,6 +4,15 @@ size: 1024,256
format: RGBA8888
filter: Nearest,Nearest
repeat: none
+bg
+ rotate: false
+ xy: 452, 41
+ size: 48, 48
+ split: 23, 23, 23, 23
+ pad: 11, 11, 12, 12
+ orig: 48, 48
+ offset: 0, 0
+ index: -1
cancel
rotate: false
xy: 386, 26
@@ -46,15 +55,6 @@ to
orig: 190, 217
offset: 0, 0
index: -1
-typewriter
- rotate: false
- xy: 452, 41
- size: 48, 48
- split: 23, 23, 23, 23
- pad: 11, 11, 12, 12
- orig: 48, 48
- offset: 0, 0
- index: -1
unit
rotate: false
xy: 386, 91
diff --git a/assets/ui/typewriter.9.png b/assets/ui/bg.9.png
index a2fbc8c..a2fbc8c 100644
--- a/assets/ui/typewriter.9.png
+++ b/assets/ui/bg.9.png
Binary files differ
diff --git a/core/src/ch/asynk/rustanddust/RustAndDust.java b/core/src/ch/asynk/rustanddust/RustAndDust.java
index a73a725..161ba81 100644
--- a/core/src/ch/asynk/rustanddust/RustAndDust.java
+++ b/core/src/ch/asynk/rustanddust/RustAndDust.java
@@ -23,7 +23,7 @@ import ch.asynk.rustanddust.ui.Bg;
public class RustAndDust extends Game
{
- public static final String NINEPATCH = "typewriter";
+ public static final String BG_PATCH = "bg";
public static final String TTF_FONT = "skin/veteran-typewriter.ttf";
public static final String ATLAS_UI = "data/ui.atlas";
public static final String ATLAS_HUD = "data/hud.atlas";
@@ -70,7 +70,7 @@ public class RustAndDust extends Game
public TextureAtlas uiAtlas;
public BitmapFont font;
- public NinePatch ninePatch;
+ public NinePatch bgPatch;
public enum State
{
@@ -214,7 +214,7 @@ public class RustAndDust extends Game
parameter.size = Math.max((int) (h * 0.04f), 16);
parameter.color = Color.BLACK;
font = generator.generateFont(parameter);
- ninePatch = uiAtlas.createPatch(NINEPATCH);
+ bgPatch = uiAtlas.createPatch(BG_PATCH);
}
private void unloadUiAssets()
diff --git a/core/src/ch/asynk/rustanddust/game/Hud.java b/core/src/ch/asynk/rustanddust/game/Hud.java
index 0e1ddec..89b6349 100644
--- a/core/src/ch/asynk/rustanddust/game/Hud.java
+++ b/core/src/ch/asynk/rustanddust/game/Hud.java
@@ -66,8 +66,8 @@ public class Hud implements Disposable, Animation
playerInfo = new PlayerInfo(game);
actionButtons = new ActionButtons(game);
actionButtons.hide();
- msg = new Msg(game.font, game.ninePatch, 20f);
- okCancel = new OkCancel(game.font, game.ninePatch, game.factory.getHudRegion(game.factory.ACT_DONE), game.factory.getHudRegion(game.factory.ACT_ABORT));
+ msg = new Msg(game.font, game.bgPatch, 20f);
+ okCancel = new OkCancel(game.font, game.bgPatch, game.factory.getHudRegion(game.factory.ACT_DONE), game.factory.getHudRegion(game.factory.ACT_ABORT));
optionsBtn = new Bg(game.factory.getHudRegion(game.factory.ACT_OPTIONS));
optionsPanel = new OptionsPanel(game);
stats = new StatisticsPanel(game);
diff --git a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
index 15726aa..c4f4e8e 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
@@ -44,7 +44,7 @@ public class EngagementPanel extends Patch implements Animation
public EngagementPanel(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.usFlag = new Bg(game.factory.getFlag(Army.US));
this.geFlag = new Bg(game.factory.getFlag(Army.GE));
this.attackImg = new Bg(game.factory.getHudRegion(game.factory.PNG_ATTACK));
diff --git a/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java b/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java
index 76ac97f..c97bb9a 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java
@@ -20,7 +20,7 @@ public class ObjectivesPanel extends Patch
public ObjectivesPanel(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.title = new Label(game.font, LABEL_PADDING);
this.content = new Label(game.font, LABEL_PADDING);
this.visible = false;
diff --git a/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java b/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java
index e7a4377..5e004e6 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java
@@ -37,7 +37,7 @@ public class OptionsPanel extends Patch
public OptionsPanel(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.game = game;
this.font = game.font;
this.title = new Label(game.font, LABEL_PADDING);
diff --git a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java
index 9b2746c..1711168 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java
@@ -28,7 +28,7 @@ public class StatisticsPanel extends Patch
public StatisticsPanel(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.title = new Label(game.font);
this.header = new Label(game.font);
this.stats1 = new Label(game.font);
diff --git a/core/src/ch/asynk/rustanddust/menu/MainMenu.java b/core/src/ch/asynk/rustanddust/menu/MainMenu.java
index e69329f..024fec3 100644
--- a/core/src/ch/asynk/rustanddust/menu/MainMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/MainMenu.java
@@ -36,7 +36,7 @@ public class MainMenu extends Menu
public MainMenu(RustAndDust game)
{
- super(Items.NONE, game.font, game.ninePatch);
+ super(Items.NONE, game.font, game.bgPatch);
this.visible = true;
}
diff --git a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
index 0dada78..f5b5182 100644
--- a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
@@ -45,7 +45,7 @@ public class OptionsMenu extends Patch
public OptionsMenu(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.game = game;
this.font = game.font;
this.okBtn = new Bg(game.getUiRegion(game.UI_OK));
diff --git a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java
index 9cf6f9e..97fead0 100644
--- a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java
@@ -34,7 +34,7 @@ public class PlayMenu extends Patch
public PlayMenu(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.game = game;
this.title = new Label(game.font);
this.title.write("- Play");
@@ -49,7 +49,7 @@ public class PlayMenu extends Patch
this.objectives = new Label(game.font);
this.objectives.write("Battle Objectives");
this.objectivesPanel = new ObjectivesPanel(game);
- this.okCancel = new OkCancel(game.font, game.ninePatch, game.getUiRegion(game.UI_OK), game.getUiRegion(game.UI_CANCEL));
+ this.okCancel = new OkCancel(game.font, game.bgPatch, game.getUiRegion(game.UI_OK), game.getUiRegion(game.UI_CANCEL));
if (game.config.battle == null) {
battleIdx = 0;
diff --git a/core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java b/core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java
index 4ea46da..75e2c90 100644
--- a/core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/ScenariosMenu.java
@@ -31,7 +31,7 @@ public class ScenariosMenu extends Patch
public ScenariosMenu(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.game = game;
this.font = game.font;
this.okBtn = new Bg(game.getUiRegion(game.UI_OK));
diff --git a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java
index 75de5aa..d5c38c9 100644
--- a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java
@@ -20,7 +20,7 @@ public class TutorialsMenu extends Patch
public TutorialsMenu(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.game = game;
this.okBtn = new Bg(game.getUiRegion(game.UI_OK));
this.title = new Label(game.font);
diff --git a/core/src/ch/asynk/rustanddust/ui/Menu.java b/core/src/ch/asynk/rustanddust/ui/Menu.java
index 0ffc5f1..35d707f 100644
--- a/core/src/ch/asynk/rustanddust/ui/Menu.java
+++ b/core/src/ch/asynk/rustanddust/ui/Menu.java
@@ -21,9 +21,9 @@ public class Menu extends Patch
protected MenuItem menuItem;
- public Menu(MenuItem menuItem, BitmapFont font, NinePatch ninePatch)
+ public Menu(MenuItem menuItem, BitmapFont font, NinePatch bgPatch)
{
- super(ninePatch);
+ super(bgPatch);
this.menuItem = menuItem;
this.labels = new Label[menuItem.last()];
for (int i = 0; i< menuItem.last(); i ++) {
generated by cgit v1.1-2-g2b99 at 2024-11-21 17:37:53 +0100