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

Merging 1.7.5 Source: item assets changes (plus placeholder for bandolier) + included grave sprite from donation features(simpler than keeping it out of every item sheet related commit)

Browse Source
This commit is contained in:
Evan Debenham 2015-02-05 16:54:21 -05:00
parent e2ee042c38
commit 7b3747fd05
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB

17
src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java
View File

@ -47,14 +47,15 @@ public class ItemSpriteSheet {
public static final int BONES = ROW1+4;
public static final int REMAINS = ROW1+5;
public static final int TOMB = ROW1+6;
public static final int CHEST = ROW1+7;
public static final int LOCKED_CHEST = ROW1+8;
public static final int CRYSTAL_CHEST = ROW1+9;
// Placeholders
public static final int WEAPON = ROW1+10;
public static final int ARMOR = ROW1+11;
public static final int RING = ROW1+12;
public static final int SMTH = ROW1+13;
public static final int GRAVE = ROW1+7;
public static final int CHEST = ROW1+8;
public static final int LOCKED_CHEST = ROW1+9;
public static final int CRYSTAL_CHEST = ROW1+10;
// Placeholders
public static final int WEAPON = ROW1+11;
public static final int ARMOR = ROW1+12;
public static final int RING = ROW1+13;
public static final int SMTH = ROW1+14;
//Row Two: Miscellaneous single use items
public static final int GOLD = ROW2+0;