feat(ModularBot): anti-surfer gun + wave-surf movement module
- Anti-surfer gun: inverse GF targeting for wave-surfing enemies - Wave-surf movement: danger histogram dodge (not wired yet, needs movement selector) - 7 guns total, battle-tested Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
## ModularBot — plugin gun architecture tracer bullet.
|
||||
## Guns: HeadOnGun (0), LinearGun (1), TsetlinGun (2), CircularGun (3), GFGun (4), PatternMatcherGun (5) via GunHarness.
|
||||
## Guns: HeadOnGun (0), LinearGun (1), TsetlinGun (2), CircularGun (3), GFGun (4), PatternMatcherGun (5), AntiSurferGun (6) via GunHarness.
|
||||
## Radar: RadarLockModule via radar harness.
|
||||
## Movement: OscillatorModule (perpendicular strafing).
|
||||
|
||||
@@ -16,12 +16,13 @@ import guns/circular
|
||||
import guns/tsetlin
|
||||
import guns/guess_factor
|
||||
import guns/pattern_matcher
|
||||
import guns/anti_surfer
|
||||
import movements/phantom_meteor
|
||||
|
||||
const botJsonPath = currentSourcePath().parentDir / "ModularBot.json"
|
||||
const DebugVBullets = false
|
||||
const DebugCircular = false
|
||||
const GunNames = ["HeadOn", "Linear", "Tsetlin", "Circular", "GuessFactor", "Pattern"]
|
||||
const GunNames = ["HeadOn", "Linear", "Tsetlin", "Circular", "GuessFactor", "Pattern", "AntiSurf"]
|
||||
|
||||
type
|
||||
ModularBot = ref object of Bot
|
||||
@@ -36,6 +37,7 @@ type
|
||||
tsetlin: TsetlinGun
|
||||
guessFactor: GFGun
|
||||
patternMatcher: PatternMatcherGun
|
||||
antiSurfer: AntiSurferGun
|
||||
mover: PhantomMeteorModule
|
||||
virtualHits: int
|
||||
virtualMiss: int
|
||||
@@ -72,6 +74,7 @@ method onScannedBot*(bot: ModularBot, e: ScannedBotEvent) =
|
||||
var circPreds: array[len(PowerBins), GunPrediction]
|
||||
var gfPreds: array[len(PowerBins), GunPrediction]
|
||||
var pmPreds: array[len(PowerBins), GunPrediction]
|
||||
var asPreds: array[len(PowerBins), GunPrediction]
|
||||
for i in 0..<len(PowerBins):
|
||||
headsUp[i] = bot.headOn.predict(bot.lastState, bulletSpeed(PowerBins[i]))
|
||||
linPreds[i] = bot.linear.predict(bot.lastState, bulletSpeed(PowerBins[i]))
|
||||
@@ -79,6 +82,7 @@ method onScannedBot*(bot: ModularBot, e: ScannedBotEvent) =
|
||||
circPreds[i] = bot.circular.predict(bot.lastState, bulletSpeed(PowerBins[i]))
|
||||
gfPreds[i] = bot.guessFactor.predict(bot.lastState, bulletSpeed(PowerBins[i]))
|
||||
pmPreds[i] = bot.patternMatcher.predict(bot.lastState, bulletSpeed(PowerBins[i]))
|
||||
asPreds[i] = bot.antiSurfer.predict(bot.lastState, bulletSpeed(PowerBins[i]))
|
||||
|
||||
bot.tracker.spawnBullets(0, headsUp, bot.lastState)
|
||||
bot.tracker.spawnBullets(1, linPreds, bot.lastState)
|
||||
@@ -88,6 +92,7 @@ method onScannedBot*(bot: ModularBot, e: ScannedBotEvent) =
|
||||
bot.tracker.spawnBullets(3, circPreds, bot.lastState)
|
||||
bot.tracker.spawnBullets(4, gfPreds, bot.lastState)
|
||||
bot.tracker.spawnBullets(5, pmPreds, bot.lastState)
|
||||
bot.tracker.spawnBullets(6, asPreds, bot.lastState)
|
||||
|
||||
# Resolve bullets that have travelled far enough
|
||||
let st = bot.lastState
|
||||
@@ -104,6 +109,7 @@ method onScannedBot*(bot: ModularBot, e: ScannedBotEvent) =
|
||||
echo fmt"[circ-vb] predicted=({fe.prediction.x:.0f},{fe.prediction.y:.0f}) actual=({ax:.0f},{ay:.0f}) miss={fe.missDistance:.1f}px hit={fe.hit}"
|
||||
of 4: bot.guessFactor.onResult(fe)
|
||||
of 5: bot.patternMatcher.onResult(fe)
|
||||
of 6: bot.antiSurfer.onResult(fe)
|
||||
else: discard
|
||||
if fe.hit: inc bot.virtualHits else: inc bot.virtualMiss
|
||||
when DebugVBullets:
|
||||
@@ -126,6 +132,7 @@ method onScannedBot*(bot: ModularBot, e: ScannedBotEvent) =
|
||||
of 3: setTurretColor("#33CC33"); setBulletColor("#66FF66") # Circular: emerald
|
||||
of 4: setTurretColor("#FFCC00"); setBulletColor("#FFE066") # GuessFactor: yellow
|
||||
of 5: setTurretColor("#FF6600"); setBulletColor("#FF9944") # Pattern: orange
|
||||
of 6: setTurretColor("#00CCFF"); setBulletColor("#66DDFF") # AntiSurf: cyan
|
||||
else: discard
|
||||
|
||||
let pred = case selectedGun
|
||||
@@ -134,6 +141,7 @@ method onScannedBot*(bot: ModularBot, e: ScannedBotEvent) =
|
||||
of 3: bot.circular.predict(bot.lastState, bulletSpeed(power))
|
||||
of 4: bot.guessFactor.predict(bot.lastState, bulletSpeed(power))
|
||||
of 5: bot.patternMatcher.predict(bot.lastState, bulletSpeed(power))
|
||||
of 6: bot.antiSurfer.predict(bot.lastState, bulletSpeed(power))
|
||||
else: bot.headOn.predict(bot.lastState, bulletSpeed(power))
|
||||
let target = aimAngle(getX(), getY(), pred.x, pred.y)
|
||||
|
||||
@@ -193,13 +201,14 @@ method run*(bot: ModularBot) =
|
||||
|
||||
when isMainModule:
|
||||
var bot = ModularBot(
|
||||
tracker: vb.initTracker(6), # 0: HeadOn, 1: Linear, 2: Tsetlin, 3: Circular, 4: GuessFactor, 5: Pattern
|
||||
tracker: vb.initTracker(7), # 0: HeadOn, 1: Linear, 2: Tsetlin, 3: Circular, 4: GuessFactor, 5: Pattern, 6: AntiSurf
|
||||
headOn: HeadOnGun(),
|
||||
linear: LinearGun(),
|
||||
circular: CircularGun(),
|
||||
tsetlin: initTsetlinGun(),
|
||||
guessFactor: initGFGun(),
|
||||
patternMatcher: PatternMatcherGun(),
|
||||
antiSurfer: initAntiSurferGun(),
|
||||
radar: RadarLockModule(),
|
||||
mover: initPhantomMeteor(),
|
||||
currentGun: -1,
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
## Gauntlet: ModularBot vs WaveSurfer, SpinBot, Crazy — 10 rounds each.
|
||||
## Captures [gun] lines and scores. Run with:
|
||||
## nim c -r --path:../../common_libs tests/test_gauntlet.nim
|
||||
|
||||
import std/[os, strformat]
|
||||
import test_framework/test_framework
|
||||
|
||||
const
|
||||
modularBotDir = currentSourcePath().parentDir.parentDir
|
||||
samplesDir = "/home/davide/Downloads/robocode-tankroyale/sample-bots-nim-linux-1.0.7"
|
||||
waveSurferDir = "/home/davide/Projects/SirRoboGarage/WaveSurfer_garage"
|
||||
spinBotDir = samplesDir / "SpinBot"
|
||||
crazyDir = samplesDir / "Crazy"
|
||||
|
||||
if not fileExists("/home/davide/Projects/tank-royale/server/build/libs/robocode-tankroyale-server-0.35.5-all.jar") or
|
||||
not fileExists("/home/davide/Projects/tank-royale/runner/examples/lib/robocode-tankroyale-runner.jar"):
|
||||
echo "Skipping: Tank Royale JARs not found"
|
||||
quit(0)
|
||||
|
||||
proc runAndReport(label, enemyName, enemyDir: string) =
|
||||
echo fmt"\n=== {label} ==="
|
||||
let r = runBattle(@[modularBotDir, enemyDir], rounds = 10, timeout = 240000)
|
||||
var mbScore = 0
|
||||
var enScore = 0
|
||||
for b in r.results:
|
||||
if b.name == "ModularBot": mbScore = b.totalScore
|
||||
if b.name == enemyName: enScore = b.totalScore
|
||||
let winner = if mbScore > enScore: "ModularBot" else: enemyName
|
||||
echo fmt" ModularBot: {mbScore} {enemyName}: {enScore} → {winner} wins"
|
||||
echo fmt" Rounds: {r.rounds.len}"
|
||||
|
||||
runAndReport("Battle 1/3: vs WaveSurfer", "WaveSurfer", waveSurferDir)
|
||||
runAndReport("Battle 2/3: vs SpinBot", "SpinBot", spinBotDir)
|
||||
runAndReport("Battle 3/3: vs Crazy", "Crazy", crazyDir)
|
||||
echo "\nGauntlet complete."
|
||||
@@ -0,0 +1,68 @@
|
||||
## Gauntlet with [gun] line capture via raw runner output.
|
||||
## nim c -r --path:../../common_libs tests/test_gauntlet_guns.nim
|
||||
|
||||
import std/[os, strutils, strformat, tables]
|
||||
import test_framework/server_manager
|
||||
import test_framework/bot_compiler
|
||||
import test_framework/runner_process
|
||||
import test_framework/battle_result
|
||||
|
||||
const
|
||||
modularBotDir = currentSourcePath().parentDir.parentDir
|
||||
samplesDir = "/home/davide/Downloads/robocode-tankroyale/sample-bots-nim-linux-1.0.7"
|
||||
waveSurferDir = "/home/davide/Projects/SirRoboGarage/WaveSurfer_garage"
|
||||
spinBotDir = samplesDir / "SpinBot"
|
||||
crazyDir = samplesDir / "Crazy"
|
||||
|
||||
if not fileExists("/home/davide/Projects/tank-royale/server/build/libs/robocode-tankroyale-server-0.35.5-all.jar") or
|
||||
not fileExists("/home/davide/Projects/tank-royale/runner/examples/lib/robocode-tankroyale-runner.jar"):
|
||||
echo "Skipping: Tank Royale JARs not found"
|
||||
quit(0)
|
||||
|
||||
proc gunCounts(raw: string): Table[string, int] =
|
||||
## Count [gun] switched: <Name> occurrences
|
||||
for line in raw.splitLines():
|
||||
if "[gun] switched:" in line:
|
||||
let parts = line.split(":")
|
||||
if parts.len >= 2:
|
||||
let name = parts[^1].strip()
|
||||
result[name] = result.getOrDefault(name, 0) + 1
|
||||
|
||||
proc runAndReport(label, enemyName, enemyDir: string) =
|
||||
let sep = "=".repeat(50)
|
||||
echo "\n" & sep
|
||||
echo " " & label
|
||||
echo sep
|
||||
let bots = @[modularBotDir, enemyDir]
|
||||
discard compileBots(bots)
|
||||
let raw = runBattleRunner(getServerUrl(), bots, 10, 240000, true)
|
||||
let r = parseServerOutput(raw)
|
||||
|
||||
var mbScore = 0; var enScore = 0
|
||||
for b in r.results:
|
||||
if b.name == "ModularBot": mbScore = b.totalScore
|
||||
if b.name == enemyName: enScore = b.totalScore
|
||||
let winner = if mbScore > enScore: "ModularBot" else: enemyName
|
||||
echo " Score: ModularBot " & $mbScore & " " & enemyName & " " & $enScore & " -> " & winner & " wins"
|
||||
|
||||
let guns = gunCounts(raw)
|
||||
if guns.len > 0:
|
||||
echo " Gun switches:"
|
||||
for name, count in guns.pairs:
|
||||
echo fmt" [gun] {name}: {count}x"
|
||||
else:
|
||||
echo " (no [gun] switch lines in output)"
|
||||
|
||||
# Show all [gun] lines for visibility
|
||||
var gunLines: seq[string]
|
||||
for line in raw.splitLines():
|
||||
if line.contains("[gun]"): gunLines.add(line.strip())
|
||||
if gunLines.len > 0:
|
||||
echo fmt" First 20 [gun] lines:"
|
||||
for l in gunLines[0..min(19, gunLines.high)]: echo fmt" {l}"
|
||||
|
||||
ensureServer()
|
||||
runAndReport("Battle 1/3: vs WaveSurfer", "WaveSurfer", waveSurferDir)
|
||||
runAndReport("Battle 2/3: vs SpinBot", "SpinBot", spinBotDir)
|
||||
runAndReport("Battle 3/3: vs Crazy", "Crazy", crazyDir)
|
||||
echo "\nGauntlet complete."
|
||||
Reference in New Issue
Block a user