Work orders: craft your own

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
rope 2026-11-03 20:15:30 +00:00
parent 5606267df5
commit 4eb23fc009
3 changed files with 37 additions and 15 deletions

View file

@ -4176,8 +4176,6 @@ def claim_order(world: dict, player: dict, order_id) -> str | None:
order = order_by_id(world, order_id)
if not order or order["status"] != "open" or order["kind"] != "craft":
return "No such order"
if order["by"] == player["id"] and not order.get("city"):
return "That's your own order"
if order["claimed"] not in (None, player["id"]):
return "Someone else has it"
if skill_level(player, order["skill"]) < order["level"]:
@ -4267,8 +4265,8 @@ def _deliver(world: dict, order: dict, giver: dict, qty: int, now: float,
earned = order.setdefault("earned", {})
earned[uid] = earned.get(uid, 0) + share
pay -= share
giver["gold"] += pay
if pay:
giver["gold"] += pay # on your own order: what the helpers didn't earn comes back
if pay and giver["id"] != order["by"]:
note(world, giver, now, "Earned", "gold", pay, who=order["by"])
owner = world["players"].get(order["by"])
if order.get("city"):
@ -4279,7 +4277,7 @@ def _deliver(world: dict, order: dict, giver: dict, qty: int, now: float,
order["status"] = "done"
order["done"] = now
_refund(world, order, now) # leftover reagents
whose = "the city's" if order.get("city") else f"{owner['name']}'s" if owner else "someone's"
whose = "the city's" if order.get("city") else "their own" if owner is giver else f"{owner['name']}'s" if owner else "someone's"
log(world, now, "order", f"{giver['name']} filled {whose} order: {amount(order['item'], order['qty'])}")
@ -6855,6 +6853,7 @@ PATCH_NOTES = [
{"date": "2026-11-03", "title": "Combat materials on order", "notes": [
("new", "Work orders: relics, reagents and trophies under Materials ⚔️, by area."),
("new", "Work orders: 🔨 on recipes and gathering, opens the order."),
("new", "Work orders: craft your own. Helpers' reagents still get paid."),
]},
{"date": "2026-11-02", "title": "Militia drilling", "notes": [
("fix", "Drilling the militia is no longer wiped before a raid is calculated. Last raid losses recalculated."),

View file

@ -2508,7 +2508,7 @@ function orderNews(state) {
toast(`📜 ${o.city ? "🏘️ " : ""}${item(o.item).name}${o.qty > 1 ? ` ×${fmt(o.qty)}` : ""}${o.reward || !o.city ? ` · ${fmt(o.reward)} gold` : ""}`, "level");
}
const was = deliveredSeen[o.id];
if (o.by === uid && !o.city && was !== undefined && o.delivered > was) toast(`📦 ${item(o.item).name} ×${fmt(o.delivered - was)}`, "good");
if (o.by === uid && !o.city && o.claimed !== uid && was !== undefined && o.delivered > was) toast(`📦 ${item(o.item).name} ×${fmt(o.delivered - was)}`, "good");
const got = (o.earned || {})[uid] || 0, had = earnedSeen[o.id];
if (had !== undefined && got > had) toast(`🤝 ${item(o.item).name} · +${fmt(got - had)} gold`, "good");
// Favour from your reagents in someone else's make: your own makes show in the summary.
@ -2572,13 +2572,13 @@ function orderCard(o) {
? ` · ${Object.entries(o.from).map(([uid, n]) => `${esc(playerName(uid))} ${fmt(n)}`).join(", ")}` : ""}</div>
<div class="bar"><span style="width:${o.delivered / o.qty * 100}%"></span></div>` : "";
let buttons = "", status = "";
// Your city order is still yours to cancel, and anyone's to fill: you too.
const cancel = mine && o.city ? `<button class="btn danger" data-order-cancel="${o.id}">Cancel</button>` : "";
// Your order is still yours to cancel while you (or, on a city order, anyone) fill it.
const cancel = mine ? `<button class="btn danger" data-order-cancel="${o.id}">Cancel</button>` : "";
if (o.status !== "open") {
status = `<span class="tag ${o.status === "done" ? "good" : ""}">${{ done: "Done", cancelled: "Cancelled", expired: "Expired" }[o.status]}</span>`;
if (mine && !o.held) buttons = `<button class="btn" data-order-remove="${o.id}">Remove</button>`;
} else if (mine && !o.city) {
buttons = `<button class="btn danger" data-order-cancel="${o.id}">Cancel</button>`;
} else if (mine && !o.city && (o.kind === "gather" || short || o.claimed && o.claimed !== S.uid)) {
buttons = cancel;
if (o.claimed) status = `<span class="tag">${esc(playerName(o.claimed))}</span>`;
} else if (o.kind === "gather") {
buttons = `${cancel}<button class="btn primary" data-order-deliver="${o.id}" ${have ? "" : "disabled"}>Deliver ${fmt(Math.min(have, left))}</button>`;
@ -2590,7 +2590,7 @@ function orderCard(o) {
const why = short ? `Needs ${skill.name.toLowerCase()} ${o.level}` : S.me.blocked[o.action] && !working
&& !S.me.blocked[o.action].startsWith("Out of") ? S.me.blocked[o.action] : "";
buttons = `${cancel}${o.claimed === S.uid || o.city && working ? `<button class="btn" data-order-drop="${o.id}">Drop</button>` : ""}
${have ? `<button class="btn" data-order-deliver="${o.id}">Deliver ${fmt(Math.min(have, left))}</button>` : ""}
${have && (!mine || o.city) ? `<button class="btn" data-order-deliver="${o.id}">Deliver ${fmt(Math.min(have, left))}</button>` : ""}
${working ? `<span class="tag gold">Crafting</span>` : `<button class="btn primary" data-order-work="${o.id}" ${why ? `disabled title="${esc(why)}"` : ""}>Craft</button>`}`;
}
const reward = o.kind === "gather" ? `${fmt(Math.round(o.reward / o.qty))} each` : fmt(o.reward);
@ -2625,9 +2625,8 @@ function orderPicker(list) {
const q = (d.search || "").trim().toLowerCase();
const shown = q ? actions.filter(([id]) => item(id).name.toLowerCase().includes(q))
: inSkill.filter(([, a]) => !groups.length || a.group === d.group);
const others = S.players.filter((p) => p.id !== S.uid || d.city); // a city order you can make yourself
const tiles = shown.sort((x, y) => x[1].level - y[1].level).map(([id, a]) => {
const makers = others.filter((p) => p.levels[a.skill] >= a.level).length;
const makers = S.players.filter((p) => p.levels[a.skill] >= a.level).length;
const tip = `${item(id).name} · ${skillOf(a.skill).name} ${a.level}${d.kind === "craft" ? ` · 👥 ${makers}` : ""}`;
return `<button class="doll-slot swap pick ${d.item === id ? "on" : ""} ${d.kind === "craft" && !makers ? "nobody" : ""}" data-draft-item="${id}" title="${esc(tip)}">
${item(id).icon}<span class="pick-name">${esc(item(id).name)}${d.kind === "craft" ? ` <span class="muted">👥 ${makers}</span>` : ""}</span><span class="pick-lvl">${a.level}</span></button>`;
@ -2650,7 +2649,7 @@ function orderComposer() {
let slots = "", maker = "";
const a = d.item && C.actions.find((x) => x.id === list[d.item]);
if (a) {
const smiths = S.players.filter((p) => (p.id !== S.uid || d.city) && p.levels[a.skill] >= a.level).length;
const smiths = S.players.filter((p) => p.levels[a.skill] >= a.level).length;
maker = `<div class="small muted" title="${esc(`${skillOf(a.skill).name} ${a.level} · ${smiths} can make it`)}">${skillOf(a.skill).icon} ${a.level} · 👥 ${smiths}</div>`;
if (d.kind === "craft") {
const runs = Math.ceil(d.qty / a.outputs[d.item]), ins = runInputs(a);

View file

@ -2630,6 +2630,30 @@ class WorkOrderTest(unittest.TestCase):
self.assertNotIn("oak_plank", self.fred["bank"]) # the crafter brings what wasn't provided
self.assertIsNone(self.fred["action"])
def test_you_can_craft_your_own_order_and_helpers_are_paid(self):
self.fred["gold"] = 100
self.assertIsNone(game.post_order(self.world, self.fred, "craft", "iron_warhammer", 1, [], 100, T0))
order = self.world["orders"][0]
self.dave["bank"] = {"iron_bar": 3, "clay_core": 3}
self.assertIsNone(game.provide_reagent(self.world, self.dave, order["id"], "iron_bar"))
self.assertIsNone(game.provide_reagent(self.world, self.dave, order["id"], "clay_core"))
self.fred["bank"] = {"oak_plank": 1}
self.assertIsNone(game.work_order(self.world, self.fred, order["id"], T0))
self.assertEqual(game.claim_order(self.world, self.dave, order["id"]), "Someone else has it")
game.process_player(self.world, self.fred, T0 + 600, random.Random(1))
self.assertEqual(order["status"], "done")
self.assertEqual(self.fred["bank"].get("iron_warhammer"), 1)
self.assertEqual(order["earned"]["dave"], self.dave["gold"])
self.assertGreater(self.dave["gold"], 0)
self.assertEqual(self.fred["gold"] + self.dave["gold"], 100) # no gold made from nothing
self.assertFalse([e for e in self.fred["ledger"] if e.get("verb") == "Earned"])
def test_you_cant_deliver_to_your_own_order(self):
self.fred["gold"] = 100
game.post_order(self.world, self.fred, "craft", "iron_warhammer", 1, [], 100, T0)
self.fred["bank"] = {"iron_warhammer": 1}
self.assertEqual(game.deliver_order(self.world, self.fred, self.world["orders"][0]["id"], T0), "That's your own order")
def test_an_order_mid_queue_puts_the_make_back_in_line(self):
self.post_hammer()
order = self.world["orders"][0]
@ -2656,7 +2680,7 @@ class WorkOrderTest(unittest.TestCase):
def test_cancelling_refunds_what_is_left(self):
self.post_hammer()
order = self.world["orders"][0]
self.assertEqual(game.claim_order(self.world, self.mike, order["id"]), "That's your own order")
self.assertEqual(game.claim_order(self.world, self.mike, order["id"]), "Needs smithing 21")
self.assertIsNone(game.cancel_order(self.world, self.mike, order["id"], T0))
self.assertEqual(self.mike["bank"], {"iron_bar": 3, "clay_core": 3})
self.assertEqual(self.mike["gold"], 200)