From 185740a9fb66249dfab2b674d122393fa2d2bfa9 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 16 Sep 2022 13:59:54 -0400 Subject: [PATCH] v1.4.0: thrown weps now show their count in orange when about to break --- .../items/weapon/missiles/MissileWeapon.java | 5 +++++ .../shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java | 8 ++++++++ 2 files changed, 13 insertions(+) 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 6500a5f26..1073324ec 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 @@ -265,6 +265,11 @@ abstract public class MissileWeapon extends Weapon { } return this; } + + public String status() { + //show quantity even when it is 1 + return Integer.toString( quantity ); + } @Override public float castDelay(Char user, int dst) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java index b30ac0ffa..95999cf91 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java @@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring; import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; @@ -227,6 +228,13 @@ public class ItemSlot extends Button { status.text( item.status() ); + if (item instanceof MissileWeapon + && ((MissileWeapon) item).durabilityLeft() <= ((MissileWeapon) item).durabilityPerUse()){ + status.hardlight(WARNING); + } else { + status.resetColor(); + } + if (item.icon != -1 && (item.isIdentified() || (item instanceof Ring && ((Ring) item).isKnown()))){ extra.text( null );