jekyll-dice-tray 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f49149fc1cd489c751a686785425dc11dc5ce28672b9a296360d08ee14faa2e
-  data.tar.gz: 9c63fa27e57d9b64b846ec5c5c7a753747b46a98bc9ad61de422c83e10afe7b8
+  metadata.gz: d3d407c51d39049511c08f665a5b70a71d0eff1a0ec1522472948ce6350fd670
+  data.tar.gz: d2ae3f53ca8018c55bfff796cba3781684076bdeb8ba5bfdc9307c5f3e30c127
 SHA512:
-  metadata.gz: b7eee62b2881996cbce8cd8dda45ae0a932a609ac5beb02c4a9edc3b70873517b5f8485789845809137f292efde3a70115eeeb08532120b0764986b526584561
-  data.tar.gz: f5572b43292713c2194c6a01d63e16d09e285bd16496b1749b6676d2d743a7a90789d1d35cea53d6da637113cf58c572d5fe9c37db58e3c024931f7b57cb3a14
+  metadata.gz: e30263b41fc804cb82a2f6ba76a0697bd31e0e6d5ace3550a94fb6d41d20a25eec1c2db6e65048ea94b549b3137de4a079dc57c7c9f6209b6b841d5b20723ac4
+  data.tar.gz: 843991fe95b1a12b60550fc6bc462ea547b46e23b740eda47fe3a454dda4d0e34c4757d7ba8f2f3ae68989814c551b3011fbb571b7f022ab1dd404a4f28942fe

data/README.md

@@ -4,10 +4,10 @@ A Jekyll plugin gem that:
 
 - Adds an overlay dice tray that accepts dice rolling input
 - Recognizes dice expressions in rendered pages like `d4`, `1d6`, `1d20+1` and turns them into clickable links that roll in the tray
-- Recognizes THAC0-style bracket modifiers like `THAC0 18 [+1]` or `18 [+1]` in a THAC0 table row/column; the `+1` inside the brackets is clickable and rolls `d20+1` (other `[+n]` text is left alone)
+- Clicking a lookup-table die in the header row (e.g. `1d12`) rolls and shows the matching row
 - Persists input history, result history, minimize status
-- `/help` - help
-- `/clear` - clears results and input history
+
+https://github.com/user-attachments/assets/6ef8d788-a1ee-49d4-ab26-f63899bb4a10
 
 ## Install
 

data/assets/jekyll-dice-tray/dice_tray.css

@@ -114,12 +114,67 @@
   color: rgba(0, 0, 0, 0.45);
 }
 
+#jekyll-dice-tray .jdt-success {
+  color: #1a7f37;
+}
+
+#jekyll-dice-tray .jdt-failure {
+  color: #cf222e;
+}
+
 #jekyll-dice-tray .jdt-entry .jdt-details {
   margin-top: 4px;
   color: rgba(0, 0, 0, 0.55);
   font-size: 12px;
 }
 
+#jekyll-dice-tray .jdt-table-context {
+  margin-top: 6px;
+  padding-top: 6px;
+  border-top: 1px dashed rgba(0, 0, 0, 0.08);
+}
+
+#jekyll-dice-tray .jdt-table-row {
+  font-size: 12px;
+  line-height: 1.4;
+  color: rgba(0, 0, 0, 0.72);
+}
+
+#jekyll-dice-tray .jdt-table-row + .jdt-table-row {
+  margin-top: 2px;
+}
+
+#jekyll-dice-tray .jdt-table-header {
+  font-weight: 600;
+  color: rgba(0, 0, 0, 0.55);
+}
+
+#jekyll-dice-tray .jdt-table-sep {
+  color: rgba(0, 0, 0, 0.45);
+}
+
+#jekyll-dice-tray .jdt-table-value {
+  font-family: inherit;
+}
+
+#jekyll-dice-tray .jdt-table-value a,
+#jekyll-dice-tray .jdt-table-header a {
+  text-decoration: underline;
+  text-underline-offset: 2px;
+}
+
+#jekyll-dice-tray .jdt-table-value a.dice-tray-roll {
+  color: #ff0000;
+}
+
+#jekyll-dice-tray .jdt-table-value a:visited {
+  color: inherit;
+}
+
+#jekyll-dice-tray .jdt-table-value a.dice-tray-roll:visited {
+  color: #ff0000;
+}
+
 a.dice-tray-roll {
   text-decoration: underline;
   text-underline-offset: 2px;
@@ -168,6 +223,22 @@ a.dice-tray-roll:visited {
     color: rgba(255, 255, 255, 0.6);
   }
 
+  #jekyll-dice-tray .jdt-table-context {
+    border-top-color: rgba(255, 255, 255, 0.1);
+  }
+
+  #jekyll-dice-tray .jdt-table-row {
+    color: rgba(255, 255, 255, 0.78);
+  }
+
+  #jekyll-dice-tray .jdt-table-header {
+    color: rgba(255, 255, 255, 0.62);
+  }
+
+  #jekyll-dice-tray .jdt-table-sep {
+    color: rgba(255, 255, 255, 0.48);
+  }
+
   #jekyll-dice-tray .jdt-result .jdt-rolls {
     color: rgba(255, 255, 255, 0.65);
   }
