Rebuild comboBattler: escalation waves/elites + hit juice

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

web/comboBattler.js

@@ -4953,12 +4953,16 @@ async function createCombatRenderer({ pixi, defsById = {}, layers, coords, getBa
         const v = view[e.who];
         if (v) v.flash = 130;
         playHurt(e.who, actorOf(e.who));
+        hooks.onHit?.(e);
         e.empowered ? floatText(e.who, "-" + e.amount + "!", GOLD, { big: true }) : floatText(e.who, "-" + e.amount, 16743018);
       } else if (e.kind === "heal" && e.amount > 0) e.empowered ? floatText(e.who, "+" + e.amount + "!", GOLD, { big: true }) : floatText(e.who, "+" + e.amount, 9429896);
       else if (e.kind === "cond" && e.empowered) floatText(e.who, (e.cond === "interrupted" ? "INTERRUPT" : String(e.cond).toUpperCase()) + "!", GOLD, { big: true });
       else if (e.kind === "empower") flagEmpower(e.who);
       else if (e.kind === "miss") floatText(e.who, "dodge", 10405352);
-      else if (e.kind === "death") playDie(e.who, actorOf(e.who));
+      else if (e.kind === "death") {
+        playDie(e.who, actorOf(e.who));
+        hooks.onDeath?.(e);
+      }
     }
   }
   return {
@@ -6062,6 +6066,13 @@ function mountComboBattler(pixi, host, opts = {}) {
   let emoteLayer = null;
   const emoPrev = /* @__PURE__ */ new Map();
   let idleEmoAcc = 0;
+  let runState = { time: 0, kills: 0, diff: 1 };
+  let hitstopT = 0;
+  const shake = { t: 0, mag: 0 };
+  const addShake = (dur, mag) => {
+    shake.t = Math.max(shake.t, dur);
+    shake.mag = Math.max(shake.mag, mag);
+  };
   const depthScale = { v: 2 };
   let offTick = null, keyHandlers = null, tapHandlers = null, controlsEl = null, alive = true;
   const keys = { x: 0, y: 0 };
@@ -6315,10 +6326,13 @@ function mountComboBattler(pixi, host, opts = {}) {
       req.skill = 0;
       if (s) setInput(battle, "P0", { action: s.id });
     }
-    acc.t += Math.min(dt, 0.1);
-    while (acc.t >= STEP) {
-      step(battle, STEP);
-      acc.t -= STEP;
+    if (hitstopT > 0) hitstopT = Math.max(0, hitstopT - dt);
+    else {
+      acc.t += Math.min(dt, 0.1);
+      while (acc.t >= STEP) {
+        step(battle, STEP);
+        acc.t -= STEP;
+      }
     }
     if (!dead && p && !p.alive) {
       dead = true;
@@ -6331,7 +6345,41 @@ function mountComboBattler(pixi, host, opts = {}) {
     R.syncActors(battle, dtMS, battle.t);
     R.updateFloats(dtMS);
     R.drawProjectiles(battle);
-    R.processLog(battle, cursor);
+    R.processLog(battle, cursor, {
+      onHit: (e) => {
+        const p2 = pa();
+        if (!p2) return;
+        if (e.who === p2.id) {
+          addShake(0.16, 5);
+          hitstopT = Math.max(hitstopT, 0.03);
+        } else if (e.src === p2.id) {
+          if (e.amount >= 12) hitstopT = Math.max(hitstopT, 0.035);
+          if (e.amount >= 28) addShake(0.1, 3);
+        }
+      },
+      onDeath: (e) => {
+        const p2 = pa();
+        if (!p2) return;
+        if (e.who === p2.id) {
+          addShake(0.45, 11);
+          hitstopT = Math.max(hitstopT, 0.07);
+        } else {
+          addShake(0.2, 6);
+          hitstopT = Math.max(hitstopT, 0.06);
+        }
+      }
+    });
+    {
+      const app = map.getApp?.();
+      if (app?.stage) {
+        if (shake.t > 0) {
+          shake.t = Math.max(0, shake.t - dt);
+          const m = shake.mag * (shake.t / 0.2);
+          app.stage.position.set((Math.random() * 2 - 1) * m, (Math.random() * 2 - 1) * m);
+          if (shake.t === 0) app.stage.position.set(0, 0);
+        }
+      }
+    }
     updateEmotes(dt);
     drawRings();
     drawMarkers();
@@ -6469,6 +6517,13 @@ function mountComboBattler(pixi, host, opts = {}) {
     }
     emoteLayer = null;
     emoPrev.clear();
+    hitstopT = 0;
+    shake.t = 0;
+    shake.mag = 0;
+    try {
+      map.getApp()?.stage?.position.set(0, 0);
+    } catch {
+    }
     try {
       combatRoot?.destroy({ children: true });
     } catch {
@@ -6559,27 +6614,49 @@ function mountComboBattler(pixi, host, opts = {}) {
     let foeN = 0;
     const deadAt = /* @__PURE__ */ new Map();
     const spawnAcc = { t: SPAWN_INTERVAL };
+    let nextEliteAt = 8, nextBossAt = 24;
+    runState = { time: 0, kills: 0, diff: 1 };
+    const TIER = {
+      // hp/dmg multipliers relative to the current difficulty; bosses are tanky, not one-shotters
+      elite: { hp: 2.4, dmg: 1.4, scale: 1.4 },
+      boss: { hp: 4.6, dmg: 1.8, scale: 1.95 }
+    };
     const rosterAt = (fx2, fy2) => {
       const w = fieldToWorld(fx2, fy2);
       const b = map.biomeAt(Math.round(w.x / TILE8), Math.round(w.y / TILE8)) || "forgottenPlains";
       const r = rosters[b];
       return r && r.length ? r : rosters.forgottenPlains || [];
     };
-    const addFoe = async (entry, pos) => {
+    const addFoe = async (entry, pos, { hpMul = 1, dmgMul = 1, tier = null } = {}) => {
       const id = "R" + foeN++;
-      const a = spawnActor(battle, { ...entry.unit || {}, name: entry.name }, "enemy", id);
+      const name = tier === "boss" ? `${entry.name} the Champion` : tier === "elite" ? `Elite ${entry.name}` : entry.name;
+      const a = spawnActor(battle, { ...entry.unit || {}, name, hpMul, dmgMul }, "enemy", id);
       a.x = pos.x;
       a.y = pos.y;
-      if (alive) await R.addActor(id, { name: entry.name, ...sd(entry.sheets) });
+      if (tier) a.tier = tier;
+      if (alive) await R.addActor(id, { name, ...sd(entry.sheets) });
+      if (tier && TIER[tier]) {
+        const v = R.view?.[id];
+        if (v?.container) v.container.scale.set(TIER[tier].scale);
+      }
+      if (tier) {
+        try {
+          emoteLayer?.show(id, "angry", battle.t, 1.6);
+        } catch {
+        }
+      }
     };
     spawnFn = (dt) => {
       if (dead || !battle) return;
       const p = pa();
       if (!p) return;
+      runState.time += dt;
+      runState.diff = Math.min(4, 1 + runState.time / 80 + runState.kills * 0.03);
       for (const a of ea()) {
         if (!a.alive) {
           if (!deadAt.has(a.id)) {
             deadAt.set(a.id, battle.t);
+            runState.kills++;
             heroEmote("happy");
             try {
               opts.onEnemyDefeated?.({ id: a.id, name: a.name, profession: a.profession, tier: a.tier, x: a.x, y: a.y, t: battle.t });
@@ -6598,14 +6675,25 @@ function mountComboBattler(pixi, host, opts = {}) {
       spawnAcc.t += dt;
       if (spawnAcc.t < SPAWN_INTERVAL) return;
       spawnAcc.t = 0;
-      const need = Math.min(TARGET_FOES, MAX_FOES) - ea().filter((a) => a.alive).length;
+      const diff = runState.diff;
+      const target = Math.min(MAX_FOES, Math.round(TARGET_FOES + diff * 1.5));
+      const need = target - ea().filter((a) => a.alive).length;
       for (let i = 0; i < need; i++) {
         const ang = Math.random() * Math.PI * 2;
         const rr = (SPAWN_TILES + (Math.random() * 2 - 1) * SPAWN_JITTER) * FSTEP;
         const pos = snapField(p.x + Math.cos(ang) * rr, p.y + Math.sin(ang) * rr);
         const roster = rosterAt(pos.x, pos.y);
         if (!roster.length) continue;
-        addFoe(roster[Math.random() * roster.length | 0], pos);
+        const entry = roster[Math.random() * roster.length | 0];
+        let opt = { hpMul: diff * (0.85 + Math.random() * 0.3), dmgMul: diff * (0.85 + Math.random() * 0.3) };
+        if (i === 0 && runState.kills >= nextBossAt) {
+          opt = { hpMul: diff * TIER.boss.hp, dmgMul: diff * TIER.boss.dmg, tier: "boss" };
+          nextBossAt += 26 + (Math.random() * 10 | 0);
+        } else if (i === 0 && runState.kills >= nextEliteAt) {
+          opt = { hpMul: diff * TIER.elite.hp, dmgMul: diff * TIER.elite.dmg, tier: "elite" };
+          nextEliteAt += 8 + (Math.random() * 6 | 0);
+        }
+        addFoe(entry, pos, opt);
       }
     };
     bindKeys();
@@ -6680,7 +6768,7 @@ function mountComboBattler(pixi, host, opts = {}) {
     const p = pa();
     return p ? { name: p.name, profession: p.profession, hp: Math.round(p.hp), maxHp: Math.round(p.maxHp), skills: (p.bar || []).map((s) => s.name) } : null;
   }
-  const ctrl = { ready, selectHero, getSpawnWorld, getSnapshot, getHero, heroEmote, levelUpHero, setHeroSkills, resize, onChange, destroy, map, walkable: (wx, wy) => roamWalkable(wx, wy) };
+  const ctrl = { ready, selectHero, getSpawnWorld, getSnapshot, getHero, heroEmote, levelUpHero, setHeroSkills, getThreat: () => ({ ...runState }), resize, onChange, destroy, map, walkable: (wx, wy) => roamWalkable(wx, wy) };
   if (typeof window !== "undefined") {
     window.__comboSnap = () => ctrl.getSnapshot();
     window.__combo = ctrl;