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"
+6
View File
@@ -71,6 +71,10 @@ var practice_bots: int = Tuning.SOLO_PLAYERS - 1:
var practice_difficulty: int = -1:
set(value):
practice_difficulty = clampi(value, -1, Tuning.BOT_DIFFICULTIES.size() - 1)
## Practice solo (1) or in duos with a bot teammate (Tuning.DUO_TEAM_SIZE), M7.
var practice_team_size: int = 1:
set(value):
practice_team_size = clampi(value, 1, Tuning.DUO_TEAM_SIZE)
func shadow_distance() -> float:
@@ -118,6 +122,7 @@ func save(path: String = DEFAULT_PATH) -> Error:
config.set_value("player", "last_server", last_server)
config.set_value("practice", "bots", practice_bots)
config.set_value("practice", "difficulty", practice_difficulty)
config.set_value("practice", "team_size", practice_team_size)
return config.save(path)
@@ -144,6 +149,7 @@ static func load_from(path: String = DEFAULT_PATH) -> GameSettings:
settings.last_server = String(server_value).strip_edges().left(255)
settings.practice_bots = _int(config, "practice", "bots", settings.practice_bots)
settings.practice_difficulty = _int(config, "practice", "difficulty", settings.practice_difficulty)
settings.practice_team_size = _int(config, "practice", "team_size", settings.practice_team_size)
return settings
+13
View File
@@ -14,6 +14,8 @@ const FONT_SMALL: int = 13
const FONT_BODY: int = 16
const FONT_TITLE: int = 22
const MARGIN: float = 18.0
## Shown while downed in duos (M7).
const DOWN_TEXT: String = "DOWN · bleeding out · crawl to your crewmate, who can haul you up with interact"
var state: HudState = HudState.new()
@@ -24,6 +26,8 @@ var _vitals: Vitals
var _hotbar: HBoxContainer
var _materials: VBoxContainer
var _build: Label
## Down in duos (M7): what to do about it, above the hotbar.
var _down: Label
var _reticle: Reticle
var _hurt: HurtEdge
## When a feed line was first shown (msec), so lines fade after HudState.FEED_SECONDS.
@@ -90,6 +94,14 @@ func _init() -> void:
_build.size = Vector2(520.0, 24.0)
_build.position = Vector2(-260.0, -112.0 - MARGIN - 30.0)
add_child(_build)
_down = _label(FONT_BODY, Palette.WARNING)
_down.set_anchors_preset(Control.PRESET_CENTER_BOTTOM)
_down.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
_down.size = Vector2(720.0, 24.0)
_down.position = Vector2(-360.0, -112.0 - MARGIN - 30.0)
_down.text = DOWN_TEXT
_down.visible = false
add_child(_down)
_materials = VBoxContainer.new()
_materials.set_anchors_preset(Control.PRESET_BOTTOM_RIGHT)
@@ -157,6 +169,7 @@ func show_state(shown: HudState) -> void:
var count: int = shown.materials[code] if code < shown.materials.size() else 0
(_materials.get_child(code) as Label).text = "%s %d" % [Materials.NAMES[code].replace("_", " ").capitalize(), count]
_down.visible = shown.playing and shown.downed
_build.visible = shown.playing and not shown.build.is_empty()
if _build.visible:
var build: Dictionary = shown.build
+21 -5
View File
@@ -25,6 +25,8 @@ var standing: int = 0
var total: int = 0
## Lines for the kill feed, oldest first: {"text", "you"}.
var feed: Array[Dictionary] = []
## Down in duos (M7): crawling, bleeding, waiting for a crewmate to haul them up.
var downed: bool = false
## True when the aiming reticle is shown: playing, on foot or swimming.
var reticle: bool = false
## Hit feedback (A7, HitFeedback): the marker for a shot that struck someone and the
@@ -50,9 +52,11 @@ static func from_client(game: ClientGame, input: ClientInput, own_handle: int, f
state.playing = true
state.health = drawn.health if drawn != null else me.health
state.armor = drawn.armor if drawn != null else me.armor
state.reticle = me.drop_state == Drop.NONE
state.reticle = me.drop_state == Drop.NONE and not me.downed
state.downed = me.downed
_fill_carried(state, me)
state.build = build_of(input.build_mode, input.build_kind, input.material, me.materials)
if not me.downed:
state.build = build_of(input.build_mode, input.build_kind, input.material, me.materials)
return state
@@ -78,9 +82,11 @@ static func from_match(flow: Match, handle: int, build_mode: bool = false, build
state.playing = true
state.health = me.health
state.armor = me.armor
state.reticle = me.drop_state == Drop.NONE
state.reticle = me.drop_state == Drop.NONE and not me.downed
state.downed = me.downed
_fill_carried(state, me)
state.build = build_of(build_mode, build_kind, material, me.materials)
if not me.downed:
state.build = build_of(build_mode, build_kind, material, me.materials)
return state
@@ -112,7 +118,10 @@ static func feed_lines(entries: Array[Dictionary], own_handle: int) -> Array[Dic
var by_is_you: bool = int(entry.get("by", 0)) == own_handle and own_handle != 0
var victim: String = "You" if victim_is_you else String(entry.get("victim_name", "Someone"))
var by: String = "You" if by_is_you else String(entry.get("by_name", ""))
lines.append({"text": feed_text(victim, by, String(entry.get("cause", "none")), int(entry.get("item", -1)), victim_is_you), "you": victim_is_you or by_is_you})
var text: String = feed_text(victim, by, String(entry.get("cause", "none")), int(entry.get("item", -1)), victim_is_you)
if bool(entry.get("downed", false)):
text = downed_text(victim, by, victim_is_you)
lines.append({"text": text, "you": victim_is_you or by_is_you})
return lines
@@ -136,6 +145,13 @@ static func feed_text(victim: String, by: String, cause: String, item: int, vict
return "%s is out" % victim
## A down in duos (M7): the player isn't out until they bleed out or their team falls.
static func downed_text(victim: String, by: String, victim_is_you: bool) -> String:
if not by.is_empty() and by != victim:
return "%s knocked %s down" % [by, "you" if victim_is_you else victim]
return "%s %s down" % [victim, "are" if victim_is_you else "is"]
## "flintlock_pistol" -> "Flintlock Pistol".
static func item_name(id: String) -> String:
return id.replace("_", " ").capitalize()