diff --git a/game.py b/game.py
index 69ce729..33f9559 100644
--- a/game.py
+++ b/game.py
@@ -3090,16 +3090,9 @@ def process_player(world: dict, player: dict, now: float, rng: random.Random | N
current["turn"] = 1 - current.get("turn", 0)
if player["action"] is current and "left" in current:
current["left"] -= 1
- if current["left"] <= 0:
- back = current.get("resume")
- if back:
- plot2 = current.get("resume_plot2")
- player["action"] = current = {"id": back, "start": current["start"]}
- if plot2:
- current.update(plot2=plot2, turn=0)
- summary["resumed"] = back
- else:
- stop(player)
+ if current["left"] <= 0 and finish_once(player, current["start"]):
+ current = player["action"]
+ summary["resumed"] = current["id"]
if player["action"] is current and "enemy" not in action and not current.get("plot2"):
# Out of materials: stop now, not once the next bar has filled.
reason = can_start(world, player, growing(player))
@@ -3117,6 +3110,19 @@ def stop(player: dict, reason: str | None = None) -> None:
player["stopped"] = reason
+def finish_once(player: dict, at: float, reason: str | None = None) -> bool:
+ """A one-off is done: back to what you were doing before (True), or stop."""
+ current = player["action"]
+ back = current.get("resume")
+ if not back:
+ stop(player, reason)
+ return False
+ player["action"] = {"id": back, "start": at}
+ if current.get("resume_plot2"):
+ player["action"].update(plot2=current["resume_plot2"], turn=0)
+ return True
+
+
def drop_out(world: dict, player: dict, now: float, reason: str | None = None) -> None:
"""Stop, stepping out of a shared fight if you're in one."""
current = player["action"]
@@ -3180,7 +3186,7 @@ def offline_limit(world: dict, player: dict) -> float:
def joinable(world: dict, player: dict) -> bool:
"""Whether someone's fight is one others can tag into."""
current = player["action"]
- if not current or "left" in current or "order" in current:
+ if not current or "order" in current:
return False
action = ACTION_BY_ID[current["id"]]
if action.get("dungeon"):
@@ -3309,9 +3315,9 @@ def process_party(world: dict, pid: str, now: float, rng: random.Random) -> None
if world["parties"].get(pid) is not party:
break # the last of them carries on alone, and picks up when they're back
at = max(party["start"], offline_limit(world, player))
- wind = {"wind_used": True} if player["action"].get("wind_used") else {}
+ keep = {k: v for k, v in player["action"].items() if k in ("wind_used", "left", "resume", "resume_plot2")}
leave_party(world, player, pid, at)
- player["action"] = {"id": action["id"], "start": at, **wind}
+ player["action"] = {"id": action["id"], "start": at, **keep}
continue
if end > now:
break
@@ -3336,6 +3342,15 @@ def process_party(world: dict, pid: str, now: float, rng: random.Random) -> None
for other in members:
if other is not player:
together[other["name"]] = together.get(other["name"], 0) + 1
+ current = player["action"]
+ if not action.get("dungeon") and "left" in current:
+ # Fought once: step out, and back to what you were doing. The rest carry on.
+ current["left"] -= 1
+ if current["left"] <= 0:
+ if world["parties"].get(current.get("party")) is party:
+ leave_party(world, player, pid, end)
+ if finish_once(player, end):
+ summary["resumed"] = player["action"]["id"]
if action.get("dungeon") and world["parties"].get(pid) is party:
_advance_run(world, party, action, fight, members, end, rng)
@@ -3382,8 +3397,11 @@ def _advance_run(world: dict, party: dict, action: dict, fight: dict, members: l
log(world, now, "party", f"{names}: {reason.lower()} in {spec['name']}")
del world["parties"][party["id"]]
for player in members:
- stop(player, reason)
- player.setdefault("away", empty_summary())["stopped"] = reason
+ summary = player.setdefault("away", empty_summary())
+ if finish_once(player, now, reason):
+ summary["resumed"] = player["action"]["id"]
+ else:
+ summary["stopped"] = reason
def _clear_bonus(world: dict, player: dict, spec: dict, now: float, rng: random.Random) -> None:
@@ -6074,6 +6092,8 @@ PATCH_NOTES = [
("fix", "Resting in a group: everyone heals at their own pace, so good food tops you up first. The pull still "
"waits for the slowest, and Pull now sends each in as healed as they really are."),
("new", "DPS meter under the combat log: damage per second and total for each fighter, live. Shows the last fight while resting."),
+ ("new", "Improved raid UI"),
+ ("fix", "Bugfix: Combats started using \"Fight once\" can now be joined."),
]},
{"date": "2026-10-24", "title": "Dungeon loot", "notes": [
("new", "Masterwork patterns: every dungeon boss can drop one of 7 (15% from a mini-boss, 35% from the last boss, "
diff --git a/static/app.js b/static/app.js
index 5eda0ca..7679ca7 100644
--- a/static/app.js
+++ b/static/app.js
@@ -218,71 +218,413 @@ function showThreat() {
const t = S.threat_report;
if (!t || watching === t.id || !$("#modal").hidden) return;
watching = t.id;
- const r = t.report, dragon = t.kind === "dragon", won = r.title.startsWith("Victory");
- const foe = dragon ? "The dragon" : "Raiders";
- openModal(`
-
-
${dragon ? "🐉 The dragon attacks!" : "⚔️ The raiders attack!"}
-
Our defence ${fmt(r.defence)}
-
-
${foe} ${fmt(r.attack)}
-
-
${dragon ? "A shadow falls over the walls…" : "Horns sound from the walls…"}
-
-
${esc(r.title)}
- ${r.garrison.length ? `
Garrison: ${r.garrison.map((g) => esc(g.name)).join(", ")}
` : ""}
- ${r.lines.map((l) => `
${esc(l)}
`).join("")}
-
-
Skip
- Close
-
${name(src)} → ${name(tgt)} ${Math.max(1, Math.round(n))} ${kind === "crit" ? " crit" : ""}${what} ` : "";
+ case "miss": return `${name(src)} → ${name(tgt)} miss `;
+ case "cast": return `${name(src)}${what}… `;
+ case "stop": {
+ const cut = battleMove(extra);
+ return `${name(src)}${what} ✋ ${name(tgt)} ${cut?.icon || ""} ${esc(cut?.name)} `;
+ }
+ case "die": {
+ const v = u(tgt);
+ if (v.side === "them") return `${v.id === "d" ? `${v.name} flees` : v.id === "ram" ? "The ram is burning" : `${v.name} break and run`} `;
+ return `${v.uid ? (v.uid === S.uid ? "You're knocked out" : `${v.name} is knocked out`)
+ : v.id === "walls" ? "The walls are breached" : `${v.name} fall back`}
+
${u.label}${dmgIcon(u.dmg, "attack")}
+
+
+ ${u.every ? `
` : ""}
+ ${casters.has(u.id) ? `
` : ""}
+
${me.known.map((id) => `
+ ${C.abilities[id].icon} `).join("")}
` : "";
+ const group = (r.group || (dragon ? "the dragon" : "the raiders")).replace(/^\w/, (c) => c.toUpperCase());
+ openModal(`
+
+
${dragon ? `🐉 ${esc(group)} attacks!` : `⚔️ ${esc(group)} attack!`}
+
${fmt(r.defence)}
+
+
${fmt(r.attack)}
+
+
+ ${me ? unit(me) + kit : ""}
+
${us.filter((u) => u.uid && u !== me).map(unit).join("")}
+
${us.filter((u) => !u.uid).map(unit).join("")}
+
+
+
${them.map(unit).join("")}
+
${dragon ? "A shadow falls over the walls…" : "Horns sound from the walls…"}
+
+
+
${esc(r.title)}
+ ${r.lines.map((l) => `
${esc(l)}
`).join("")}
+
+
Skip
+ Close
+
+
+
${said} `);
- while (log.children.length > 4) log.lastElementChild.remove();
- }, every);
- playBattle.finish = finish;
+ playBattle.skip = () => { skipped = true; };
+ requestAnimationFrame(frame);
+}
+
+function drawBattle(b, box, t) {
+ const { st, shown } = battleState(b, t), before = t < b.end ? battleState(b, t - LAG).st : st;
+ let ours = 0, theirs = 0;
+ for (const u of b.units) if (u.side === "us") ours += st[u.id].hp; else theirs += st[u.id].hp;
+ $("[data-b-tug]", box).style.width = `${ours / (ours + theirs || 1) * 100}%`;
+ $("[data-b-us]", box).textContent = fmt(Math.ceil(ours));
+ $("[data-b-them]", box).textContent = fmt(Math.ceil(theirs));
+ for (const el of box.querySelectorAll("[data-b]")) {
+ const u = st[el.dataset.b], was = before[el.dataset.b], spec = b.byId[el.dataset.b];
+ el.classList.toggle("out", u.out);
+ el.querySelector("[data-u-bar]").style.width = `${u.hp / u.top * 100}%`;
+ el.querySelector("[data-u-lag]").style.width = `${Math.max(u.hp, was.hp) / u.top * 100}%`;
+ el.querySelector("[data-u-hp]").textContent = `${fmt(Math.ceil(u.hp))} / ${fmt(Math.ceil(u.top))}`;
+ const hit = u.hit && t - u.hit.at < 1 ? u.hit : null, num = el.querySelector("[data-u-hitnum]");
+ num.textContent = hit ? `−${Math.max(1, Math.round(hit.n))}` : "";
+ num.className = `hitnum bad ${hit?.kind === "crit" ? "crit" : ""}`;
+ num.style.opacity = hit ? `${1 - (t - hit.at)}` : "0";
+ const swing = el.querySelector("[data-u-swing]");
+ if (swing) swing.style.width = u.out || t >= b.end ? "0%" : `${Math.max(0, Math.min(100, (t - (u.swung ?? spec.from)) / spec.every * 100))}%`;
+ const cast = u.cast && t < u.cast.until ? u.cast : null;
+ const stopped = !cast && u.stopped && t - u.stopped.at < STOPPED ? u.stopped : null;
+ const move = battleMove(cast?.label || stopped?.label);
+ const castEl = el.querySelector("[data-u-cast]");
+ const key = cast ? `${cast.label}:${cast.from}` : stopped ? `stopped:${stopped.at}` : "";
+ if (castEl && castEl.dataset.key !== key) {
+ castEl.dataset.key = key;
+ castEl.classList.toggle("stopped", !!stopped);
+ castEl.innerHTML = cast ? `${move.icon || ""} ${esc(move.name)} ✋ ${move.icon || ""} ${esc(move.name)} interrupted ` : "";
+ }
+ if (cast && castEl) castEl.querySelector(".bar > span").style.width = `${Math.min(100, (t - cast.from) / (cast.until - cast.from) * 100)}%`;
+ }
+ // Your abilities: the shade is the cooldown left, a flash when one's just been used.
+ const mine = b.units.find((u) => u.uid === S.uid);
+ for (const el of box.querySelectorAll("[data-bab]")) {
+ const used = st[mine.id].cds[el.dataset.bab], cd = battleCd(el.dataset.bab);
+ const left = used == null || t >= b.end ? 0 : Math.max(0, used + cd - t);
+ el.querySelector("[data-ab-cd]").style.height = `${left / cd * 100}%`;
+ el.classList.toggle("fired", used != null && t - used < 0.6);
+ }
+ // The log keeps to what you'd follow: your own blows and the ones on you, abilities, crits, the big
+ // moves and who falls. Everyone's swings are on the bars.
+ const log = $("[data-b-log]", box);
+ b.told ||= b.events.filter((e) => battleTold(e, b));
+ let told = 0;
+ while (told < b.told.length && b.told[told][0] <= t) told++;
+ if (told && log.dataset.key !== `${told}:${t >= b.end}`) {
+ log.dataset.key = `${told}:${t >= b.end}`;
+ const lines = b.told.slice(Math.max(0, told - 7), told).reverse().map((e) => battleLine(e, b)).filter(Boolean);
+ if (t >= b.end) lines.unshift(b.won ? `Victory! The line breaks. Damage DPS · total
+ ${rows.map((u) => `${u.uid ? esc(playerName(u.uid)) : esc(u.name)} ${(dealt[u.id] / secs).toFixed(1)} · ${fmt(Math.round(dealt[u.id]))} ` : "";
+ }
+}
+
+// Whether a line of the replay makes the log (see drawBattle).
+function battleTold(e, b) {
+ const [, src, tgt, kind, n, , label] = e;
+ const mine = (id) => b.byId[id]?.uid === S.uid;
+ if (kind === "cast" || kind === "stop" || kind === "die") return true;
+ if (kind === "miss") return mine(src);
+ return !!n && (kind === "crit" || mine(src) || mine(tgt) || !!C.abilities[label] && !!b.byId[src]?.uid);
}
function openModal(html) {
@@ -1799,6 +2141,7 @@ function council() {
: { fortune: "win", hardship: "loss", minor: "loss" }[h.track] || "";
html += `
${h.report.icon || eventIcon(h.kind)} ${esc(h.report.title)} ${ago(h.at)}
+ ${fight ? `
▶ Watch ` : ""}
${fight ? `
Defence ${fmt(h.report.defence)} vs ${h.kind === "dragon" ? "the dragon" : "raiders"} ${fmt(h.report.attack)}${h.report.garrison.length ? ` · garrison: ${h.report.garrison.map((g) => esc(g.name)).join(", ")}` : ""}
` : ""}
${h.report.lines.map((l) => `
${esc(l)}
`).join("")}
`;
@@ -2092,6 +2435,40 @@ function notes() {
}).join("")}`).join("");
}
+// --- achievements ----------------------------------------------------------
+// A record of what's left to unlock, read off what you already have. Tap a chip for what it is.
+
+const tally = (entries) => [entries.filter((e) => e.done).length, entries.length];
+
+function achievementsNav(me) {
+ const [have, need] = tally(me.achievements.flatMap((s) => s.cards.flatMap((c) => c.entries)));
+ return nav("achievements", "🏆", "Achievements", `${have}/${need}`, "", `${have} of ${need} unlocked`);
+}
+
+function achievements() {
+ const sections = S.me.achievements, all = sections.flatMap((s) => s.cards.flatMap((c) => c.entries));
+ const [have, need] = tally(all);
+ return `Achievements ${have} / ${need}
+
${esc(s.name)} ${sh} / ${sn}
+ ${s.cards.map((c, ci) => achCard(c, `${si}.${ci}`)).join("")}
`;
+ }).join("");
+}
+
+function achCard(card, key) {
+ const [have, need] = tally(card.entries);
+ const pick = achPick?.startsWith(key + ".") ? card.entries[Number(achPick.split(".")[2])] : null;
+ const icon = (e) => e.colour ? `${icon(e)} `).join("");
+ return `${esc(card.name)} ${have} / ${need}
+
+
${chips}
+ ${pick ? `
${pick.done ? "✓" : "🔒"} ${esc(pick.name)} ${pick.tip ? ` · ${esc(pick.tip)} ` : ""}
` : ""}
Achievements ${have} / ${need}
-
${esc(s.name)} ${sh} / ${sn}
- ${s.cards.map((c, ci) => achCard(c, `${si}.${ci}`)).join("")}
`;
- }).join("");
-}
-
-function achCard(card, key) {
- const [have, need] = tally(card.entries);
- const pick = achPick?.startsWith(key + ".") ? card.entries[Number(achPick.split(".")[2])] : null;
- const icon = (e) => e.colour ? `${icon(e)} `).join("");
- return `${esc(card.name)} ${have} / ${need}
-
-
${chips}
- ${pick ? `
${pick.done ? "✓" : "🔒"} ${esc(pick.name)} ${pick.tip ? ` · ${esc(pick.tip)} ` : ""}
` : ""}