{combat && (() => {
- const partyIds = combat.partyIds ?? [combat.playerEntityId].filter(Boolean)
- const anyActionPossible = partyIds.some(cid => !isDead(combat.characters[cid]?.integrity))
+ const partyCids = Object.keys(combat.characters).filter(cid => {
+ const ch = combat.characters[cid]
+ return ch && (ch.owner === 'player' || ch.relationships?.player === 'ally')
+ })
+ const anyActionPossible = partyCids.some(cid => !isDead(combat.characters[cid]?.integrity))
return anyActionPossible && (
- {partyIds.map(cid => {
+ {partyCids.map(cid => {
const ch = combat.characters[cid]
if (!ch) return null
const isDeadChar = isDead(ch.integrity)
@@ -2888,6 +3345,72 @@ class MoveAction {
{expandedWeapon.includes(cid) && (
+ {/* Abilities */}
+
setAbilitiesOpen(prev => prev.includes(cid) ? prev.filter(x => x !== cid) : [...prev, cid])}>
+ {abilitiesOpen.includes(cid) ? '▼' : '▶'}
+ Abilities
+
+ {abilitiesOpen.includes(cid) && (
+
+ {debugAbilitiesRef.current.includes('instant_kill') && (() => {
+ const enemies = combat ? Object.keys(combat.characters).filter(id => {
+ const ch = combat.characters[id]; return ch && ch.owner !== 'player' && !isDead(ch.integrity)
+ }) : []
+ return (
+
setDebugAbilityOpen(prev => prev === 'kill' ? null : 'kill')}>
+ {debugAbilityOpen === 'kill' ? '▼' : '▶'}
+ Instant Kill
+
+ )
+ })()}
+ {debugAbilityOpen === 'kill' && combat && Object.keys(combat.characters).filter(id => {
+ const ch = combat.characters[id]; return ch && ch.owner !== 'player' && !isDead(ch.integrity)
+ }).map(eid => (
+
debugInstantKill(eid)}>
+ ○
+ {combat.characters[eid].name ?? eid}
+
+ ))}
+ {debugAbilitiesRef.current.includes('instant_ko') && (() => {
+ const enemies = combat ? Object.keys(combat.characters).filter(id => {
+ const ch = combat.characters[id]; return ch && ch.owner !== 'player' && !isDead(ch.integrity)
+ }) : []
+ return (
+
setDebugAbilityOpen(prev => prev === 'ko' ? null : 'ko')}>
+ {debugAbilityOpen === 'ko' ? '▼' : '▶'}
+ Instant Knockout
+
+ )
+ })()}
+ {debugAbilityOpen === 'ko' && combat && Object.keys(combat.characters).filter(id => {
+ const ch = combat.characters[id]; return ch && ch.owner !== 'player' && !isDead(ch.integrity)
+ }).map(eid => (
+
debugInstantKO(eid)}>
+ ○
+ {combat.characters[eid].name ?? eid}
+
+ ))}
+ {debugAbilitiesRef.current.includes('pocket_dimension') && (() => {
+ const allChars = combat ? Object.keys(combat.characters).filter(id => {
+ const ch = combat.characters[id]; return ch && !isDead(ch.integrity)
+ }) : []
+ return (
+
setDebugAbilityOpen(prev => prev === 'pocket' ? null : 'pocket')}>
+ {debugAbilityOpen === 'pocket' ? '▼' : '▶'}
+ Pocket Dimension
+
+ )
+ })()}
+ {debugAbilityOpen === 'pocket' && combat && Object.keys(combat.characters).filter(id => {
+ const ch = combat.characters[id]; return ch && !isDead(ch.integrity)
+ }).map(eid => (
+
debugPocketDimension(eid)}>
+ ○
+ {eid === 'player' ? 'Player' : (combat.characters[eid].name ?? eid)}
+
+ ))}
+
+ )}
{/* Weapons */}
setWeaponsOpen(prev => prev.includes(cid) ? prev.filter(x => x !== cid) : [...prev, cid])}>
{weaponsOpen.includes(cid) ? '▼' : '▶'}
@@ -3035,7 +3558,7 @@ class MoveAction {
if (aimModeRef.current) {
if (selectedSkillRef.current !== 'Shoot' || limbSelectRef.current !== 'pistol') {
const cc = combatRef.current
- const allCharIds = [...(cc?.enemyIds ?? []), ...(cc?.npcIds ?? []), ...(cc?.partyIds ?? [cc?.playerEntityId].filter(Boolean))]
+ const allCharIds = Object.keys(cc?.characters ?? {})
let closest = null, closestDist = 20
allCharIds.forEach(cid => {
const ch = cc.characters[cid]
@@ -3057,7 +3580,7 @@ class MoveAction {
const dy = ty - pp.y
const d = Math.sqrt(dx * dx + dy * dy)
if (d > 0) {
- characterActionsRef.current[turnActor] = new TurnAction({ targetDir: { dx: dx / d, dy: dy / d }, getDir: () => characterDirsRef.current[turnActor] ?? { dx: 0, dy: 1 }, setDir: d2 => { characterDirsRef.current[turnActor] = d2 } })
+ characterActionsRef.current[turnActor] = new TurnAction({ cancellable: true, targetDir: { dx: dx / d, dy: dy / d }, getDir: () => characterDirsRef.current[turnActor] ?? { dx: 0, dy: 1 }, setDir: d2 => { characterDirsRef.current[turnActor] = d2 } })
setMoveMode(null); setCurrentActor(null)
}
return
@@ -3080,35 +3603,35 @@ class MoveAction {
}}>
{(combat?.blocks ?? []).map((block, i) =>
)}
- {(combat?.enemyIds ?? []).map((eid, idx) => {
- const enemy = combat.characters[eid]
- const dead = isDead(enemy.integrity)
- 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
- // Targeting in melee/ranged-aim mode: clicking the dot itself
- // is a hard, direct hit-test — independent of the SVG's own
- // click-coordinate nearest-enemy search above. This is what
- // makes "click the dot" reliably select the target.
+ {/* All character circles */}
+ {combat && Object.keys(combat.characters).map(cid => {
+ const ch = combat.characters[cid]
+ if (!ch) return null
+ const dead = isDead(ch.integrity)
+ const isShaking = hitShake?.charId === cid
+ const cx = isShaking ? ch.pos.x + (Math.random() - 0.5) * 1.5 : ch.pos.x
+ const cy = isShaking ? ch.pos.y + (Math.random() - 0.5) * 1.5 : ch.pos.y
+ const chSize = ch.size ?? 1
+ const radius = ch.owner === 'player' ? 4 * chSize : 5 * chSize
const isTargetable = aimMode && !dead && (selectedSkill !== 'Shoot' || limbSelect !== 'pistol')
- const isCurrentTarget = attackEnemy === idx
+ const hostileToPlayer = ch.relationships?.player === 'enemy'
+ const ownerStroke = ch.owner === 'player' ? '#3498db' : hostileToPlayer ? '#e74c3c' : '#22c55e'
return (
-
- setHoveredChar(`enemy-${eid}`)}
- onMouseLeave={() => setHoveredChar(null)}
- onClick={e => {
- if (!isTargetable) return
- e.stopPropagation()
- attackCharTarget(eid)
- }} />
-
+
setHoveredChar(cid)}
+ onMouseLeave={() => setHoveredChar(null)}
+ onClick={e => {
+ if (!isTargetable) return
+ e.stopPropagation()
+ attackCharTarget(cid)
+ }}
+ onContextMenu={e => { e.preventDefault(); e.stopPropagation(); setHoverInfo(null); setHoveredChar(null); setContextMenu({ x: e.clientX, y: e.clientY, charId: cid }) }} />
)
})}
{combat && selectedSkill && limbSelect && (() => {
@@ -3160,103 +3683,59 @@ class MoveAction {
)
})()}
- {/* Party member circles */}
- {combat && (() => {
- const partyCircles = combat.partyIds ?? [combat.playerEntityId].filter(Boolean)
- return partyCircles.map(cid => {
- const ch = combat.characters[cid]
- if (!ch) return null
- const chDead = isDead(ch.integrity)
- const color = cid === 'player' ? player.fillColor : ch.fillColor
- return (
- setHoveredChar(cid)} onMouseLeave={() => setHoveredChar(null)}
- onClick={e => { e.stopPropagation(); if (aimMode && limbSelect !== 'pistol') attackCharTarget(cid) }}
- onContextMenu={e => { e.preventDefault(); e.stopPropagation(); setHoverInfo(null); setHoveredChar(null); setContextMenu({ x: e.clientX, y: e.clientY, charId: cid }) }} />
- )
- })
- })()}
- {/* Non-hostile NPC circles */}
- {combat?.npcIds?.map(nid => {
- const ch = combat.characters[nid]
- if (!ch) return null
- return (
- setHoveredChar(nid)} onMouseLeave={() => setHoveredChar(null)}
- onClick={e => { e.stopPropagation(); if (aimMode && limbSelect !== 'pistol') attackCharTarget(nid) }}
- onContextMenu={e => { e.preventDefault(); e.stopPropagation(); setHoverInfo(null); setHoveredChar(null); setContextMenu({ x: e.clientX, y: e.clientY, charId: nid }) }} />
- )
- })}
- {/* Weapon circles for party members */}
+ {/* Weapon circles for all characters */}
{combat && (() => {
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 isFist = w => w === 'fists' || w === 'left_arm' || w === 'right_arm'
const isAtk = t => [ANIM_TYPES.SLASH, ANIM_TYPES.PIERCE_STRIKE, ANIM_TYPES.FIST_STRIKE, ANIM_TYPES.FIST_HOOK, ANIM_TYPES.OVERHEAD].includes(t)
const allSlots = []
- const partyIds = combat.partyIds ?? [combat.playerEntityId].filter(Boolean)
- partyIds.forEach(cid => {
+ Object.keys(combat.characters).forEach(cid => {
const ch = combat.characters[cid]
if (!ch || isDead(ch.integrity)) return
- const equipped = ch.equipped ?? { left: 'fists', right: 'fists' }
- const lw = equipped.left, rw = equipped.right
const dir = characterDirsRef.current[cid] ?? { dx: 0, dy: 1 }
const off = 7
const shake = hitShake?.charId === cid
const bx = shake ? ch.pos.x + (Math.random() - 0.5) * 1.5 : ch.pos.x
const by = shake ? ch.pos.y + (Math.random() - 0.5) * 1.5 : ch.pos.y
- const bothWpn = lw === rw && !isFist(lw)
const chPos = ch.pos
- if (bothWpn) {
- const anim = animations.find(a => a.charId === cid && isAtk(a.type) && a.weaponId === lw)
- const p = anim ? { x: getAnimPos(anim).x - chPos.x, y: getAnimPos(anim).y - chPos.y } : wpnOff(dir, 'front', off)
- allSlots.push({ key: `pw-${cid}-both`, ox: p.x, oy: p.y, fill: '#fbbf24', bx, by })
- } else {
- const lAnim = animations.find(a => a.charId === cid && isAtk(a.type) && (a.weaponId === lw || a.weaponId === 'left_arm'))
- const rAnim = animations.find(a => a.charId === cid && isAtk(a.type) && (a.weaponId === rw || a.weaponId === 'right_arm'))
- const bothAnim = animations.find(a => a.charId === cid && 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 - chPos.x, y: getAnimPos(ap).y - chPos.y } : wpnOff(dir, 'left', off)
- allSlots.push({ key: `pw-${cid}-left`, ox: p.x, oy: p.y, fill: isFist(lw) ? ch.fillColor : '#fbbf24', bx, by })
- }
- if (!isFist(rw) || rAnim || bothAnim) {
- const ap = (isFist(rw) && bothAnim) ? bothAnim : rAnim
- const p = ap ? { x: getAnimPos(ap).x - chPos.x, y: getAnimPos(ap).y - chPos.y } : wpnOff(dir, 'right', off)
- allSlots.push({ key: `pw-${cid}-right`, ox: p.x, oy: p.y, fill: isFist(rw) ? ch.fillColor : '#fbbf24', bx, by })
+ if (ch.equipped) {
+ const equipped = ch.equipped
+ const lw = equipped.left, rw = equipped.right
+ const bothWpn = lw === rw && !isFist(lw)
+ if (bothWpn) {
+ const anim = animations.find(a => a.charId === cid && isAtk(a.type) && a.weaponId === lw)
+ const p = anim ? { x: getAnimPos(anim).x - chPos.x, y: getAnimPos(anim).y - chPos.y } : wpnOff(dir, 'front', off)
+ allSlots.push({ key: `w-${cid}-both`, ox: p.x, oy: p.y, fill: '#fbbf24', bx, by })
+ } else {
+ const lAnim = animations.find(a => a.charId === cid && isAtk(a.type) && (a.weaponId === lw || a.weaponId === 'left_arm'))
+ const rAnim = animations.find(a => a.charId === cid && isAtk(a.type) && (a.weaponId === rw || a.weaponId === 'right_arm'))
+ const bothAnim = animations.find(a => a.charId === cid && 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 - chPos.x, y: getAnimPos(ap).y - chPos.y } : wpnOff(dir, 'left', off)
+ allSlots.push({ key: `w-${cid}-left`, ox: p.x, oy: p.y, fill: isFist(lw) ? ch.fillColor : '#fbbf24', bx, by })
+ }
+ if (isFist(rw) || rAnim || bothAnim) {
+ const ap = (isFist(rw) && bothAnim) ? bothAnim : rAnim
+ const p = ap ? { x: getAnimPos(ap).x - chPos.x, y: getAnimPos(ap).y - chPos.y } : wpnOff(dir, 'right', off)
+ allSlots.push({ key: `w-${cid}-right`, ox: p.x, oy: p.y, fill: isFist(rw) ? ch.fillColor : '#fbbf24', bx, by })
+ }
}
+ } else if (ch.weapon) {
+ const wpn = ch.weapon
+ const anim = animations.find(a => a.charId === cid && isAtk(a.type) && (a.weaponId === wpn || a.weaponId === 'fists'))
+ if (isFist(wpn) && !anim) return
+ const p = anim ? { x: getAnimPos(anim).x - chPos.x, y: getAnimPos(anim).y - chPos.y } : { x: -dir.dy * 7, y: dir.dx * 7 }
+ allSlots.push({ key: `w-${cid}`, ox: p.x, oy: p.y, fill: isFist(wpn) ? ch.fillColor : '#f97316', bx, by })
}
})
const flat = allSlots.map(s => )
return flat
})()}
- {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) 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 || a.type === ANIM_TYPES.OVERHEAD))
- 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 => (
@@ -3267,47 +3746,24 @@ class MoveAction {
style={{ cursor: 'pointer', pointerEvents: 'auto' }}
onContextMenu={e => { e.preventDefault(); e.stopPropagation(); setContextMenu({ x: e.clientX, y: e.clientY, groundId: gi.id, itemId: gi.itemId }) }} />
))}
- {/* Direction arrows (on top, in front of character) */}
- {combat && (() => {
- const partyIds = combat.partyIds ?? [combat.playerEntityId].filter(Boolean)
- const anyAlive = partyIds.some(cid => !isDead(combat.characters[cid]?.integrity))
- if (!anyAlive) return null
- return partyIds.map(cid => {
- const ch = combat.characters[cid]
- if (!ch || isDead(ch.integrity)) return null
- const d = characterDirsRef.current[cid] ?? { dx: 0, dy: 1 }
- const isShaking = hitShake?.charId === cid
- const cx = isShaking ? ch.pos.x + (Math.random() - 0.5) * 1.5 : ch.pos.x
- const cy = isShaking ? ch.pos.y + (Math.random() - 0.5) * 1.5 : ch.pos.y
- const isHovered = hoveredChar === cid
- const px = -d.dy, py = d.dx
- return (
- {
+ const ch = combat.characters[cid]
+ if (!ch || isDead(ch.integrity)) return null
+ const d = characterDirsRef.current[cid] ?? { dx: 0, dy: 1 }
+ const isShaking = hitShake?.charId === cid
+ const cx = isShaking ? ch.pos.x + (Math.random() - 0.5) * 1.5 : ch.pos.x
+ const cy = isShaking ? ch.pos.y + (Math.random() - 0.5) * 1.5 : ch.pos.y
+ const isHovered = hoveredChar === cid
+ const px = -d.dy, py = d.dx
+ const arrowColor = ch.owner === 'player' ? '#3498db' : ch.relationships?.player === 'enemy' ? '#e74c3c' : '#22c55e'
+ 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 (
-
+ fill={isHovered ? '#fff' : arrowColor} opacity="0.8" filter={isHovered ? 'url(#arrowGlow)' : undefined} />
)
})}
@@ -3321,24 +3777,9 @@ class MoveAction {