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

v0.2.3: WIP/placeholder sprites for new items

Browse Source
This commit is contained in:
Evan Debenham 2014-12-01 22:25:06 -05:00
parent ee9aad9078
commit 70d18c822a
3 changed files with 21 additions and 13 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

5
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java
View File

@ -3,6 +3,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.artifacts;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot; import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlot;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
@ -18,7 +19,7 @@ public class TimekeepersHourglass extends Artifact {
{ {
name = "timekeeper's hourglass"; name = "timekeeper's hourglass";
image = 0; image = ItemSpriteSheet.ARTIFACT_HOURGLASS;
level = 0; level = 0;
levelCap = 5; levelCap = 5;
@ -123,7 +124,7 @@ public class TimekeepersHourglass extends Artifact {
{ {
name = "bag of magic sand"; name = "bag of magic sand";
image = 0; image = ItemSpriteSheet.SANDBAG;
} }
@Override @Override

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

@ -41,18 +41,20 @@ public class ItemSpriteSheet {
//null warning occupies space 0, should only show up if there's a bug. //null warning occupies space 0, should only show up if there's a bug.
public static final int NULLWARN = ROW1+0; public static final int NULLWARN = ROW1+0;
public static final int DEWDROP = ROW1+1; public static final int DEWDROP = ROW1+1;
public static final int PETAL = ROW1+2;
public static final int SANDBAG = ROW1+3;
// Heaps (containers) // Heaps (containers)
public static final int BONES = ROW1+2; public static final int BONES = ROW1+4;
public static final int REMAINS = ROW1+3; public static final int REMAINS = ROW1+5;
public static final int TOMB = ROW1+4; public static final int TOMB = ROW1+6;
public static final int CHEST = ROW1+5; public static final int CHEST = ROW1+7;
public static final int LOCKED_CHEST = ROW1+6; public static final int LOCKED_CHEST = ROW1+8;
public static final int CRYSTAL_CHEST = ROW1+7; public static final int CRYSTAL_CHEST = ROW1+9;
// Placeholders // Placeholders
public static final int WEAPON = ROW1+8; public static final int WEAPON = ROW1+10;
public static final int ARMOR = ROW1+9; public static final int ARMOR = ROW1+11;
public static final int RING = ROW1+10; public static final int RING = ROW1+12;
public static final int SMTH = ROW1+11; public static final int SMTH = ROW1+13;
//Row Two: Miscellaneous single use items //Row Two: Miscellaneous single use items
public static final int GOLD = ROW2+0; public static final int GOLD = ROW2+0;
@ -137,7 +139,9 @@ public class ItemSpriteSheet {
public static final int ARTIFACT_ARMBAND = ROW8+1; public static final int ARTIFACT_ARMBAND = ROW8+1;
public static final int ARTIFACT_CAPE = ROW8+2; public static final int ARTIFACT_CAPE = ROW8+2;
public static final int ARTIFACT_TALISMAN = ROW8+3; public static final int ARTIFACT_TALISMAN = ROW8+3;
public static final int ARTIFACT_ROSE = ROW8+4; public static final int ARTIFACT_HOURGLASS = ROW8+4;
public static final int ARTIFACT_TOOLKIT = ROW8+5;
//Row Nine: Artifacts with Dynamic Images //Row Nine: Artifacts with Dynamic Images
public static final int ARTIFACT_HORN1 = ROW9+0; public static final int ARTIFACT_HORN1 = ROW9+0;
@ -151,6 +155,9 @@ public class ItemSpriteSheet {
public static final int ARTIFACT_SHOES = ROW9+8; public static final int ARTIFACT_SHOES = ROW9+8;
public static final int ARTIFACT_BOOTS = ROW9+9; public static final int ARTIFACT_BOOTS = ROW9+9;
public static final int ARTIFACT_GREAVES = ROW9+10; public static final int ARTIFACT_GREAVES = ROW9+10;
public static final int ARTIFACT_ROSE1 = ROW9+11;
public static final int ARTIFACT_ROSE2 = ROW9+12;
public static final int ARTIFACT_ROSE3 = ROW9+13;
//Row Ten: Scrolls //Row Ten: Scrolls
public static final int SCROLL_KAUNAN = ROW10+0; public static final int SCROLL_KAUNAN = ROW10+0;