diff --git a/core/src/main/assets/items.png b/core/src/main/assets/items.png index 40be4d588..2cab2c07f 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/items/stones/StoneOfAggression.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java index 2541cffb0..70a163dd8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java @@ -37,7 +37,7 @@ import com.watabou.utils.PathFinder; public class StoneOfAggression extends Runestone { { - image = ItemSpriteSheet.STONE_KAUNAN; + image = ItemSpriteSheet.STONE_AGGRESSION; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAugmentation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAugmentation.java index 4c6bcea04..9cbd0e084 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAugmentation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAugmentation.java @@ -39,7 +39,7 @@ public class StoneOfAugmentation extends InventoryStone { { mode = WndBag.Mode.ENCHANTABLE; - image = ItemSpriteSheet.STONE_YNGVI; + image = ItemSpriteSheet.STONE_AUGMENTATION; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAvoidance.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAvoidance.java index 0e36c635d..473cbbeac 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAvoidance.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAvoidance.java @@ -37,7 +37,7 @@ import com.watabou.utils.PathFinder; public class StoneOfAvoidance extends Runestone { { - image = ItemSpriteSheet.STONE_LAGUZ; + image = ItemSpriteSheet.STONE_AVOIDANCE; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfBlast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfBlast.java index 906f71911..5ab072bce 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfBlast.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfBlast.java @@ -27,7 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class StoneOfBlast extends Runestone { { - image = ItemSpriteSheet.STONE_GYFU; + image = ItemSpriteSheet.STONE_BLAST; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfBlink.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfBlink.java index 835973ead..3ae61e88a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfBlink.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfBlink.java @@ -30,7 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class StoneOfBlink extends Runestone { { - image = ItemSpriteSheet.STONE_SOWILO; + image = ItemSpriteSheet.STONE_BLINK; } private static Ballistica throwPath; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfClairvoyance.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfClairvoyance.java index 95ac79258..672465edb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfClairvoyance.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfClairvoyance.java @@ -44,7 +44,7 @@ public class StoneOfClairvoyance extends Runestone { private static final int DIST = 8; { - image = ItemSpriteSheet.STONE_RAIDO; + image = ItemSpriteSheet.STONE_CLAIRVOYANCE; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDeepenedSleep.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDeepenedSleep.java index 4c009b16d..919ac14f2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDeepenedSleep.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDeepenedSleep.java @@ -36,7 +36,7 @@ import com.watabou.utils.PathFinder; public class StoneOfDeepenedSleep extends Runestone { { - image = ItemSpriteSheet.STONE_NAUDIZ; + image = ItemSpriteSheet.STONE_SLEEP; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDetectCurse.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDetectCurse.java index f9cb5db68..4ff278962 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDetectCurse.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDetectCurse.java @@ -33,7 +33,7 @@ public class StoneOfDetectCurse extends InventoryStone { { mode = WndBag.Mode.CURSE_DETECTABLE; - image = ItemSpriteSheet.STONE_ODAL; + image = ItemSpriteSheet.STONE_CURSE; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfEnchantment.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfEnchantment.java index 808444213..c4ca67dbb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfEnchantment.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfEnchantment.java @@ -35,7 +35,7 @@ public class StoneOfEnchantment extends InventoryStone { { mode = WndBag.Mode.ENCHANTABLE; - image = ItemSpriteSheet.STONE_TIWAZ; + image = ItemSpriteSheet.STONE_ENCHANT; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java index 1c685ca1a..40a60e9db 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java @@ -36,7 +36,7 @@ import com.watabou.utils.Random; public class StoneOfFlock extends Runestone { { - image = ItemSpriteSheet.STONE_BERKANAN; + image = ItemSpriteSheet.STONE_FLOCK; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java index 0be0ee6d4..5be06de3a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java @@ -75,7 +75,7 @@ public class StoneOfIntuition extends InventoryStone { { mode = WndBag.Mode.UNIDED_POTION_OR_SCROLL; - image = ItemSpriteSheet.STONE_ISAZ; + image = ItemSpriteSheet.STONE_INTUITION; } @Override @@ -128,7 +128,7 @@ public class StoneOfIntuition extends InventoryStone { public WndGuess(final Item item){ IconTitle titlebar = new IconTitle(); - titlebar.icon( new ItemSprite(ItemSpriteSheet.STONE_ISAZ, null) ); + titlebar.icon( new ItemSprite(ItemSpriteSheet.STONE_INTUITION, null) ); titlebar.label( Messages.get(StoneOfIntuition.class, "name") ); titlebar.setRect( 0, 0, WIDTH, 0 ); add( titlebar ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfShock.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfShock.java index a055ac0ce..78eb6b51d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfShock.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfShock.java @@ -41,7 +41,7 @@ import java.util.ArrayList; public class StoneOfShock extends Runestone { { - image = ItemSpriteSheet.STONE_MANNAZ; + image = ItemSpriteSheet.STONE_SHOCK; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java index 4b2463927..acd9a7d85 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java @@ -1552,7 +1552,7 @@ public class ChangesScene extends PixelScene { "\n" + "Dev commentary will be added here in the future.")); - changes.addButton( new ChangeButton(new ItemSprite(ItemSpriteSheet.STONE_YNGVI, null), "Pixel Dungeon v1.7.2", + changes.addButton( new ChangeButton(new ItemSprite(ItemSpriteSheet.STONE_AUGMENTATION, null), "Pixel Dungeon v1.7.2", "Implemented directly from v1.7.2:\n" + "_-_ Synchronous Movement\n" + "_-_ Challenges\n" + 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 910aa9a7a..616b7dd41 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -443,19 +443,19 @@ public class ItemSpriteSheet { assignItemRect(i, 15, 14); } - private static final int STONES = xy(1, 21); //16 slots - public static final int STONE_KAUNAN = STONES+0; - public static final int STONE_SOWILO = STONES+1; - public static final int STONE_LAGUZ = STONES+2; - public static final int STONE_YNGVI = STONES+3; - public static final int STONE_GYFU = STONES+4; - public static final int STONE_RAIDO = STONES+5; - public static final int STONE_ISAZ = STONES+6; - public static final int STONE_MANNAZ = STONES+7; - public static final int STONE_NAUDIZ = STONES+8; - public static final int STONE_BERKANAN = STONES+9; - public static final int STONE_ODAL = STONES+10; - public static final int STONE_TIWAZ = STONES+11; + private static final int STONES = xy(1, 21); //16 slots + public static final int STONE_AGGRESSION = STONES+0; + public static final int STONE_AUGMENTATION = STONES+1; + public static final int STONE_AVOIDANCE = STONES+2; + public static final int STONE_BLAST = STONES+3; + public static final int STONE_BLINK = STONES+4; + public static final int STONE_CLAIRVOYANCE = STONES+5; + public static final int STONE_SLEEP = STONES+6; + public static final int STONE_CURSE = STONES+7; + public static final int STONE_ENCHANT = STONES+8; + public static final int STONE_FLOCK = STONES+9; + public static final int STONE_INTUITION = STONES+10; + public static final int STONE_SHOCK = STONES+11; static { for (int i = STONES; i < STONES+16; i++) assignItemRect(i, 14, 12);