diff --git a/core/src/main/assets/icons.png b/core/src/main/assets/icons.png index ac0b21099..f0802a553 100644 Binary files a/core/src/main/assets/icons.png and b/core/src/main/assets/icons.png differ diff --git a/core/src/main/assets/items.png b/core/src/main/assets/items.png index fd73baa22..7673bac6e 100644 Binary files a/core/src/main/assets/items.png and b/core/src/main/assets/items.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java index f7bf5685c..76d267f1b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java @@ -213,7 +213,7 @@ public class RankingsScene extends PixelScene { if (rec.depth != 0){ depth.text( Integer.toString(rec.depth) ); depth.measure(); - steps.copy(Icons.DEPTH_LG.get()); + steps.copy(Icons.DEPTH.get()); add(steps); add(depth); @@ -239,14 +239,12 @@ public class RankingsScene extends PixelScene { add( shield ); position = new BitmapText( PixelScene.pixelFont); - position.alpha(0.8f); add( position ); desc = renderMultiline( 7 ); add( desc ); depth = new BitmapText( PixelScene.pixelFont); - depth.alpha(0.8f); steps = new Image(); @@ -254,7 +252,6 @@ public class RankingsScene extends PixelScene { add( classIcon ); level = new BitmapText( PixelScene.pixelFont); - level.alpha(0.8f); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index 8dfb35cd0..1c3a7c6c3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -41,10 +41,17 @@ public class ItemSpriteSheet { public static final int WEAPON_HOLDER = PLACEHOLDERS+1; public static final int ARMOR_HOLDER = PLACEHOLDERS+2; public static final int RING_HOLDER = PLACEHOLDERS+3; - public static final int SOMETHING = PLACEHOLDERS+4; - static { - for (int i = PLACEHOLDERS; i < PLACEHOLDERS+8; i++) - assignItemRect(i, 16, 16); + public static final int POTION_HOLDER = PLACEHOLDERS+4; + public static final int SCROLL_HOLDER = PLACEHOLDERS+5; + public static final int SOMETHING = PLACEHOLDERS+6; + static{ + assignItemRect(NULLWARN, 16, 7); + 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 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 9bccdc2ee..228457ec7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -43,7 +43,6 @@ public enum Icons { HUNTRESS, CLOSE, DEPTH, - DEPTH_LG, SLEEP, ALERT, BACKPACK, @@ -113,9 +112,6 @@ public enum Icons { icon.frame( icon.texture.uvRect( 0, 45, 13, 58 ) ); break; case DEPTH: - icon.frame( icon.texture.uvRect( 46, 12, 54, 20 ) ); - break; - case DEPTH_LG: icon.frame( icon.texture.uvRect( 34, 46, 50, 62 ) ); break; case SLEEP: