From c1fabfbd8ae3981aa19e877900cb72663319c9ae Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 27 Mar 2024 16:38:18 -0400 Subject: [PATCH] v2.4.0: fixed a few bugs when tipped darts get high durability --- .../shatteredpixeldungeon/items/wands/WandOfRegrowth.java | 2 +- .../items/weapon/missiles/darts/TippedDart.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java index a2cbec938..e464849e7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java @@ -426,7 +426,7 @@ public class WandOfRegrowth extends Wand { } public float seedPreservation(){ - return 0.40f + 0.04f*wandLvl; + return Math.min( 1f, 0.40f + 0.04f*wandLvl ); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java index 81c524a01..d56eabd28 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java @@ -186,6 +186,9 @@ public abstract class TippedDart extends Dart { usages += 4; } + //at 100 uses, items just last forever. + if (usages >= 100f) return 0; + //add a tiny amount to account for rounding error for calculations like 1/3 return (MAX_DURABILITY/usages) + 0.001f; }