Restore saved player position on reconnect

This commit is contained in:
Jage9
2026-02-24 21:08:48 -05:00
parent 6eb83d6df4
commit 503ba63a24
3 changed files with 22 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
// Maintainer-controlled web client version. // Maintainer-controlled web client version.
// Format: YYYY.MM.DD Rn (example: 2026.02.20 R2) // Format: YYYY.MM.DD Rn (example: 2026.02.20 R2)
window.CHGRID_WEB_VERSION = "2026.02.25 R240"; window.CHGRID_WEB_VERSION = "2026.02.25 R241";
// Optional display timezone for timestamps. Falls back to America/Detroit if unset/invalid. // Optional display timezone for timestamps. Falls back to America/Detroit if unset/invalid.
window.CHGRID_TIME_ZONE = "America/Detroit"; window.CHGRID_TIME_ZONE = "America/Detroit";

View File

@@ -1012,6 +1012,20 @@ function persistPlayerPosition(): void {
} }
} }
/** Loads previously persisted local player coordinates, when available and valid. */
function getPersistedPlayerPosition(): { x: number; y: number } | null {
const raw = localStorage.getItem('spatialChatPosition');
if (!raw) return null;
try {
const parsed = JSON.parse(raw) as { x?: unknown; y?: unknown };
if (typeof parsed.x !== 'number' || typeof parsed.y !== 'number') return null;
if (!Number.isFinite(parsed.x) || !Number.isFinite(parsed.y)) return null;
return { x: Math.round(parsed.x), y: Math.round(parsed.y) };
} catch {
return null;
}
}
/** Picks one random footstep sample URL. */ /** Picks one random footstep sample URL. */
function randomFootstepUrl(): string { function randomFootstepUrl(): string {
return FOOTSTEP_SOUND_URLS[Math.floor(Math.random() * FOOTSTEP_SOUND_URLS.length)]; return FOOTSTEP_SOUND_URLS[Math.floor(Math.random() * FOOTSTEP_SOUND_URLS.length)];
@@ -1355,6 +1369,7 @@ const onAppMessage = createOnMessageHandler({
mediaSession.setConnecting(value); mediaSession.setConnecting(value);
updateConnectAvailability(); updateConnectAvailability();
}, },
getPersistedPlayerPosition,
rendererSetGridSize: (size) => renderer.setGridSize(size), rendererSetGridSize: (size) => renderer.setGridSize(size),
applyServerItemUiDefinitions: (defs) => applyServerItemUiDefinitions(defs as Parameters<typeof applyServerItemUiDefinitions>[0]), applyServerItemUiDefinitions: (defs) => applyServerItemUiDefinitions(defs as Parameters<typeof applyServerItemUiDefinitions>[0]),
state, state,

View File

@@ -9,6 +9,7 @@ type MessageHandlerDeps = {
setWorldGridSize: (size: number) => void; setWorldGridSize: (size: number) => void;
setMovementTickMs: (value: number) => void; setMovementTickMs: (value: number) => void;
setConnecting: (value: boolean) => void; setConnecting: (value: boolean) => void;
getPersistedPlayerPosition: () => { x: number; y: number } | null;
rendererSetGridSize: (size: number) => void; rendererSetGridSize: (size: number) => void;
applyServerItemUiDefinitions: (defs: unknown) => boolean; applyServerItemUiDefinitions: (defs: unknown) => boolean;
state: { state: {
@@ -97,8 +98,11 @@ export function createOnMessageHandler(deps: MessageHandlerDeps): (message: Inco
deps.state.player.id = message.id; deps.state.player.id = message.id;
deps.state.running = true; deps.state.running = true;
deps.setConnecting(false); deps.setConnecting(false);
deps.state.player.x = Math.max(0, Math.min(deps.getWorldGridSize() - 1, message.player.x)); const persistedPosition = deps.getPersistedPlayerPosition();
deps.state.player.y = Math.max(0, Math.min(deps.getWorldGridSize() - 1, message.player.y)); const targetX = persistedPosition?.x ?? message.player.x;
const targetY = persistedPosition?.y ?? message.player.y;
deps.state.player.x = Math.max(0, Math.min(deps.getWorldGridSize() - 1, targetX));
deps.state.player.y = Math.max(0, Math.min(deps.getWorldGridSize() - 1, targetY));
deps.dom.nicknameContainer.classList.add('hidden'); deps.dom.nicknameContainer.classList.add('hidden');
deps.dom.connectButton.classList.add('hidden'); deps.dom.connectButton.classList.add('hidden');
deps.dom.disconnectButton.classList.remove('hidden'); deps.dom.disconnectButton.classList.remove('hidden');