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:
+25
-4
@@ -18,11 +18,19 @@ static func tick_limit() -> int:
|
||||
## count from the barge leaving. Each group (M6) adds up its bots' BotBrain.stats and
|
||||
## holds their "bots", "places" and "wins".
|
||||
##
|
||||
## With `team_size` 2 the match is duos (M7), and the result also has "downs",
|
||||
## "revives", "team_hits" (hits that did damage between teammates, which must be 0) and
|
||||
## "winner_teams" (how many teams the winners came from, which must be 1).
|
||||
##
|
||||
## With `split_builders`, only every other bot gathers and builds; the rest are the
|
||||
## control group. Bot difficulty also goes by turns of three, so both groups have each
|
||||
## level equally (within one bot).
|
||||
static func run_match(seed_value: int, bots: int = Tuning.SOLO_PLAYERS, difficulty: int = -1, split_builders: bool = false) -> Dictionary:
|
||||
var loop: ServerLoop = ServerLoop.new(seed_value, 0, bots, null, difficulty)
|
||||
static func run_match(seed_value: int, bots: int = Tuning.SOLO_PLAYERS, difficulty: int = -1, split_builders: bool = false, team_size: int = 1) -> Dictionary:
|
||||
var rules: MatchRules = null
|
||||
if team_size > 1:
|
||||
rules = ServerLoop.immediate_rules(0, bots)
|
||||
rules.team_size = team_size
|
||||
var loop: ServerLoop = ServerLoop.new(seed_value, 0, bots, rules, difficulty)
|
||||
var flow: Match = loop.match_flow
|
||||
var level_of: Dictionary = {}
|
||||
for bot: BotBrain in loop.bots:
|
||||
@@ -31,6 +39,7 @@ static func run_match(seed_value: int, bots: int = Tuning.SOLO_PLAYERS, difficul
|
||||
"seed": seed_value, "finished": false, "winner": 0, "winner_difficulty": "",
|
||||
"timed_out": false, "causes": {}, "places": {}, "eliminations": {}, "shots": 0,
|
||||
"slow_ticks": [], "weapon_kills": {}, "death_seconds": [],
|
||||
"downs": 0, "revives": 0, "team_hits": 0, "winner_teams": 0,
|
||||
}
|
||||
var limit: int = tick_limit()
|
||||
var split: bool = false
|
||||
@@ -45,13 +54,25 @@ static func run_match(seed_value: int, bots: int = Tuning.SOLO_PLAYERS, difficul
|
||||
if Time.get_ticks_usec() - before > ServerLoop.TICK_BUDGET_USEC:
|
||||
result["slow_ticks"].append(loop.sim.tick)
|
||||
for event: Dictionary in loop.sim.events:
|
||||
if event["type"] == "shot":
|
||||
result["shots"] += 1
|
||||
match String(event["type"]):
|
||||
"shot":
|
||||
result["shots"] += 1
|
||||
"downed":
|
||||
result["downs"] += 1
|
||||
"revived":
|
||||
result["revives"] += 1
|
||||
"player_hit":
|
||||
if int(event["armor"]) + int(event["health"]) > 0 and loop.sim.are_teammates(loop.sim.entities.find(int(event["victim"])), loop.sim.entities.find(int(event["player"]))):
|
||||
result["team_hits"] += 1
|
||||
for event: Dictionary in flow.events:
|
||||
if event["type"] == "match_ended":
|
||||
result["timed_out"] = event["timed_out"]
|
||||
result["ticks"] = loop.sim.tick
|
||||
result["finished"] = flow.phase == Match.RESULTS
|
||||
var winner_teams: Dictionary = {}
|
||||
for handle: int in flow.winners:
|
||||
winner_teams[flow.team_of[handle]] = true
|
||||
result["winner_teams"] = winner_teams.size()
|
||||
if flow.winners.size() > 0:
|
||||
result["winner"] = flow.winners[0]
|
||||
result["winner_difficulty"] = level_of.get(flow.winners[0], "")
|
||||
|
||||
@@ -446,3 +446,66 @@ func test_a_bot_with_nothing_to_do_holds_its_ground() -> void:
|
||||
_run(roundi(Tuning.BOT_HOLD_SECONDS * 0.8) * TICKS)
|
||||
assert_true(me.position.distance_to(at) < 3.0, "and stays put while holding (moved %.1f m)" % me.position.distance_to(at))
|
||||
assert_true(at.distance_to(HOME) <= Tuning.BOT_ROAM_METRES + 5.0, "it didn't roam far (%.1f m)" % at.distance_to(HOME))
|
||||
|
||||
|
||||
# Duos (M7): bots as teammates.
|
||||
|
||||
func test_bots_never_target_or_shoot_a_teammate() -> void:
|
||||
_setup()
|
||||
var brain: BotBrain = _bot(HOME, BotBrain.HARD)
|
||||
var me: SimEntity = sim.entities.find(brain.player_id)
|
||||
_arm(me)
|
||||
var mate: SimEntity = _player(HOME + Vector3(8.0, 0.0, 0.0))
|
||||
sim.set_team(me.id, 0)
|
||||
sim.set_team(mate.id, 0)
|
||||
_ready_world()
|
||||
_pin(brain)
|
||||
_run(3 * TICKS)
|
||||
assert_eq(brain.target_id, 0, "a teammate in plain view isn't a target")
|
||||
assert_eq(int(shots_by.get(me.id, 0)), 0)
|
||||
assert_eq(mate.health, Tuning.PLAYER_MAX_HEALTH)
|
||||
|
||||
|
||||
func test_a_bot_goes_to_a_downed_teammate_and_revives_them() -> void:
|
||||
_setup()
|
||||
var brain: BotBrain = _bot(HOME)
|
||||
var me: SimEntity = sim.entities.find(brain.player_id)
|
||||
_arm(me)
|
||||
var mate: SimEntity = _player(HOME + Vector3(12.0, 0.0, 6.0))
|
||||
sim.set_team(me.id, 0)
|
||||
sim.set_team(mate.id, 0)
|
||||
_ready_world()
|
||||
mate.health = 0
|
||||
_run(1)
|
||||
assert_true(mate.downed)
|
||||
var revived: Array[bool] = [false]
|
||||
var states: Dictionary = {}
|
||||
_run(20 * TICKS, func() -> bool:
|
||||
states[brain.state] = true
|
||||
for event: Dictionary in sim.events:
|
||||
if event["type"] == "revived" and event["by"] == me.id:
|
||||
revived[0] = true
|
||||
return revived[0])
|
||||
assert_true(states.has("revive"), "states: %s" % [states.keys()])
|
||||
assert_true(revived[0], "revived within 20 s (mate downed: %s, %.1f m apart)" % [mate.downed, me.position.distance_to(mate.position)])
|
||||
assert_false(mate.downed)
|
||||
assert_true(Simulation.is_standing(mate))
|
||||
|
||||
|
||||
func test_a_downed_bot_crawls_toward_its_standing_teammate() -> void:
|
||||
_setup()
|
||||
var brain: BotBrain = _bot(HOME)
|
||||
var me: SimEntity = sim.entities.find(brain.player_id)
|
||||
var mate: SimEntity = _player(HOME + Vector3(10.0, 0.0, 0.0))
|
||||
sim.set_team(me.id, 0)
|
||||
sim.set_team(mate.id, 0)
|
||||
_ready_world()
|
||||
me.health = 0
|
||||
_run(1)
|
||||
assert_true(me.downed)
|
||||
var before: float = me.position.distance_to(mate.position)
|
||||
_run(3 * TICKS)
|
||||
assert_eq(brain.state, "downed")
|
||||
var after: float = me.position.distance_to(mate.position)
|
||||
assert_near(before - after, 3.0 * Tuning.DOWNED_CRAWL_SPEED, 0.5, "crawled toward the teammate")
|
||||
assert_eq(int(shots_by.get(me.id, 0)), 0)
|
||||
|
||||
Reference in New Issue
Block a user