diff --git a/assets/items.png b/assets/items.png index 95eeda4f7..531098d96 100644 Binary files a/assets/items.png and b/assets/items.png differ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java index f880d1e44..55ac8886a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java @@ -26,7 +26,7 @@ import java.util.Collections; * Created by debenhame on 08/09/2014. */ public class SandalsOfNature extends Artifact { - //todo: test, add sprite switching, number tweaking. + //todo: polish, tweak the greaves sprite a little, it's too neat/needs to be more messy. { name = "Sandals of Nature"; @@ -38,7 +38,7 @@ public class SandalsOfNature extends Artifact { } public static final String[] NAMES = {"Sandals of Nature", "Shoes of Nature", - "Boots of Nature", "Leggings of Nature"}; + "Boots of Nature", "Greaves of Nature"}; public static final String AC_FEED = "FEED"; public static final String AC_ROOT = "ROOT"; @@ -95,16 +95,19 @@ public class SandalsOfNature extends Artifact { private static final String SEEDS = "seeds"; + private static final String NAME = "name"; @Override public void storeInBundle( Bundle bundle ) { super.storeInBundle(bundle); + bundle.put(NAME, name); bundle.put(SEEDS, seeds.toArray(new String[seeds.size()])); } @Override public void restoreFromBundle( Bundle bundle ) { super.restoreFromBundle(bundle); + name = bundle.getString( NAME ); if (bundle.contains(SEEDS)) Collections.addAll(seeds , bundle.getStringArray(SEEDS)); } @@ -131,7 +134,7 @@ public class SandalsOfNature extends Artifact { hero.sprite.operate( hero.pos ); hero.busy(); hero.spend( 2f ); - if (seeds.size() >= 5+level){ + if (seeds.size() >= 2){ seeds.clear(); upgrade(); if (level >= 1 && level <= 3) { @@ -145,7 +148,7 @@ public class SandalsOfNature extends Artifact { else if (level == 2) image = ItemSpriteSheet.ARTIFACT_BOOTS; else if (level >= 3) - image = ItemSpriteSheet.ARTIFACT_LEGGINGS; + image = ItemSpriteSheet.ARTIFACT_GREAVES; } else { GLog.i("Your " + name + " absorb the seed, they seem healthier."); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index f304d48ec..a0110719a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -134,7 +134,7 @@ public class ItemSpriteSheet { public static final int ARTIFACT_CLOAK = ROW8+0; public static final int ARTIFACT_ARMBAND = ROW8+1; public static final int ARTIFACT_CAPE = ROW8+2; - public static final int ARTIFACT_TALISMAN = 0; + public static final int ARTIFACT_TALISMAN = ROW8+3; //Row Nine: Artifacts with Dynamic Images @@ -148,7 +148,7 @@ public class ItemSpriteSheet { public static final int ARTIFACT_SANDALS = ROW9+7; public static final int ARTIFACT_SHOES = ROW9+8; public static final int ARTIFACT_BOOTS = ROW9+9; - public static final int ARTIFACT_LEGGINGS = ROW9+10; + public static final int ARTIFACT_GREAVES = ROW9+10; //Row Ten: Scrolls public static final int SCROLL_KAUNAN = ROW10+0;