feat(movement): dodge timing, wall avoidance, distance control, ram finisher
PhantomMeteor: - Ram finisher: charge at enemy when <200px and their energy <10 - Ram opportunity: charge when <60px and we have >20 energy advantage - Integrated gunheat tracker for 1-2 tick earlier wave detection - Distance control: smooth linear ramp toward preferred engagement distance - Phantom range expanded 150→250px to catch closer threats WaveSurfer: - Wall-aware dodge bin selection: penalize bins leading off-arena - Dodge timing: predict future position 15 ticks ahead for safety - Distance control: radial blend when outside deadband (350±50px) - Wall escape: invert strafe if pushing further into wall, blend toward center ModularBot: - Wired KNN gun (purple/magenta) - Shadows tracked for movement (safer GF prediction) - Bullet lifecycle management (onBulletFired/onBulletHitBot/onBulletHitWall) - Unified phantom_meteor movement (wave_surfer unplugged) - Config logging on round start + gun switch Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
import std/math
|
||||
import gun_harness/gun_interface
|
||||
import movement_harness/movement_interface
|
||||
import movement_harness/gunheat_tracker
|
||||
|
||||
# Inline the gravity engine types and logic here to keep the module self-contained.
|
||||
# We re-export nothing from gravity.nim — it's not on the common_libs path.
|
||||
@@ -56,6 +57,10 @@ type
|
||||
|
||||
# ── Gravity engine internals ──────────────────────────────────────────────────
|
||||
|
||||
const
|
||||
CLR_CYAN = "\e[36m"
|
||||
CLR_RST = "\e[0m"
|
||||
|
||||
const
|
||||
KBullet = 1500.0
|
||||
KWall = 4000.0
|
||||
@@ -136,28 +141,33 @@ proc computeForces(eng: GravityEngine, botPos, enemyPos: Vec2, arenaW, arenaH: f
|
||||
for ph in eng.phantoms:
|
||||
if ph.alive:
|
||||
let d = dist(ph.pos, botPos)
|
||||
if d < 150.0:
|
||||
if d < 250.0:
|
||||
hasClose = true
|
||||
total = total + normalize(botPos - ph.pos) * (KBullet * (1.0 - d/150.0))
|
||||
total = total + normalize(botPos - ph.pos) * (KBullet * (1.0 - d/250.0))
|
||||
|
||||
# Priority 2: wall escape (hard override)
|
||||
# Priority 2: wall escape (additive — blends with phantom forces)
|
||||
let minW = min(min(botPos.x, arenaW-botPos.x), min(botPos.y, arenaH-botPos.y))
|
||||
if minW < VeryClose:
|
||||
var ex = 0.0; var ey = 0.0
|
||||
if botPos.x < VeryClose: ex = 1.0
|
||||
if botPos.x < VeryClose: ex = 1.0
|
||||
if arenaW - botPos.x < VeryClose: ex = -1.0
|
||||
if botPos.y < VeryClose: ey = 1.0
|
||||
if botPos.y < VeryClose: ey = 1.0
|
||||
if arenaH - botPos.y < VeryClose: ey = -1.0
|
||||
let m = sqrt(ex*ex + ey*ey)
|
||||
if m > 0.1: return normalize(vec2(ex,ey)) * 500.0
|
||||
let wm = sqrt(ex*ex + ey*ey)
|
||||
if wm > 0.1: total = total + normalize(vec2(ex, ey)) * 500.0
|
||||
|
||||
# Priority 3: distance to enemy
|
||||
# Priority 3: distance to enemy — symmetric attraction/repulsion around PreferredDist.
|
||||
# Linear ramp over ±150px so the transition is smooth, not a hard switch.
|
||||
# ponytail: linear ramp, tune rampWidth if distance oscillates
|
||||
let de = dist(enemyPos, botPos)
|
||||
if not hasClose and de > 100.0:
|
||||
if de < PreferredDist:
|
||||
total = total + normalize(botPos - enemyPos) * KEnemy
|
||||
elif de > PreferredDist + 100.0:
|
||||
total = total + normalize(enemyPos - botPos) * (KEnemy * 0.3)
|
||||
const rampWidth = 150.0
|
||||
let distErr = de - PreferredDist # >0 = too far, <0 = too close
|
||||
let t = clamp(distErr / rampWidth, -1.0, 1.0)
|
||||
# t > 0 → attract toward enemy; t < 0 → repel away
|
||||
let dir = if t >= 0.0: normalize(enemyPos - botPos)
|
||||
else: normalize(botPos - enemyPos)
|
||||
total = total + dir * (KEnemy * abs(t))
|
||||
|
||||
# Priority 4: weak wall repulsion
|
||||
let dL = max(botPos.x, WallMinDist)
|
||||
@@ -171,31 +181,67 @@ proc computeForces(eng: GravityEngine, botPos, enemyPos: Vec2, arenaW, arenaH: f
|
||||
# ── MovementModule wrapper ────────────────────────────────────────────────────
|
||||
|
||||
type PhantomMeteorModule* = object
|
||||
engine: GravityEngine
|
||||
engine: GravityEngine
|
||||
gunheat: GunheatTracker
|
||||
|
||||
proc initPhantomMeteor*(): PhantomMeteorModule =
|
||||
PhantomMeteorModule(engine: initEngine())
|
||||
PhantomMeteorModule(engine: initEngine(), gunheat: initGunheatTracker())
|
||||
|
||||
proc resetRound*(m: var PhantomMeteorModule) =
|
||||
## Clear per-round transients (phantoms, waves, energy baseline), keep histogram.
|
||||
m.engine.phantoms = @[]
|
||||
m.engine.waves = @[]
|
||||
m.engine.prevEnemyEnergy = 100.0
|
||||
m.gunheat.resetRound()
|
||||
|
||||
proc computeMove*(m: var PhantomMeteorModule, ws: WorldState): MoveCommand =
|
||||
let botPos = vec2(ws.selfX, ws.selfY)
|
||||
let enemyPos = vec2(ws.enemyX, ws.enemyY)
|
||||
|
||||
# ── Ram override ─────────────────────────────────────────────────────────────
|
||||
let ramDist = dist(botPos, enemyPos)
|
||||
let ramFinisher = ramDist < 200.0 and ws.enemyEnergy < 10.0 and ws.selfEnergy > ws.enemyEnergy
|
||||
let ramOpportunity = ramDist < 60.0 and ws.selfEnergy > ws.enemyEnergy + 20.0
|
||||
if ramFinisher or ramOpportunity:
|
||||
let tag = if ramFinisher: "finisher" else: "opportunity"
|
||||
echo CLR_CYAN & "[ram:" & tag & "] dist=" & $int(ramDist) &
|
||||
" selfE=" & $int(ws.selfEnergy) & " enemyE=" & $int(ws.enemyEnergy) & CLR_RST
|
||||
let headingRad = arctan2(enemyPos.y - botPos.y, enemyPos.x - botPos.x)
|
||||
let desiredDeg = radToDeg(headingRad)
|
||||
var delta = desiredDeg - ws.selfHeading
|
||||
while delta > 180.0: delta -= 360.0
|
||||
while delta < -180.0: delta += 360.0
|
||||
return (speed: 8.0, turnRate: delta.clamp(-10.0, 10.0))
|
||||
|
||||
# Advance simulation
|
||||
m.engine.tickPhantoms()
|
||||
m.engine.tickWaves(botPos)
|
||||
|
||||
# Fire detection → spawn phantoms + wave
|
||||
let (fired, power) = m.engine.detectFire(ws.enemyEnergy)
|
||||
if fired:
|
||||
let bspeed = 20.0 - 3.0 * power
|
||||
m.engine.spawnPhantoms(enemyPos, botPos, bspeed)
|
||||
m.engine.spawnWave(enemyPos, botPos, bspeed)
|
||||
# Fire detection via gunheat tracker (1-2 ticks earlier than energy drop).
|
||||
var spawnedThisTick = false
|
||||
for ev in m.gunheat.tick(ws):
|
||||
let bspeed = 20.0 - 3.0 * ev.bulletPower
|
||||
let evPos = vec2(ev.fireX, ev.fireY)
|
||||
case ev.kind
|
||||
of wePredicted:
|
||||
m.engine.spawnPhantoms(evPos, botPos, bspeed)
|
||||
m.engine.spawnWave(evPos, botPos, bspeed)
|
||||
spawnedThisTick = true
|
||||
of weConfirmed:
|
||||
if not spawnedThisTick:
|
||||
m.engine.spawnPhantoms(evPos, botPos, bspeed)
|
||||
m.engine.spawnWave(evPos, botPos, bspeed)
|
||||
spawnedThisTick = true
|
||||
# Fallback: energy-drop detection (fires if gunheat tracker missed it).
|
||||
if not spawnedThisTick:
|
||||
let (fired, power) = m.engine.detectFire(ws.enemyEnergy)
|
||||
if fired:
|
||||
let bspeed = 20.0 - 3.0 * power
|
||||
m.engine.spawnPhantoms(enemyPos, botPos, bspeed)
|
||||
m.engine.spawnWave(enemyPos, botPos, bspeed)
|
||||
else:
|
||||
# Keep prevEnemyEnergy in sync so energy-drop fallback stays coherent.
|
||||
discard m.engine.detectFire(ws.enemyEnergy)
|
||||
|
||||
# Compute force vector
|
||||
let force = m.engine.computeForces(botPos, enemyPos, ws.arenaWidth, ws.arenaHeight)
|
||||
|
||||
Reference in New Issue
Block a user