M7: Duos and revive

Two-player teams, enforced by the simulation:
- Match puts every player on a team (SimEntity.team); Weapons.damage_player
  refuses damage between teammates from every weapon, the boathook and blasts.
- A player whose health runs out with a teammate standing goes down instead of
  out: 60 health to bleed (one point every half second), crawling at 1 m/s, no
  firing, building, looting or items. Hits still take it; drowning too.
- A standing teammate within 2 m holding interact for 6 s revives them with 30
  health. Letting go or moving away starts it over.
- Downed players are out when their health runs out again or when no teammate
  is left standing, credited to whoever downed them. A team falls together and
  shares its place; the tie-break puts standing ahead of downed.
- Downs and revives go through Match events and the kill feed ("X knocked Y
  down"); the HUD says what to do while down.

Wire: FLAG_DOWNED in the player record and the own block (flags now u16),
so prediction crawls too. Protocol version 5.

Bots: never target a teammate, land with their teammate, regroup when they
stray past 30 m, crawl toward a standing teammate when down, go to revive a
downed teammate within 60 m when not in a fight, and turn from a downed target
to its standing teammate when it's in view.

Options: --team-size=2 on the server, --duos offline, and Solo/Duos under
Crew in the Practice menu. The figure has a downed crawl pose.

Tests: test_duos (downing, crawl, revive, interrupted revive, bleed-out,
finishing, team out, falling together, no friendly damage including kegs,
drowning while down, hash, match placement and tie-break), bots as teammates,
the downed flag on the wire, the feed, server and menu options. make
duo-matches plays 10 bot duos matches.

Closes #30

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-15 03:01:09 -05:00
co-authored by Claude Opus 5.5
parent 324bf84dd5
commit 2167900e45
53 changed files with 1105 additions and 61 deletions
+49
View File
@@ -0,0 +1,49 @@
## Plays bot-only duos matches (M7) on a run of seeds: 12 teams of two bots. Checks
## every match ends with one winning team, bots went down and revived teammates, no hit
## between teammates did damage, and the ticks kept within budget.
##
## tools/godot.sh --script res://tools/duo_matches.gd -- [--seeds=10] [--first=1]
##
## Prints one JSON line per match and a summary. Exits 1 if a check fails.
extends SceneTree
func _init() -> void:
var count: int = 10
var first: int = 1
for arg: String in OS.get_cmdline_user_args():
if arg.begins_with("--seeds="):
count = arg.trim_prefix("--seeds=").to_int()
elif arg.begins_with("--first="):
first = arg.trim_prefix("--first=").to_int()
var results: Array[Dictionary] = []
var downs: int = 0
var revives: int = 0
var team_hits: int = 0
var one_team: int = 0
for seed_value: int in range(first, first + count):
var result: Dictionary = BotBatch.run_match(seed_value, Tuning.SOLO_PLAYERS, -1, false, Tuning.DUO_TEAM_SIZE)
result.erase("building")
results.append(result)
downs += int(result["downs"])
revives += int(result["revives"])
team_hits += int(result["team_hits"])
one_team += 1 if int(result["winner_teams"]) == 1 else 0
print(JSON.stringify({"seed": seed_value, "finished": result["finished"], "ticks": result["ticks"],
"winner_teams": result["winner_teams"], "downs": result["downs"], "revives": result["revives"],
"team_hits": result["team_hits"], "causes": result["causes"], "p99_us": result["timing"].get("p99_us", 0)}))
var total: Dictionary = BotBatch.summarise(results)
var problems: Array[String] = []
if total["finished"] != count or one_team != count:
problems.append("%d of %d matches finished with one winning team" % [one_team, count])
if downs == 0 or revives == 0:
problems.append("bots went down %d times and revived %d times; both should happen" % [downs, revives])
if team_hits > 0:
problems.append("%d hits between teammates did damage" % team_hits)
if int(total["worst_p99_us"]) > ServerLoop.TICK_BUDGET_USEC:
problems.append("the worst match's p99 tick was %d us, over the %d us budget" % [total["worst_p99_us"], ServerLoop.TICK_BUDGET_USEC])
for problem: String in problems:
print("duo-matches FAIL: %s" % problem)
if problems.is_empty():
print("duo-matches: ok (%d matches, each won by one team, %d downs, %d revives, %.1f%% drowned, worst p99 %d us)" % [count, downs, revives, total["drown_share"] * 100.0, total["worst_p99_us"]])
quit(0 if problems.is_empty() else 1)
+1
View File
@@ -0,0 +1 @@
uid://ddv3is8k7bg05
+19
View File
@@ -0,0 +1,19 @@
#!/usr/bin/env bash
# Plays bot-only duos matches on a run of seeds, under nice, and prints one JSON line per
# match, a summary and the verdict. See tools/duo_matches.gd for what is checked.
#
# tools/duo_matches.sh seeds 1 to 10
# DUO_MATCH_SEEDS=5 DUO_MATCH_FIRST=40 tools/duo_matches.sh
set -uo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")/.."
count="${DUO_MATCH_SEEDS:-10}"
first="${DUO_MATCH_FIRST:-1}"
raw="$(nice -n 15 tools/godot.sh --script res://tools/duo_matches.gd -- --seeds="$count" --first="$first" 2>&1)"
code=$?
grep -E '^\{|^duo-matches' <<<"$raw"
if [[ "$code" -ne 0 ]] && ! grep -q '^duo-matches' <<<"$raw"; then
echo "duo-matches FAIL: the run exited $code"
tail -n 15 <<<"$raw"
fi
exit "$code"