@mauricode/token-derby 3.0.0 → 3.1.0

package/dist/bin.js

@@ -199,9 +199,31 @@ var HATS = [
   // Claim-only: awarded by an admin, never from a roll. Only the A channel cycles,
   // so the inset motif shifts colour while the cap body stays a static rust brown.
   // The body colour is kept out of the frame list so the motif never merges into it.
-  { id: "contributor_cap", name: "Contributor Cap", rarity: "legendary", width: 11, anchor_x: 23, rows: [".....Q.....", "....QQQ....", "...QQQQQ...", "..QAAAQQQ..", "..QQAQQQQ..", ".QQQAQAAQQ.", ".QQQAQAQAQ.", ".QQQQQAQAQ.", ".QQQQQAAQQ.", ".QQQQQQQQQ."], colors: { A: "#21138b", Q: "#6f2801" }, animation: { type: "cycle", frames: ["#FF8C42", "#E0457B", "#8B5CF6", "#3B82F6", "#22D3EE", "#34D399", "#A3E635", "#FBBF24"], fps: 6 }, rollable: false }
+  { id: "contributor_cap", name: "Contributor Cap", rarity: "legendary", width: 11, anchor_x: 23, rows: [".....Q.....", "....QQQ....", "...QQQQQ...", "..QAAAQQQ..", "..QQAQQQQ..", ".QQQAQAAQQ.", ".QQQAQAQAQ.", ".QQQQQAQAQ.", ".QQQQQAAQQ.", ".QQQQQQQQQ."], colors: { A: "#21138b", Q: "#6f2801" }, animation: { type: "cycle", frames: ["#FF8C42", "#E0457B", "#8B5CF6", "#3B82F6", "#22D3EE", "#34D399", "#A3E635", "#FBBF24"], fps: 6 }, rollable: false },
+  // ── LIMITED (6) ────────────────────────────────────────────────────────
+  // London series. Claim-only by construction: limited is absent from
+  // TIER_WEIGHTS, so no roll can reach this tier.
+  { id: "bearskin", name: "Bearskin", rarity: "limited", width: 11, anchor_x: 23, rows: ["...CCCCC.Q.", "..CAAAAACQ.", "..AAAAAACQ.", "..AAAAAAAQ.", "..AAAAAAA..", "..AAAAAAA..", "..AAAAAAA..", "..AAAAAAA..", "..DDDDDDD..", "..AAAAAAA.."], variants: [{ A: "#23232A", Q: "#C8102E", C: "#15151A", D: "#FFD300" }], rollable: false },
+  { id: "roundel_cap", name: "Roundel Cap", rarity: "limited", width: 11, anchor_x: 23, rows: ["...........", "..AAAAAA...", ".AAAAAAAA..", ".AAQQQQQAA.", ".AAQDDDQAA.", ".AFFFFFFFA.", ".AAQDDDQAA.", ".AAQQQQQAA.", ".AAAAAAAAA.", ".FFFFFFFFFF"], variants: [{ A: "#0B3B8C", Q: "#E32017", C: "#1050B8", D: "#F4F1E8", F: "#072A66" }], rollable: false },
+  { id: "union_topper", name: "Union Topper", rarity: "limited", width: 11, anchor_x: 23, rows: ["..CCCCCCC..", "..AQAAAQA..", "..AAQDQAA..", "..QQQDQQQ..", "..DDDDDDD..", "..QQQDQQQ..", "..AAQDQAA..", "..AQAAAQA..", ".CCCCCCCCC.", ".FFFFFFFFF."], variants: [{ A: "#0B2C6B", Q: "#F2F6FA", C: "#081F4D", D: "#C8102E", F: "#061838" }], rollable: false },
+  { id: "crown_jewels", name: "Crown Jewels", rarity: "limited", width: 11, anchor_x: 23, rows: ["...........", "....QQQ....", ".....Q.....", "..QQ.Q.QQ..", ".Q..QQQ..Q.", ".QCCCQCCCQ.", ".QCCCQCCCQ.", ".QQCCQCCQQ.", "..QQQQQQQ..", "..AAAAAAA.."], variants: [{ A: "#f5f5f5", Q: "#ffd700", C: "#5d0a8a" }], rollable: false },
+  { id: "black_cab", name: "Black Cab", rarity: "limited", width: 11, anchor_x: 22, rows: ["...........", "....CCC....", "..AAAAAA...", "..AQQAQA...", ".AAQQAQAAA.", ".AAAAAAAAAF", "AAAAAAAAAAF", "ADDAAAADDA.", ".DD....DD..", "..........."], variants: [{ A: "#141416", Q: "#8FB8D8", C: "#F5C518", D: "#3A3A40", F: "#D9DDE3" }], rollable: false },
+  { id: "london_bus", name: "London Bus", rarity: "limited", width: 11, anchor_x: 22, rows: ["...........", "...........", ".AAAAAAAAAA", "AAAAAAAAAAA", "ACCCACCCAAC", "AAAAAAAAACC", "ACCCACCCACC", "AAAAAAAAAAA", "AQQAAAAAQQA", ".QQ.....QQ."], variants: [{ A: "#e32402", Q: "#0d0c0c", C: "#dcaf09" }], rollable: false }
 ];
 