@@ -179,5 +250,13 @@ a.dice-tray-roll:visited {
   #jekyll-dice-tray .jdt-result .jdt-vs-sep {
     color: rgba(255, 255, 255, 0.48);
   }
+
+  #jekyll-dice-tray .jdt-success {
+    color: #3fb950;
+  }
+
+  #jekyll-dice-tray .jdt-failure {
+    color: #f85149;
+  }
 }
 

data/assets/jekyll-dice-tray/dice_tray.js

@@ -93,6 +93,28 @@
       };
     }
 
+    var chance = compact.match(/^(\d{1,3})-in-(\d{1,4})$/i);
+    if (chance) {
+      var successOn = parseInt(chance[1], 10);
+      var sides = parseInt(chance[2], 10);
+
+      if (!Number.isFinite(successOn) || !Number.isFinite(sides)) {
+        return { kind: "invalid", raw: s };
+      }
+      if (successOn < 1) successOn = 1;
+      if (successOn > 100) successOn = 100;
+      if (sides < 2) sides = 2;
+      if (sides > 10000) sides = 10000;
+      if (successOn > sides) return { kind: "invalid", raw: s };
+
+      return {
+        kind: "chance",
+        success_on: successOn,
+        sides: sides,
+        normalized: String(successOn) + "-in-" + String(sides),
+      };
+    }
+
     var m = compact.match(/^(\d{0,3})d(\d{1,4})([+-]\d{1,5})?$/i);
     if (!m) return { kind: "invalid", raw: s };
 
