Doomsday Clock: judge teams against the same bar as solo sides (#4624)

**Add approved & assigned issue number here:**

Resolves #(to be filed — happy to open the matching issue; flagging
directly since this is live in prod team lobbies)

## Description:

**Bug.** In Team mode the Doomsday Clock threshold is scaled by the
team's *alive* headcount (`base × members.length`, capped at the whole
map). In real team lobbies this breaks the mechanic:

- With ~16 players per team, wave 1 already demands `4 % × 16 = 64 %+`
of the map per team while all humans combined hold ~35 % (bots own the
rest). Every non-leading team is skulled ~1 minute into wave 1 and
drained to the 5 % floor ~90 s later — even on **slow**, whose squeeze
is designed to run to 45:00. The game is decided by whoever leads at
grace-end.
- The bar/forecast **drops when a teammate dies** (players see "will
rise to 68 %" → "44 %" mid-game), and disconnected-but-alive teammates
silently inflate it.
- Past the 100 % cap, the per-capita scaling stops meaning anything
anyway.

**Evidence.** Prod game `JEUieLzK` (`Team, playerTeams: 4, 69 players,
doomsdayClock slow, bots: 400, no timer`): ended **16:47** via the 95 %
team-domination check. From the archived record: 25 deaths before 10:00,
only 8 after — the drain cripples rather than kills, so the collapse is
invisible in death stats but decisive in outcome. Reconstruction with
the real schedule + drain constants: every non-leading team skulled
~11:00–11:30 and pinned at the floor by ~12:30; the crown-exempt leader
rolled to 95 % by 16:47.

**Why flat is correct.** The wave levels encode a viable-**side** count
— `floor(100 / wave%)` sides fit above the bar (25 → 11 → 6 → 3 → 2 →
1). Elimination and victory happen at side granularity (a team is out
when the whole team is out; the winner is a team), so the slots must be
counted in sides. A team now faces exactly the bar a solo player faces,
judged on its combined territory — and each speed preset means the same
thing in teams as it does in FFA.

**Changes:**

- `DoomsdayClock.ts`: remove `doomsdayClockSideRequiredTiles`; the sim
and the HUD both use `doomsdayClockRequiredTiles` (hoisted out of the
per-side loop — it no longer varies per side).
- `DoomsdayClockExecution.ts`: flat per-side bar; comments updated.
- `DoomsdayClockPanel.ts`: drop `scalePct`/headcount from the readout —
the zone forecast becomes one universal, monotonic number for every
player (fixes the 68 % → 44 % whipsaw). `sideStats` → `sideTiles`.
- Tests: headcount-scaling expectations replaced with flat-bar +
death-invariance regression tests.

(History note: an earlier commit restricted team lobbies to normal/fast
presets; it was reverted in-branch — with the flat bar the presets carry
the same meaning as in FFA, so the full rotation stays. Squash-merge
leaves the fix only.)

FFA behaviour is unchanged throughout (sides of size 1: flat ≡ current).
Deterministic integer math untouched (strictly fewer ops). `npm test`
fully green.

Rule comparison on `JEUieLzK`'s shape (real death ticks + constants;
modeled share trajectories):

| rule | trailing teams skulled | all non-leaders at 5 % floor |
|---|---|---|
| current (× alive) | 11:01–11:27 | **12:34** ← matches the real 16:47
blowout |
| flat per-side bar | 26:01–30:42 | 31:49 (late-game backstop, as
designed) |

## Please complete the following:

- [ ] I have added screenshots for all UI updates — _no layout/element
changes; the existing readout shows unscaled values (numbers only)_
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file — _no new strings; existing
`doomsday_clock.*` keys reused with the same params_
- [x] I have added relevant tests to the test directory

## Please put your Discord username so you can be contacted if a bug or
regression is found:

zixer
This commit is contained in:
Zixer1
2026-07-17 08:46:47 -07:00
committed by GitHub
parent 943740de32
commit 95840a2074
4 changed files with 76 additions and 87 deletions
+9 -9
View File
@@ -1,6 +1,6 @@
import {
doomsdayClockDrain,
doomsdayClockSideRequiredTiles,
doomsdayClockRequiredTiles,
} from "../game/DoomsdayClock";
import {
Execution,
@@ -16,6 +16,12 @@ import {
* Doomsday Clock (anti-stall). Once armed, every side must hold a rising
* share of the whole map: each player in FFA, each whole team in team modes (so
* a team is judged on its combined territory and every member shares the fate).
* The bar is the SAME for every side regardless of headcount — the clock shrinks
* the number of viable SIDES, and sides are the unit of elimination/victory, so
* a team faces exactly the bar a solo player faces. (It was previously scaled by
* member count, which saturated at "hold the whole map" right after the grace in
* real team lobbies and dropped whenever a teammate died — deciding games at
* ~minute 12 on the slow preset instead of acting as a late-game backstop.)
* The bar rises in discrete waves (battle-royale zone), stepping up to each
* wave's level (chosen by the speed preset, see DoomsdayClock.ts) and holding. As
* it rises the bottom is cut, which forces consolidation and guarantees a finish.
@@ -75,6 +81,8 @@ export class DoomsdayClockExecution implements Execution {
}
const land = mg.numLandTiles() - mg.numTilesWithFallout();
// One bar for every side this tick (solo or team — headcount never scales it).
const required = doomsdayClockRequiredTiles(cfg.speed, land, elapsed);
// The leading side (the crown holder in FFA, the top team otherwise) is
// never doomed. Doomsday Clock culls the challengers toward the leader, so the
@@ -92,14 +100,6 @@ export class DoomsdayClockExecution implements Execution {
for (let i = 0; i < sides.length; i++) {
const members = sides[i];
// Threshold scales with the side's headcount: a team of N must hold N× a
// solo player's share (FFA sides are size 1, unscaled).
const required = doomsdayClockSideRequiredTiles(
cfg.speed,
land,
elapsed,
members.length,
);
// A non-leading side below the bar skulls and drains every member; the
// leader (and any side above the bar) clears them all.
if (i !== leaderIdx && sideTiles[i] < required) {