Spaces:

build-small-hackathon
/

Rune-Goblin

Sleeping

App Files Files Community

ASHu2 commited on Jun 13

Commit

718a54b

unverified ·

2 Parent(s): 09d75f7 1e6787f

Merge branch 'feat/better-maps' of github.com:ASH1998/Rune-Goblin into feat/better-maps

Browse files

Files changed (5) hide show

app/rpg_app.py +37 -2
app/rpg_static/rpg.css +54 -0
app/rpg_static/rpg.js +131 -7
src/rune_goblin/world.py +49 -9
tests/test_world_cast.py +40 -1

app/rpg_app.py CHANGED Viewed

@@ -46,7 +46,7 @@ PLAY_PAGE = """<!doctype html>
   <title>Rune Goblin RPG</title>
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link href="https://fonts.googleapis.com/css2?family=Press+Start+2P&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="/rg/static/rpg.css?v=64">
 </head>
 <body>
   <div id="rg-root">
@@ -95,6 +95,41 @@ PLAY_PAGE = """<!doctype html>
       <div class="rg-draw" id="rg-draw">
         <h3>Draw your spell</h3>
         <canvas id="rg-sketch" width="340" height="340"></canvas>
         <div class="row">
           <button class="rg-btn primary" id="rg-draw-cast">🔮 Cast Drawing</button>
           <button class="rg-btn" id="rg-draw-clear">Clear</button>
@@ -131,7 +166,7 @@ PLAY_PAGE = """<!doctype html>
       <div class="rg-hint">WASD / Arrows move · 1–9 pick runes · Space cast · E draw · C clear · M minimap · step into portals to travel</div>
     </div>
   </div>
-  <script src="/rg/static/rpg.js?v=64"></script>
 </body>
 </html>
 """

   <title>Rune Goblin RPG</title>
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link href="https://fonts.googleapis.com/css2?family=Press+Start+2P&display=swap" rel="stylesheet">
+  <link rel="stylesheet" href="/rg/static/rpg.css?v=66">
 </head>
 <body>
   <div id="rg-root">
       <div class="rg-draw" id="rg-draw">
         <h3>Draw your spell</h3>
         <canvas id="rg-sketch" width="340" height="340"></canvas>
+        <button class="rg-btn rg-customize" id="rg-draw-customize" type="button" aria-expanded="false" aria-controls="rg-draw-tools">Customize</button>
+        <div class="rg-draw-tools" id="rg-draw-tools" aria-label="Drawing controls">
+          <div class="rg-tool-group">
+            <span>Ink</span>
+            <button class="rg-swatch on" type="button" data-rg-ink="#17120b" title="Black ink" style="--swatch:#17120b"></button>
+            <button class="rg-swatch" type="button" data-rg-ink="#7b2cff" title="Violet ink" style="--swatch:#7b2cff"></button>
+            <button class="rg-swatch" type="button" data-rg-ink="#008bd8" title="Blue ink" style="--swatch:#008bd8"></button>
+            <button class="rg-swatch" type="button" data-rg-ink="#14893c" title="Green ink" style="--swatch:#14893c"></button>
+            <button class="rg-swatch" type="button" data-rg-ink="#c23b22" title="Red ink" style="--swatch:#c23b22"></button>
+            <button class="rg-swatch" type="button" data-rg-ink="#ffb000" title="Gold ink" style="--swatch:#ffb000"></button>
+            <button class="rg-swatch" type="button" data-rg-ink="#ffffff" title="White ink" style="--swatch:#ffffff"></button>
+            <button class="rg-swatch" type="button" data-rg-ink="#ff5db1" title="Pink ink" style="--swatch:#ff5db1"></button>
+            <button class="rg-swatch" type="button" data-rg-ink="#00c7a8" title="Teal ink" style="--swatch:#00c7a8"></button>
+          </div>
+          <div class="rg-tool-group">
+            <span>Fill</span>
+            <button class="rg-fill on" type="button" data-rg-fill="#ffe7a8" title="Gold fill" style="--swatch:#ffe7a8"></button>
+            <button class="rg-fill" type="button" data-rg-fill="#b9f6ca" title="Green fill" style="--swatch:#b9f6ca"></button>
+            <button class="rg-fill" type="button" data-rg-fill="#a6ddff" title="Blue fill" style="--swatch:#a6ddff"></button>
+            <button class="rg-fill" type="button" data-rg-fill="#ffc1d9" title="Pink fill" style="--swatch:#ffc1d9"></button>
+            <button class="rg-fill" type="button" data-rg-fill="#d4c2ff" title="Violet fill" style="--swatch:#d4c2ff"></button>
+            <button class="rg-fill" type="button" data-rg-fill="#ffffff" title="White fill" style="--swatch:#ffffff"></button>
+          </div>
+          <div class="rg-tool-group rg-size-tool">
+            <span>Size</span>
+            <input id="rg-line-size" type="range" min="3" max="18" value="7" aria-label="Line size">
+          </div>
+          <div class="rg-tool-group">
+            <span>Line</span>
+            <button class="rg-line-style on" type="button" data-rg-line="round" title="Round line">●</button>
+            <button class="rg-line-style" type="button" data-rg-line="square" title="Square line">■</button>
+            <button class="rg-line-style" type="button" data-rg-line="dot" title="Dotted line">···</button>
+            <button class="rg-line-style" type="button" data-rg-line="soft" title="Soft marker">◌</button>
+          </div>
+        </div>
         <div class="row">
           <button class="rg-btn primary" id="rg-draw-cast">🔮 Cast Drawing</button>
           <button class="rg-btn" id="rg-draw-clear">Clear</button>
       <div class="rg-hint">WASD / Arrows move · 1–9 pick runes · Space cast · E draw · C clear · M minimap · step into portals to travel</div>
     </div>
   </div>