@@ -126,6 +148,136 @@
   }
 
   function mountTray(root) {
+    function normalizeCellText(node) {
+      return String(node && node.textContent ? node.textContent : "")
+        .replace(/\s+/g, " ")
+        .trim();
+    }
+
+    function cellInnerHtml(node) {
+      return node && node.innerHTML ? node.innerHTML.trim() : "";
+    }
+
+    function findTableHeaderRow(table) {
+      if (!table) return null;
+      var thead = table.querySelector("thead");
+      if (thead) {
+        var theadRows = thead.querySelectorAll("tr");
+        if (theadRows.length) return theadRows[theadRows.length - 1];
+      }
+      var rows = table.querySelectorAll("tr");
+      for (var i = 0; i < rows.length; i++) {
+        if (rows[i].querySelector("th")) return rows[i];
+      }
+      return table.querySelector("tr");
+    }
+
+    function parseFirstColumnEntry(text) {
+      if (!text) return null;
+      var normalized = text.replace(/[\u2013\u2014]/g, "-");
+      if (/^\d+$/.test(normalized)) {
+        return { kind: "exact", value: parseInt(normalized, 10) };
+      }
+      var rangeMatch = normalized.match(/^(\d+)\s*-\s*(\d+)$/);
+      if (rangeMatch) {
+        var min = parseInt(rangeMatch[1], 10);
+        var max = parseInt(rangeMatch[2], 10);
+        if (min <= max) return { kind: "range", min: min, max: max };
+      }
+      return null;
+    }
+
+    function firstColumnEntry(row) {
+      if (!row) return null;
+      var cell = row.querySelector("td, th");
+      if (!cell) return null;
+      return parseFirstColumnEntry(normalizeCellText(cell));
+    }
+
+    function isLookupTable(table, headerRow) {
+      if (!table || !headerRow) return false;
+      var rows = table.querySelectorAll("tr");
+      var matches = 0;
+      for (var i = 0; i < rows.length; i++) {
+        if (rows[i] === headerRow) continue;
+        if (firstColumnEntry(rows[i]) !== null) matches++;
+      }
+      return matches >= 2;
+    }
+
+    function findLookupRow(table, headerRow, rollTotal) {
+      var rows = table.querySelectorAll("tr");
+      var rangeRow = null;
+      for (var i = 0; i < rows.length; i++) {
+        var row = rows[i];
+        if (row === headerRow) continue;
+        var entry = firstColumnEntry(row);
+        if (!entry) continue;
+        if (entry.kind === "exact" && entry.value === rollTotal) return row;
+        if (entry.kind === "range" && !rangeRow && rollTotal >= entry.min && rollTotal <= entry.max) {
+          rangeRow = row;
+        }
+      }
+      return rangeRow;
+    }
+
+    function getLookupTableContext(anchor, rollTotal) {
+      if (!anchor || !anchor.closest || rollTotal == null) return null;
+      var cell = anchor.closest("td, th");
+      if (!cell) return null;
+      var clickRow = cell.closest("tr");
+      if (!clickRow) return null;
+      var table = clickRow.closest("table");
+      if (!table) return null;
+
+      var headerRow = findTableHeaderRow(table);
+      if (!headerRow || !headerRow.contains(cell)) return null;
+      if (!isLookupTable(table, headerRow)) return null;
+
+      var matchedRow = findLookupRow(table, headerRow, rollTotal);
+      if (!matchedRow) return null;
+
+      var headerCells = Array.prototype.slice.call(headerRow.querySelectorAll("td, th"));
+      var valueCells = Array.prototype.slice.call(matchedRow.querySelectorAll("td, th"));
+      var columns = [];
+
+      for (var c = 0; c < valueCells.length; c++) {
+        var headerCell = headerCells[c];
+        var valueCell = valueCells[c];
+        columns.push({
+          header: headerCell ? normalizeCellText(headerCell) : "",
+          header_html: headerCell ? cellInnerHtml(headerCell) : "",
+          value: normalizeCellText(valueCell),
+          value_html: cellInnerHtml(valueCell),
+        });
+      }
+
+      return columns.length ? { columns: columns } : null;
+    }
+
+    function appendTableContext(entry, tableContext) {
+      if (!tableContext || !tableContext.columns || !tableContext.columns.length) return;
+
+      var ctx = el("div", { class: "jdt-table-context" });
+      tableContext.columns.forEach(function (col) {
+        if (!col || (!col.value && !col.value_html)) return;
+        var line = el("div", { class: "jdt-table-row" });
+        if (col.header || col.header_html) {
+          var headerSpan = el("span", { class: "jdt-table-header" });
+          if (col.header_html) headerSpan.innerHTML = col.header_html;
+          else headerSpan.textContent = col.header;
+          line.appendChild(headerSpan);
+          line.appendChild(el("span", { class: "jdt-table-sep" }, ": "));
+        }
+        var valueSpan = el("span", { class: "jdt-table-value" });
+        if (col.value_html) valueSpan.innerHTML = col.value_html;
+        else valueSpan.textContent = col.value || "";
+        line.appendChild(valueSpan);
+        ctx.appendChild(line);
+      });
+      if (ctx.childNodes.length) entry.appendChild(ctx);
+    }
+
     var toggle = qs(".jdt-toggle", root);
     var body = qs(".jdt-body", root);
     var input = qs(".jdt-input", root);
@@ -237,10 +389,31 @@
             item.right_label || "",
             item.mod || 0,
             item.time || "",
-            item.mode || "high"
+            item.mode || "high",
+            item.table_context || null,
+            true
+          );
+        } else if (item.kind === "chance") {
+          addChanceEntry(
+            item.expr || "",
+            item.roll,
+            item.success_on,
+            item.sides,
+            !!item.success,
+            item.time || "",
+            item.table_context || null,
+            true
           );
         } else if (item.kind === "roll") {
-          addRollEntry(item.expr || "", item.total, item.rolls || [], item.mod || 0, item.time || "");
+          addRollEntry(
+            item.expr || "",
+            item.total,
+            item.rolls || [],
+            item.mod || 0,
+            item.time || "",
+            item.table_context || null,
+            true
+          );
         }
       });
       log.scrollTop = log.scrollHeight;
