Jocaru/echoes-of-the-ash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP: Current state before PVP combat investigation

Browse Source
This commit is contained in:
Joan
2026-02-03 12:19:28 +01:00
parent 7f42fd6b7f
commit 0b0a23f500
36 changed files with 2423 additions and 1472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pwa/src/components/game/hooks/useGameEngine.ts
View File

@@ -910,8 +910,8 @@ export function useGameEngine(
// Map API field names to playerState field names
const mappedData: any = {}
// Skip HP updates if in combat (Combat.tsx handles HP timing)
if (playerData.hp !== undefined && !combatState) {
// HP updates are now controlled by Combat.tsx - it calls updatePlayerState at the right time
if (playerData.hp !== undefined) {
mappedData.health = playerData.hp
}
if (playerData.max_hp !== undefined) {
@@ -929,8 +929,8 @@ export function useGameEngine(
setPlayerState((prev: any) => prev ? { ...prev, ...mappedData } : null)
}
// Also update profile for consistency (skip HP if in combat)
if (playerData.hp !== undefined && profile && !combatState) {
// Also update profile for consistency
if (playerData.hp !== undefined && profile) {
setProfile((prev: any) => prev ? { ...prev, hp: playerData.hp } : null)
}
if (playerData.xp !== undefined && profile) {