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
+2 -2
View File
@@ -176,9 +176,9 @@ func hear(records: Array[Dictionary]) -> void:
## Puts the held item's model in the figure's hand; the figure points it where the
## player looks. Nothing is held aboard the barge, falling, gliding or swimming.
## player looks. Nothing is held aboard the barge, falling, gliding, swimming or down.
func _hold(figure: FigureRig, entity: SimEntity) -> void:
var busy: bool = entity.drop_state != Drop.NONE or entity.swimming or entity.eliminated
var busy: bool = entity.drop_state != Drop.NONE or entity.swimming or entity.eliminated or entity.downed
figure.hand().visible = not busy
if busy:
return
+16
View File
@@ -231,6 +231,22 @@ static func _clips() -> Dictionary:
[0.0, swim], [0.325, swim_pull], [0.65, mirror(swim)], [0.975, mirror(swim_pull)],
]]
# Downed in duos (M7): on hands and knees, head up, crawling a hand and knee at a time.
var downed: Dictionary = {
"hips": Vector3(78, 0, 0), "waist": Vector3(-4, 0, 0), "neck": Vector3(-52, 0, 0),
"shoulder_r": Vector3(-84, 0, -6), "elbow_r": Vector3(-8, 0, 0),
"shoulder_l": Vector3(-84, 0, 6), "elbow_l": Vector3(-8, 0, 0),
"hip_r": Vector3(-78, 0, -4), "knee_r": Vector3(92, 0, 0),
"hip_l": Vector3(-78, 0, 4), "knee_l": Vector3(92, 0, 0), "lift": Vector3(0, -0.5, 0),
}
var downed_reach: Dictionary = over(downed, {
"shoulder_r": Vector3(-104, 0, -6), "hip_l": Vector3(-64, 0, 4), "knee_l": Vector3(84, 0, 0),
"waist": Vector3(-4, 6, 0),
})
clips["downed"] = [1.6, true, [
[0.0, downed], [0.4, downed_reach], [0.8, downed], [1.2, mirror(downed_reach)],
]]
# How the held item is carried (arms only).
# Long things at the chest, the right hand at the grip and the left reaching
# along to the fore-end.
+4 -1
View File
@@ -55,7 +55,7 @@ const COLOURS: Dictionary = {
}
const COAT_SHADE: float = 0.28
## The states of `move`, in input order.
const STATES: Array[String] = ["ground", "crouch", "air", "skydive", "glide", "swim", "aboard"]
const STATES: Array[String] = ["ground", "crouch", "air", "skydive", "glide", "swim", "aboard", "downed"]
const HOLDS: Array[String] = ["long", "short", "carry"]
const ACTIONS: Array[String] = ["fire_long", "fire_short", "swing", "throw", "build"]
## How long a figure must be off the ground before it's drawn in the air, so steps
@@ -304,6 +304,9 @@ static func state_of(entity: SimEntity, airborne: bool) -> String:
return "glide"
if entity.swimming:
return "swim"
if entity.downed:
# Duos (M7): down on hands and knees, crawling.
return "downed"
if airborne:
return "air"
return "crouch" if entity.crouching else "ground"