v0.4.0: lots more curse implementation

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java

@@ -31,6 +31,8 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfFuror;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfSharpshooting;
+import com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses.Annoying;
+import com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses.Exhausting;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses.Fragile;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses.Wayward;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Blazing;
@@ -274,7 +276,7 @@ abstract public class Weapon extends KindOfWeapon {
 			2, 2, 2 };
 
 		private static final Class<?>[] curses = new Class<?>[]{
-				Fragile.class, Wayward.class
+				Annoying.class, Exhausting.class, Fragile.class, Wayward.class
 		};
 			
 		public abstract int proc( Weapon weapon, Char attacker, Char defender, int damage );

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Annoying.java

@@ -0,0 +1,66 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015  Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2016 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+package com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses;
+
+import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
+import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
+import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
+import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
+import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
+import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
+import com.watabou.noosa.audio.Sample;
+import com.watabou.utils.Random;
+
+public class Annoying extends Weapon.Enchantment {
+
+	private static ItemSprite.Glowing BLACK = new ItemSprite.Glowing( 0x000000 );
+
+	@Override
+	public int proc( Weapon weapon, Char attacker, Char defender, int damage ) {
+
+		if (Random.Int(20) == 0) {
+			for (Mob mob : Dungeon.level.mobs.toArray(new Mob[0])) {
+				mob.beckon(attacker.pos);
+			}
+			attacker.sprite.centerEmitter().start(Speck.factory(Speck.SCREAM), 0.3f, 3);
+			Sample.INSTANCE.play(Assets.SND_MIMIC);
+			Invisibility.dispel();
+			GLog.n(Messages.get(this, "msg_" + (Random.Int(5)+1)));
+		}
+
+		return damage;
+	}
+
+	@Override
+	public boolean curse() {
+		return true;
+	}
+
+	@Override
+	public ItemSprite.Glowing glowing() {
+		return BLACK;
+	}
+
+}

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/curses/Exhausting.java

@@ -0,0 +1,54 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015  Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2016 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+package com.shatteredpixel.shatteredpixeldungeon.items.weapon.curses;
+
+import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
+import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness;
+import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
+import com.watabou.utils.Random;
+
+public class Exhausting extends Weapon.Enchantment {
+
+	private static ItemSprite.Glowing BLACK = new ItemSprite.Glowing( 0x000000 );
+
+	@Override
+	public int proc(Weapon weapon, Char attacker, Char defender, int damage ) {
+
+		if (attacker == Dungeon.hero && Random.Int(20) == 0) {
+			Buff.affect(attacker, Weakness.class, Random.Float(5f, 25f));
+		}
+
+		return damage;
+	}
+
+	@Override
+	public boolean curse() {
+		return true;
+	}
+
+	@Override
+	public ItemSprite.Glowing glowing() {
+		return BLACK;
+	}
+}

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java

@@ -77,8 +77,7 @@ public class MeleeWeapon extends Weapon {
 			}
 		}
 
-		//defense-granting weapons include the DR amount, otherwise the value is discarded.
-		String stats_desc = Messages.get(this, "stats_desc", defenceFactor(Dungeon.hero));
+		String stats_desc = Messages.get(this, "stats_desc");
 		if (!stats_desc.equals("")) info+= "\n\n" + stats_desc;
 
 		switch (imbue) {