diff --git a/core/src/main/assets/interfaces/exp_bar.png b/core/src/main/assets/interfaces/exp_bar.png deleted file mode 100644 index badef03d9..000000000 Binary files a/core/src/main/assets/interfaces/exp_bar.png and /dev/null differ diff --git a/core/src/main/assets/interfaces/hp_bar.png b/core/src/main/assets/interfaces/hp_bar.png deleted file mode 100644 index aaec77d63..000000000 Binary files a/core/src/main/assets/interfaces/hp_bar.png and /dev/null differ diff --git a/core/src/main/assets/interfaces/shield_bar.png b/core/src/main/assets/interfaces/shield_bar.png deleted file mode 100644 index 07bdb45e3..000000000 Binary files a/core/src/main/assets/interfaces/shield_bar.png and /dev/null differ diff --git a/core/src/main/assets/interfaces/status_pane.png b/core/src/main/assets/interfaces/status_pane.png index 522d804ac..35f9d6c85 100644 Binary files a/core/src/main/assets/interfaces/status_pane.png and b/core/src/main/assets/interfaces/status_pane.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java index 2219c12aa..e7f292cb3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java @@ -75,9 +75,6 @@ public class Assets { public static final String STATUS = "interfaces/status_pane.png"; public static final String MENU = "interfaces/menu_pane.png"; public static final String MENU_BTN = "interfaces/menu_button.png"; - public static final String HP_BAR = "interfaces/hp_bar.png"; - public static final String SHLD_BAR = "interfaces/shield_bar.png"; - public static final String XP_BAR = "interfaces/exp_bar.png"; public static final String TOOLBAR = "interfaces/toolbar.png"; public static final String SHADOW = "interfaces/shadow.png"; public static final String BOSSHP = "interfaces/boss_hp.png"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java index d4fc7dd3f..53153851e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java @@ -77,10 +77,12 @@ public class StatusPane extends Component { private BusyIndicator busy; private CircleArc counter; + private static String asset = Assets.Interfaces.STATUS; + @Override protected void createChildren() { - bg = new NinePatch( Assets.Interfaces.STATUS, 0, 0, 128, 36, 85, 0, 45, 0 ); + bg = new NinePatch( asset, 0, 0, 128, 36, 85, 0, 45, 0 ); add( bg ); add( new Button(){ @@ -104,21 +106,21 @@ public class StatusPane extends Component { compass = new Compass( Statistics.amuletObtained ? Dungeon.level.entrance : Dungeon.level.exit ); add( compass ); - rawShielding = new Image( Assets.Interfaces.SHLD_BAR ); + rawShielding = new Image(asset, 0, 40, 50, 4); rawShielding.alpha(0.5f); add(rawShielding); - shieldedHP = new Image( Assets.Interfaces.SHLD_BAR ); + shieldedHP = new Image(asset, 0, 40, 50, 4); add(shieldedHP); - hp = new Image( Assets.Interfaces.HP_BAR ); + hp = new Image(asset, 0, 36, 50, 4); add( hp ); hpText = new BitmapText(PixelScene.pixelFont); hpText.alpha(0.6f); add(hpText); - exp = new Image( Assets.Interfaces.XP_BAR ); + exp = new Image(asset, 0, 44, 16, 1); add( exp ); level = new BitmapText( PixelScene.pixelFont);