From a06ee84df6d5c7fa8309c86ba8d0b4ddd9905613 Mon Sep 17 00:00:00 2001
From: Jonathan Yaeger <jmyaeger@gmail.com>
Date: Sun, 28 Dec 2025 01:39:56 -0500
Subject: [PATCH] Make getTtk handle hp-dependent cases

---
 src/lib/PlayerVsNPCCalc.ts | 67 +++++++++++++++++++++++++++++++++-----
 1 file changed, 59 insertions(+), 8 deletions(-)

diff --git a/src/lib/PlayerVsNPCCalc.ts b/src/lib/PlayerVsNPCCalc.ts
index ae5312962..2780e13d0 100644
--- a/src/lib/PlayerVsNPCCalc.ts
+++ b/src/lib/PlayerVsNPCCalc.ts
@@ -1958,19 +1958,70 @@ export default class PlayerVsNPCCalc extends BaseCalc {
    * Returns the average hits-to-kill calculation.
    */
   public getHtk() {
-    const dist = this.getDistribution();
-    const hist = dist.asHistogram();
     const startHp = this.monster.inputs.monsterCurrentHp;
-    const max = Math.min(startHp, dist.getMax());
-    if (max === 0) {
-      return 0;
+    const isHpDependent = this.distIsCurrentHpDependent(this.player, this.monster);
+
+    if (!isHpDependent || this.opts.disableMonsterScaling) {
+      const dist = this.getDistribution();
+      const hist = dist.asHistogram();
+      const max = Math.min(startHp, dist.getMax());
+      if (max === 0) {
+        return 0;
+      }
+
+      const htk = new Float64Array(startHp + 1); // 0 hits left to do if hp = 0
+
+      for (let hp = 1; hp <= startHp; hp++) {
+        let val = 1.0; // takes at least one hit
+        for (let hit = 1; hit <= Math.min(hp, max); hit++) {
+          const p = hist[hit];
+          val += p.value * htk[hp - hit];
+        }
+
+        htk[hp] = val / (1 - hist[0].value);
+      }
+
+      return htk[startHp];
     }
 
-    const htk = new Float64Array(startHp + 1); // 0 hits left to do if hp = 0
+    // for hp-dependent cases, cache the hit dists and max hits for each hp
+    const hpHists = new Array<ReturnType<AttackDistribution['asHistogram']>>(startHp + 1);
+    const hpMaxHits = new Uint16Array(startHp + 1);
+
+    for (let hp = 0; hp <= startHp; hp++) {
+      if (hp === this.monster.inputs.monsterCurrentHp) {
+        const dist = this.getDistribution();
+        hpHists[hp] = dist.asHistogram();
+        hpMaxHits[hp] = dist.getMax();
+      } else {
+        const subCalc = this.noInitSubCalc(
+          this.player,
+          scaleMonsterHpOnly({
+            ...this.baseMonster,
+            inputs: {
+              ...this.baseMonster.inputs,
+              monsterCurrentHp: hp,
+            },
+          }),
+        );
+        const dist = subCalc.getDistribution();
+        hpHists[hp] = dist.asHistogram();
+        hpMaxHits[hp] = dist.getMax();
+      }
+    }
+
+    const htk = new Float64Array(startHp + 1);
 
     for (let hp = 1; hp <= startHp; hp++) {
-      let val = 1.0; // takes at least one hit
-      for (let hit = 1; hit <= Math.min(hp, max); hit++) {
+      const hist = hpHists[hp];
+      const max = Math.min(hp, hpMaxHits[hp]);
+
+      if (max === 0) {
+        continue;
+      }
+
+      let val = 1.0;
+      for (let hit = 1; hit <= max; hit++) {
         const p = hist[hit];
         val += p.value * htk[hp - hit];
       }