Release Healer Man 0.1.21

src/game/CombatBridge.tsx

@@ -6,7 +6,12 @@ import { advanceDungeonPartyCombat } from "./partyRuntime";
 import { useGameStore } from "./store";
 import { activateManastormActiveSpellLoadout } from "./manastormSpellLoadout";
 import { useManastormStore } from "./manastormStore";
-import { useWailingEncounterStore } from "./wailingCavernsEncounter";
+import {
+  activateDungeonEncounterDefinitions,
+  advanceDungeonEncounters,
+  resetDungeonEncounters,
+} from "./dungeonEncounterRuntime";
+import { requireDungeonDefinition } from "./dungeonRegistry";
 import {
   onlineSessionIsActive,
   onlineSessionOwnsWorldSimulation,
@@ -21,9 +26,10 @@ import { combatSimulationTimerShouldRun } from "./combatSimulationLifecycle";
 export function CombatBridge() {
   const character = useShellStore((state) => state.activeCharacter);
   const gameMode = useGameStore((state) => state.gameMode);
+  const activeDungeonId = useGameStore((state) => state.activeDungeonId);
   const activeRole = useShellStore((state) => state.activeDungeonRole);
-  const resetRevision = useGameStore((state) => state.resetRevision);
-  const mountedResetRevision = useRef(resetRevision);
+  const encounterResetRevision = useGameStore((state) => state.encounterResetRevision);
+  const mountedResetRevision = useRef(encounterResetRevision);
 
   useEffect(() => {
     if (!character) return;
@@ -37,11 +43,16 @@ export function CombatBridge() {
   }, [activeRole, character?.id, gameMode]);
 
   useEffect(() => {
-    if (mountedResetRevision.current === resetRevision) return;
-    mountedResetRevision.current = resetRevision;
+    const definition = requireDungeonDefinition(activeDungeonId);
+    activateDungeonEncounterDefinitions(activeDungeonId, definition.encounters ?? []);
+  }, [activeDungeonId]);
+
+  useEffect(() => {
+    if (mountedResetRevision.current === encounterResetRevision) return;
+    mountedResetRevision.current = encounterResetRevision;
     useCombatStore.getState().resetEncounter();
-    useWailingEncounterStore.getState().reset();
-  }, [resetRevision]);
+    resetDungeonEncounters("dungeon", useGameStore.getState().activeDungeonId);
+  }, [encounterResetRevision]);
 
   useEffect(() => {
     if (!character) return;
@@ -113,15 +124,17 @@ export function CombatBridge() {
           advanceDungeonPartyCombat(epochNow);
         }
         useCombatStore.getState().synchronizeActors();
-        if (
-          onlineSessionOwnsWorldSimulation()
-          && game.gameMode === "dungeon"
-          && game.activeDungeonId === "wailing-caverns"
-        ) {
-          useWailingEncounterStore.getState().advance(
-            useCombatStore.getState().mobs,
-            epochNow,
-          );
+        if (onlineSessionOwnsWorldSimulation() && game.gameMode === "dungeon") {
+          const mobs = useCombatStore.getState().mobs;
+          const registeredEntityIds = Object.keys(mobs);
+          advanceDungeonEncounters(game.activeDungeonId, {
+            kind: "tick",
+            now: epochNow,
+            facts: {
+              registeredEntityIds,
+              deadEntityIds: registeredEntityIds.filter((id) => mobs[id].dead),
+            },
+          });
         }
       }
     };