From c5b0c490cd82f016597f36bd5d2023a114762f66 Mon Sep 17 00:00:00 2001 From: rope Date: Wed, 4 Nov 2026 22:03:15 +0000 Subject: [PATCH] Work orders: gather button on material orders Co-Authored-By: Claude Opus 5.5 --- game.py | 3 +++ static/app.js | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/game.py b/game.py index 82b84d8..687f73a 100644 --- a/game.py +++ b/game.py @@ -7787,6 +7787,9 @@ ORDER_RECIPES, ORDER_RAW = _order_sources() # What changed, shown on the Patch notes page. Newest first; every shipped change adds a # line here (new / balance / fix), and a new release a new entry on top. PATCH_NOTES = [ + {"date": "2026-11-04", "title": "Work orders", "notes": [ + ("new", "Work orders: Gather button on material orders. Fight-only materials link to the fight."), + ]}, {"date": "2026-11-04", "title": "Roster", "notes": [ ("new", "Roster table shows each player's town."), ]}, diff --git a/static/app.js b/static/app.js index 54885f8..d6ab7a5 100644 --- a/static/app.js +++ b/static/app.js @@ -901,11 +901,11 @@ function queueRow() { // Start, or while a make runs: After Q sets what comes once it and the queue are done, // and on that one, Skip Q drops them and starts it now. -function startButton(a, size, why) { +function startButton(a, size, why, start = "Start") { const making = S.me.action?.left, after = making && S.me.action.resume === a.id; - const [label, title] = !making ? ["Start", ""] : after ? ["Skip Q", "Skip queue: drop the make and queue, start this now"] + const [label, title] = !making ? [start, ""] : after ? ["Skip Q", "Skip queue: drop the make and queue, start this now"] : ["After Q", "After queue: do this once the make and queue are done"]; - return ``; + return ``; } // The recipe you're after, under the top bar on every page: have / need for each input. @@ -2746,6 +2746,15 @@ function orderSlots(o) { }).join(""); } +// A materials order: gather it right here. A fight opens its card instead, odds and all. +function gatherButton(o) { + const a = sourceOf(o.item); + if (!a) return ""; + if (S.me.action?.id === a.id) return `${a.enemy ? "Fighting" : "Gathering"}`; + if (a.enemy) return ``; + return startButton(a, "", S.me.blocked[a.id], "Gather"); +} + function orderCard(o) { const it = item(o.item), mine = o.by === S.uid, skill = skillOf(o.skill); const short = S.me.levels[o.skill] < o.level, have = S.me.bank[o.item] || 0, left = o.qty - o.delivered; @@ -2763,7 +2772,8 @@ function orderCard(o) { buttons = cancel; if (o.claimed) status = `${esc(playerName(o.claimed))}`; } else if (o.kind === "gather") { - buttons = `${cancel}`; + const gather = gatherButton(o); + buttons = `${cancel}${have || !gather ? `` : ""}${gather}`; } else if (o.claimed && o.claimed !== S.uid) { status = `${esc(playerName(o.claimed))}`; buttons = cancel;