From e2a7bea5e6ee18f41374735efc3bd85f2ab686c9 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 2 Oct 2020 15:30:59 -0400 Subject: [PATCH] v0.9.0: added an icon to represent talents, tweaked test subject icon --- core/src/main/assets/interfaces/icons.png | Bin 10652 -> 10711 bytes .../main/assets/interfaces/talent_icons.png | Bin 869 -> 868 bytes .../scenes/HeroSelectScene.java | 14 +++++--------- .../shatteredpixeldungeon/ui/Icons.java | 5 ++++- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/core/src/main/assets/interfaces/icons.png b/core/src/main/assets/interfaces/icons.png index 5c6da5e93aefdadd0ed982d597e591f13bf0e510..bc9bcc8c6d89083b2a847a55419a202e4cccc941 100644 GIT binary patch literal 10711 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 JPDHLkV1mD=nA89O literal 10652 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 aoc{yL+hb~>RFg>n0000M*1 z?8D($ayXny_OH(+1FuLtPCZimy>p865hNJ|(}W;^S-}fjnrBH}@NdW_Se8X<0_g~! z4+L|@3z84PlxYH0J|ZPA1WZ2#$yY)0C1L_bkbGSN`}M6EAb(gFv5CS!*aLaN+H$cj z93yZ%nF#`YJcBT_gn+s0QtXB1tE*``PqR1$_(8B_QV_g?pW9EW5abj9c^E-NiCqT3 z1TxJBy73(23ZH_`<@-B9!j0!DBRC?+v>C96TZAADLoI{=o*9hwBO;1vIEufQ^N$58 zDLhLUXU>4|f`15sdbX>~-f<7eYy|X!>lSI)#92zg$a}$(f}5L=gaCdND3cRXdn?if zOBIv~MvyNMh@>F-x&*NS$s57#ZT;0(!l8n#g>OE$Ug)Nf@Xl1>Jox~kQXcn zBBB~MLlLM8`t*5F&VxX7BQb+v1!Da?ji7!Xs4I||I!mD+XbS>qCy*DIe(<@#EuoaN zTLLkg=zj%D-V6LOuJG;{S%4Rq?+3&S{8e7zKNYxQ`g1vdSMd0V;HhNbCHW;3fglNj z;GZS=Q+Rm^LHu_D`a$r|p|JPh1wj}PytW`%A_0d%?j|-alOyoAx3@IV50p!=wSeGJ z2m;TffO1x@fF)=U2tJd7HzRl!f{w9-#|V5IGhzV*wI3kh0}?^|83gc6VETdBg&Z<} zQdST#AMap|S8gIRh!FxNU@00000NkvXXu0mjfW6?*G 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;