@@ -264,10 +437,41 @@
       pushHistory({ kind: "system", title: title, body: body, time: timeStr });
     }
 
-    function addRollEntry(expr, total, rolls, mod, timeStr) {
+    function addChanceEntry(expr, roll, successOn, sides, success, timeStr, tableContext, skipHistory) {
+      var entry = el("div", { class: "jdt-entry", title: expr });
+      var colorClass = success ? "jdt-success" : "jdt-failure";
+      var result = el("div", { class: "jdt-result" });
+
+      result.appendChild(el("strong", { class: colorClass }, String(roll)));
+
+      var bracket = el("span", { class: "jdt-rolls" }, " [");
+      bracket.appendChild(el("span", { class: colorClass }, String(roll)));
+      bracket.appendChild(el("span", null, "]"));
+      result.appendChild(bracket);
+
+      entry.appendChild(result);
+      appendTableContext(entry, tableContext);
+
+      log.appendChild(entry);
+      log.scrollTop = log.scrollHeight;
+
+      if (skipHistory) return;
+
+      var item = {
+        kind: "chance",
+        expr: expr,
+        roll: roll,
+        success_on: successOn,
+        sides: sides,
+        success: success,
+        time: timeStr,
+      };
+      if (tableContext) item.table_context = tableContext;
+      pushHistory(item);
+    }
+
+    function addRollEntry(expr, total, rolls, mod, timeStr, tableContext, skipHistory) {
       var entry = el("div", { class: "jdt-entry", title: expr });
-      // expression
-      //entry.appendChild(el("div", { class: "jdt-expr" }, expr));
 
       var result = el("div", { class: "jdt-result" });
       result.appendChild(el("strong", null, String(total)));
@@ -277,18 +481,20 @@
       }
       result.appendChild(el("span", { class: "jdt-rolls" }, " " + rollsText));
 
-      // result
       entry.appendChild(result);
+      appendTableContext(entry, tableContext);
 
-      // time
-      //entry.appendChild(el("div", { class: "jdt-details" }, timeStr));
-      log.appendChild(entry); // newest at bottom
+      log.appendChild(entry);
       log.scrollTop = log.scrollHeight;
 
-      pushHistory({ kind: "roll", expr: expr, total: total, rolls: rolls, mod: mod, time: timeStr });
+      if (skipHistory) return;
+
+      var item = { kind: "roll", expr: expr, total: total, rolls: rolls, mod: mod, time: timeStr };
+      if (tableContext) item.table_context = tableContext;
+      pushHistory(item);
     }
 
-    function addBestOf2Entry(expr, chosenTotal, leftRolls, rightRolls, leftIsWinner, leftLabel, rightLabel, mod, timeStr, mode) {
+    function addBestOf2Entry(expr, chosenTotal, leftRolls, rightRolls, leftIsWinner, leftLabel, rightLabel, mod, timeStr, mode, tableContext, skipHistory) {
       var entry = el("div", { class: "jdt-entry", title: expr });
       entry.appendChild(el("div", { class: "jdt-expr" }, expr));
 
@@ -318,12 +524,15 @@
       }
 
       entry.appendChild(result);
+      appendTableContext(entry, tableContext);
       entry.appendChild(el("div", { class: "jdt-details" }, timeStr));
 
       log.appendChild(entry);
       log.scrollTop = log.scrollHeight;
 
-      pushHistory({
+      if (skipHistory) return;
+
+      var item = {
         kind: "bestof2",
         expr: expr,
         chosen_total: chosenTotal,
@@ -335,24 +544,44 @@
         mode: mode,
         mod: mod,
         time: timeStr,
-      });
+      };
+      if (tableContext) item.table_context = tableContext;
+      pushHistory(item);
     }
 
     function showHelp() {
       addSystemEntry(
-        "Usage: 1d6, d4, 2d8+1",
-        "Click linked dice like 1d20+5 or bracket modifiers like [+1] (rolls d20+1). Commands: /help, /clear",
+        "Usage: 1d6, d4, 2d8+1, 2-in-6",
+        "Click linked dice like 1d20+5, chance like 2-in-6 (roll d6, 1-2 succeed), or bracket modifiers like [+1] (rolls d20+1). Clicking a table die (e.g. 1d12) shows the matching row (first column: single number or range like 3-12). Commands: /help, /clear",
         nowTime()
       );
     }
 
