SirStone/SirRoboGarage
1
0
Fork 0
Code Issues 28 Pull Requests Actions Projects Releases Wiki Activity

fix(movement): lock target during ram — no switching until target dies or ram exits

Browse Source
This commit is contained in:
Davide Cappellini
2026-09-20 12:39:11 +02:00
parent c90874affd
commit 7657699531
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ModularBot_garage/src/ModularBot.nim
+10 -7
View File
@@ -174,6 +174,8 @@ method onBotDeath*(bot: ModularBot, e: BotDeathEvent) =
bot.enemyTracker.markDead(e.victimId) bot.enemyTracker.markDead(e.victimId)
if bot.enemyCount > 0: if bot.enemyCount > 0:
dec bot.enemyCount dec bot.enemyCount
if e.victimId == bot.currentTargetId:
bot.isRamming = false
method onGameStarted*(bot: ModularBot, e: GameStartedEventForBot) = method onGameStarted*(bot: ModularBot, e: GameStartedEventForBot) =
# minNumberOfParticipants == maxNumberOfParticipants for fixed battles; self is -1 # minNumberOfParticipants == maxNumberOfParticipants for fixed battles; self is -1
@@ -256,13 +258,14 @@ method run*(bot: ModularBot) =
setRadarTurnRate(radarRate) setRadarTurnRate(radarRate)
go() go()
# --- Target selection (sticky) --- # --- Target selection (sticky) --- lock target during ram to prevent dangerous switch
let candidateId = selectTarget(bot.enemyTracker, getX(), getY(), tmClosest) if not bot.isRamming:
if bot.shouldSwitchTarget(candidateId): let candidateId = selectTarget(bot.enemyTracker, getX(), getY(), tmClosest)
if candidateId != bot.currentTargetId: if bot.shouldSwitchTarget(candidateId):
bot.currentTargetId = candidateId if candidateId != bot.currentTargetId:
bot.targetSwitchTick = bot.tick bot.currentTargetId = candidateId
bot.printConfig("target") bot.targetSwitchTick = bot.tick
bot.printConfig("target")
# --- Aim + fire from tracked state (not scan event) --- # --- Aim + fire from tracked state (not scan event) ---
let tid = bot.currentTargetId let tid = bot.currentTargetId