LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.0: added an icon to represent talents, tweaked test subject icon

Browse Source
This commit is contained in:
Evan Debenham 2020-10-02 15:30:59 -04:00
parent c14a098fa2
commit e2a7bea5e6
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/assets/interfaces/icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
core/src/main/assets/interfaces/talent_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 869 B

After

Width:  |  Height:  |  Size: 868 B

14
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/HeroSelectScene.java
View File

@ -359,29 +359,25 @@ public class HeroSelectScene extends PixelScene {
case WARRIOR: default: case WARRIOR: default:
tabIcons = new Image[]{ tabIcons = new Image[]{
new ItemSprite(ItemSpriteSheet.SEAL, null), new ItemSprite(ItemSpriteSheet.SEAL, null),
new ItemSprite(ItemSpriteSheet.WORN_SHORTSWORD, null), new ItemSprite(ItemSpriteSheet.WORN_SHORTSWORD, null)
new ItemSprite(ItemSpriteSheet.ARMOR_WARRIOR, null)
}; };
break; break;
case MAGE: case MAGE:
tabIcons = new Image[]{ tabIcons = new Image[]{
new ItemSprite(ItemSpriteSheet.MAGES_STAFF, null), new ItemSprite(ItemSpriteSheet.MAGES_STAFF, null),
new ItemSprite(ItemSpriteSheet.HOLDER, null), new ItemSprite(ItemSpriteSheet.HOLDER, null)
new ItemSprite(ItemSpriteSheet.ARMOR_MAGE, null)
}; };
break; break;
case ROGUE: case ROGUE:
tabIcons = new Image[]{ tabIcons = new Image[]{
new ItemSprite(ItemSpriteSheet.ARTIFACT_CLOAK, null), new ItemSprite(ItemSpriteSheet.ARTIFACT_CLOAK, null),
new ItemSprite(ItemSpriteSheet.DAGGER, null), new ItemSprite(ItemSpriteSheet.DAGGER, null)
new ItemSprite(ItemSpriteSheet.ARMOR_ROGUE, null),
}; };
break; break;
case HUNTRESS: case HUNTRESS:
tabIcons = new Image[]{ tabIcons = new Image[]{
new ItemSprite(ItemSpriteSheet.SPIRIT_BOW, null), new ItemSprite(ItemSpriteSheet.SPIRIT_BOW, null),
new ItemSprite(ItemSpriteSheet.GLOVES, null), new ItemSprite(ItemSpriteSheet.GLOVES, null)
new ItemSprite(ItemSpriteSheet.ARMOR_HUNTRESS, null)
}; };
break; break;
} }
@ -410,7 +406,7 @@ public class HeroSelectScene extends PixelScene {
}; };
add(tab); add(tab);
tab = new IconTab( tabIcons[2] ){ tab = new IconTab( Icons.get(Icons.TALENT) ){
@Override @Override
protected void select(boolean value) { protected void select(boolean value) {
super.select(value); super.select(value);

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
View File

@ -42,6 +42,7 @@ public enum Icons {
DISPLAY, DISPLAY,
DATA, DATA,
AUDIO, AUDIO,
TALENT,
//ingame UI icons //ingame UI icons
SKULL, SKULL,
@ -125,13 +126,15 @@ public enum Icons {
case DISPLAY: case DISPLAY:
icon.frame( icon.texture.uvRect( 32, 16, 45, 32 ) ); icon.frame( icon.texture.uvRect( 32, 16, 45, 32 ) );
break; break;
//TODO UI icon?
case DATA: case DATA:
icon.frame( icon.texture.uvRect( 48, 16, 64, 31 ) ); icon.frame( icon.texture.uvRect( 48, 16, 64, 31 ) );
break; break;
case AUDIO: case AUDIO:
icon.frame( icon.texture.uvRect( 64, 16, 78, 30 ) ); icon.frame( icon.texture.uvRect( 64, 16, 78, 30 ) );
break; break;
case TALENT:
icon.frame( icon.texture.uvRect( 80, 16, 93, 29 ) );
break;
case SKULL: case SKULL:
icon.frame( icon.texture.uvRect( 0, 32, 8, 40 ) ); icon.frame( icon.texture.uvRect( 0, 32, 8, 40 ) );
break; break;