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
+9 -2
View File
@@ -9,7 +9,7 @@
class_name Menus
extends Control
signal practice_requested(bots: int, difficulty: int)
signal practice_requested(bots: int, difficulty: int, team_size: int)
signal join_requested(host: String, port: int, player_name: String)
signal resume_requested
signal leave_requested
@@ -41,6 +41,7 @@ var _binding_note: Label
## Practice.
var _bots: SpinBox
var _difficulty: OptionButton
var _mode: OptionButton
## Join.
var _name: LineEdit
var _address: LineEdit
@@ -360,6 +361,10 @@ func _build_practice() -> void:
for index: int in Tuning.BOT_DIFFICULTIES.size():
_difficulty.add_item(String(Tuning.BOT_DIFFICULTIES[index]["name"]).capitalize(), index + 1)
_row(column, "Bot skill", _difficulty)
_mode = OptionButton.new()
_mode.add_item("Solo", 1)
_mode.add_item("Duos, with a bot crewmate", Tuning.DUO_TEAM_SIZE)
_row(column, "Crew", _mode)
_button(column, "Set out", _start_practice)
_button(column, "Back", back)
@@ -367,8 +372,9 @@ func _build_practice() -> void:
func _start_practice() -> void:
settings.practice_bots = int(_bots.value)
settings.practice_difficulty = _difficulty.selected - 1
settings.practice_team_size = _mode.get_item_id(_mode.selected)
save_settings()
practice_requested.emit(settings.practice_bots, settings.practice_difficulty)
practice_requested.emit(settings.practice_bots, settings.practice_difficulty, settings.practice_team_size)
func _build_join() -> void:
@@ -580,6 +586,7 @@ func _build_results() -> void:
func _refresh_controls() -> void:
_bots.value = settings.practice_bots
_difficulty.selected = settings.practice_difficulty + 1
_mode.selected = maxi(_mode.get_item_index(settings.practice_team_size), 0)
_name.text = settings.player_name
if _address.text.is_empty():
_address.text = settings.last_server