diff --git a/assets/items.png b/assets/items.png index b610ac629..88d20cf9f 100644 Binary files a/assets/items.png and b/assets/items.png differ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java index c0f33b16f..ac6a7b9d3 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java @@ -36,7 +36,7 @@ public class MagesStaff extends MeleeWeapon { { name = "Mage's Staff"; - image = ItemSpriteSheet.WAND_MAGIC_MISSILE; + image = ItemSpriteSheet.MAGES_STAFF; defaultAction = AC_ZAP; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index 447bafb96..b8f218133 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -81,14 +81,15 @@ public class ItemSpriteSheet { public static final int KNUCKLEDUSTER = ROW3+0; public static final int DAGGER = ROW3+1; public static final int SHORT_SWORD = ROW3+2; - public static final int QUARTERSTAFF = ROW3+3; - public static final int SPEAR = ROW3+4; - public static final int MACE = ROW3+5; - public static final int SWORD = ROW3+6; - public static final int BATTLE_AXE = ROW3+7; - public static final int LONG_SWORD = ROW3+8; - public static final int WAR_HAMMER = ROW3+9; - public static final int GLAIVE = ROW3+10; + public static final int MAGES_STAFF = ROW3+3; + public static final int QUARTERSTAFF = ROW3+4; + public static final int SPEAR = ROW3+5; + public static final int MACE = ROW3+6; + public static final int SWORD = ROW3+7; + public static final int BATTLE_AXE = ROW3+8; + public static final int LONG_SWORD = ROW3+9; + public static final int WAR_HAMMER = ROW3+10; + public static final int GLAIVE = ROW3+11; //Row Four: Missile weapons public static final int DART = ROW4+0;