diff --git a/assets/items.png b/assets/items.png index 5dec4a0ce..b610ac629 100644 Binary files a/assets/items.png and b/assets/items.png differ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java index fc22f8232..46de4cb82 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java @@ -36,7 +36,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfMagic.Magic; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; -import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.watabou.utils.Bundle; @@ -75,8 +74,6 @@ public abstract class Wand extends KindOfWeapon { { defaultAction = AC_ZAP; - - image = ItemSpriteSheet.WAND_MAGIC_MISSILE; } public Wand() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAvalanche.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAvalanche.java index 31f824c95..60d2af479 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAvalanche.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAvalanche.java @@ -17,6 +17,7 @@ */ package com.shatteredpixel.shatteredpixeldungeon.items.wands; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.Camera; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; @@ -42,6 +43,8 @@ public class WandOfAvalanche extends Wand { { name = "Wand of Avalanche"; + image = ItemSpriteSheet.WAND_AVALANCHE; + collisionProperties = Ballistica.STOP_TERRAIN; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java index 4849e2fcf..0143dfb41 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java @@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.utils.Callback; import com.watabou.utils.Random; @@ -37,6 +38,8 @@ public class WandOfDisintegration extends Wand { { name = "Wand of Disintegration"; + image = ItemSpriteSheet.WAND_DISINTEGRATION; + collisionProperties = Ballistica.STOP_TERRAIN; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java index 6e7068d94..c917ee4aa 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFirebolt.java @@ -17,6 +17,7 @@ */ package com.shatteredpixel.shatteredpixeldungeon.items.wands; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; @@ -41,6 +42,7 @@ public class WandOfFirebolt extends Wand { { name = "Wand of Firebolt"; + image = ItemSpriteSheet.WAND_FIREBOLT; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java index f6ebd07ee..7ed6521f4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.HashSet; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.Camera; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions; @@ -40,6 +41,7 @@ public class WandOfLightning extends Wand { { name = "Wand of Lightning"; + image = ItemSpriteSheet.WAND_LIGHTNING; } private ArrayList affected = new ArrayList(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPoison.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPoison.java index a8164fc5a..a08286944 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPoison.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPoison.java @@ -18,6 +18,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; @@ -32,6 +33,7 @@ public class WandOfPoison extends Wand { { name = "Wand of Poison"; + image = ItemSpriteSheet.WAND_ACID; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java index a14a9df2d..906ae3d31 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java @@ -17,6 +17,7 @@ */ package com.shatteredpixel.shatteredpixeldungeon.items.wands; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; @@ -34,6 +35,7 @@ public class WandOfRegrowth extends Wand { { name = "Wand of Regrowth"; + image = ItemSpriteSheet.WAND_REGROWTH; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfSlowness.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfSlowness.java index a8ead1508..4451bf94c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfSlowness.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfSlowness.java @@ -18,6 +18,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; @@ -32,6 +33,7 @@ public class WandOfSlowness extends Wand { { name = "Wand of Slowness"; + image = ItemSpriteSheet.WAND_FROST; } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java index 1f10fd763..fef9a626b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java @@ -17,6 +17,7 @@ */ package com.shatteredpixel.shatteredpixeldungeon.items.wands; +import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; @@ -37,6 +38,8 @@ public class WandOfTelekinesis extends Wand { { name = "Wand of Telekinesis"; + image = ItemSpriteSheet.WAND_FORCE; + collisionProperties = Ballistica.STOP_TERRAIN; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index e5b4389c8..447bafb96 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -112,18 +112,18 @@ public class ItemSpriteSheet { //Row Six: Wands public static final int WAND_MAGIC_MISSILE = ROW6+0; - public static final int WAND_HOLLY = ROW6+1; - public static final int WAND_YEW = ROW6+2; - public static final int WAND_EBONY = ROW6+3; - public static final int WAND_CHERRY = ROW6+4; - public static final int WAND_TEAK = ROW6+5; - public static final int WAND_ROWAN = ROW6+6; - public static final int WAND_WILLOW = ROW6+7; - public static final int WAND_MAHOGANY = ROW6+8; - public static final int WAND_BAMBOO = ROW6+9; - public static final int WAND_PURPLEHEART = ROW6+10; - public static final int WAND_OAK = ROW6+11; - public static final int WAND_BIRCH = ROW6+12; + public static final int WAND_FIREBOLT = ROW6+1; + public static final int WAND_FROST = ROW6+2; + public static final int WAND_LIGHTNING = ROW6+3; + public static final int WAND_DISINTEGRATION = ROW6+4; + public static final int WAND_PRISMATIC_LIGHT= ROW6+5; + public static final int WAND_ACID = ROW6+6; + public static final int WAND_CORRUPTION = ROW6+7; + public static final int WAND_WARDING = ROW6+8; + public static final int WAND_REGROWTH = ROW6+9; + public static final int WAND_SUMMONING = ROW6+10; + public static final int WAND_AVALANCHE = ROW6+11; + public static final int WAND_FORCE = ROW6+12; //Row Seven: Rings public static final int RING_GARNET = ROW7+0;