+  <script src="/rg/static/rpg.js?v=68"></script>
 </body>
 </html>
 """

app/rpg_static/rpg.css CHANGED Viewed

@@ -56,6 +56,29 @@ html, body {
 .rg-btn:active { transform:translatey(1px); }
 .rg-btn.primary { background:var(--accent); color:#160d24; font-weight:bold; }
 .rg-btn.ghost { background:transparent; }
 .rg-admin-goto { background:#173b2a; color:var(--green); border-color:#2f6f4d; max-width:200px; }
 .rg-admin-goto:hover { background:#1d4d37; }
 .rg-sel { color:var(--accent); font-size:13px; min-width:110px; }
@@ -105,8 +128,39 @@ html, body {
 .rg-draw.open { display:flex; }
 .rg-draw h3 { font-family:"Press Start 2P",monospace; color:var(--accent); font-size:13px; margin:0; }
 #rg-sketch { background:#efe1bd; border:3px solid #8e6e37; border-radius:8px; cursor:crosshair; touch-action:none; }
 .rg-draw .row { display:flex; gap:8px; }
 .rg-draw .tip { color:var(--muted); font-size:11px; max-width:340px; text-align:center; }
 /* end screen */
 .rg-end {

 .rg-btn:active { transform:translatey(1px); }
 .rg-btn.primary { background:var(--accent); color:#160d24; font-weight:bold; }
 .rg-btn.ghost { background:transparent; }
+#rg-draw-open {
+  border:2px solid transparent; padding:7px 12px; color:#f8efff;
+  background:
+    linear-gradient(#2a1f3d, #2a1f3d) padding-box,
+    linear-gradient(90deg, #ff4d6d, #ffd24a, #6df5a0, #48c9ff, #b07cff, #ff4d6d) border-box;
+  background-size:100% 100%, 320% 100%;
+  box-shadow:0 0 0 1px rgba(255,255,255,0.08) inset, 0 0 14px rgba(176,124,255,0.5);
+  animation:rg-rainbow-border 2.4s linear infinite;
+}
+#rg-draw-open:hover {
+  background:
+    linear-gradient(#3a2c54, #3a2c54) padding-box,
+    linear-gradient(90deg, #ff4d6d, #ffd24a, #6df5a0, #48c9ff, #b07cff, #ff4d6d) border-box;
+  background-size:100% 100%, 320% 100%;
+  box-shadow:0 0 0 1px rgba(255,255,255,0.12) inset, 0 0 18px rgba(72,201,255,0.65);
+}
+@keyframes rg-rainbow-border {
+  from { background-position:0 0, 0% 50%; }
+  to { background-position:0 0, 320% 50%; }
+}
+@media (prefers-reduced-motion: reduce) {
+  #rg-draw-open { animation:none; }
+}
 .rg-admin-goto { background:#173b2a; color:var(--green); border-color:#2f6f4d; max-width:200px; }
 .rg-admin-goto:hover { background:#1d4d37; }
 .rg-sel { color:var(--accent); font-size:13px; min-width:110px; }
 .rg-draw.open { display:flex; }
 .rg-draw h3 { font-family:"Press Start 2P",monospace; color:var(--accent); font-size:13px; margin:0; }
 #rg-sketch { background:#efe1bd; border:3px solid #8e6e37; border-radius:8px; cursor:crosshair; touch-action:none; }
+.rg-customize {
+  padding:6px 11px; font-size:12px;
+}
+.rg-draw-tools {
+  width:min(540px, calc(100vw - 28px)); display:none; grid-template-columns:1fr 1fr;
+  gap:7px; padding:8px; border:1px solid rgba(176,124,255,.35); border-radius:8px;
+  background:rgba(18,12,30,.78);
+}
+.rg-draw-tools.open { display:grid; }
+.rg-tool-group { display:flex; align-items:center; flex-wrap:wrap; gap:6px; min-width:0; }
+.rg-tool-group span {
+  flex:0 0 auto; color:var(--muted); font-size:10px; text-transform:uppercase; letter-spacing:.04em;
+}
+.rg-swatch,
+.rg-fill,
+.rg-line-style {
+  width:26px; height:26px; border:1px solid var(--border); border-radius:6px;
+  background:#2a1f3d; color:var(--ink); cursor:pointer; font-size:11px;
+  display:inline-flex; align-items:center; justify-content:center;
+}
+.rg-swatch,
+.rg-fill { background:var(--swatch); box-shadow:0 0 0 1px rgba(0,0,0,.35) inset; }
+.rg-swatch.on,
+.rg-fill.on,
+.rg-line-style.on {
+  border-color:var(--accent); box-shadow:0 0 0 2px var(--accent), 0 0 0 1px rgba(0,0,0,.35) inset;
+}
+.rg-size-tool input { flex:1 1 150px; min-width:76px; accent-color:var(--accent); }
 .rg-draw .row { display:flex; gap:8px; }
 .rg-draw .tip { color:var(--muted); font-size:11px; max-width:340px; text-align:center; }
+@media (max-width: 520px) {
+  .rg-draw-tools { grid-template-columns:1fr; }
+}
 /* end screen */
 .rg-end {

app/rpg_static/rpg.js CHANGED Viewed

@@ -33,6 +33,7 @@
   let enemyCooldown = {};
   let xpFlashUntil = 0;       // HUD XP-bar pulse timer (set on every XP gain)
   let masteryChoiceOpen = false;
   let selecting = false;        // title-screen character select active
   let chosenClass = null;       // selected goblin class id
   let journalOpen = false;
@@ -42,6 +43,8 @@
   let lastEnding = null;        // {ending,title,text} from win_game action
   let lastCastMetadata = null;  // structured /rg/cast metadata for HUD/debug
   let CLASSES = [], WEAPONS = {}, ITEMS = {}, QUESTS_META = {};
   let STORY_BEATS = [];         // proactive beat triggers from /rg/world
   let barks = [];               // live speech bubbles: {eid, area, text, until}
   const CLASS_SPRITE = {        // in-game sprite per class (Goblin Pack #1 hero sheets)
@@ -1532,6 +1535,12 @@
   }
   function grantMasteryChoice() {
     const cls = CLASSES.find((c) => c.id === P.goblin_class) || {};
     const counts = Object.entries(P.rune_mastery || {}).sort((a, b) => b[1] - a[1]).map((x) => x[0]);
     const pool = counts.concat(selected || [], cls.affinity || [], ["closed_circle", "eye", "wave", "key", "spiral"]);
@@ -1716,6 +1725,9 @@
   function closeDialogue() {
     if (masteryChoiceOpen) return;
     dialogueOpen = false; $("rg-dialogue").className = "rg-dialogue";
   }
   // ---- story card: full-screen panel for the campaign's major beats ----
@@ -2696,13 +2708,30 @@
     const bagCount = Object.values(P.items || {}).reduce((a, b) => a + b, 0);
     ctx.fillStyle = "#9c8bc4"; ctx.fillText("BAG " + bagCount, hx, cy); hx += 95;
     ctx.fillStyle = "#ffd24a"; ctx.fillText("G " + (P.gold || 0), hx, cy); hx += 80;
-    if (P.spell_power) { ctx.fillStyle = "#ff9d5c"; ctx.fillText("SP " + P.spell_power, hx, cy); hx += 70; }
-    if (P.crit) { ctx.fillStyle = "#ffe27a"; ctx.fillText("✷" + P.crit + "%", hx, cy); hx += 70; }
-    ctx.textAlign = "right";
     const areaLabel = A.name.toUpperCase();
     ctx.fillStyle = "#b07cff";
     ctx.fillText(areaLabel, canvas.width - 14, cy);
-    if (W && W.admin) {
       ctx.fillStyle = "#6df5a0";
       ctx.fillText("🔓 ADMIN", canvas.width - 14 - ctx.measureText(areaLabel).width - 18, cy);
     }
@@ -3018,13 +3047,65 @@
   function hideReading() { const c = $("rg-reading"); if (c) c.classList.remove("open"); }
   // ---- drawing overlay ----
   function openDraw() {
     if (over) return;
     drawing = true; $("rg-draw").classList.add("open");
     clearSketch();
   }
   function closeDraw() { drawing = false; $("rg-draw").classList.remove("open"); }
-  function clearSketch() { sctx.fillStyle = "#efe1bd"; sctx.fillRect(0, 0, sketch.width, sketch.height); }
   function setupSketch() {
     sketch = $("rg-sketch"); sctx = sketch.getContext("2d");
     clearSketch();
@@ -3032,16 +3113,59 @@
     const pos = (ev) => { const r = sketch.getBoundingClientRect();
       const t = ev.touches ? ev.touches[0] : ev;
       return [(t.clientX - r.left) * sketch.width / r.width, (t.clientY - r.top) * sketch.height / r.height]; };
-    const start = (ev) => { down = true; [lx, ly] = pos(ev); ev.preventDefault(); };
     const move = (ev) => { if (!down) return; const [x, y] = pos(ev);
-      sctx.strokeStyle = "#17120b"; sctx.lineWidth = 7; sctx.lineCap = "round";
       sctx.beginPath(); sctx.moveTo(lx, ly); sctx.lineTo(x, y); sctx.stroke();
       lx = x; ly = y; ev.preventDefault(); };
     const end = () => { down = false; };
     sketch.addEventListener("mousedown", start); sketch.addEventListener("mousemove", move);
     window.addEventListener("mouseup", end);
     sketch.addEventListener("touchstart", start); sketch.addEventListener("touchmove", move);
     sketch.addEventListener("touchend", end);
   }
   // ---- input ----

   let enemyCooldown = {};
   let xpFlashUntil = 0;       // HUD XP-bar pulse timer (set on every XP gain)
   let masteryChoiceOpen = false;
+  let pendingMasteryChoice = false; // mastery picker deferred until an open dialogue closes
   let selecting = false;        // title-screen character select active
   let chosenClass = null;       // selected goblin class id
   let journalOpen = false;
   let lastEnding = null;        // {ending,title,text} from win_game action
   let lastCastMetadata = null;  // structured /rg/cast metadata for HUD/debug
   let CLASSES = [], WEAPONS = {}, ITEMS = {}, QUESTS_META = {};
+  const SKETCH_BG = "#efe1bd";
+  const drawTool = { ink: "#17120b", fill: "#ffe7a8", size: 7, line: "round", mode: "draw" };
   let STORY_BEATS = [];         // proactive beat triggers from /rg/world
   let barks = [];               // live speech bubbles: {eid, area, text, until}
   const CLASS_SPRITE = {        // in-game sprite per class (Goblin Pack #1 hero sheets)
   }
   function grantMasteryChoice() {
+    // If a conversation is mid-flow (e.g. a quest turn-in that just paid XP and
+    // bumped the level), defer the picker until that dialogue is dismissed.
+    // Opening it now would set masteryChoiceOpen, then the caller's own
+    // showDialogue() would clobber the mastery buttons while the flag stays
+    // true — permanently blocking closeDialogue() and soft-locking the game.
+    if (dialogueOpen && !masteryChoiceOpen) { pendingMasteryChoice = true; return; }
     const cls = CLASSES.find((c) => c.id === P.goblin_class) || {};
     const counts = Object.entries(P.rune_mastery || {}).sort((a, b) => b[1] - a[1]).map((x) => x[0]);
     const pool = counts.concat(selected || [], cls.affinity || [], ["closed_circle", "eye", "wave", "key", "spiral"]);
   function closeDialogue() {
     if (masteryChoiceOpen) return;
     dialogueOpen = false; $("rg-dialogue").className = "rg-dialogue";
+    // A level-up that landed mid-conversation parked its mastery picker here —
+    // now that the dialogue is dismissed, present it.
+    if (pendingMasteryChoice) { pendingMasteryChoice = false; grantMasteryChoice(); }
   }
   // ---- story card: full-screen panel for the campaign's major beats ----
     const bagCount = Object.values(P.items || {}).reduce((a, b) => a + b, 0);
     ctx.fillStyle = "#9c8bc4"; ctx.fillText("BAG " + bagCount, hx, cy); hx += 95;
     ctx.fillStyle = "#ffd24a"; ctx.fillText("G " + (P.gold || 0), hx, cy); hx += 80;
+    // Right-aligned area title (+ optional admin badge). Compute its left edge first
+    // so the optional SP/crit stats below can be gated on the space that's left.
     const areaLabel = A.name.toUpperCase();
+    const admin = !!(W && W.admin);
+    const rightBlockLeft = canvas.width - 14 - ctx.measureText(areaLabel).width
+      - (admin ? ctx.measureText("🔓 ADMIN").width + 18 : 0);
+    // Optional stats: only draw each if it fits before the area title (with padding).
+    const GAP = 16;
+    if (P.spell_power) {
+      const t = "SP " + P.spell_power;
+      if (hx + ctx.measureText(t).width <= rightBlockLeft - GAP) {
+        ctx.fillStyle = "#ff9d5c"; ctx.fillText(t, hx, cy); hx += 70;
+      }
+    }
+    if (P.crit) {
+      const t = "✷" + P.crit + "%";
+      if (hx + ctx.measureText(t).width <= rightBlockLeft - GAP) {
+        ctx.fillStyle = "#ffe27a"; ctx.fillText(t, hx, cy); hx += 70;
+      }
+    }
+    ctx.textAlign = "right";
     ctx.fillStyle = "#b07cff";
     ctx.fillText(areaLabel, canvas.width - 14, cy);
+    if (admin) {
       ctx.fillStyle = "#6df5a0";
       ctx.fillText("🔓 ADMIN", canvas.width - 14 - ctx.measureText(areaLabel).width - 18, cy);
     }
   function hideReading() { const c = $("rg-reading"); if (c) c.classList.remove("open"); }
   // ---- drawing overlay ----
+  function setCustomizeOpen(open) {
+    const tools = $("rg-draw-tools");
+    const btn = $("rg-draw-customize");
+    if (!tools || !btn) return;
+    tools.classList.toggle("open", open);
+    btn.setAttribute("aria-expanded", open ? "true" : "false");
+    btn.textContent = open ? "Hide customization" : "Customize";
+  }
   function openDraw() {
     if (over) return;
     drawing = true; $("rg-draw").classList.add("open");
+    setCustomizeOpen(false);
     clearSketch();
   }
   function closeDraw() { drawing = false; $("rg-draw").classList.remove("open"); }
+  function clearSketch() { sctx.fillStyle = SKETCH_BG; sctx.fillRect(0, 0, sketch.width, sketch.height); }
+  function setActiveTool(nodes, active) {
+    nodes.forEach((node) => node.classList.toggle("on", node === active));
+  }
+  function hexToRgb(hex) {
+    return hex.match(/\w\w/g).map((n) => parseInt(n, 16));
+  }
+  function floodFill(x, y) {
+    const w = sketch.width, h = sketch.height;
+    const sx = Math.max(0, Math.min(w - 1, Math.round(x)));
+    const sy = Math.max(0, Math.min(h - 1, Math.round(y)));
+    const img = sctx.getImageData(0, 0, w, h);
+    const data = img.data;
+    const start = (sy * w + sx) * 4;
+    const target = [data[start], data[start + 1], data[start + 2], data[start + 3]];
+    const fill = hexToRgb(drawTool.fill);
+    if (Math.abs(target[0] - fill[0]) + Math.abs(target[1] - fill[1]) + Math.abs(target[2] - fill[2]) < 12) return;
+    const seen = new Uint8Array(w * h);
+    const stack = [[sx, sy]];
+    const tolerance = 28;
+    while (stack.length) {
+      const p = stack.pop();
+      const px = p[0], py = p[1], pi = py * w + px, di = pi * 4;
+      if (seen[pi]) continue;
+      seen[pi] = 1;
+      const delta = Math.abs(data[di] - target[0]) + Math.abs(data[di + 1] - target[1]) +
+        Math.abs(data[di + 2] - target[2]) + Math.abs(data[di + 3] - target[3]);
+      if (delta > tolerance) continue;
+      data[di] = fill[0]; data[di + 1] = fill[1]; data[di + 2] = fill[2]; data[di + 3] = 255;
+      if (px > 0) stack.push([px - 1, py]);
+      if (px < w - 1) stack.push([px + 1, py]);
+      if (py > 0) stack.push([px, py - 1]);
+      if (py < h - 1) stack.push([px, py + 1]);
+    }
+    sctx.putImageData(img, 0, 0);
+  }
+  function applyLineStyle() {
+    sctx.strokeStyle = drawTool.ink;
+    sctx.lineWidth = drawTool.size;
+    sctx.lineJoin = drawTool.line === "square" ? "miter" : "round";
+    sctx.lineCap = drawTool.line === "square" ? "butt" : "round";
+    sctx.globalAlpha = drawTool.line === "soft" ? 0.58 : 1;
+    sctx.setLineDash(drawTool.line === "dot" ? [Math.max(1, drawTool.size * 0.12), drawTool.size * 1.8] : []);
+  }
   function setupSketch() {
     sketch = $("rg-sketch"); sctx = sketch.getContext("2d");
     clearSketch();
     const pos = (ev) => { const r = sketch.getBoundingClientRect();
       const t = ev.touches ? ev.touches[0] : ev;
       return [(t.clientX - r.left) * sketch.width / r.width, (t.clientY - r.top) * sketch.height / r.height]; };
+    const start = (ev) => {
+      [lx, ly] = pos(ev);
+      if (drawTool.mode === "fill") {
+        floodFill(lx, ly);
+        ev.preventDefault();
+        return;
+      }
+      down = true;
+      ev.preventDefault();
+    };
     const move = (ev) => { if (!down) return; const [x, y] = pos(ev);
+      applyLineStyle();
       sctx.beginPath(); sctx.moveTo(lx, ly); sctx.lineTo(x, y); sctx.stroke();
+      sctx.globalAlpha = 1; sctx.setLineDash([]);
       lx = x; ly = y; ev.preventDefault(); };
     const end = () => { down = false; };
     sketch.addEventListener("mousedown", start); sketch.addEventListener("mousemove", move);
     window.addEventListener("mouseup", end);
     sketch.addEventListener("touchstart", start); sketch.addEventListener("touchmove", move);
     sketch.addEventListener("touchend", end);
+    const customize = $("rg-draw-customize");
+    if (customize) {
+      customize.onclick = () => {
+        const tools = $("rg-draw-tools");
+        setCustomizeOpen(!(tools && tools.classList.contains("open")));
+      };
+    }
+    const inkButtons = [...document.querySelectorAll("[data-rg-ink]")];
+    inkButtons.forEach((btn) => {
+      btn.onclick = () => {
+        drawTool.ink = btn.dataset.rgInk;
+        drawTool.mode = "draw";
+        setActiveTool(inkButtons, btn);
+      };
+    });
+    const fillButtons = [...document.querySelectorAll("[data-rg-fill]")];
+    fillButtons.forEach((btn) => {
+      btn.onclick = () => {
+        drawTool.fill = btn.dataset.rgFill;
+        drawTool.mode = "fill";
+        setActiveTool(fillButtons, btn);
+      };
+    });
+    const lineButtons = [...document.querySelectorAll("[data-rg-line]")];
+    lineButtons.forEach((btn) => {
+      btn.onclick = () => {
+        drawTool.line = btn.dataset.rgLine;
+        drawTool.mode = "draw";
+        setActiveTool(lineButtons, btn);
+      };
+    });
+    const size = $("rg-line-size");
+    if (size) size.oninput = () => { drawTool.size = Number(size.value) || 7; };
   }
   // ---- input ----

src/rune_goblin/world.py CHANGED Viewed

@@ -419,7 +419,9 @@ def _build_areas() -> dict[str, Area]:
                  dialogue="I lost my map. Soothe me (wave) and I'll bless your courage.",
                  hint="cast wave/leaf to comfort"),
             _npc("toll_pixie", "Toll Pixie", 16, 3, sprite_key="fluttering_pixie",
-                 dialogue="The goblin hates bells and coins. Just saying.",
                  hint="a helpful hint about the gate goblin"),
             _npc("road_druid", "Road Druid", 41, 27, sprite_key="expert_druid",
                  dialogue="Two doors west and east. The Library hides a Calendar Key. "
@@ -444,7 +446,7 @@ def _build_areas() -> dict[str, Area]:
                    loot=["lucky coin"], hint="locked — pay with a coin rune"),
             Entity("toll_shrine", "shrine", "Mile-Marker Shrine", 24, 3, sprite="⛩️",
                    blocking=True, tags=["holy"], state="dormant",
-                   hint="cast leaf/closed_circle to bless yourself"),
             Entity("portal_caverns", "portal", "Cavern Mouth", 2, 14, sprite="🕳️",
                    blocking=False, target_area="caverns", target_x=3, target_y=2,
                    hint="step in → Mirror Fungus Caverns"),
@@ -454,7 +456,7 @@ def _build_areas() -> dict[str, Area]:
             Entity("portal_market", "portal", "Bone Market Tunnel", 24, 30, sprite="🕳️",
                    state="locked", blocking=True, target_area="bone_market", target_x=2, target_y=2,
                    requires=["Debt Receipt"], tags=["shop", "shortcut"],
-                   hint="sealed — needs Debt Receipt, coin+bell, or a forced cursed entrance"),
             Entity("portal_frost", "portal", "Frostbite Trail", 5, 27, sprite="🌀",
                    blocking=False, target_area="frost_pass", target_x=3, target_y=3,
                    hint="step in → Frostbite Pass"),
@@ -515,7 +517,7 @@ def _build_areas() -> dict[str, Area]:
                    loot=["jar of teeth", "minor powerup"], hint="locked — flame or key"),
             Entity("cavern_shrine", "shrine", "Dripping Shrine", 13, 9, sprite="⛩️",
                    blocking=True, tags=["holy"], state="dormant",
-                   hint="cast leaf to heal at the shrine"),
             Entity("portal_home_c", "portal", "Cave Exit", 2, 29, sprite="🚪",
                    blocking=False, target_area="overworld", target_x=3, target_y=14,
                    hint="step out → Toll Road"),
@@ -1207,7 +1209,11 @@ def build_world(seed: int | None = None, admin: bool | None = None) -> dict:
             "gold": 3, "rune_mastery": {}, "story_flags": [], "ending_flags": [], "journal": [],
             "four_rune_unlocked": False,
             "inventory": ["wet candle"], "score": 0, "statuses": [],
-            "items": {}, "quests": {},
             "quest_log": ["Find the Calendar Shard in the Mirror Fungus Caverns."],
             "discoveries": [], "recent_story_events": [], "trust": {},
             "beats_seen": [],
@@ -1425,6 +1431,16 @@ def _defeat_loot_actions(player: dict, target: dict, rng: random.Random) -> list
     actions += _weapon_temper_actions(player)
     if "mycologist" in str(target.get("id", "")):
         actions += _flag_actions(["mycologist_defeated"])
     return actions
@@ -1784,6 +1800,15 @@ def resolve_world_cast(
         # done and does NOT retaliate — paying the toll is a transaction, not a
         # fight. The spell's effect text carries the peaceful "gate opens" line.
         actions.append({"type": "defeat_entity", "target_id": tid})
         if "bell" in runes:
             actions += _flag_actions(["queue_goblin_paid", "tollmaster_route_open"])
@@ -2091,23 +2116,38 @@ def resolve_world_cast(
                 status_effects=["door_unlocked"], chaos=5 if forced else 4,
             )
         else:
             spell = SpellResult(
                 spell_name="Polite Refusal", spell_type="unlock_emotion",
                 flavor=_flavor_world(runes, target, combo),
-                effect=f"It stays shut. It needs: {' + '.join(requires)}.", chaos=2,
             )
         return {"spell": spell.model_dump(), "world_actions": actions, "target_id": tid, "runes": runes}
     # --- shrine ------------------------------------------------------------
     if ttype == "shrine":
-        heal = 4 if any(r in {"leaf", "closed_circle"} for r in runes) else 2
         actions.append({"type": "heal_player", "amount": heal})
         actions.append({"type": "add_courage", "amount": 1})
-        actions.append({"type": "set_entity_state", "target_id": tid, "state": "spent"})
         spell = SpellResult(
             spell_name="Mile-Marker Blessing", spell_type="shrine",
             flavor=_flavor_world(runes, target, combo),
-            effect=f"Warmth restores {heal} HP and steadies your nerve.",
             player_hp_delta=heal, status_effects=["player_blessed"], chaos=3,
         )
         return {"spell": spell.model_dump(), "world_actions": actions, "target_id": tid, "runes": runes}

                  dialogue="I lost my map. Soothe me (wave) and I'll bless your courage.",
                  hint="cast wave/leaf to comfort"),
             _npc("toll_pixie", "Toll Pixie", 16, 3, sprite_key="fluttering_pixie",
+                 dialogue="The gate goblin? Pay him or beat him — either way he stamps "
+                          "a Debt Receipt, and that opens the Bone Market Tunnel south "
+                          "of here. He hates bells and coins. Just saying.",
                  hint="a helpful hint about the gate goblin"),
             _npc("road_druid", "Road Druid", 41, 27, sprite_key="expert_druid",
                  dialogue="Two doors west and east. The Library hides a Calendar Key. "
                    loot=["lucky coin"], hint="locked — pay with a coin rune"),
             Entity("toll_shrine", "shrine", "Mile-Marker Shrine", 24, 3, sprite="⛩️",
                    blocking=True, tags=["holy"], state="dormant",
+                   hint="rest stop — face it and cast closed circle (⭕) for a full heal, any time"),
             Entity("portal_caverns", "portal", "Cavern Mouth", 2, 14, sprite="🕳️",
                    blocking=False, target_area="caverns", target_x=3, target_y=2,
                    hint="step in → Mirror Fungus Caverns"),
             Entity("portal_market", "portal", "Bone Market Tunnel", 24, 30, sprite="🕳️",
                    state="locked", blocking=True, target_area="bone_market", target_x=2, target_y=2,
                    requires=["Debt Receipt"], tags=["shop", "shortcut"],
+                   hint="sealed — settle with the Queue Goblin at the toll gate for a Debt Receipt"),
             Entity("portal_frost", "portal", "Frostbite Trail", 5, 27, sprite="🌀",
                    blocking=False, target_area="frost_pass", target_x=3, target_y=3,
                    hint="step in → Frostbite Pass"),
                    loot=["jar of teeth", "minor powerup"], hint="locked — flame or key"),
             Entity("cavern_shrine", "shrine", "Dripping Shrine", 13, 9, sprite="⛩️",
                    blocking=True, tags=["holy"], state="dormant",
+                   hint="cast closed circle (⭕) to fully heal at the shrine"),
             Entity("portal_home_c", "portal", "Cave Exit", 2, 29, sprite="🚪",
                    blocking=False, target_area="overworld", target_x=3, target_y=14,
                    hint="step out → Toll Road"),
             "gold": 3, "rune_mastery": {}, "story_flags": [], "ending_flags": [], "journal": [],
             "four_rune_unlocked": False,
             "inventory": ["wet candle"], "score": 0, "statuses": [],
+            # One starter potion teaches the bag/potion loop before the first
+            # quest reward. (Healing/NPC guidance reaches the player through the
+            # shrine's bump-hint and the Journal's "talk to a quest-giver"
+            # empty-state, so the quest_log stays the single main objective.)
+            "items": {"health_potion": 1}, "quests": {},
             "quest_log": ["Find the Calendar Shard in the Mirror Fungus Caverns."],
             "discoveries": [], "recent_story_events": [], "trust": {},
             "beats_seen": [],
     actions += _weapon_temper_actions(player)
     if "mycologist" in str(target.get("id", "")):
         actions += _flag_actions(["mycologist_defeated"])
+    # Beating the Queue Goblin in a straight fight settles the toll too — the
+    # Debt Receipt (Bone Market key) must be reachable at level 1, when the
+    # coin/bell payment runes are still locked.
+    if str(target.get("id", "")) == "toll_goblin":
+        actions += _flag_actions(["queue_goblin_forced"])
+        if "Debt Receipt" not in (player.get("inventory") or []):
+            actions.append({"type": "add_inventory", "item": "Debt Receipt"})
+            actions.append({"type": "add_journal_entry",
+                            "text": "A Debt Receipt flutters from the Queue Goblin's "
+                                    "cup. It opens the Bone Market Tunnel on the south road."})
     return actions
         # done and does NOT retaliate — paying the toll is a transaction, not a
         # fight. The spell's effect text carries the peaceful "gate opens" line.
         actions.append({"type": "defeat_entity", "target_id": tid})
+        # Settling the toll — by bell, coin or blood — earns the Debt Receipt
+        # that unseals the Bone Market Tunnel on the south road. Without this
+        # the receipt only existed via a forced cursed entry of that same
+        # portal, which was circular.
+        if "Debt Receipt" not in inventory:
+            actions.append({"type": "add_inventory", "item": "Debt Receipt"})
+            actions.append({"type": "add_journal_entry",
+                            "text": "The Queue Goblin stamps you a Debt Receipt. "
+                                    "It opens the Bone Market Tunnel on the south road."})
         if "bell" in runes:
             actions += _flag_actions(["queue_goblin_paid", "tollmaster_route_open"])
                 status_effects=["door_unlocked"], chaos=5 if forced else 4,
             )
         else:
+            effect = f"It stays shut. It needs: {' + '.join(requires)}."
+            if tid == "portal_market":
+                effect += (" The Queue Goblin at the toll gate stamps one "
+                           "when you settle your toll — pay him or beat him.")
             spell = SpellResult(
                 spell_name="Polite Refusal", spell_type="unlock_emotion",
                 flavor=_flavor_world(runes, target, combo),
+                effect=effect, chaos=2,
             )
         return {"spell": spell.model_dump(), "world_actions": actions, "target_id": tid, "runes": runes}
     # --- shrine ------------------------------------------------------------
+    # Shrines are reusable rest stops — the one reliable heal on every map.
+    # An attuned rune (closed_circle is in the level-1 starting three; leaf
+    # joins later) restores the player to full; anything else patches 2 HP.
     if ttype == "shrine":
+        max_hp = int(player.get("max_hp", 10) or 10)
+        cur_hp = max(0, int(player.get("hp", max_hp) or 0))
+        attuned = any(r in {"leaf", "closed_circle"} for r in runes)
+        if attuned:
+            heal = max(0, max_hp - cur_hp)
+            effect = ("The shrine's warmth restores you to full health."
+                      if heal else "You are already whole. The shrine hums approvingly.")
+        else:
+            heal = 2
+            effect = "Warmth restores 2 HP. Cast a closed circle (⭕) here for a full heal."
         actions.append({"type": "heal_player", "amount": heal})
         actions.append({"type": "add_courage", "amount": 1})
         spell = SpellResult(
             spell_name="Mile-Marker Blessing", spell_type="shrine",
             flavor=_flavor_world(runes, target, combo),
+            effect=effect,
             player_hp_delta=heal, status_effects=["player_blessed"], chaos=3,
         )
         return {"spell": spell.model_dump(), "world_actions": actions, "target_id": tid, "runes": runes}

tests/test_world_cast.py CHANGED Viewed

@@ -465,6 +465,43 @@ def test_toll_bell_passes_free_and_opens_tollmaster_route():
     assert "queue_goblin_paid" in flags and "tollmaster_route_open" in flags
 def test_player_starts_with_spendable_coins():
     assert build_world()["player"]["gold"] >= 1
@@ -483,7 +520,9 @@ def test_world_exposes_items_and_quests_metadata():
     assert {"health_potion", "courage_draught", "monster_trophy", "fungus_spore"} <= item_ids
     quest_ids = {q["id"] for q in w["quests"]}
     assert {"road_patrol", "spore_sample", "quartermaster_kit"} <= quest_ids
-    assert w["player"]["items"] == {} and w["player"]["quests"] == {}
 def test_quest_giver_npcs_are_tagged():

     assert "queue_goblin_paid" in flags and "tollmaster_route_open" in flags
+def _inventory_adds(res):
+    return [a["item"] for a in res["world_actions"] if a["type"] == "add_inventory"]
+def test_settling_toll_grants_debt_receipt_every_way():
+    # Paying (coin/bell, with or without gold) stamps the Bone Market key…
+    for runes, gold in ((["coin"], 3), (["coin"], 0), (["bell"], 0)):
+        res = resolve_world_cast(runes, _player(gold=gold), dict(TOLL_GOBLIN), seed=1)
+        assert "Debt Receipt" in _inventory_adds(res)
+        assert "add_journal_entry" in _types(res)
+    # …and so does beating him in a straight fight (level-1 path: the coin and
+    # bell runes are still locked then).
+    fight = dict(TOLL_GOBLIN, hp=1, weakness=["jagged_line"], resistance=[])
+    res = resolve_world_cast(["jagged_line"], _player(), fight, seed=2)
+    assert "defeat_entity" in _types(res)
+    assert "Debt Receipt" in _inventory_adds(res)
+    # Already holding one: never duplicated.
+    res = resolve_world_cast(["coin"], _player(gold=3, inventory=["Debt Receipt"]),
+                             dict(TOLL_GOBLIN), seed=1)
+    assert "Debt Receipt" not in _inventory_adds(res)
+def test_shrine_fully_heals_with_starting_rune_and_is_reusable():
+    shrine = {"id": "toll_shrine", "type": "shrine", "name": "Mile-Marker Shrine",
+              "state": "dormant"}
+    # closed_circle is in the level-1 starting trio -> full heal
+    res = resolve_world_cast(["closed_circle"], _player(hp=3, max_hp=12), shrine, seed=4)
+    heals = [a["amount"] for a in res["world_actions"] if a["type"] == "heal_player"]
+    assert heals == [9]  # back to full
+    # the shrine is never spent — it stays a reusable rest stop
+    assert "set_entity_state" not in _types(res)
+    # unattuned runes still patch a little
+    res2 = resolve_world_cast(["spiral"], _player(hp=3, max_hp=12), shrine, seed=4)
+    heals2 = [a["amount"] for a in res2["world_actions"] if a["type"] == "heal_player"]
+    assert heals2 == [2]
 def test_player_starts_with_spendable_coins():
     assert build_world()["player"]["gold"] >= 1
     assert {"health_potion", "courage_draught", "monster_trophy", "fungus_spore"} <= item_ids
     quest_ids = {q["id"] for q in w["quests"]}
     assert {"road_patrol", "spore_sample", "quartermaster_kit"} <= quest_ids
+    # one starter potion so the bag/heal loop is live before the first quest
+    assert w["player"]["items"] == {"health_potion": 1}
+    assert w["player"]["quests"] == {}
 def test_quest_giver_npcs_are_tagged():