Release Healer Man 0.1.37

src/ui/Hud.tsx

@@ -28,12 +28,15 @@ import { Minimap } from "./Minimap";
 import { PlayerStatusPanel } from "./PlayerStatusPanel";
 import { EncounterTimeline } from "./EncounterTimeline";
 import { PartyFrames } from "./PartyFrames";
+import { ResurrectionDestination, useResurrectionCheckpoints } from "./ResurrectionDestination";
+import type { ResurrectionCheckpoint } from "../game/resurrectionCheckpoints";
 import { TimedEffectStrip } from "./TimedEffectStrip";
 import { AuraStrip } from "./AuraStrip";
 import { ShelvedHud } from "@shelvedHud";
 import { ThreatMeterWidget } from "./ThreatMeterWidget";
 import { BossLootWindow } from "./BossLootWindow";
 import { EditableHudElement } from "./EditableHudElement";
+import { DpsMeter } from "./DpsMeter";
 import { DesktopActionBars } from "./DesktopActionBars";
 import { currentUiDevice, useUiLayoutStore } from "../game/uiLayoutStore";
 import { SummonFrames } from "./SummonFrames";
@@ -82,12 +85,16 @@ export function DefeatedPrompt({
   resurrectionCharges,
   onReturn,
   sharedOnline = false,
+  checkpoints = [],
 }: {
   gameMode: "dungeon" | "manastorm";
   resurrectionCharges: number;
-  onReturn: () => void;
+  onReturn: (checkpointId?: string) => void;
   sharedOnline?: boolean;
+  checkpoints?: readonly ResurrectionCheckpoint[];
 }) {
+  const [requestedCheckpoint, setRequestedCheckpoint] = useState("entrance");
+  const checkpointId = checkpoints.some((checkpoint) => checkpoint.id === requestedCheckpoint) ? requestedCheckpoint : "entrance";
   const canReturn = !sharedOnline && (gameMode === "dungeon" || resurrectionCharges > 0);
   return (
     <section
@@ -103,11 +110,16 @@ export function DefeatedPrompt({
           Stay down and wait for a party member to resurrect you, or choose to return now.
         </p>
         {canReturn ? (
-          <button type="button" className="button button--primary" onClick={onReturn}>
-            {gameMode === "manastorm"
-              ? `Resurrect now · ${resurrectionCharges} remaining`
-              : "Respawn at entrance"}
-          </button>
+          <>
+            {gameMode === "dungeon" && checkpoints.length > 0 ? (
+              <ResurrectionDestination checkpoints={checkpoints} value={checkpointId} onChange={setRequestedCheckpoint} />
+            ) : null}
+            <button type="button" className="button button--primary" onClick={() => onReturn(gameMode === "dungeon" ? checkpointId : undefined)}>
+              {gameMode === "manastorm"
+                ? `Resurrect now · ${resurrectionCharges} remaining`
+                : checkpointId === "entrance" ? "Respawn at entrance" : "Respawn at checkpoint"}
+            </button>
+          </>
         ) : sharedOnline ? (
           <small>Your shared run is still active. A living player can resurrect you.</small>
         ) : (
@@ -159,6 +171,7 @@ export function Hud() {
   const assetStatus = useGameStore((state) => state.assetStatus);
   const assetMessage = useGameStore((state) => state.assetMessage);
   const activeDungeonId = useGameStore((state) => state.activeDungeonId);
+  const resurrectionCheckpoints = useResurrectionCheckpoints();
   const dungeon = requireDungeonDefinition(activeDungeonId);
   const encounter = useManastormStore((state) => state.currentEncounter);
   const resurrectionCharges = useManastormStore((state) => state.resurrectionCharges);
@@ -349,12 +362,12 @@ export function Hud() {
     mapId: dungeon.mapId,
     areaName,
   });
-  const returnFromDefeat = () => {
+  const returnFromDefeat = (checkpointId?: string) => {
     if (gameMode === "manastorm") {
       resurrectManastormSession({ kind: "player" });
       return;
     }
-    respawnDefeatedPlayer();
+    respawnDefeatedPlayer(checkpointId ?? "entrance");
   };
   const finishDungeon = () => {
     useShellStore.getState().saveActiveDungeonRunCheckpoint(null);
@@ -364,6 +377,7 @@ export function Hud() {
   return (
     <div className="hud" style={{ "--game-ui-scale": settings.uiScale } as CSSProperties}>
       <ShelvedHud />
+      <DpsMeter />
       <BossLootWindow />
       <EditableHudElement id="completion">{dungeonComplete && health > 0 ? (
         <DungeonCompletePrompt dungeonTitle={dungeon.title} onFinish={finishDungeon} />
@@ -501,6 +515,7 @@ export function Hud() {
           gameMode={gameMode}
           resurrectionCharges={resurrectionCharges}
           onReturn={returnFromDefeat}
+          checkpoints={resurrectionCheckpoints}
           sharedOnline={onlineSession !== null}
         />
       ) : null}