+// ../shared/dist/hat-shape.js
+function isAnimatedHat(hat) {
+  return "animation" in hat;
+}
+function hatColors(hat, variantIdx = 0) {
+  if (isAnimatedHat(hat))
+    return hat.colors;
+  return hat.variants[variantIdx] ?? hat.variants[0];
+}
+function channelColor(colors, ch) {
+  return colors[ch] ?? colors.A;
+}
+
 // ../shared/dist/series-transform.js
 var PACE_WINDOW_MS = 15 * 6e4;
 
@@ -433,7 +455,7 @@ function composeHatGrid(baseSprite, hat, variantIdx, horseColors) {
       grid[y + ext][x + horseOffsetX] = tagToColor(tag, horseColors);
     }
   }
-  const hatColors = hatColorsFor(hat, variantIdx);
+  const colors = hatColors(hat, variantIdx);
   for (let y = 0; y < hatH; y++) {
     const row = hat.rows[y];
     for (let x = 0; x < hatW; x++) {
@@ -441,7 +463,7 @@ function composeHatGrid(baseSprite, hat, variantIdx, horseColors) {
       if (ch === "." || ch === void 0) continue;
       const gx = hat.anchor_x + x + horseOffsetX;
       if (gx < 0 || gx >= canvasW) continue;
-      const color = ch === "A" ? hatColors.A : hatColors.Q ?? hatColors.A;
+      const color = channelColor(colors, ch);
       grid[y][gx] = color;
     }
   }
@@ -463,10 +485,6 @@ function tagToColor(tag, c) {
       return FIXED_COLORS.H;
   }
 }
-function hatColorsFor(hat, variantIdx) {
-  if (hat.rarity === "legendary") return hat.colors;
-  return hat.variants[variantIdx] ?? hat.variants[0];
-}
 
 // src/ui/half-blocks.ts
 var RESET = "\x1B[0m";
@@ -538,19 +556,19 @@ import { useEffect, useState } from "react";
 import { Box as Box2, Text as Text2 } from "ink";
 import { jsx as jsx2 } from "react/jsx-runtime";
 function AnimatedHorseSprite({ sprite, colors, hat }) {
-  const isLegendary = hat.rarity === "legendary";
-  const frames = isLegendary ? hat.animation.frames : [];
-  const fps = isLegendary ? hat.animation.fps : 1;
+  const animated = isAnimatedHat(hat);
+  const frames = animated ? hat.animation.frames : [];
+  const fps = animated ? hat.animation.fps : 1;
   const [idx, setIdx] = useState(0);
   useEffect(() => {
-    if (!isLegendary || frames.length <= 1) return;
+    if (!animated || frames.length <= 1) return;
     const interval = setInterval(
       () => setIdx((i) => (i + 1) % frames.length),
       Math.max(1, Math.round(1e3 / fps))
     );
     return () => clearInterval(interval);
-  }, [isLegendary, frames.length, fps]);
-  const renderedHat = isLegendary && frames[idx] ? { ...hat, colors: { ...hat.colors, A: frames[idx] } } : hat;
+  }, [animated, frames.length, fps]);
+  const renderedHat = animated && frames[idx] ? { ...hat, colors: { ...hat.colors, A: frames[idx] } } : hat;
   const { grid } = composeHatGrid(sprite, renderedHat, 0, colors);
   const lines = hexGridToHalfBlocks(grid);
   return /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", children: lines.map((line, i) => /* @__PURE__ */ jsx2(Text2, { children: line }, i)) });
