diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java index 2825a503a..1f0372b6c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java @@ -201,17 +201,17 @@ abstract public class MissileWeapon extends Weapon { parent.durability = MAX_DURABILITY; } else { parent.durability -= parent.durabilityPerUse(); - if (parent.durability <= parent.durabilityPerUse()){ - if (level() <= 0)GLog.w(Messages.get(Weapon.class, "about_to_break")); - else GLog.n(Messages.get(Weapon.class, "about_to_break")); + if (parent.durability > 0 && parent.durability <= parent.durabilityPerUse()){ + if (level() <= 0)GLog.w(Messages.get(MissileWeapon.class, "about_to_break")); + else GLog.n(Messages.get(MissileWeapon.class, "about_to_break")); } } parent = null; } else { durability -= durabilityPerUse(); - if (durability <= durabilityPerUse()){ - if (level() <= 0)GLog.w(Messages.get(Weapon.class, "about_to_break")); - else GLog.n(Messages.get(Weapon.class, "about_to_break")); + if (durability > 0 && durability <= durabilityPerUse()){ + if (level() <= 0)GLog.w(Messages.get(MissileWeapon.class, "about_to_break")); + else GLog.n(Messages.get(MissileWeapon.class, "about_to_break")); } } if (durability > 0){ diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index 644d2a80c..e567d4b72 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -1386,7 +1386,7 @@ items.weapon.missiles.missileweapon.distance=This weapon is designed to be used items.weapon.missiles.missileweapon.durability=Missile weapons will wear out and break as they are used. items.weapon.missiles.missileweapon.uses_left=This stack of weapons has _%d/%d_ uses left before one breaks. items.weapon.missiles.missileweapon.unlimited_uses=_But these are of such high quality that they will effectively last forever._ -ttems.weapon.missiles.missileweapon.about_to_break=Your thrown weapon is about to break. +items.weapon.missiles.missileweapon.about_to_break=Your thrown weapon is about to break. items.weapon.missiles.shuriken.name=shuriken items.weapon.missiles.shuriken.desc=Star-shaped pieces of metal with razor-sharp blades. They are lightweight and easy to use on the move. A single shuriken can be thrown instantly after moving.