diff --git a/core/src/main/assets/interfaces/icons.png b/core/src/main/assets/interfaces/icons.png index 4b09fb758..895475356 100644 Binary files a/core/src/main/assets/interfaces/icons.png and b/core/src/main/assets/interfaces/icons.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java index 7d2f326ac..12ec82930 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -44,6 +44,8 @@ public enum Icons { AUDIO, TALENT, MAGNIFY, + BUFFS, + BACKPACK_LRG, //ingame UI icons SKULL, @@ -142,6 +144,13 @@ public enum Icons { case MAGNIFY: icon.frame( icon.texture.uvRect( 96, 16, 110, 30 ) ); break; + case BUFFS: + icon.frame( icon.texture.uvRect( 110, 16, 128, 31 ) ); + break; + case BACKPACK_LRG: + icon.frame( icon.texture.uvRect( 64, 80, 80, 96 ) ); + break; + case SKULL: icon.frame( icon.texture.uvRect( 0, 32, 8, 40 ) ); break; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java index 2b336e2c8..285a7e4fc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndHero.java @@ -79,14 +79,14 @@ public class WndHero extends WndTabbed { buffs.setRect(0, 0, WIDTH, HEIGHT); buffs.setupList(); - add( new LabeledTab( Messages.get(this, "stats") ) { + add( new IconTab( Icons.get(Icons.RANKINGS) ) { protected void select( boolean value ) { super.select( value ); if (selected) lastIdx = 0; stats.visible = stats.active = selected; } } ); - add( new LabeledTab( Messages.get(this, "talents") ) { + add( new IconTab( Icons.get(Icons.TALENT) ) { protected void select( boolean value ) { super.select( value ); if (selected) lastIdx = 1; @@ -94,7 +94,7 @@ public class WndHero extends WndTabbed { talents.visible = talents.active = selected; } } ); - add( new LabeledTab( Messages.get(this, "buffs") ) { + add( new IconTab( Icons.get(Icons.BUFFS) ) { protected void select( boolean value ) { super.select( value ); if (selected) lastIdx = 2; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java index 6c8d40381..d860f8866 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java @@ -120,8 +120,8 @@ public class WndRanking extends WndTabbed { private void createControls() { - String[] labels = - {Messages.get(this, "stats"), Messages.get(this, "items"), Messages.get(this, "badges")}; + Icons[] icons = + {Icons.RANKINGS, Icons.BACKPACK_LRG, Icons.BADGES}; Group[] pages = {new StatsTab(), new ItemsTab(), new BadgesTab()}; @@ -129,7 +129,7 @@ public class WndRanking extends WndTabbed { add( pages[i] ); - Tab tab = new RankingTab( labels[i], pages[i] ); + Tab tab = new RankingTab( icons[i], pages[i] ); add( tab ); } @@ -138,12 +138,12 @@ public class WndRanking extends WndTabbed { select( 0 ); } - private class RankingTab extends LabeledTab { + private class RankingTab extends IconTab { private Group page; - public RankingTab( String label, Group page ) { - super( label ); + public RankingTab( Icons icon, Group page ) { + super( Icons.get(icon) ); this.page = page; }