setExpandedWeapon(expandedWeapon === 'ROOT' ? null : 'ROOT')}>
{expandedWeapon === 'ROOT' ? '▼' : '▶'}
@@ -1316,41 +1686,46 @@ export default function App() {
{weaponsOpen && (
{(() => {
- const lw = equippedWeapons.left, rw = equippedWeapons.right
+ const lw = player.equipped.left, rw = player.equipped.right
const entries = []
if (lw === 'fists') {
entries.push(
setHoverInfo({ type: 'weapon', id: 'left_arm' })} onMouseLeave={() => setHoverInfo(null)}
- onClick={() => { setLimbSelect('left_arm'); setSelectedSkill(null); setSelectedTarget(null); setMoveMode(null) }}>
+ onClick={() => { setLimbSelect('left_arm'); setSelectedSkill(null); setSelectedTarget(null); setMoveMode(null); setAimMode(false) }}>
○Left Arm
)
- } else {
+ } else if (lw !== rw) {
entries.push(
setHoverInfo({ type: 'weapon', id: lw })} onMouseLeave={() => setHoverInfo(null)}
- onClick={() => { setLimbSelect(lw); setSelectedSkill(null); setSelectedTarget(null); setMoveMode(null) }}>
+ onClick={() => { setLimbSelect(lw); setSelectedSkill(null); setSelectedTarget(null); setMoveMode(null); setAimMode(false) }}>
○Left: {weaponMap[lw].name}
)
}
if (rw === 'fists') {
entries.push(
setHoverInfo({ type: 'weapon', id: 'right_arm' })} onMouseLeave={() => setHoverInfo(null)}
- onClick={() => { setLimbSelect('right_arm'); setSelectedSkill(null); setSelectedTarget(null); setMoveMode(null) }}>
+ onClick={() => { setLimbSelect('right_arm'); setSelectedSkill(null); setSelectedTarget(null); setMoveMode(null); setAimMode(false) }}>
○Right Arm
)
} else if (lw !== rw) {
entries.push(
setHoverInfo({ type: 'weapon', id: rw })} onMouseLeave={() => setHoverInfo(null)}
- onClick={() => { setLimbSelect(rw); setSelectedSkill(null); setSelectedTarget(null); setMoveMode(null) }}>
+ onClick={() => { setLimbSelect(rw); setSelectedSkill(null); setSelectedTarget(null); setMoveMode(null); setAimMode(false) }}>
○Right: {weaponMap[rw].name}
)
}
+ if (lw === rw && lw !== 'fists' && lw !== 'left_arm' && lw !== 'right_arm') {
+ entries.push(
setHoverInfo({ type: 'weapon', id: lw })} onMouseLeave={() => setHoverInfo(null)}
+ onClick={() => { setLimbSelect(lw); setSelectedSkill(null); setSelectedTarget(null); setMoveMode(null); setAimMode(false) }}>
+ ○Both: {weaponMap[lw].name}
)
+ }
if (lw === 'fists' && rw === 'fists') {
entries.push(
setHoverInfo({ type: 'weapon', id: 'fists' })} onMouseLeave={() => setHoverInfo(null)}
- onClick={() => { setLimbSelect('fists'); setSelectedSkill(null); setSelectedTarget(null); setMoveMode(null) }}>
+ onClick={() => { setLimbSelect('fists'); setSelectedSkill(null); setSelectedTarget(null); setMoveMode(null); setAimMode(false) }}>
○Fists
)
}
return entries
})()}
)}
-
{/* Items */}
setItemsOpen(!itemsOpen)}>
{itemsOpen ? '▼' : '▶'}
@@ -1358,9 +1733,9 @@ export default function App() {
{itemsOpen && (
- {playerInventory.length === 0
+ {player.inventory.length === 0
?
No items
- : playerInventory.map((itemId, i) => (
+ : player.inventory.map((itemId, i) => (
{ setShowInventory(true); setPanelTarget('player') }}>
○{itemMap[itemId]?.name ?? itemId}
@@ -1376,15 +1751,15 @@ export default function App() {
{movementOpen && (
-
{ if (!busy) setMoveMode(m => m === 'walk' ? null : 'walk') }}>
- ○Walk
-
-
{ if (!busy) setMoveMode(m => m === 'run' ? null : 'run') }}>
- ○Run
-
-
{ if (!busy) setMoveMode(m => m === 'turn' ? null : 'turn') }}>
- ○Turn
-
+
{ if (!busy) { setMoveMode(m => m === 'walk' ? null : 'walk'); setAimMode(false) } }}>
+ ○Walk
+
+
{ if (!busy) { setMoveMode(m => m === 'run' ? null : 'run'); setAimMode(false) } }}>
+ ○Run
+
+
{ if (!busy) { setMoveMode(m => m === 'turn' ? null : 'turn'); setAimMode(false) } }}>
+ ○Turn
+
{moveMode && moveMode !== 'turn' &&
Click on the mini-map to move
}
{moveMode === 'turn' &&
Click on the mini-map to face a direction
}
@@ -1398,7 +1773,7 @@ export default function App() {
{/* ── center: minimap + log */}
-
+
@@ -1432,24 +1807,37 @@ export default function App() {
}}
onClick={e => {
if (minimapMovedRef.current) { minimapMovedRef.current = false; return }
- if (limbSelect || !moveMode) return
+ if (limbSelect || (!moveMode && !aimMode)) return
const r = e.currentTarget.getBoundingClientRect()
const tx = ((e.clientX - r.left) / r.width) * 160 / minimapView.scale + minimapView.x
const ty = ((e.clientY - r.top) / r.height) * 160 / minimapView.scale + minimapView.y
- if (moveMode === 'turn') {
- const dx = tx - combat.playerPos.x
- const dy = ty - combat.playerPos.y
- const d = Math.sqrt(dx * dx + dy * dy)
- if (d > 0) {
- playerTargetDirRef.current = { dx: dx / d, dy: dy / d }
- playerActionRef.current = { type: 'turn' }
- timerActiveRef.current = true; setTimerRunning(true)
- setMoveMode(null)
- }
+ if (aimMode) {
+ queueShot(tx, ty)
return
}
+ if (moveMode === 'turn') {
+ const pp = combat.characters['player'].pos
+ const dx = tx - pp.x
+ const dy = ty - pp.y
+ const d = Math.sqrt(dx * dx + dy * dy)
+ if (d > 0) {
+ if (!timerActiveRef.current) { timerActiveRef.current = true; setTimerRunning(true) }
+ characterActionsRef.current['player'] = new TurnAction({ targetDir: { dx: dx / d, dy: dy / d }, getDir: () => characterDirsRef.current['player'] ?? { dx: 0, dy: 1 }, setDir: d => { characterDirsRef.current['player'] = d } })
+ setMoveMode(null)
+ }
+ return
+ }
startMove(tx, ty)
}}>
+
+
+
+
+
+
+
+
+
{MAP_BLOCKS.map((block, i) => )}
- {(combat?.enemies || []).map((enemy, i) => {
+ {(combat?.enemyIds ?? []).map(eid => {
+ const enemy = combat.characters[eid]
const dead = isDead(enemy.integrity)
- const isShaking = hitShake && hitShake.enemyIndex === i && hitShake.actor === 'enemy'
+ const isShaking = hitShake && hitShake.charId === eid && hitShake.actor === 'enemy'
+ const eSize = enemy.size ?? 1
+ const ex = isShaking ? enemy.pos.x + (Math.random() - 0.5) * 1.5 : enemy.pos.x
+ const ey = isShaking ? enemy.pos.y + (Math.random() - 0.5) * 1.5 : enemy.pos.y
return (
- { e.stopPropagation(); setHoverInfo({ type: 'enemy', name: enemy.name, attack: enemy.attack, speed: enemy.speed, defeated: isDead(enemy.integrity) }) }}
- onMouseLeave={() => setHoverInfo(null)}
- onClick={e => { e.stopPropagation(); setShowInventory(true); setPanelTarget(i) }} />
+
+ { e.stopPropagation(); setHoverInfo({ type: 'enemy', name: enemy.name, attack: enemy.attack, speed: enemy.speed, defeated: isDead(enemy.integrity) }); setHoveredChar(`enemy-${eid}`) }}
+ onMouseLeave={() => { setHoverInfo(null); setHoveredChar(null) }}
+ onClick={e => { e.stopPropagation(); setShowInventory(true); setPanelTarget(eid) }} />
+
)
})}
{combat && selectedSkill && limbSelect && (
-
+
)}
{combat && (
+ cx={hitShake && hitShake.actor === 'player' ? combat.characters['player'].pos.x + (Math.random() - 0.5) * 1.5 : combat.characters['player'].pos.x}
+ cy={hitShake && hitShake.actor === 'player' ? combat.characters['player'].pos.y + (Math.random() - 0.5) * 1.5 : combat.characters['player'].pos.y}
+ r={4 * 1.3} fill={isDead(player.integrity) ? '#6b7280' : player.fillColor} stroke={isDead(player.integrity) ? '#6b7280' : '#3498db'} strokeWidth="1" opacity={isDead(player.integrity) ? 0.5 : 1}
+ onMouseEnter={() => setHoveredChar('player')} onMouseLeave={() => setHoveredChar(null)}
+ onClick={e => { e.stopPropagation(); setShowInventory(true); setPanelTarget('player') }} />
)}
- {/* Weapon circles — player */}
+ {/* Weapon circles */}
{combat && (() => {
- const anim = animations.find(a => a.actor === 'player' && (a.type === ANIM_TYPES.SLASH || a.type === ANIM_TYPES.PIERCE_STRIKE))
- const pos = anim ? getAnimPos(anim) : null
- const px = pos ? pos.x : (hitShake && hitShake.actor === 'player' ? combat.playerPos.x + (Math.random() - 0.5) * 1.5 : combat.playerPos.x)
- const py = pos ? pos.y : (hitShake && hitShake.actor === 'player' ? combat.playerPos.y + (Math.random() - 0.5) * 1.5 : combat.playerPos.y)
- const dir = playerDirRef.current
- const lw = equippedWeapons.left
- const rw = equippedWeapons.right
+ const wpnOff = (dir, side, off) => {
+ if (side === 'front') return { x: dir.dx * off, y: dir.dy * off }
+ if (side === 'left') return { x: dir.dy * off, y: -dir.dx * off }
+ return { x: -dir.dy * off, y: dir.dx * off }
+ }
+ const wpnDots = (slots, bx, by) => slots.map(s =>
+
+ )
+ const dir = characterDirsRef.current['player'] ?? { dx: 0, dy: 1 }
const off = 7
- const circles = []
- const both = lw === rw && lw !== 'fists' && lw !== 'left_arm' && lw !== 'right_arm'
- if (both) {
- circles.push(
-
- )
+ const shake = hitShake?.actor === 'player'
+ const bx = shake ? combat.characters['player'].pos.x + (Math.random() - 0.5) * 1.5 : combat.characters['player'].pos.x
+ const by = shake ? combat.characters['player'].pos.y + (Math.random() - 0.5) * 1.5 : combat.characters['player'].pos.y
+ const lw = player.equipped.left, rw = player.equipped.right
+ const isFist = w => w === 'fists' || w === 'left_arm' || w === 'right_arm'
+ const bothWpn = lw === rw && !isFist(lw)
+ const isAtk = t => [ANIM_TYPES.SLASH, ANIM_TYPES.PIERCE_STRIKE, ANIM_TYPES.FIST_STRIKE, ANIM_TYPES.FIST_HOOK].includes(t)
+ const slots = []
+
+ const playerPos = combat.characters['player'].pos
+ if (bothWpn) {
+ const anim = animations.find(a => a.actor === 'player' && isAtk(a.type) && a.weaponId === lw)
+ const p = anim ? { x: getAnimPos(anim).x - playerPos.x, y: getAnimPos(anim).y - playerPos.y } : wpnOff(dir, 'front', off)
+ slots.push({ key: 'pw-both', ox: p.x, oy: p.y, fill: '#fbbf24' })
} else {
- if (lw !== 'fists' && lw !== 'left_arm') {
- circles.push(
-
- )
+ const lAnim = animations.find(a => a.actor === 'player' && isAtk(a.type) && (a.weaponId === lw || a.weaponId === 'left_arm'))
+ const rAnim = animations.find(a => a.actor === 'player' && isAtk(a.type) && (a.weaponId === rw || a.weaponId === 'right_arm'))
+ const bothAnim = animations.find(a => a.actor === 'player' && isAtk(a.type) && a.weaponId === 'fists')
+
+ if (!isFist(lw) || lAnim || bothAnim) {
+ const ap = (isFist(lw) && bothAnim) ? bothAnim : lAnim
+ const p = ap ? { x: getAnimPos(ap).x - playerPos.x, y: getAnimPos(ap).y - playerPos.y } : wpnOff(dir, 'left', off)
+ slots.push({ key: 'pw-left', ox: p.x, oy: p.y, fill: isFist(lw) ? player.fillColor : '#fbbf24' })
}
- if (rw !== 'fists' && rw !== 'right_arm') {
- circles.push(
-
- )
+ if (!isFist(rw) || rAnim || bothAnim) {
+ const ap = (isFist(rw) && bothAnim) ? bothAnim : rAnim
+ const p = ap ? { x: getAnimPos(ap).x - playerPos.x, y: getAnimPos(ap).y - playerPos.y } : wpnOff(dir, 'right', off)
+ slots.push({ key: 'pw-right', ox: p.x, oy: p.y, fill: isFist(rw) ? player.fillColor : '#fbbf24' })
}
}
- return circles
+ return wpnDots(slots, bx, by)
})()}
- {/* Weapon circles — enemies */}
- {combat.enemies.map((enemy, i) => {
+ {combat && combat.enemyIds.map(eid => {
+ const enemy = combat.characters[eid]
const dead = isDead(enemy.integrity)
if (dead) return null
const wpn = enemy.weapon
- if (!wpn || wpn === 'fists') return null
- const enemyAnim = animations.find(a => a.actor === i && (a.type === ANIM_TYPES.SLASH || a.type === ANIM_TYPES.PIERCE_STRIKE))
- const ePos = enemyAnim ? getAnimPos(enemyAnim) : null
- const isShaking = hitShake && hitShake.enemyIndex === i && hitShake.actor === 'enemy'
- const ex = ePos ? ePos.x : (isShaking ? enemy.pos.x + (Math.random() - 0.5) * 1.5 : enemy.pos.x)
- const ey = ePos ? ePos.y : (isShaking ? enemy.pos.y + (Math.random() - 0.5) * 1.5 : enemy.pos.y)
- const dir = enemyDirsRef.current[i] ?? { dx: 0, dy: 1 }
+ if (!wpn) return null
+ const dir = characterDirsRef.current[eid] ?? { dx: 0, dy: 1 }
+ const shake = hitShake && hitShake.charId === eid && hitShake.actor === 'enemy'
+ const bx = shake ? enemy.pos.x + (Math.random() - 0.5) * 1.5 : enemy.pos.x
+ const by = shake ? enemy.pos.y + (Math.random() - 0.5) * 1.5 : enemy.pos.y
+ const isFist = wpn === 'fists' || wpn === 'left_arm' || wpn === 'right_arm'
+ const enemyAnim = animations.find(a => a.charId === eid && (a.type === ANIM_TYPES.SLASH || a.type === ANIM_TYPES.PIERCE_STRIKE || a.type === ANIM_TYPES.FIST_STRIKE || a.type === ANIM_TYPES.FIST_HOOK))
+ if (isFist && !enemyAnim) return null
+ const p = enemyAnim ? { x: getAnimPos(enemyAnim).x - enemy.pos.x, y: getAnimPos(enemyAnim).y - enemy.pos.y } : { x: -dir.dy * 7, y: dir.dx * 7 }
+ return
+ })}
+ {/* Projectile dots */}
+ {projectiles.map(p => (
+
+ ))}
+ {/* Direction arrows (on top, in front of character) */}
+ {combat && !isDead(player.integrity) && (() => {
+ const d = characterDirsRef.current['player'] ?? { dx: 0, dy: 1 }
+ const cx = hitShake && hitShake.actor === 'player'
+ ? combat.characters['player'].pos.x + (Math.random() - 0.5) * 1.5 : combat.characters['player'].pos.x
+ const cy = hitShake && hitShake.actor === 'player'
+ ? combat.characters['player'].pos.y + (Math.random() - 0.5) * 1.5 : combat.characters['player'].pos.y
+ const isHovered = hoveredChar === 'player'
+ const px = -d.dy, py = d.dx
return (
-
+
+ )
+ })()}
+ {combat && combat.enemyIds.map(eid => {
+ const enemy = combat.characters[eid]
+ const dead = isDead(enemy.integrity)
+ if (dead) return null
+ const isShaking = hitShake && hitShake.charId === eid && hitShake.actor === 'enemy'
+ const ex = isShaking ? enemy.pos.x + (Math.random() - 0.5) * 1.5 : enemy.pos.x
+ const ey = isShaking ? enemy.pos.y + (Math.random() - 0.5) * 1.5 : enemy.pos.y
+ const d = characterDirsRef.current[eid] ?? { dx: 0, dy: 1 }
+ const isHovered = hoveredChar === `enemy-${eid}`
+ const px = -d.dy, py = d.dx
+ return (
+
)
})}
@@ -1551,11 +1988,15 @@ export default function App() {
{/* ── right: enemy list */}
- {(combat?.enemies || []).map((enemy, i) => (
-
{ setSelectedEnemy(i); setShowInventory(true); setPanelTarget(i) }}>
+ {(combat?.enemyIds ?? []).map(eid => {
+ const enemy = combat.characters[eid]
+ const idx = combat.enemyIds.indexOf(eid)
+ return (
+
{ setSelectedEnemy(idx); setShowInventory(true); setPanelTarget(eid) }}>
{enemy.name}
- ))}
+ )
+ })}
@@ -1571,7 +2012,10 @@ export default function App() {
const skills = weapon?.skills ?? []
return (
-
{weaponName}
+
+ {weaponName}
+ {limbSelect === 'pistol' && Ammo: {player.weaponMagazines.pistol}/{PISTOL_MAG}}
+
{/* skill list */}
{skills.length > 0 && (
@@ -1579,8 +2023,12 @@ export default function App() {
Select Skill
{skills.map((skill, i) => (
-
-
Day {displayDay} {String(displayHour).padStart(2,'0')}:00
+
{dateString}, {String(displayHour).padStart(2,'0')}:00
{weatherLabels[weather]}
@@ -1790,7 +2239,8 @@ export default function App() {
@@ -1798,7 +2248,7 @@ export default function App() {
{locMap[selected].name}
{locMap[selected].description}
- {playerLoc !== selected && connectedTo(playerLoc).includes(selected) && (
+ {player.location !== selected && connectedTo(player.location).includes(selected) && (
Travel here
@@ -1811,7 +2261,7 @@ export default function App() {
{item.name}
{item.price}g
-
+
))}
@@ -1822,7 +2272,7 @@ export default function App() {
?
None
: liveCharacters.filter(c => c.location === selected).map(c => (
-
{c.name}
+
{ setShowInventory(true); setPanelTarget(c.id) }}>{c.name}
{c.money !== undefined && {c.money}g}
{c.inventory?.length > 0 && {c.inventory.map(id => itemMap[id]?.name ?? id).join(', ')}}
@@ -1831,7 +2281,7 @@ export default function App() {
))
}
- {playerLoc === selected && (
+ {player.location === selected && (
@@ -1892,7 +2342,7 @@ export default function App() {
?
No one here.
: liveCharacters.filter(c => c.id !== 'player' && c.location === showLocationModal).map(c => (
-
{c.name}
+
{ setShowInventory(true); setPanelTarget(c.id) }}>{c.name}
))
@@ -1918,7 +2368,16 @@ export default function App() {
)}
{/* ═══════════════════════════════════════════════════════ INVENTORY PANEL */}
- {showInventory && (
+ {showInventory && (() => {
+ const character = panelTarget === 'player'
+ ? player
+ : combat && combat.characters[panelTarget]
+ ? combat.characters[panelTarget]
+ : (() => { const npc = characters.find(c => c.id === panelTarget); return npc ? createCharacter(npc) : null })()
+ const isPlayer = character?.id === 'player'
+ const charWeight = character?.inventory?.reduce((sum, id) => sum + (itemMap[id]?.weight ?? 0) * ((character.itemCounts?.[id] ?? 0) || 1), 0) ?? 0
+ const charHp = character ? totalHp(character.integrity) : 0
+ return (
{ setShowInventory(false); setPanelTarget('player'); setHoverInfo(null); setContextMenu(null) }}
onContextMenu={e => { e.preventDefault(); setContextMenu(null) }}
@@ -1927,11 +2386,7 @@ export default function App() {
- {panelTarget === 'player'
- ?
- : combat?.enemies[panelTarget]
- ?
- : null}
+ {character && }
@@ -1940,158 +2395,113 @@ export default function App() {
- {panelTarget === 'player' ? (
- <>
- {invTab === 'health' && (
-
-
Body Parts
- {Object.keys(MAX_BODY).map(part => {
- const hp = bodyParts[part], max = MAX_BODY[part]
- const injuries = bodyInjuries[part] ?? []
- return (
-
-
-
-
{bodyPartLabels[part]}
-
-
{hp}/{max}
-
- {injuries.length > 0 &&
{injuries.map((inj,i) => {inj.type} ({inj.severity}))}
}
-
- )
- })}
-
Integrity{playerHp}/{MAX_HP}
-
- )}
- {invTab === 'inventory' && (
-
+ {character && invTab === 'health' && (
+
+
Body Parts
+ {Object.keys(MAX_BODY).map(part => {
+ const hp = character.integrity[part], max = MAX_BODY[part]
+ const injuries = character.injuries[part] ?? []
+ return (
+
+
+
+
{bodyPartLabels[part]}
+
+
{hp}/{max}
+
+ {injuries.length > 0 &&
{injuries.map((inj,i) => {inj.type} ({inj.severity}))}
}
+
+ )
+ })}
+
Integrity{charHp}/{MAX_HP}
+
+ )}
+ {character && invTab === 'inventory' && (
+
+ {isPlayer && (
+ <>
Weapons
{(() => {
- const lw = equippedWeapons.left, rw = equippedWeapons.right
+ const lw = character.equipped.left, rw = character.equipped.right
if (lw === rw) return (
setHoverInfo({ type:'weapon', id:lw })} onMouseLeave={() => setHoverInfo(null)}>
{lw === 'fists' ? 'Fists' : `Both: ${weaponMap[lw].name}`}
- {lw !== 'fists' && <>DMG: {weaponMap[lw].damage}COND: {weaponConditions[lw] ?? weaponMap[lw].maxCondition}/{weaponMap[lw].maxCondition}{weaponMap[lw].passives.length > 0 && {weaponMap[lw].passives.join(', ')}}}
+ {lw !== 'fists' && <>DMG: {weaponMap[lw].damage}COND: {character.weaponConditions[lw] ?? weaponMap[lw].maxCondition}/{weaponMap[lw].maxCondition}{weaponMap[lw].passives.length > 0 && {weaponMap[lw].passives.join(', ')}}}
)
return ['left','right'].map(side => {
- const wid = equippedWeapons[side]
+ const wid = character.equipped[side]
if (wid === 'fists') return null
return (
setHoverInfo({ type:'weapon', id:wid })} onMouseLeave={() => setHoverInfo(null)}>
{side === 'left' ? 'Left' : 'Right'}: {weaponMap[wid].name}
DMG: {weaponMap[wid].damage}
- COND: {weaponConditions[wid] ?? weaponMap[wid].maxCondition}/{weaponMap[wid].maxCondition}
+ COND: {character.weaponConditions[wid] ?? weaponMap[wid].maxCondition}/{weaponMap[wid].maxCondition}
{weaponMap[wid].passives.length > 0 && {weaponMap[wid].passives.join(', ')}}
+
)
})
})()}
-
Inventory ({playerInventory.length})
- {playerInventory.length === 0
- ?
Empty
- : playerInventory.map((itemId, i) => (
-
setHoverInfo({ type:'item', id:itemId })} onMouseLeave={() => setHoverInfo(null)}>
- {itemMap[itemId]?.name ?? itemId}
-
- ))
- }
-
Weight: {currentWeight}/{MAX_WEIGHT}
-
{playerMoney}g
-
+
)}
- {invTab === 'stats' && (
-
-
Character
-
NameYou
-
Age24
-
Location{locMap[playerLoc]?.name ?? playerLoc}
-
-
Equipped{equippedWeapons.left === equippedWeapons.right ? (equippedWeapons.left === 'fists' ? 'Fists' : `Both: ${weaponMap[equippedWeapons.left].name}`) : [equippedWeapons.left !== 'fists' ? `L:${weaponMap[equippedWeapons.left].name}` : '', equippedWeapons.right !== 'fists' ? `R:${weaponMap[equippedWeapons.right].name}` : ''].filter(Boolean).join(' + ')}
+ {!isPlayer && character.weapon && character.weapon !== 'fists' && (
+
+
Equipped Weapon
{(() => {
- const shown = new Set(), rows = []
- const addWeapon = wid => {
- if (shown.has(wid) || wid === 'fists') return; shown.add(wid)
- rows.push(
Skills{weaponMap[wid].skills.map(s=>s.name).join(', ')}
Weapon SPD{weaponMap[wid].speed}
)
- }
- addWeapon(equippedWeapons.left); addWeapon(equippedWeapons.right); return rows
- })()}
-
-
Integrity{playerHp}/{MAX_HP}
-
Items{playerInventory.length}
-
Weight{currentWeight}/{MAX_WEIGHT}
-
Money{playerMoney}g
-
- )}
-
- ) : combat?.enemies[panelTarget] ? (
- <>
- {invTab === 'health' && (
-
-
Body Parts
- {Object.keys(MAX_BODY).map(part => {
- const hp = combat.enemies[panelTarget].integrity[part], max = MAX_BODY[part]
- const injuries = combat.enemies[panelTarget].injuries[part] ?? []
+ const wep = weaponMap[character.weapon]
return (
-
-
-
-
{bodyPartLabels[part]}
-
-
{hp}/{max}
-
- {injuries.length > 0 &&
{injuries.map((inj,i) => {inj.type} ({inj.severity}))}
}
+
setHoverInfo({ type:'weapon', id:character.weapon })} onMouseLeave={() => setHoverInfo(null)}>
+ {wep?.name ?? character.weapon}
+ {wep && <>DMG: {character.attack}SPD: {character.speed}{wep.passives?.length > 0 && {wep.passives.join(', ')}}}
)
- })}
-
Integrity{Object.values(combat.enemies[panelTarget].integrity).reduce((a,b)=>a+b,0)}/{MAX_HP}
-
- )}
- {invTab === 'inventory' && (
-
-
Inventory ({(combat.enemies[panelTarget].inventory||[]).length})
- {(combat.enemies[panelTarget].inventory||[]).length === 0
- ?
Empty
- : combat.enemies[panelTarget].inventory.map((itemId, i) => (
-
setHoverInfo({ type:'item', id:itemId })} onMouseLeave={() => setHoverInfo(null)}>
- {itemMap[itemId]?.name ?? itemId}
-
- ))
- }
-
{combat.enemies[panelTarget].money || 0}g
-
- )}
- {invTab === 'stats' && (
-
- {(() => {
- const e = combat.enemies[panelTarget], wid = e.weapon ?? 'fists', wep = weaponMap[wid]
- return (<>
-
{e.name}
-
Name{e.name}
-
Age{e.age ?? '??'}
-
Location{e.location ?? 'Unknown'}
-
-
Weapon{wep?.name ?? wid}
- {wep && wid !== 'fists' && <>
DMG{e.attack}
SPD{e.speed}
}
- {wep?.skills?.length > 0 &&
Skills{wep.skills.map(s=>s.name).join(', ')}
}
-
-
Integrity{Object.values(e.integrity).reduce((a,b)=>a+b,0)}/{MAX_HP}
-
Items{(e.inventory||[]).length}
-
Money{e.money||0}g
- )
})()}
)}
-
- ) : null}
+ {!isPlayer && character.weapon && character.weapon !== 'fists' &&
}
+
Inventory ({character.inventory.length})
+ {character.inventory.length === 0
+ ?
Empty
+ : character.inventory.map((itemId, i) => {
+ const qty = character.itemCounts?.[itemId]
+ if (qty !== undefined && qty <= 0) return null
+ return (
+
setHoverInfo({ type:'item', id:itemId })} onMouseLeave={() => setHoverInfo(null)}>
+ {itemMap[itemId]?.name ?? itemId}
+ {qty !== undefined && ×{qty}}
+ {isPlayer && weaponMap[itemId] && }
+
+ )
+ })
+ }
+ {isPlayer &&
Weight: {charWeight}/{MAX_WEIGHT}
}
+
{character.money || 0}g
+
+ )}
+ {character && invTab === 'stats' && (
+
+
{isPlayer ? 'Character' : character.name}
+
Name{isPlayer ? 'You' : character.name}
+
Age{character.age ?? '??'}
+ {isPlayer &&
Size{character.size ?? 1}x
}
+
Location{locMap[character.location]?.name ?? character.location}
+
+
+
Integrity{charHp}/{MAX_HP}
+
Items{character.inventory.length}
+ {isPlayer &&
Weight{charWeight}/{MAX_WEIGHT}
}
+
Money{character.money || 0}g
+
+ )}
- )}
+ )})()}
{/* ═══════════════════════════════════════════════════════ SETTINGS */}
{showSettings && (
@@ -2104,14 +2514,14 @@ export default function App() {
Game
-
Day{gameTime.day}
+
Date{getDateString(gameTime.day)}
Time{String(gameTime.hour).padStart(2,'0')}:00
Weather{weatherLabels[weather]}
Player
-
Location{locMap[playerLoc]?.name ?? playerLoc}
-
Money{playerMoney}g
+
Location{locMap[player.location]?.name ?? player.location}
+
Money{player.money}g
@@ -2124,10 +2534,10 @@ export default function App() {
World
-
Day{gameTime.day}
+
Date{getDateString(gameTime.day)}
Time{String(gameTime.hour).padStart(2,'0')}:00
Weather{weatherLabels[weather]}
-
Location{locMap[playerLoc]?.name ?? playerLoc}
+
Location{locMap[player.location]?.name ?? player.location}
@@ -2151,7 +2561,7 @@ export default function App() {
{hoverInfo.id === 'left_arm' || hoverInfo.id === 'right_arm'
? <>
{weaponMap[hoverInfo.id].name}
Unarmed strike (DMG: 10)
: <>
{weaponMap[hoverInfo.id].name}
DMG: {weaponMap[hoverInfo.id].damage} SPD: {weaponMap[hoverInfo.id].speed}
-
Condition: {weaponConditions[hoverInfo.id] ?? weaponMap[hoverInfo.id].maxCondition}/{weaponMap[hoverInfo.id].maxCondition}
+
Condition: {player.weaponConditions[hoverInfo.id] ?? weaponMap[hoverInfo.id].maxCondition}/{weaponMap[hoverInfo.id].maxCondition}
Skills: {weaponMap[hoverInfo.id].skills.map(s=>`${s.name} (${s.damageType})`).join(', ')}
{weaponMap[hoverInfo.id].passives.length > 0 &&
Passives: {weaponMap[hoverInfo.id].passives.join(', ')}
}
}
@@ -2178,6 +2588,21 @@ export default function App() {
)}
+
+ {/* ═══════════════════════════════════════════════════════ EQUIP ARM CHOICE */}
+ {equipArmChoice && (
+
setEquipArmChoice(null)}>
+
e.stopPropagation()}>
+
Equip {weaponMap[equipArmChoice].name}
+
+
+
+
+
+
+
+
+ )}
)
}
\ No newline at end of file