Phase 4: close loot/refund leaks, landing-site garrisons, speed-scaled shipping, update/offsite tooling, broad e2e

Built:
- Economy: raid loot capped to the room the raiders have at home (rest stays with the victim, "lootLeft" in the report); trade escrow reserves its room so refunds always fit; trade accept refuses with no_room_for_goods when the goods would not fit. Loot destroyed per 30-day run 31-61k -> ~1k, refunds clipped ~27k -> 0 (docs/BALANCE.md, 3 seeds).
- End game: members of the holding alliance garrison landing sites (migration 005_site_garrison.sql), garrison counts in site defence, 72 h capture shield, withdraw route, POP view lists garrisoned units. Shipping capacity scales with world speed (3x world: winner 76-98 -> ~30-36 days after sites open). Bot runs show real contests (84-194 attacks on held sites at 1x).
- Ops: deploy/update.sh (backup, stop, ff-merge, npm ci --ignore-scripts, health check, rollback), deploy/upstream-offsite (rsync only), admin end-world snapshots results, EPIPE fix, docs/workflows/ filled in.
- e2e 62 -> 163 checks: units, raids/reports, alliance+messages, trade, end game, nb, PWA, reconnect, slow polling fallback (opt-in). Two app bugs found: message push ignored, "New" button stayed English.

Tested: npm test 274/274, openapi check, npm run e2e 163/163 (137 s), bot runs 50x30d seeds 1-3 and 140-day/60-day speed-3 end-game runs INVARIANTS OK, adversarial review pass (findings fixed or documented).
NOT tested: update.sh on a real box (systemd, real npm, runuser; stubs only, shellcheck not installed), garrison card/loot text on a phone, Node 22.13, humans. Known leaks left open and documented (BALANCE S6): loot/shipments can still overflow when stock arrives in flight, bounced backbone shipments lose overflow (reported to the sender). Garrison numbers (heldDefenceMult 2, shield 72 h) are first guesses from 2 seeds. Not claimed: balanced.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Q2MJaQ5LXAHzGnTDgceT14
This commit is contained in:
jvanvik 2026-10-12 00:58:12 +02:00
parent 9104480463
commit 3c23c51902
92 changed files with 4887 additions and 300 deletions

View file

@ -17,14 +17,15 @@ const townBrief = (t) => t ? { id: t.id, name: t.name, x: t.x, y: t.y } : null;
const opBrief = (o) => o ? { id: o.id, name: o.name, asNumber: o.as_number } : null;
// Add resources to a SETTLED town, capped at its storage (an amount already above the cap is kept). -> what was lost
function addCargo(db, town, cargo) {
const cap = R.storageCap(town);
// `bonus` (optional, per resource) is part of the cargo that is credited even above the Rack hall size (one-time rewards).
function addCargo(db, town, cargo, bonus) {
const lost = {};
for (const r of D.RESOURCES) {
const add = (cargo && cargo[r]) || 0;
if (!add) continue;
const cur = town.res[r];
const next = Math.min(Math.max(cap, cur), cur + add);
const free = Math.max(0, add - ((bonus && bonus[r]) || 0));
const next = Math.min(Math.max(R.storageCapOf(town, r), cur), cur + free) + (add - free); // escrowed goods of open offers keep their room (storageCapOf)
lost[r] = Math.max(0, Math.round(cur + add - next));
town.res[r] = next;
}
@ -50,6 +51,7 @@ function bounce(ctx, mv, now, reason, details) {
function arriveReinforce(ctx, mv, ev) {
const { db } = ctx;
const now = ev.dueAt;
if (!mv.toTownId) return require('./landing').reinforce(ctx, mv, ev); // a backbone landing site: the garrison (E6)
const target = mv.toTownId ? db.get('SELECT * FROM towns WHERE id = ?', mv.toTownId) : null;
if (!target || !U.mayReinforce(db, mv.ownerId, target.owner_id)) return bounce(ctx, mv, now, 'not_allied');
const ownerTown = U.homeTownFor(db, mv.ownerId, mv.fromTownId);