@@ -739,7 +757,7 @@ function HorseCreator({
         "]"
       ] })
     ] }),
-    /* @__PURE__ */ jsx3(Box3, { marginBottom: 1, children: previewHatDef ? previewHatDef.rarity === "legendary" ? /* @__PURE__ */ jsx3(AnimatedHorseSprite, { sprite: MAIN_SPRITE, colors, hat: previewHatDef }) : /* @__PURE__ */ jsx3(HorseSprite, { sprite: MAIN_SPRITE, colors, hat: { hat: previewHatDef, variant: previewHat?.variant ?? 0 } }) : /* @__PURE__ */ jsx3(HorseSprite, { sprite: MAIN_SPRITE, colors }) }),
+    /* @__PURE__ */ jsx3(Box3, { marginBottom: 1, children: previewHatDef ? isAnimatedHat(previewHatDef) ? /* @__PURE__ */ jsx3(AnimatedHorseSprite, { sprite: MAIN_SPRITE, colors, hat: previewHatDef }) : /* @__PURE__ */ jsx3(HorseSprite, { sprite: MAIN_SPRITE, colors, hat: { hat: previewHatDef, variant: previewHat?.variant ?? 0 } }) : /* @__PURE__ */ jsx3(HorseSprite, { sprite: MAIN_SPRITE, colors }) }),
     /* @__PURE__ */ jsx3(Box3, { flexDirection: "column", children: rows.map((r, i) => {
       const cursor = i === rowIdx ? "\u25BA" : " ";
       if (r.kind === "color") {
@@ -785,8 +803,8 @@ function renderHatLabel(hats, hatChoice, initialEquipped) {
   if (!collected) return /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "?" });
   const hat = hatById(collected.id);
   const name = hat?.name ?? collected.id;
-  const variantSuffix = hat && hat.rarity !== "legendary" && collected.variant !== void 0 ? ` #${collected.variant + 1}` : "";
-  const rarityColor = hat ? hat.rarity === "legendary" ? "yellow" : hat.rarity === "epic" ? "magenta" : hat.rarity === "rare" ? "blue" : "gray" : "gray";
+  const variantSuffix = hat && !isAnimatedHat(hat) && collected.variant !== void 0 ? ` #${collected.variant + 1}` : "";
+  const rarityColor = hat ? hat.rarity === "limited" ? "magentaBright" : hat.rarity === "legendary" ? "yellow" : hat.rarity === "epic" ? "magenta" : hat.rarity === "rare" ? "blue" : "gray" : "gray";
   const equippedMark = initialEquipped === hatChoice ? " \u2713" : "";
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     name,
@@ -843,8 +861,8 @@ var HEARTBEAT_RETRY_DELAYS_MS = [1e3, 2e3, 4e3, 8e3, 15e3];
 // src/version.ts
 import { createRequire } from "module";
 function readVersion() {
-  if ("3.0.0".length > 0) {
-    return "3.0.0";
+  if ("3.1.0".length > 0) {
+    return "3.1.0";
   }
   try {
     const req = createRequire(import.meta.url);
@@ -3477,13 +3495,13 @@ import { useEffect as useEffect3, useState as useState7 } from "react";
 import { Box as Box10, Text as Text10 } from "ink";
 import { jsx as jsx10 } from "react/jsx-runtime";
 function HatSprite({ hat, variant, centerIn }) {
-  const colors = hatColorsFor2(hat, variant ?? 0);
+  const colors = hatColors(hat, variant ?? 0);
   const grid = makeHatGrid(hat, colors, centerIn);
   const lines = hexGridToHalfBlocks(grid);
   return /* @__PURE__ */ jsx10(Box10, { flexDirection: "column", children: lines.map((line, i) => /* @__PURE__ */ jsx10(Text10, { children: line }, i)) });
 }
 function AnimatedHatSprite({ hat, variant, centerIn }) {
-  if (hat.rarity !== "legendary") {
+  if (!isAnimatedHat(hat)) {
     return /* @__PURE__ */ jsx10(HatSprite, { hat, variant, centerIn });
   }
   const frames = hat.animation.frames;
@@ -3500,10 +3518,6 @@ function AnimatedHatSprite({ hat, variant, centerIn }) {
   const framed = { ...hat, colors: { ...hat.colors, A: frames[idx] } };
   return /* @__PURE__ */ jsx10(HatSprite, { hat: framed, variant, centerIn });
 }
-function hatColorsFor2(hat, variantIdx) {
-  if (hat.rarity === "legendary") return hat.colors;
-  return hat.variants[variantIdx] ?? hat.variants[0];
-}
 function makeHatGrid(hat, colors, centerIn) {
   const w = centerIn?.w ?? hat.width;
   const h = centerIn?.h ?? hat.rows.length;
@@ -3518,7 +3532,7 @@ function makeHatGrid(hat, colors, centerIn) {
       const gx = x + offX;
       const gy = y + offY;
       if (gx < 0 || gx >= w || gy < 0 || gy >= h) continue;
-      grid[gy][gx] = ch === "A" ? colors.A : colors.Q ?? colors.A;
+      grid[gy][gx] = channelColor(colors, ch);
     }
   }
   return grid;
@@ -3532,7 +3546,8 @@ var TIER_PALETTE = {
   common: ["#FFFFFF", "#DDDDDD", "#AAAAAA", "#9E9E9E"],
   rare: ["#42A5F5", "#1E88E5", "#90CAF9", "#0277BD"],
   epic: ["#AB47BC", "#8E24AA", "#CE93D8", "#6A1B9A"],
-  legendary: ["#FFD700", "#FF7F00", "#FF0000", "#FF00FF", "#00BFFF", "#7CFC00", "#8B00FF"]
+  legendary: ["#FFD700", "#FF7F00", "#FF0000", "#FF00FF", "#00BFFF", "#7CFC00", "#8B00FF"],
+  limited: ["#F472B6", "#EC4899", "#FF4FA3", "#FBCFE8", "#FFFFFF"]
 };
 var CONFETTI_CHARS = ["\u2726", "\u2727", "\u22C6", "\u2605", "\u2606", "\u2728", "*", "\u2022", "\u25C6", "\u25C7"];
 var SCENE_W = 32;
@@ -3635,7 +3650,7 @@ function ConfettiBurst({ tier }) {
 var CLOSED_HOLD_MS = 3e3;
 function RollReveal({ outcome, onDone }) {
   const isNoHat = outcome.kind === "no_hat";
-  const isLegendary = outcome.kind !== "no_hat" && outcome.hat.rarity === "legendary";
+  const isShowpiece = outcome.kind !== "no_hat" && (outcome.hat.rarity === "legendary" || outcome.hat.rarity === "limited");
   const [phase, setPhase] = useState8("closed");
   useEffect4(() => {
     const timers = [];
@@ -3647,10 +3662,10 @@ function RollReveal({ outcome, onDone }) {
     } else {
       timers.push(setTimeout(() => setPhase("burst"), CLOSED_HOLD_MS + 700));
       timers.push(setTimeout(() => setPhase("reveal"), CLOSED_HOLD_MS + 1650));
-      timers.push(setTimeout(onDone, CLOSED_HOLD_MS + (isLegendary ? 4650 : 2650)));
+      timers.push(setTimeout(onDone, CLOSED_HOLD_MS + (isShowpiece ? 4650 : 2650)));
     }
     return () => timers.forEach(clearTimeout);
-  }, [isNoHat, isLegendary, onDone]);
+  }, [isNoHat, isShowpiece, onDone]);
   if (phase === "closed") return /* @__PURE__ */ jsx11(GiftBox, { frame: BOX_CLOSED, color: BOX_COLOR });
   if (phase === "open1") return /* @__PURE__ */ jsx11(GiftBox, { frame: BOX_OPENING_1, color: BOX_COLOR });
   if (phase === "open2") return /* @__PURE__ */ jsx11(GiftBox, { frame: BOX_OPENING_2, color: BOX_COLOR });
@@ -3659,7 +3674,7 @@ function RollReveal({ outcome, onDone }) {
     return /* @__PURE__ */ jsx11(ConfettiBurst, { tier: outcome.hat.rarity });
   }
   if (outcome.kind === "no_hat") return /* @__PURE__ */ jsx11(GiftBox, { frame: BOX_EMPTY, color: BOX_COLOR });
-  return outcome.hat.rarity === "legendary" ? /* @__PURE__ */ jsx11(AnimatedHatSprite, { hat: outcome.hat, centerIn: { w: SCENE_W, h: SCENE_H } }) : /* @__PURE__ */ jsx11(HatSprite, { hat: outcome.hat, variant: outcome.variant, centerIn: { w: SCENE_W, h: SCENE_H } });
+  return isAnimatedHat(outcome.hat) ? /* @__PURE__ */ jsx11(AnimatedHatSprite, { hat: outcome.hat, centerIn: { w: SCENE_W, h: SCENE_H } }) : /* @__PURE__ */ jsx11(HatSprite, { hat: outcome.hat, variant: outcome.variant, centerIn: { w: SCENE_W, h: SCENE_H } });
 }
 
 // src/ui/reveal.ts
@@ -3750,7 +3765,7 @@ async function rollCommand() {
     await runReveal(outcome);
     if (result.result === "hat") {
       const hat = hatById(result.collected.id);
-      const variantSuffix = hat.rarity !== "legendary" && result.collected.variant !== void 0 ? ` #${result.collected.variant + 1}` : "";
+      const variantSuffix = !isAnimatedHat(hat) && result.collected.variant !== void 0 ? ` #${result.collected.variant + 1}` : "";
       console.log(`
 \u2728 ${hat.name}${variantSuffix} [${hat.rarity.toUpperCase()}]
 `);
@@ -3788,8 +3803,9 @@ async function claimCommand(token) {
     console.error("Usage: token-derby claim <token>");
     return 2;
   }
+  let probe;
   try {
-    await probeClaim(token);
+    probe = await probeClaim(token);
   } catch (e) {
     if (e instanceof ApiError) {
       console.error(`Error: ${e.code} ${e.message}`);
@@ -3811,7 +3827,9 @@ async function claimCommand(token) {
     console.error("No horses in your stable. Run `token-derby stable create` first.");
     return 1;
   }
-  console.log("\n\u{1F381} A cosmetic has been awarded to you.\n");
+  console.log(probe.entry_count > 1 ? `
+\u{1F381} A pack of ${probe.entry_count} cosmetics \u2014 one of them will be yours.
+` : "\n\u{1F381} A cosmetic has been awarded to you.\n");
   const picked = await new Promise((resolve) => {
     const app = render7(React15.createElement(HorsePicker, {
       horses: stable.horses,
@@ -3855,7 +3873,7 @@ async function claimCommand(token) {
   await runReveal(outcome);
   if (result.result === "hat") {
     const hat2 = hatById(result.collected.id);
-    const variantSuffix2 = hat2.rarity !== "legendary" && result.collected.variant !== void 0 ? ` #${result.collected.variant + 1}` : "";
+    const variantSuffix2 = !isAnimatedHat(hat2) && result.collected.variant !== void 0 ? ` #${result.collected.variant + 1}` : "";
     console.log(`
 \u2728 ${hat2.name}${variantSuffix2} [${hat2.rarity.toUpperCase()}]
 `);
@@ -3881,12 +3899,9 @@ ${picked.name} already has ${hat?.name ?? result.hat_id}${variantSuffix}. +${res
 
 // src/commands/org-join.ts
 async function orgJoinCommand(token) {
-  if (!token) {
-    console.error("Usage: token-derby organisation join <join-token>");
-    return 2;
-  }
+  const join_token = token?.trim();
   try {
-    const resp = await joinOrganisation({ join_token: token });
+    const resp = await joinOrganisation(join_token ? { join_token } : {});
     console.log(`Joined organisation: ${resp.org_name}`);
     return 0;
   } catch (e) {
@@ -3964,7 +3979,9 @@ Stable management:
   token-derby stable delete <name>        Remove a horse from your stable
 
 Organisations:
-  token-derby organisation join <token>   Join an organisation with a join token
+  token-derby organisation join [token]   Join an organisation with a join token,
+                                          or leave the token out to join by your
+                                          verified email domain
   token-derby web                         Open the web org manager (create orgs,
                                           manage schedules, webhooks, members)
 
@@ -4027,7 +4044,7 @@ async function main() {
     const sub = argv[1];
     if (sub === "join") return orgJoinCommand(argv[2]);
     console.error(`Organisation management has moved to the web: token-derby web`);
-    console.error(`The only CLI organisation command is: organisation join <token>`);
+    console.error(`The only CLI organisation command is: organisation join [token]`);
     return 2;
   }
   if (cmd === "create") {