-    function doRoll(raw) {
+    function doRoll(raw, meta) {
+      meta = meta || {};
+      var anchor = meta.anchor || null;
       var p = parseExpr(raw);
       if (p.kind === "empty") return;
       if (p.kind === "help") return showHelp();
       if (p.kind === "clear") return clearStorageAndUi();
-      if (p.kind !== "roll" && p.kind !== "bestof2") {
-        addSystemEntry("Unrecognized roll: " + p.raw, "Try: 1d6, d4, 2d8+1 or /help", nowTime());
+      if (p.kind !== "roll" && p.kind !== "bestof2" && p.kind !== "chance") {
+        addSystemEntry("Unrecognized roll: " + p.raw, "Try: 1d6, d4, 2-in-6, 2d8+1 or /help", nowTime());
+        return;
+      }
+
+      if (p.kind === "chance") {
+        var chanceRoll = rollDice(1, p.sides);
+        var roll = chanceRoll.rolls[0];
+        var success = roll <= p.success_on;
+        addChanceEntry(
+          p.normalized,
+          roll,
+          p.success_on,
+          p.sides,
+          success,
+          nowTime(),
+          getLookupTableContext(anchor, roll)
+        );
         return;
       }
 
@@ -377,14 +606,15 @@
           rightLabel,
           p.mod,
           nowTime(),
-          mode
+          mode,
+          getLookupTableContext(anchor, chosenTotal)
         );
         return;
       }
 
       var r = rollDice(p.count, p.sides);
       var total = r.total + p.mod;
-      addRollEntry(p.normalized, total, r.rolls, p.mod, nowTime());
+      addRollEntry(p.normalized, total, r.rolls, p.mod, nowTime(), getLookupTableContext(anchor, total));
     }
 
     toggle.addEventListener("click", function () {
@@ -446,7 +676,7 @@
       if (!expr) return;
       e.preventDefault();
       setExpanded(true);
-      doRoll(expr);
+      doRoll(expr, { anchor: a });
     });
 
     // Public API

data/lib/jekyll/dice_tray/html_rewriter.rb

@@ -14,6 +14,14 @@ module Jekyll
         (?![A-Za-z0-9_])
       /x
 
+      CHANCE_RE = /
+        (?<![A-Za-z0-9_])
+        \d{1,3}
+        \s*-\s*in\s*-\s*
+        \d{1,4}
+        (?![A-Za-z0-9_])
+      /ix
+
       THAC0_WORD_RE = /THAC0/i
 
       BRACKET_INNER_RE = /
@@ -105,6 +113,17 @@ module Jekyll
           }
         end
 
+        text.to_enum(:scan, CHANCE_RE).each do
+          m = Regexp.last_match
+          matches << {
+            start: m.begin(0),
+            end: m.end(0),
+            expr: m[0].gsub(/\s+/, ""),
+            label_start: m.begin(0),
+            label_end: m.end(0),
+          }
+        end
+
         text.to_enum(:scan, THAC0_INLINE_RE).each do
           matches << bracket_mod_hit(text, Regexp.last_match)
         end

data/lib/jekyll/dice_tray/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module DiceTray
-    VERSION = "0.1.1"
+    VERSION = "0.3.0"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-dice-tray
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - directsun