From 03f657f4f4af4c1655323152ed4ab258495786b3 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 19 Jan 2022 22:00:59 -0500 Subject: [PATCH] v1.2.0: moved health and xp bar textures into status pane file --- core/src/main/assets/interfaces/exp_bar.png | Bin 83 -> 0 bytes core/src/main/assets/interfaces/hp_bar.png | Bin 109 -> 0 bytes core/src/main/assets/interfaces/shield_bar.png | Bin 108 -> 0 bytes core/src/main/assets/interfaces/status_pane.png | Bin 585 -> 684 bytes .../shatteredpixeldungeon/Assets.java | 3 --- .../shatteredpixeldungeon/ui/StatusPane.java | 12 +++++++----- 6 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 core/src/main/assets/interfaces/exp_bar.png delete mode 100644 core/src/main/assets/interfaces/hp_bar.png delete mode 100644 core/src/main/assets/interfaces/shield_bar.png 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 badef03d98008351ad061fba9f5698f964425bb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~j!2~2Dq<3-vDJf4E$B+uf g6B3>_DJzIGWcM*m_)>X>5vYp6)78&qol`;+0HwSXEdT%j 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 aaec77d6388d7f9c2f46b7607a72178ed5a6b55c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4nWMp!3HGl7FaF;QYM}*jv*C{$v5N^e%8-OU@I~> z>|?w4zq3rUt$!KAmdqFb2@h7$W=?|%d<-A>ii}@`KT-l|@^tlcS?83{1OUZ* B8b|;D diff --git a/core/src/main/assets/interfaces/status_pane.png b/core/src/main/assets/interfaces/status_pane.png index 522d804ac11339db45d5cafa4b3b84341031157c..35f9d6c85dc01602ed80729d5c1cbb6cce2dc16b 100644 GIT binary patch delta 460 zcmV;-0W{0eU0e-oknio3Xn(5wox(m zm5r8MK*4unRysu1Wu~OVBwb=sIzrAxrlq5#Twr24M%H!rfOcK0{ijyG{_xBEymZ4wiw2Gk z5W2=_d`;znC_`1k7B7#^S!7(yzUiy{--{E@?B|oU8x< 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);