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:
@@ -165,6 +165,7 @@ func test_the_own_block_round_trips_exactly() -> void:
|
||||
assert_eq(copy.stamina_ticks, 1234)
|
||||
assert_true(copy.swimming and not copy.on_ground)
|
||||
assert_eq(copy.drop_state, Drop.GLIDING)
|
||||
assert_false(copy.downed)
|
||||
assert_eq(back["self"]["water"], own["water"])
|
||||
assert_eq(back["self"]["water_mask"], 0b101010101)
|
||||
for length: int in bytes.size():
|
||||
@@ -176,3 +177,25 @@ func test_the_own_block_round_trips_exactly() -> void:
|
||||
assert_true(NetSnapshot.decode_snapshot(poisoned).is_empty(), "a NaN position")
|
||||
poisoned.encode_float(at, INF)
|
||||
assert_true(NetSnapshot.decode_snapshot(poisoned).is_empty(), "an infinite position")
|
||||
|
||||
|
||||
func test_downed_travels_in_the_record_and_the_own_block() -> void:
|
||||
var sim: Simulation = Simulation.new(3, SimGround.flat())
|
||||
var player: SimEntity = _player(sim, Vector3(100.0, 0.0, 100.0))
|
||||
player.downed = true
|
||||
player.crouching = true
|
||||
player.reload_ticks = 3
|
||||
var record: PackedInt32Array = NetSnapshot.record_of(player)
|
||||
assert_true(record[NetSnapshot.R_FLAGS] & NetSnapshot.FLAG_DOWNED != 0)
|
||||
var own: Dictionary = NetSnapshot.self_of(player, 0.0, 0)
|
||||
var bytes: PackedByteArray = NetSnapshot.encode_snapshot({"tick": 2, "sim_tick": 2, "own_id": player.id, "self": own}, PackedInt32Array(), [[player.id, NetSnapshot.full_mask(SimEntity.ARCHETYPE_PLAYER), record]])
|
||||
var back: Dictionary = NetSnapshot.decode_snapshot(bytes)
|
||||
assert_false(back.is_empty())
|
||||
var merged: PackedInt32Array = NetSnapshot.merge_record(PackedInt32Array(), SimEntity.ARCHETYPE_PLAYER, back["records"][0][2], back["records"][0][3])
|
||||
assert_eq(merged, record)
|
||||
var flags: int = merged[NetSnapshot.R_FLAGS]
|
||||
assert_true(flags & NetSnapshot.FLAG_DOWNED != 0, "in the record")
|
||||
assert_true(flags & NetSnapshot.FLAG_RELOADING != 0, "the low byte is still there")
|
||||
var copy: SimEntity = SimEntity.new(1, SimEntity.ARCHETYPE_PLAYER)
|
||||
NetSnapshot.apply_self(copy, back["self"])
|
||||
assert_true(copy.downed, "in the own block, so prediction crawls too")
|
||||
|
||||
Reference in New Issue
Block a user