Skip to content

FFA baseline: let the band target orbit, so a bot at its band radius stops standing still (dormant, default unchanged) #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devin-ai-integration wants to merge 1 commit into
base: main
Choose a base branch
from
Open

FFA baseline: let the band target orbit, so a bot at its band radius stops standing still (dormant, default unchanged) #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions players/baseline/baseline.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ const
FfaHunterArmTripMaxSecDefault = 30
FfaHunterArmTripMaxDetourRadiusDefault = 240.0
FfaHunterArmSafeMarginDefault = 80.0
FfaOrbitLeadDegDefault = 0.0
FfaPactWindowFractionDefault = 0.35
FfaPactWindowSecDefault = 0
FfaPactBrawlRadiusDefault = 220.0
Expand Down Expand Up @@ -548,6 +549,7 @@ var
FfaHunterArmTripMaxSec = FfaHunterArmTripMaxSecDefault
FfaHunterArmTripMaxDetourRadius = FfaHunterArmTripMaxDetourRadiusDefault
FfaHunterArmSafeMargin = FfaHunterArmSafeMarginDefault
FfaOrbitLeadDeg = FfaOrbitLeadDegDefault
FfaPactWindowFraction = FfaPactWindowFractionDefault
FfaPactWindowSec = FfaPactWindowSecDefault
FfaPactBrawlRadius = FfaPactBrawlRadiusDefault
Expand Down Expand Up @@ -686,23 +688,37 @@ proc ffaSeatBearing(slot: int): Vec =
of 6: vec(0.0, -1.0)
else: vec(1.0, -1.0)

proc ffaOrbitBearing(bot: Bot, bearing: Vec): Vec =
if FfaOrbitLeadDeg == 0.0:
return bearing
let
angle = float(FfaOrbitLeadDeg) * PI / 180.0 *
(if bot.slot mod 2 == 0: 1.0 else: -1.0)
cosAngle = cos(angle)
sinAngle = sin(angle)
vec(
bearing.x * cosAngle - bearing.y * sinAngle,
bearing.x * sinAngle + bearing.y * cosAngle)

proc ffaBandTarget(bot: Bot, me, center: Vec, safeRadius: int,
fraction: float): Vec =
let
fromCenter = me - center
bearing =
rawBearing =
if fromCenter.len() >= FfaBearingEpsilon: norm(fromCenter)
else: norm(ffaSeatBearing(bot.slot))
bearing = ffaOrbitBearing(bot, rawBearing)
radius = float(max(1, safeRadius)) * fraction
center + bearing * radius

proc ffaBandTargetAtRadius(bot: Bot, me, center: Vec,
radius: float): Vec =
let
fromCenter = me - center
bearing =
rawBearing =
if fromCenter.len() >= FfaBearingEpsilon: norm(fromCenter)
else: norm(ffaSeatBearing(bot.slot))
bearing = ffaOrbitBearing(bot, rawBearing)
center + bearing * radius

proc ffaBandRadiusWithRingMargin(bandRadius: float, ringRadius: int,
Expand Down Expand Up @@ -4313,6 +4329,8 @@ proc runBot(url: string) =
FfaHoldBandDefault), 0.0, 1.0)
FfaPassiveBand = clamp(parseEnvFloat("CTF_BOT_FFA_PASSIVE_BAND",
FfaPassiveBandDefault), 0.0, 1.0)
FfaOrbitLeadDeg = clamp(parseEnvFloat("CTF_BOT_FFA_ORBIT_LEAD_DEG",
FfaOrbitLeadDegDefault), 0.0, 90.0)
FfaShadeRingMargin = max(0.0, parseEnvFloat(
"CTF_BOT_FFA_SHADE_MARGIN", FfaShadeRingMarginDefault, strict = true))
FfaHunterRingMargin = max(0.0, parseEnvFloat(
Expand Down Expand Up @@ -4397,6 +4415,7 @@ proc runBot(url: string) =
" ffaHunterArmTripMaxDetourRadius=", FfaHunterArmTripMaxDetourRadius,
" ffaHunterArmSafeMargin=", FfaHunterArmSafeMargin,
" ffaHunterRingMargin=", FfaHunterRingMargin,
" ffaOrbitLeadDeg=", FfaOrbitLeadDeg,
" ffaGameTicksPerFrame=", FfaGameTicksPerFrame,
" ffaLateClose=", FfaLateClose, " -> ", endpoint
artInit(slot, $bot.team, $bot.role, "", FfaGameTicksPerFrame)
Expand Down
16 changes: 16 additions & 0 deletions tests/test_baseline_doctrine.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,22 @@ suite "baseline FFA doctrine":
check baseline.contains(
"CTF_BOT_FFA_DOCTRINE must be hybrid, legacy, passive, rush, shade, hunter, or pact")

test "FFA orbit lead preserves the default and rotates the band target":
check baseline.contains("FfaOrbitLeadDegDefault = 0.0")
check baseline.contains(
"FfaOrbitLeadDeg = clamp(parseEnvFloat(\"CTF_BOT_FFA_ORBIT_LEAD_DEG\",")
check baseline.contains("FfaOrbitLeadDegDefault), 0.0, 90.0)")
check baseline.contains("angle = float(FfaOrbitLeadDeg) * PI / 180.0")
check baseline.contains(
"(if bot.slot mod 2 == 0: 1.0 else: -1.0)")
check baseline.contains("if FfaOrbitLeadDeg == 0.0:")
check baseline.contains("bearing.x * cosAngle - bearing.y * sinAngle")
check baseline.contains("bearing.x * sinAngle + bearing.y * cosAngle")
check baseline.contains("bearing = ffaOrbitBearing(bot, rawBearing)")
check baseline.count("bearing = ffaOrbitBearing(bot, rawBearing)") == 2
check baseline.contains("else: norm(ffaSeatBearing(bot.slot))")
check baseline.contains("ffaOrbitLeadDeg=\", FfaOrbitLeadDeg")

test "pact doctrine is selectable":
check baseline.count("requestedDoctrine == \"pact\"") == 1
check baseline.count("of FfaPact: \"pact\"") == 1
Expand Down
Loading