koishi-plugin-mcdle 0.3.1 → 0.4.0

package/README.md

@@ -18,7 +18,7 @@ yarn add koishi-plugin-mcdle
 | --- | --- |
 | `mcdle` | 玩法与指令说明 |
 | `mcdle.猜 [名称]` | 用有效词条开局或猜测 |
-| `mcdle.裸猜 [开/关]` | 切换本群无前缀续猜 |
+| `mcdle.裸猜 [开/关]` | 切换本频道无前缀续猜 |
 | `mcdle.排行榜` | 群内战绩 |
 | `mcdle.词库` | 全部词条 |
 

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 import { Context, Schema, Session } from 'koishi';
 import { MobData, BlockData, ItemData } from './data';
 export declare const name = "mcdle";
-export declare const usage = "## \u4F7F\u7528\n\n\u53D1\u9001 `mcdle` \u67E5\u770B\u73A9\u6CD5\u4E0E\u5168\u90E8\u6307\u4EE4\u3002`mcdle.\u731C [\u540D\u79F0]` \u7528\u6709\u6548\u8BCD\u6761\u5F00\u5C40\u6216\u731C\u6D4B\u3002\u9996\u6B21\u731C\u6D4B\u7684\u8BCD\u6761\u51B3\u5B9A\u751F\u7269\u3001\u7269\u54C1\u6216\u65B9\u5757\u6A21\u5F0F\uFF0C\u7CFB\u7EDF\u518D\u4ECE\u540C\u7C7B\u8BCD\u5E93\u4E2D\u62BD\u53D6\u7B54\u6848\u3002\n\n## \u63D0\u793A\n\n| \u7B26\u53F7 | \u542B\u4E49 |\n| --- | --- |\n| \uD83D\uDFE9 | \u5B8C\u5168\u5339\u914D |\n| \uD83D\uDFE8 | \u90E8\u5206\u5339\u914D |\n| \uD83D\uDFE5 | \u4E0D\u5339\u914D |\n| \uD83D\uDFE5\u2B06\uFE0F / \uD83D\uDFE5\u2B07\uFE0F | \u7B54\u6848\u66F4\u5927 / \u66F4\u5C0F |\n\n## \u6307\u4EE4\n\n| \u6307\u4EE4 | \u8BF4\u660E |\n| --- | --- |\n| `mcdle` | \u73A9\u6CD5\u4E0E\u6307\u4EE4\u8BF4\u660E |\n| `mcdle.\u731C [\u540D\u79F0]` | \u7528\u6709\u6548\u8BCD\u6761\u5F00\u5C40\u6216\u731C\u6D4B |\n| `mcdle.\u88F8\u731C [\u5F00/\u5173]` | \u5F00\u5173\u672C\u9891\u9053\u7684\u65E0\u524D\u7F00\u7EED\u731C |\n| `mcdle.\u6392\u884C\u699C` | \u7FA4\u5185\u6218\u7EE9 |\n| `mcdle.\u8BCD\u5E93` | \u5168\u90E8\u8BCD\u6761 |";
+export declare const usage = "## \u4F7F\u7528\n\n\u53D1\u9001 `mcdle` \u67E5\u770B\u73A9\u6CD5\u4E0E\u5168\u90E8\u6307\u4EE4\u3002`mcdle.\u731C [\u540D\u79F0]` \u7528\u6709\u6548\u8BCD\u6761\u5F00\u5C40\u6216\u731C\u6D4B\u3002\u9996\u6B21\u731C\u6D4B\u7684\u8BCD\u6761\u51B3\u5B9A\u751F\u7269\u3001\u7269\u54C1\u6216\u65B9\u5757\u6A21\u5F0F\uFF0C\u7CFB\u7EDF\u518D\u4ECE\u540C\u7C7B\u8BCD\u5E93\u4E2D\u62BD\u53D6\u7B54\u6848\u3002\n\n## \u6307\u4EE4\n\n| \u6307\u4EE4 | \u8BF4\u660E |\n| --- | --- |\n| `mcdle` | \u73A9\u6CD5\u4E0E\u6307\u4EE4\u8BF4\u660E |\n| `mcdle.\u731C [\u540D\u79F0]` | \u7528\u6709\u6548\u8BCD\u6761\u5F00\u5C40\u6216\u731C\u6D4B |\n| `mcdle.\u88F8\u731C [\u5F00/\u5173]` | \u5F00\u5173\u672C\u9891\u9053\u7684\u65E0\u524D\u7F00\u7EED\u731C |\n| `mcdle.\u6392\u884C\u699C` | \u7FA4\u5185\u6218\u7EE9 |\n| `mcdle.\u8BCD\u5E93` | \u5168\u90E8\u8BCD\u6761 |\n\n## \u63D0\u793A\n\n| \u7B26\u53F7 | \u542B\u4E49 |\n| --- | --- |\n| \uD83D\uDFE9 | \u5B8C\u5168\u5339\u914D |\n| \uD83D\uDFE8 | \u90E8\u5206\u5339\u914D |\n| \uD83D\uDFE5 | \u4E0D\u5339\u914D |\n| \uD83D\uDFE5\u2B06\uFE0F / \uD83D\uDFE5\u2B07\uFE0F | \u7B54\u6848\u66F4\u5927 / \u66F4\u5C0F |";
 export declare const inject: {
     required: string[];
     optional: string[];
@@ -9,7 +9,7 @@ export declare const inject: {
 export interface Config {
     atReply: boolean;
     quoteReply: boolean;
-    isEnableMiddleware: boolean;
+    enableDirectInput: boolean;
     addStatusTextAfterEmoji: boolean;
     maxRank: number;
     dailyPlayLimit: number;

package/lib/index.js

@@ -15869,7 +15869,7 @@ function winCard(o) {
         <div class="sec-t"><span>答 案 档 案</span></div>
         <div class="attrs">${attrs}</div>
       </div>
-    </div>` + noteRow("mcdle.排行榜 查看战绩");
+    </div>` + noteRow("mcdle.排行榜 查看累计战绩");
   return shell(body, { accent: meta.accent, width: 720 });
 }
 __name(winCard, "winCard");
@@ -15921,14 +15921,14 @@ function helpCard(dailyLimit, allowRepeat, middleware) {
           <div class="row"><span class="cmd">mcdle.猜 [名称]</span><span class="m">开始一局，或提交猜测</span></div>
           <div class="row"><span class="cmd">mcdle.猜</span><span class="m">局中直接使用可回看当前棋盘</span></div>
           <div class="row"><span class="cmd">mcdle.裸猜 [开/关]</span><span class="m">临时切换本频道的无前缀续猜</span></div>
-          <div class="row"><span class="cmd">mcdle.排行榜</span><span class="m">查看群内战绩</span></div>
+          <div class="row"><span class="cmd">mcdle.排行榜</span><span class="m">查看累计战绩</span></div>
           <div class="row"><span class="cmd">mcdle.词库</span><span class="m">查阅全部候选词条</span></div>
         </div></div>
       </div>
       <div class="sec">
         <div class="sec-t"><span>规 则 细 则</span></div>
         <div class="panel"><div class="rows">
-          <div class="row"><span class="k">·</span><span>每个群每日可开始 <b>${dailyLimit}</b> 局，跨零点重置。</span></div>
+          <div class="row"><span class="k">·</span><span>每个频道每日可开始 <b>${dailyLimit}</b> 局，跨零点重置。</span></div>
           <div class="row"><span class="k">·</span><span>${allowRepeat ? "允许重复提交已经猜过的词条。" : "同一局内不能重复提交已猜过的词条。"}</span></div>
           <div class="row"><span class="k">·</span><span>${middleware ? "本频道裸猜已开启：只接受当前模式词库中的完整纯文本词条。" : "本频道裸猜已停用：续猜请用完整指令。"}</span></div>
           <div class="row"><span class="k">·</span><span>空指令与词库外名称不会开启新局或消耗额度。</span></div>
@@ -15942,7 +15942,7 @@ __name(helpCard, "helpCard");
 function rankCard(entries, shown) {
   if (!entries.length) {
     const body2 = header(null, "排行榜", { big: "0", cap: "上榜人数" }) + `<div class="pad"><div class="empty">${px("trophy", 44)}
-        榜单还空着<br><span style="font-size:12px">用 <span class="cmd">mcdle.猜 苦力怕</span> 开出第一局，成为榜首</span></div></div>`;
+        排行榜还空着<br><span style="font-size:12px">用 <span class="cmd">mcdle.猜 苦力怕</span> 开出第一局，成为榜首</span></div></div>`;
     return shell(body2, { accent: accentOf(90), width: 560 });
   }
   const max = Math.max(...entries.map((e) => e.total), 1);
@@ -15961,7 +15961,7 @@ function rankCard(entries, shown) {
         <div class="tot"><div class="n">${e.total}</div><div class="c">猜 中</div></div>
       </div>`;
   }).join("");
-  const body = header(null, "群内战绩 · 按累计猜中排序", { big: `${shown}`, cap: "上榜人数" }) + `<div class="pad"><div class="rank">${rows}</div></div>` + noteRow("每猜中一局记一分，按模式分别计数");
+  const body = header(null, "累计战绩 · 按累计猜中排序", { big: `${shown}`, cap: "上榜人数" }) + `<div class="pad"><div class="rank">${rows}</div></div>` + noteRow("每猜中一局记一分，按模式分别计数");
   return shell(body, { accent: accentOf(90), width: 560 });
 }
 __name(rankCard, "rankCard");
@@ -15972,15 +15972,6 @@ var usage = `## 使用
 
 发送 \`mcdle\` 查看玩法与全部指令。\`mcdle.猜 [名称]\` 用有效词条开局或猜测。首次猜测的词条决定生物、物品或方块模式，系统再从同类词库中抽取答案。
 
-## 提示
-
-| 符号 | 含义 |
-| --- | --- |
-| 🟩 | 完全匹配 |
-| 🟨 | 部分匹配 |
-| 🟥 | 不匹配 |
-| 🟥⬆️ / 🟥⬇️ | 答案更大 / 更小 |
-
 ## 指令
 
 | 指令 | 说明 |
@@ -15989,12 +15980,21 @@ var usage = `## 使用
 | \`mcdle.猜 [名称]\` | 用有效词条开局或猜测 |
 | \`mcdle.裸猜 [开/关]\` | 开关本频道的无前缀续猜 |
 | \`mcdle.排行榜\` | 群内战绩 |
-| \`mcdle.词库\` | 全部词条 |`;
+| \`mcdle.词库\` | 全部词条 |
+
+## 提示
+
+| 符号 | 含义 |
+| --- | --- |
+| 🟩 | 完全匹配 |
+| 🟨 | 部分匹配 |
+| 🟥 | 不匹配 |
+| 🟥⬆️ / 🟥⬇️ | 答案更大 / 更小 |`;
 var inject = { required: ["database"], optional: ["puppeteer"] };
 var Config = import_koishi.Schema.object({
   atReply: import_koishi.Schema.boolean().default(false).description("回复时 @ 用户。"),
   quoteReply: import_koishi.Schema.boolean().default(false).description("回复时引用消息。"),
-  isEnableMiddleware: import_koishi.Schema.boolean().default(false).description("对局进行中时，直接发送词条名称即可续猜，无需指令前缀。各频道可用「mcdle.裸猜」临时切换。"),
+  enableDirectInput: import_koishi.Schema.boolean().default(false).description("对局中直接发送词条名称即可续猜，无需指令前缀。各频道可用「mcdle.裸猜」临时切换。"),
   addStatusTextAfterEmoji: import_koishi.Schema.boolean().default(true).description("在状态方块后补一段文字说明。"),
   maxRank: import_koishi.Schema.number().default(10).min(0).description("排行榜最多显示的人数。"),
   dailyPlayLimit: import_koishi.Schema.number().default(1).min(1).description("每个频道每日可开始的局数，跨零点重置。"),
@@ -16108,7 +16108,7 @@ function apply(ctx, cfg) {
   );
   const logger = ctx.logger("mcdle");
   const middlewareOverrides = /* @__PURE__ */ new Map();
-  const middlewareOn = /* @__PURE__ */ __name((channelId) => channelId === void 0 ? cfg.isEnableMiddleware : middlewareOverrides.get(channelId) ?? cfg.isEnableMiddleware, "middlewareOn");
+  const middlewareOn = /* @__PURE__ */ __name((channelId) => channelId === void 0 ? cfg.enableDirectInput : middlewareOverrides.get(channelId) ?? cfg.enableDirectInput, "middlewareOn");
   ctx.middleware(async (session, next) => {
     if (!session.channelId || !middlewareOn(session.channelId)) return await next();
     const guess = getMiddlewareGuess(session);
@@ -16130,11 +16130,11 @@ function apply(ctx, cfg) {
   ctx.command("mcdle.猜 [guess:string]", "开局或提交一次猜测").action(async ({ session }, guess) => {
     await c(session, guess?.trim());
   });
-  ctx.command("mcdle.排行榜", "查看本频道战绩排行榜").action(async ({ session }) => phb(session));
+  ctx.command("mcdle.排行榜", "查看累计猜中排行榜").action(async ({ session }) => phb(session));
   ctx.command("mcdle.词库", "查阅全部候选词条").action(async ({ session }) => ck(session));
   ctx.command("mcdle.裸猜 [state:string]", "开关本频道的无前缀续猜").usage("例：mcdle.裸猜（切换）· mcdle.裸猜 开 · mcdle.裸猜 关 · mcdle.裸猜 状态").action(async ({ session }, state) => {
     const result = resolveMiddlewareSwitch(
-      cfg.isEnableMiddleware,
+      cfg.enableDirectInput,
       session.channelId === void 0 ? void 0 : middlewareOverrides.get(session.channelId),
       state
     );
@@ -16150,10 +16150,9 @@ function apply(ctx, cfg) {
       middlewareSwitchText(result.on, result.override !== void 0, result.reverted)
     );
   });
-  const RULE = "────────────";
   function textCard(title, ...sections) {
     const body = sections.map((s) => Array.isArray(s) ? s.filter(Boolean).join("\n") : s).filter((s) => !!s && !!s.trim()).join("\n\n");
-    return [`▍${title}`, RULE, body].filter(Boolean).join("\n");
+    return [`▍${title}`, body].filter(Boolean).join("\n");
   }
   __name(textCard, "textCard");
   function modeName(mode) {
@@ -16216,7 +16215,7 @@ function apply(ctx, cfg) {
       `${meta.tagline}，从 ${meta.total} 个候选中锁定唯一答案。`,
       `可推理属性：${FIELDS[mode].map((k) => keyMap[k] || k).join(" / ")}`,
       [
-        channelOn ? `直接发送词库中的${meta.name}名称，或使用 mcdle.猜 [名称]` : `mcdle.猜 [名称]　提交一次猜测`,
+        channelOn ? `直接发送词库中的${meta.name}名称，或发送「mcdle.猜 [名称]」` : `mcdle.猜 [名称]　提交一次猜测`,
         `今日进度 ${played}/${cfg.dailyPlayLimit}`
       ]
     );
@@ -16228,7 +16227,7 @@ function apply(ctx, cfg) {
       (k) => `${fieldLabel(k)} ${displayValues(k, o.answer[k]).map((v) => v.text).join("、")}`
     ).join(" · ");
     return textCard(
-      "猜中了",
+      "🏆 猜中了",
       wikiImage(o.answer),
       `答案　${o.answer.chinese_title}${o.answer.title ? ` ${o.answer.title}` : ""}`,
       [
@@ -16284,13 +16283,13 @@ function apply(ctx, cfg) {
   }
   __name(mcdle, "mcdle");
   function middlewareSwitchText(on, temporary, reverted) {
-    const mark = on ? "✅" : "⛔";
+    const mark = "✅";
     const state = on ? "开启" : "停用";
-    const config = cfg.isEnableMiddleware ? "开启" : "停用";
+    const config = cfg.enableDirectInput ? "开启" : "停用";
     if (!temporary) {
       return `${mark} 裸猜续局 · ${reverted ? "已复原，" : ""}跟随插件配置（${state}）`;
     }
-    const hint = on ? "仅在已有对局中，直接发送当前模式的完整词条名称才会响应" : "续猜请使用 mcdle.猜 [名称]";
+    const hint = on ? "仅在已有对局中，直接发送当前模式的完整词条名称才会响应" : "续猜请发送「mcdle.猜 [名称]」";
     return [
       `${mark} 裸猜续局 · 本频道临时${state}（插件配置：${config}）`,
       `${hint}；再次发送 mcdle.裸猜 可复原`
@@ -16306,7 +16305,6 @@ function apply(ctx, cfg) {
     if (["red", "onebot"].includes(session.platform)) {
       const allContentNodes = sections.map(
         ([title, words]) => (0, import_koishi.h)("message", { userId: session.userId }, `▍${title}
-${RULE}
 ${words.join(" ")}`)
       );
       try {
@@ -16319,7 +16317,6 @@ ${words.join(" ")}`)
     await sendMsg(
       session,
       sections.map(([title, words]) => `▍${title}
-${RULE}
 ${words.join(" ")}`).join("\n\n")
     );
   }
@@ -16381,7 +16378,22 @@ ${words.join(" ")}`).join("\n\n")
     return candidates[Math.floor(Math.random() * candidates.length)];
   }
   __name(pickAnswer, "pickAnswer");
+  const busyChannels = /* @__PURE__ */ new Set();
   async function c(session, guess, allowStart = true) {
+    const channelId = session.channelId;
+    if (channelId && busyChannels.has(channelId)) {
+      await sendMsg(session, "⏳ 上一次猜测还在处理，稍等一下。");
+      return true;
+    }
+    if (channelId) busyChannels.add(channelId);
+    try {
+      return await guessOnce(session, guess, allowStart);
+    } finally {
+      if (channelId) busyChannels.delete(channelId);
+    }
+  }
+  __name(c, "c");
+  async function guessOnce(session, guess, allowStart = true) {
     const record = await ensureRecord(session);
     const now = /* @__PURE__ */ new Date();
     await resetDailyIfNeeded(session, record, now);
@@ -16420,7 +16432,7 @@ ${words.join(" ")}`).join("\n\n")
     }
     return true;
   }
-  __name(c, "c");
+  __name(guessOnce, "guessOnce");
   function restoreGuessHistory(record) {
     const mode = record.gameMode;
     if (!mode || !MODES[mode] || !record.answer) return null;
@@ -16452,8 +16464,8 @@ ${words.join(" ")}`).join("\n\n")
     await sendMsg(
       session,
       textCard(
-        "检测到旧版本遗留的一局",
-        "这局是在旧版本下开始的，已有的猜测记录没法用新版图片牌面渲染。",
+        "❌ 检测到旧版本遗留的一局",
+        "这一局是在旧版本下开始的，已有的猜测记录没法用新版图片牌面渲染。",
         answerTitle ? `「${answerTitle}」已退回词库，之后仍有机会被抽到。` : null,
         allowStart ? "这一局已作废并退还今日额度，马上按这次的完整指令重新开局。" : "这一局已作废并退还今日额度，发送「mcdle.猜 [名称]」重新开局。"
       )
@@ -16551,7 +16563,7 @@ ${words.join(" ")}`).join("\n\n")
       );
       await sendMsg(
         session,
-        textCard("⚠️ 这一局的牌面已经无法还原", "已经把它收掉了。发送「mcdle.猜 [名称]」重新开一局。")
+        textCard("❌ 这一局的牌面已经无法还原", "已经把它收掉了。发送「mcdle.猜 [名称]」重新开一局。")
       );
       return;
     }
@@ -16687,7 +16699,7 @@ ${words.join(" ")}`).join("\n\n")
         "mcdle.词库　查阅全部候选词条"
       ],
       [
-        `每个群每日 ${cfg.dailyPlayLimit} 局，跨零点重置。`,
+        `每个频道每日 ${cfg.dailyPlayLimit} 局，跨零点重置。`,
         cfg.allowRepeatedGuesses ? "允许重复提交已经猜过的词条。" : "同一局内不能重复提交已猜过的词条。",
         channelOn ? "本频道裸猜已开启：仅已有对局、纯文本完整词条、且符合当前模式时响应。" : "本频道裸猜已停用：续猜请用完整指令。",
         "空指令和词库外名称不会开启新局或消耗额度。",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-mcdle",
   "description": "Koishi 的 Minecraft 猜词游戏插件。",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [