diff --git a/core/src/main/assets/interfaces/icons.png b/core/src/main/assets/interfaces/icons.png index 5c6da5e93..bc9bcc8c6 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/assets/interfaces/talent_icons.png b/core/src/main/assets/interfaces/talent_icons.png index c77562655..364d95a32 100644 Binary files a/core/src/main/assets/interfaces/talent_icons.png and b/core/src/main/assets/interfaces/talent_icons.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java index a4593032f..ae36b1060 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java @@ -359,29 +359,25 @@ public class HeroSelectScene extends PixelScene { case WARRIOR: default: tabIcons = new Image[]{ new ItemSprite(ItemSpriteSheet.SEAL, null), - new ItemSprite(ItemSpriteSheet.WORN_SHORTSWORD, null), - new ItemSprite(ItemSpriteSheet.ARMOR_WARRIOR, null) + new ItemSprite(ItemSpriteSheet.WORN_SHORTSWORD, null) }; break; case MAGE: tabIcons = new Image[]{ new ItemSprite(ItemSpriteSheet.MAGES_STAFF, null), - new ItemSprite(ItemSpriteSheet.HOLDER, null), - new ItemSprite(ItemSpriteSheet.ARMOR_MAGE, null) + new ItemSprite(ItemSpriteSheet.HOLDER, null) }; break; case ROGUE: tabIcons = new Image[]{ new ItemSprite(ItemSpriteSheet.ARTIFACT_CLOAK, null), - new ItemSprite(ItemSpriteSheet.DAGGER, null), - new ItemSprite(ItemSpriteSheet.ARMOR_ROGUE, null), + new ItemSprite(ItemSpriteSheet.DAGGER, null) }; break; case HUNTRESS: tabIcons = new Image[]{ new ItemSprite(ItemSpriteSheet.SPIRIT_BOW, null), - new ItemSprite(ItemSpriteSheet.GLOVES, null), - new ItemSprite(ItemSpriteSheet.ARMOR_HUNTRESS, null) + new ItemSprite(ItemSpriteSheet.GLOVES, null) }; break; } @@ -410,7 +406,7 @@ public class HeroSelectScene extends PixelScene { }; add(tab); - tab = new IconTab( tabIcons[2] ){ + tab = new IconTab( Icons.get(Icons.TALENT) ){ @Override protected void select(boolean value) { super.select(value); 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 e4816aaa3..a989c34e0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -42,6 +42,7 @@ public enum Icons { DISPLAY, DATA, AUDIO, + TALENT, //ingame UI icons SKULL, @@ -125,13 +126,15 @@ public enum Icons { case DISPLAY: icon.frame( icon.texture.uvRect( 32, 16, 45, 32 ) ); break; - //TODO UI icon? case DATA: icon.frame( icon.texture.uvRect( 48, 16, 64, 31 ) ); break; case AUDIO: icon.frame( icon.texture.uvRect( 64, 16, 78, 30 ) ); break; + case TALENT: + icon.frame( icon.texture.uvRect( 80, 16, 93, 29 ) ); + break; case SKULL: icon.frame( icon.texture.uvRect( 0, 32, 8, 40 ) ); break;