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

v0.6.1: improved depth icons and placeholder graphics

Browse Source
This commit is contained in:
Evan Debenham 2017-07-06 00:37:23 -04:00
parent c8df657e51
commit a8b3b76053
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
core/src/main/assets/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java
View File

@ -213,7 +213,7 @@ public class RankingsScene extends PixelScene {
if (rec.depth != 0){ if (rec.depth != 0){
depth.text( Integer.toString(rec.depth) ); depth.text( Integer.toString(rec.depth) );
depth.measure(); depth.measure();
steps.copy(Icons.DEPTH_LG.get()); steps.copy(Icons.DEPTH.get());
add(steps); add(steps);
add(depth); add(depth);
@ -239,14 +239,12 @@ public class RankingsScene extends PixelScene {
add( shield ); add( shield );
position = new BitmapText( PixelScene.pixelFont); position = new BitmapText( PixelScene.pixelFont);
position.alpha(0.8f);
add( position ); add( position );
desc = renderMultiline( 7 ); desc = renderMultiline( 7 );
add( desc ); add( desc );
depth = new BitmapText( PixelScene.pixelFont); depth = new BitmapText( PixelScene.pixelFont);
depth.alpha(0.8f);
steps = new Image(); steps = new Image();
@ -254,7 +252,6 @@ public class RankingsScene extends PixelScene {
add( classIcon ); add( classIcon );
level = new BitmapText( PixelScene.pixelFont); level = new BitmapText( PixelScene.pixelFont);
level.alpha(0.8f);
} }
@Override @Override

13
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
View File

@ -41,10 +41,17 @@ public class ItemSpriteSheet {
public static final int WEAPON_HOLDER = PLACEHOLDERS+1; public static final int WEAPON_HOLDER = PLACEHOLDERS+1;
public static final int ARMOR_HOLDER = PLACEHOLDERS+2; public static final int ARMOR_HOLDER = PLACEHOLDERS+2;
public static final int RING_HOLDER = PLACEHOLDERS+3; public static final int RING_HOLDER = PLACEHOLDERS+3;
public static final int SOMETHING = PLACEHOLDERS+4; public static final int POTION_HOLDER = PLACEHOLDERS+4;
public static final int SCROLL_HOLDER = PLACEHOLDERS+5;
public static final int SOMETHING = PLACEHOLDERS+6;
static{ static{
for (int i = PLACEHOLDERS; i < PLACEHOLDERS+8; i++) assignItemRect(NULLWARN, 16, 7);
assignItemRect(i, 16, 16); assignItemRect(WEAPON_HOLDER, 14, 14);
assignItemRect(ARMOR_HOLDER, 14, 12);
assignItemRect(RING_HOLDER, 8, 10);
assignItemRect(POTION_HOLDER, 10, 14);
assignItemRect(SCROLL_HOLDER, 15, 14);
assignItemRect(SOMETHING, 8, 13);
} }
private static final int UNCOLLECTIBLE = xy(9, 1); //8 slots private static final int UNCOLLECTIBLE = xy(9, 1); //8 slots

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

@ -43,7 +43,6 @@ public enum Icons {
HUNTRESS, HUNTRESS,
CLOSE, CLOSE,
DEPTH, DEPTH,
DEPTH_LG,
SLEEP, SLEEP,
ALERT, ALERT,
BACKPACK, BACKPACK,
@ -113,9 +112,6 @@ public enum Icons {
icon.frame( icon.texture.uvRect( 0, 45, 13, 58 ) ); icon.frame( icon.texture.uvRect( 0, 45, 13, 58 ) );
break; break;
case DEPTH: case DEPTH:
icon.frame( icon.texture.uvRect( 46, 12, 54, 20 ) );
break;
case DEPTH_LG:
icon.frame( icon.texture.uvRect( 34, 46, 50, 62 ) ); icon.frame( icon.texture.uvRect( 34, 46, 50, 62 ) );
break; break;
case SLEEP: case SLEEP: