Upstream/server/events/return.js
jvanvik 3c23c51902 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
2026-10-12 00:58:12 +02:00

30 lines
1.6 KiB
JavaScript

'use strict';
/*
* A return leg arrived: units and cargo go back home. If the origin POP changed hands meanwhile they go to the
* operator's capital (or oldest POP) instead; with no POP left they are lost. Cargo above the Rack hall cap is lost.
*/
const R = require('../../public/js/rules.js');
const D = require('../../public/js/data.js');
const { loadTown, settle } = require('../state');
const M = require('../military/movements');
const U = require('../military/units');
const P = require('../military/power');
const { addCargo } = require('../military/arrivals');
module.exports = function ret(ctx, ev) {
const { db } = ctx;
const mv = M.getMovement(db, ev.payload.movementId);
if (!mv || mv.status !== 'out') return;
db.run("UPDATE movements SET status = 'done' WHERE id = ?", mv.id);
const dest = U.homeTownFor(db, mv.ownerId, mv.toTownId);
const uid = U.userOfOperator(db, mv.ownerId);
if (!dest) { if (uid) ctx.notify(uid, mv.worldId, 'movement_lost', { movementId: mv.id }); return; }
const town = loadTown(db, dest.id);
settle(db, town, ev.dueAt);
U.addHome(db, town.id, mv.units);
const lost = addCargo(db, town, mv.cargo, mv.extra && mv.extra.bonus);
P.reschedule(ctx, town.id, ev.dueAt);
// Empty carriers coming home (extra.link) are silent; a bounced shipment that carries cargo is not: its overflow is reported.
const carrying = D.RESOURCES.some((r) => mv.cargo && mv.cargo[r] > 0);
if (uid && (!mv.extra.link || carrying)) ctx.notify(uid, mv.worldId, 'movement_returned', { movementId: mv.id, townId: town.id, units: mv.units, cargo: mv.cargo, cargoLost: lost });
};