spoint 0.1.0 → 0.1.10

package/apps/tps-game/index.js

@@ -3,13 +3,16 @@ export default {
     setup(ctx) {
       ctx.state.map = 'schwust'
       ctx.state.mode = 'ffa'
-      ctx.state.config = { respawnTime: 3, health: 100, damagePerHit: 25 }
+      ctx.state.config = { respawnTime: 3, health: 100, damagePerHit: 20, headshotMultiplier: 2.5, headshotZone: 0.7, hitKnockback: 4, shootKnockback: 2, magazineSize: 30, reloadTime: 2000 }
       ctx.state.spawnPoints = findSpawnPoints(ctx)
       ctx.state.playerStats = new Map()
       ctx.state.respawning = new Map()
       ctx.state.buffs = new Map()
+      ctx.state.ammo = new Map()
+      ctx.state.reloading = new Map()
       ctx.state.started = Date.now()
       ctx.state.gameTime = 0
+      ctx.state.fallTimers = new Map()
 
       ctx.bus.on('powerup.collected', (event) => {
         const d = event.data
@@ -38,6 +41,30 @@ export default {
         if (now >= buff.expiresAt) {
           ctx.state.buffs.delete(pid)
           ctx.players.send(pid, { type: 'buff_expired' })
+        } else {
+          const player = ctx.players.getAll().find(p => p.id === pid)
+          if (player?.state) {
+            const maxHp = ctx.state.config.health
+            const healRate = maxHp / 10
+            player.state.health = Math.min(maxHp, (player.state.health ?? maxHp) + healRate * dt)
+          }
+        }
+      }
+      for (const player of ctx.players.getAll()) {
+        if (!player.state || ctx.state.respawning.has(player.id)) continue
+        if ((player.state.health ?? ctx.state.config.health) <= 0) continue
+        const y = player.state.position?.[1] ?? 0
+        if (y < -20) {
+          const t = ctx.state.fallTimers.get(player.id) || 0
+          ctx.state.fallTimers.set(player.id, t + dt)
+          if (t + dt >= 5) {
+            player.state.health = 0
+            ctx.state.respawning.set(player.id, { respawnAt: now + ctx.state.config.respawnTime * 1000, killer: null })
+            ctx.network.broadcast({ type: 'death', victim: player.id, killer: null })
+            ctx.state.fallTimers.delete(player.id)
+          }
+        } else {
+          ctx.state.fallTimers.delete(player.id)
         }
       }
       for (const [pid, data] of ctx.state.respawning) {
@@ -60,34 +87,152 @@ export default {
         const p = ctx.players.getAll().find(pl => pl.id === msg.playerId)
         if (p && p.state) p.state.health = ctx.state.config.health
         ctx.state.playerStats.set(msg.playerId, { kills: 0, deaths: 0, damage: 0 })
+        ctx.state.ammo.set(msg.playerId, ctx.state.config.magazineSize)
+        ctx.state.reloading.delete(msg.playerId)
       }
       if (msg.type === 'player_leave') {
         ctx.state.playerStats.delete(msg.playerId)
         ctx.state.respawning.delete(msg.playerId)
+        ctx.state.fallTimers.delete(msg.playerId)
+        ctx.state.ammo.delete(msg.playerId)
+        ctx.state.reloading.delete(msg.playerId)
+      }
+      if (msg.type === 'reload') {
+        const playerId = msg.senderId || msg.playerId
+        if (ctx.state.reloading.has(playerId)) return
+        const currentAmmo = ctx.state.ammo.get(playerId) ?? 0
+        if (currentAmmo >= ctx.state.config.magazineSize) return
+        ctx.state.reloading.set(playerId, { startTime: Date.now() })
+        ctx.players.send(playerId, { type: 'reload_start', duration: ctx.state.config.reloadTime })
+        setTimeout(() => {
+          ctx.state.ammo.set(playerId, ctx.state.config.magazineSize)
+          ctx.state.reloading.delete(playerId)
+          ctx.players.send(playerId, { type: 'reload_complete' })
+        }, ctx.state.config.reloadTime)
       }
       if (msg.type === 'fire') {
-        ctx.bus.emit('combat.fire', {
-          shooterId: msg.shooterId,
-          origin: msg.origin,
-          direction: msg.direction
-        })
-        handleFire(ctx, msg)
+        const shooterId = msg.senderId || msg.shooterId
+        if (ctx.state.reloading.has(shooterId)) return
+        const ammo = ctx.state.ammo.get(shooterId) ?? 0
+        if (ammo <= 0) {
+          ctx.players.send(shooterId, { type: 'empty_click' })
+          return
+        }
+        ctx.state.ammo.set(shooterId, ammo - 1)
+        const shooter = ctx.players.getAll().find(p => p.id === shooterId)
+        const pos = shooter?.state?.position || [0, 0, 0]
+        const origin = [pos[0], pos[1] + 0.9, pos[2]]
+        const fireData = { shooterId, origin, direction: msg.direction }
+        ctx.bus.emit('combat.fire', fireData)
+        const dir = msg.direction
+        if (shooter?.state) {
+          shooter.state.velocity[0] -= dir[0] * ctx.state.config.shootKnockback
+          shooter.state.velocity[2] -= dir[2] * ctx.state.config.shootKnockback
+        }
+        ctx.players.send(shooterId, { type: 'aimpunch', intensity: 0.3 })
+        handleFire(ctx, fireData)
       }
     }
   },
 
   client: {
+    _tps: null,
+    setup(engine) {
+      const flash = new engine.THREE.PointLight(0xffaa00, 0, 8)
+      engine.scene.add(flash)
+      engine._tps = { lastShootTime: 0, isAiming: false, boost: null, flash, flashOff: 0, ammo: 30, reloading: false, lastReloadTime: 0 }
+      this._tps = engine._tps
+    },
+    onMouseDown(e, engine) {
+      if (e.button === 2 && engine._tps) engine._tps.isAiming = true
+    },
+    onMouseUp(e, engine) {
+      if (e.button === 2 && engine._tps) engine._tps.isAiming = false
+    },
+    onInput(input, engine) {
+      const tps = engine._tps
+      if (!tps) return
+      if (input.reload && !tps.reloading && Date.now() - tps.lastReloadTime > 100) {
+        tps.lastReloadTime = Date.now()
+        engine.client.sendReload()
+      }
+      if (input.shoot && !tps.reloading && tps.ammo > 0 && Date.now() - tps.lastShootTime > 100) {
+        tps.lastShootTime = Date.now()
+        const local = engine.client.state?.players?.find(p => p.id === engine.playerId)
+        if (local) {
+          const pos = local.position
+          engine.client.sendFire({ origin: [pos[0], pos[1] + 0.9, pos[2]], direction: engine.cam.getAimDirection(pos) })
+          const animator = engine.players.getAnimator(engine.playerId)
+          if (animator) animator.shoot()
+          tps.flash.position.set(pos[0], pos[1] + 0.5, pos[2])
+          tps.flash.intensity = 3
+          tps.flashOff = Date.now() + 60
+          tps.ammo = Math.max(0, tps.ammo - 1)
+        }
+      }
+    },
+    onEvent(payload, engine) {
+      const tps = engine._tps
+      if (payload.type === 'hit' && payload.target) {
+        engine.players.setExpression(payload.target, 'angry', 0.6)
+        setTimeout(() => engine.players.setExpression(payload.target, 'angry', 0), 500)
+      }
+      if (payload.type === 'aimpunch' && engine.cam?.punch) {
+        engine.cam.punch(payload.intensity || 0.3)
+      }
+      if (payload.type === 'death' && payload.victim) {
+        engine.players.setExpression(payload.victim, 'sorrow', 1.0)
+      }
+      if (payload.type === 'buff_applied' && tps) {
+        tps.boost = { expiresAt: Date.now() + (payload.duration || 45) * 1000 }
+      }
+      if (payload.type === 'buff_expired' && tps) { tps.boost = null }
+      if (payload.type === 'reload_start' && tps) {
+        tps.reloading = true
+        tps.reloadEndTime = Date.now() + (payload.duration || 2000)
+        const animator = engine.players?.getAnimator(engine.playerId)
+        if (animator) animator.reload()
+      }
+      if (payload.type === 'reload_complete' && tps) {
+        tps.reloading = false
+        tps.ammo = 30
+      }
+      if (payload.type === 'empty_click' && tps) {
+        // Could play empty click sound here
+      }
+    },
+    onFrame(dt, engine) {
+      const tps = engine._tps
+      if (!tps) return
+      if (tps.boost && Date.now() >= tps.boost.expiresAt) tps.boost = null
+      if (tps.flash && tps.flashOff && Date.now() >= tps.flashOff) { tps.flash.intensity = 0; tps.flashOff = 0 }
+      engine.players.setAiming(engine.playerId, tps.isAiming)
+    },
     render(ctx) {
       const h = ctx.h
+      if (!h) return { position: ctx.entity.position }
       const s = ctx.state || {}
-      const ui = h ? h('div', { class: 'game-info' },
-        h('span', null, s.mode || 'ffa'),
-        h('span', null, s.time || '0')
-      ) : null
+      const local = ctx.players?.find(p => p.id === ctx.engine?.playerId)
+      const hp = local?.health ?? 100
+      const tps = ctx.engine?._tps
+      const boostSec = tps?.boost ? Math.ceil((tps.boost.expiresAt - Date.now()) / 1000) : 0
+      const ammo = tps?.ammo ?? 0
+      const reloading = tps?.reloading ?? false
+      const reloadProgress = reloading && tps?.reloadEndTime ? Math.min(100, Math.round((1 - (tps.reloadEndTime - Date.now()) / 2000) * 100)) : 0
       return {
         position: ctx.entity.position,
-        custom: { game: s.map, mode: s.mode, time: s.gameTime?.toFixed(1) || '0' },
-        ui
+        custom: { game: s.map, mode: s.mode },
+        ui: h('div', { class: 'tps-hud' },
+          h('div', { id: 'crosshair', style: 'position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);font-size:24px;color:#fff;text-shadow:0 0 2px #000' }, '+'),
+          h('div', { id: 'ammo-counter', style: 'position:fixed;bottom:50px;right:20px;font-size:24px;font-weight:bold;color:#fff;text-shadow:0 0 4px #000;font-family:monospace' },
+            reloading ? h('span', { style: 'color:#ff0' }, `RELOADING ${reloadProgress}%`) : h('span', null, `${ammo}/30`)
+          ),
+          h('div', { id: 'health-bar', style: 'position:fixed;bottom:20px;left:50%;transform:translateX(-50%);width:200px;height:20px;background:#333;border-radius:4px;overflow:hidden' },
+            h('div', { style: `width:${hp}%;height:100%;background:${hp > 60 ? '#0f0' : hp > 30 ? '#ff0' : '#f00'};transition:width 0.2s` }),
+            h('span', { style: 'position:absolute;width:100%;text-align:center;color:#fff;font-size:12px;line-height:20px' }, String(hp))
+          ),
+          boostSec > 0 ? h('div', { style: 'position:fixed;top:80px;right:20px;padding:8px 16px;background:linear-gradient(135deg,#ffd700,#ff8c00);color:#000;font-weight:bold;border-radius:6px;font-size:14px;box-shadow:0 0 12px rgba(255,215,0,0.6)' }, `BOOSTED ${boostSec}s`) : null
+        )
       }
     }
   }
@@ -95,8 +240,8 @@ export default {
 
 function findSpawnPoints(ctx) {
   const valid = []
-  for (let x = -31; x <= 17; x += 12) {
-    for (let z = -61; z <= -1; z += 12) {
+  for (let x = -56; x <= 44; x += 13) {
+    for (let z = -90; z <= 34; z += 12) {
       const hit = ctx.raycast([x, 20, z], [0, -1, 0], 30)
       if (hit.hit && hit.position[1] > -3) valid.push([x, hit.position[1] + 2, z])
     }
@@ -106,16 +251,21 @@ function findSpawnPoints(ctx) {
 }
 
 function getAvailableSpawnPoint(ctx, spawnPoints) {
-  const MIN_SAFE_DISTANCE = 6
+  const MIN_SAFE_DISTANCE = 15
   const activePlayers = ctx.players.getAll().filter(p => p.state && !ctx.state.respawning.has(p.id))
-  const safePoints = spawnPoints.filter(sp => {
-    return activePlayers.every(player => {
-      const dist = Math.hypot(sp[0] - player.state.position[0], sp[1] - player.state.position[1], sp[2] - player.state.position[2])
-      return dist >= MIN_SAFE_DISTANCE
-    })
+  if (activePlayers.length === 0) return spawnPoints[Math.floor(Math.random() * spawnPoints.length)]
+  const scored = spawnPoints.map(sp => {
+    let minDist = Infinity
+    for (const player of activePlayers) {
+      const dist = Math.hypot(sp[0] - player.state.position[0], sp[2] - player.state.position[2])
+      if (dist < minDist) minDist = dist
+    }
+    return { sp, minDist }
   })
-  const availablePoints = safePoints.length > 0 ? safePoints : spawnPoints
-  return availablePoints[Math.floor(Math.random() * availablePoints.length)]
+  const safe = scored.filter(s => s.minDist >= MIN_SAFE_DISTANCE)
+  if (safe.length > 0) return safe[Math.floor(Math.random() * safe.length)].sp
+  scored.sort((a, b) => b.minDist - a.minDist)
+  return scored[0].sp
 }
 
 function handleFire(ctx, msg) {
@@ -142,16 +292,24 @@ function handleFire(ctx, msg) {
     const dist = Math.hypot(proj[0] - tp[0], proj[1] - (tp[1] + 0.9), proj[2] - tp[2])
     if (dist > 0.6) continue
 
+    const hitY = proj[1]
+    const playerHeight = 1.8
+    const hitRatio = (hitY - tp[1]) / playerHeight
+    const isHeadshot = hitRatio >= ctx.state.config.headshotZone
+    const finalDamage = isHeadshot ? Math.round(damage * ctx.state.config.headshotMultiplier) : damage
     const hp = target.state.health ?? ctx.state.config.health
-    const newHp = Math.max(0, hp - damage)
+    const newHp = Math.max(0, hp - finalDamage)
     target.state.health = newHp
 
-    ctx.network.broadcast({ type: 'hit', shooter: shooterId, target: target.id, damage, health: newHp })
+    target.state.velocity[0] += direction[0] * ctx.state.config.hitKnockback
+    target.state.velocity[2] += direction[2] * ctx.state.config.hitKnockback
+    ctx.players.send(target.id, { type: 'aimpunch', intensity: 0.6 })
+    ctx.network.broadcast({ type: 'hit', shooter: shooterId, target: target.id, damage: finalDamage, health: newHp, headshot: isHeadshot })
 
     if (newHp <= 0) {
       const shooterStats = ctx.state.playerStats.get(shooterId) || { kills: 0, deaths: 0, damage: 0 }
       shooterStats.kills++
-      shooterStats.damage += damage
+      shooterStats.damage += finalDamage
       ctx.state.playerStats.set(shooterId, shooterStats)
       const targetStats = ctx.state.playerStats.get(target.id) || { kills: 0, deaths: 0, damage: 0 }
       targetStats.deaths++
@@ -160,7 +318,7 @@ function handleFire(ctx, msg) {
       ctx.network.broadcast({ type: 'death', victim: target.id, killer: shooterId })
     } else {
       const shooterStats = ctx.state.playerStats.get(shooterId) || { kills: 0, deaths: 0, damage: 0 }
-      shooterStats.damage += damage
+      shooterStats.damage += finalDamage
       ctx.state.playerStats.set(shooterId, shooterStats)
     }
     break

package/apps/world/index.js

@@ -1,22 +1,68 @@
-export default {
-  port: 8080,
-  tickRate: 128,
-  gravity: [0, -9.81, 0],
-  movement: {
-    maxSpeed: 8.0,
-    groundAccel: 10.0,
-    airAccel: 1.0,
-    friction: 7.2,
-    stopSpeed: 2.0,
-    jumpImpulse: 4.5,
-    collisionRestitution: 0.7,
-    collisionDamping: 0.5
-  },
-  entities: [
-    { id: 'environment', model: './world/schwust.glb', position: [0, 0, 0], app: 'environment' },
-    { id: 'game', position: [0, 0, 0], app: 'tps-game' },
-    { id: 'power-crates', position: [0, 0, 0], app: 'power-crate' }
-  ],
-  playerModel: './world/kaira.glb',
-  spawnPoint: [-35, 3, -65]
-}
+export default {
+  port: 3001,
+  tickRate: 128,
+  gravity: [0, -9.81, 0],
+  movement: {
+    maxSpeed: 4.0,
+    groundAccel: 10.0,
+    airAccel: 1.0,
+    friction: 6.0,
+    stopSpeed: 2.0,
+    jumpImpulse: 4.0,
+    collisionRestitution: 0.2,
+    collisionDamping: 0.25
+  },
+  player: {
+    health: 100,
+    capsuleRadius: 0.4,
+    capsuleHalfHeight: 0.9,
+    crouchHalfHeight: 0.45,
+    mass: 120,
+    modelScale: 1.323,
+    feetOffset: 0.212
+  },
+  scene: {
+    skyColor: 0x87ceeb,
+    fogColor: 0x87ceeb,
+    fogNear: 80,
+    fogFar: 200,
+    ambientColor: 0xfff4d6,
+    ambientIntensity: 0.3,
+    sunColor: 0xffffff,
+    sunIntensity: 1.5,
+    sunPosition: [21, 50, 20],
+    fillColor: 0x4488ff,
+    fillIntensity: 0.4,
+    fillPosition: [-20, 30, -10],
+    shadowMapSize: 1024,
+    shadowBias: 0.0038,
+    shadowNormalBias: 0.6,
+    shadowRadius: 12,
+    shadowBlurSamples: 8
+  },
+  camera: {
+    fov: 70,
+    shoulderOffset: 0.35,
+    headHeight: 0.4,
+    zoomStages: [0, 1.5, 3, 5, 8],
+    defaultZoomIndex: 2,
+    followSpeed: 12.0,
+    snapSpeed: 30.0,
+    mouseSensitivity: 0.002,
+    pitchRange: [-1.4, 1.4]
+  },
+  animation: {
+    mixerTimeScale: 1.3,
+    walkTimeScale: 2.0,
+    sprintTimeScale: 0.56,
+    fadeTime: 0.15
+  },
+  entities: [
+    { id: 'environment', model: './apps/tps-game/schwust.glb', position: [0, 0, 0], app: 'environment' },
+    { id: 'game', position: [0, 0, 0], app: 'tps-game' },
+    { id: 'power-crates', position: [0, 0, 0], app: 'power-crate' },
+    { id: 'interact-box', position: [-100, 3, -100], app: 'interactable' }
+  ],
+  playerModel: './apps/tps-game/Cleetus.vrm',
+  spawnPoint: [-35, 3, -65]
+}