From 9b723f36bc6fbd5b8103558adbdde8e47668e7b1 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 6 Mar 2024 15:11:46 -0500 Subject: [PATCH] v2.4.0: added some game log text when thrown weapons break --- core/src/main/assets/messages/items/items.properties | 1 + .../items/weapon/missiles/MissileWeapon.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 69030f8bc..703c4b43b 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1869,6 +1869,7 @@ items.weapon.missiles.missileweapon.durability=Thrown weapons will wear out and 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._ items.weapon.missiles.missileweapon.about_to_break=Your thrown weapon is about to break. +items.weapon.missiles.missileweapon.has_broken=One of your thrown weapons has broken. items.weapon.missiles.missileweapon$placeholder.name=thrown weapon items.weapon.missiles.shuriken.name=shuriken 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 24f1aff1c..ddcb0c08e 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 @@ -351,19 +351,20 @@ abstract public class MissileWeapon extends Weapon { if (parent.durability <= parent.durabilityPerUse()){ durability = 0; parent.durability = MAX_DURABILITY; + GLog.n(Messages.get(this, "has_broken")); } else { parent.durability -= parent.durabilityPerUse(); if (parent.durability > 0 && parent.durability <= parent.durabilityPerUse()){ - if (level() <= 0)GLog.w(Messages.get(this, "about_to_break")); - else GLog.n(Messages.get(this, "about_to_break")); + GLog.w(Messages.get(this, "about_to_break")); } } parent = null; } else { durability -= durabilityPerUse(); if (durability > 0 && durability <= durabilityPerUse()){ - if (level() <= 0)GLog.w(Messages.get(this, "about_to_break")); - else GLog.n(Messages.get(this, "about_to_break")); + GLog.w(Messages.get(this, "about_to_break")); + } else if (durability <= 0){ + GLog.n(Messages.get(this, "has_broken")); } } }