diff --git a/assets/icons.png b/assets/icons.png index b134ae1f0..a64468684 100644 Binary files a/assets/icons.png and b/assets/icons.png differ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/KindofMisc.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/KindofMisc.java index 3252484b0..dc7149100 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/KindofMisc.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/KindofMisc.java @@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; + public abstract class KindofMisc extends EquipableItem { public abstract void activate(Char ch); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClothArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClothArmor.java index bdb08a77f..2b0f7afb6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClothArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClothArmor.java @@ -22,7 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.armor; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; - public class ClothArmor extends Armor { { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/LeatherArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/LeatherArmor.java index e445548e2..e155f515f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/LeatherArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/LeatherArmor.java @@ -22,7 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.armor; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; - public class LeatherArmor extends Armor { { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MailArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MailArmor.java index 600258d0f..71d5fa589 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MailArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/MailArmor.java @@ -22,7 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.armor; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; - public class MailArmor extends Armor { { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/PlateArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/PlateArmor.java index 0e60e9d95..e0b5c7728 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/PlateArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/PlateArmor.java @@ -22,7 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.armor; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; - public class PlateArmor extends Armor { { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ScaleArmor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ScaleArmor.java index c91a6cc3e..ad0d7789c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ScaleArmor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/ScaleArmor.java @@ -22,7 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.armor; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; - public class ScaleArmor extends Armor { { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java index 9b21047d5..ebf00576e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java @@ -44,6 +44,7 @@ import com.watabou.utils.Random; import java.util.Arrays; import java.util.HashSet; + //TODO: balancing public class WandOfCorruption extends Wand {