koishi-plugin-cchess 2.0.0 → 2.1.0

package/README.md

@@ -19,7 +19,7 @@ yarn add koishi-plugin-cchess
 | `cchess.悔棋 [同意/拒绝]` | 请求悔棋，也可直接回复同意或拒绝表决 |
 | `cchess.认输` | 认输 |
 | `cchess.结束` | 强制结束棋局 |
-| `cchess.棋绩 [@某人/榜] [胜场/输场] [人数]` | 查询战绩与排行榜 |
+| `cchess.战绩 [@某人/榜] [胜场/输场] [人数]` | 查询战绩与排行榜 |
 | `cchess.查看云库残局 [DTM/DTC]` | 云库残局统计 |
 
 发送 `cchess.开始` 即入座，双方就位后自动开局，无需单独的加入与退出指令。

package/lib/index.d.ts

@@ -7,6 +7,7 @@ export interface Config {
     pieceSkin: string;
     defaultEngineThinkingDepth: number;
     allowFreePieceMovementInHumanMachineMode: boolean;
+    enableDirectInput: boolean;
     defaultMaxLeaderboardEntries: number;
     retractDelay: number;
     isChessImageWithOutlineEnabled: boolean;

package/lib/index.js

@@ -268,6 +268,7 @@ var Config = import_koishi.Schema.object({
   boardSkin: import_koishi.Schema.union(boardSkins).default("象甲2023棋盘").description(`棋盘皮肤。`),
   pieceSkin: import_koishi.Schema.union(pieceSkins).default("象甲棋子").description(`棋子皮肤。`),
   allowFreePieceMovementInHumanMachineMode: import_koishi.Schema.boolean().default(false).description(`人机模式下，允许所有人自由移动棋子，开启后可以不入座直接开始人机对局。`),
+  enableDirectInput: import_koishi.Schema.boolean().default(true).description(`对局中直接发送棋谱或「同意」「拒绝」即可落子与应答，无需指令前缀。`),
   defaultEngineThinkingDepth: import_koishi.Schema.number().min(0).max(100).default(10).description(`默认引擎思考深度，越高 AI 棋力越强，耗时也越长（小于 1 时按 1 计算）。由于 Nodejs 不支持 SIMD，所以不建议设置过高。`),
   defaultMaxLeaderboardEntries: import_koishi.Schema.number().min(0).default(10).description(`排行榜默认显示的人数。`),
   retractDelay: import_koishi.Schema.number().min(0).default(0).description(`自动撤回延迟（秒），0 表示不撤回。`),
@@ -275,7 +276,6 @@ var Config = import_koishi.Schema.object({
   imageType: import_koishi.Schema.union(["png", "jpeg", "webp"]).default("png").description(`发送的图片格式。`),
   isChessImageWithOutlineEnabled: import_koishi.Schema.boolean().default(true).description(`给棋盘图片加上坐标外框。关闭后出图明显更快，但没有外框，玩起来可能会比较累。`)
 });
-var RULE = "━━━━━━━━━━━━━━";
 var SIDE_ICONS = { 红方: "🔴", 黑方: "⚫" };
 var MEDALS = ["🥇", "🥈", "🥉"];
 function withSideIcon(side) {
@@ -292,11 +292,11 @@ function isLine(line) {
 __name(isLine, "isLine");
 function panel(options) {
   const { icon = "♟️", title, at, body = [], tips = [], image } = options;
-  const lines = [`${icon} ${title}`, RULE];
+  const lines = [`${icon} ${title}`];
   if (at) lines.push(`@${at}`);
   lines.push(...body.filter(isLine));
   const validTips = tips.filter(isLine).filter(Boolean);
-  if (validTips.length) lines.push(RULE, ...validTips);
+  if (validTips.length) lines.push(...validTips);
   if (image) lines.push(image);
   return lines.join("\n");
 }
@@ -430,6 +430,7 @@ function apply(ctx, config) {
   }
   __name(matchRegretDecision, "matchRegretDecision");
   ctx.middleware(async (session, next) => {
+    if (!config.enableDirectInput) return next();
     const { channelId, content, userId } = session;
     if (!channelId || !content) return next();
     const decision = matchRegretDecision(content);
@@ -441,6 +442,7 @@ function apply(ctx, config) {
     await resolveRegret(session, decision === "agree");
   });
   ctx.middleware(async (session, next) => {
+    if (!config.enableDirectInput) return next();
     const { channelId, content, userId, username } = session;
     if (!channelId || !content) return next();
     const moveOperation = content.trim();
@@ -551,7 +553,7 @@ function apply(ctx, config) {
     const gameRecord = await getGameRecord(channelId);
     if (!gameRecord.isStarted) {
       return await sendMessage(session, panel({
-        icon: "⚠️",
+        icon: "💡",
         title: "棋盘尚且空空",
         at: username,
         body: ["当前没有进行中的对局，无需收拾残局。"],
@@ -577,7 +579,7 @@ function apply(ctx, config) {
     if (busyChannels.has(channelId)) {
       return await sendMessage(session, panel({
         icon: "⏳",
-        title: "棋局正在推演",
+        title: "对局正在推演",
         at: username,
         body: ["上一着棋尚未结算，稍候片刻。"]
       }));
@@ -593,7 +595,7 @@ function apply(ctx, config) {
           icon: "⏳",
           title: "悔棋请求待决",
           at: username,
-          body: ["对方的悔棋请求尚未答复，棋局暂歇。"],
+          body: ["对方的悔棋请求尚未答复，对局暂歇。"],
           tips: ["对方回复「同意」或「拒绝」即可表决"]
         }));
       }
@@ -727,8 +729,8 @@ function apply(ctx, config) {
     }
     if (gameRecord.moveList.length < 1) {
       return await sendMessage(session, panel({
-        icon: "⚠️",
-        title: "棋局初开",
+        icon: "💡",
+        title: "对局初开",
         at: username,
         body: ["一子未落，无悔可言。"]
       }));
@@ -755,12 +757,23 @@ function apply(ctx, config) {
       }));
     }
     await ctx.database.set("cchess_game_records", { channelId }, { isRegretRequest: true });
+    ctx.setTimeout(async () => {
+      const current = await getGameRecord(channelId);
+      if (!current?.isRegretRequest) return;
+      await ctx.database.set("cchess_game_records", { channelId }, { isRegretRequest: false });
+      await sendMessage(session, panel({
+        icon: "⏳",
+        title: "悔棋请求已作罢",
+        body: ["等了 30 秒没有等到答复，请求自动撤回。"],
+        tips: ["发送「cchess.悔棋」可以再提一次。"]
+      }));
+    }, 30 * 1e3);
     return await sendMessage(session, panel({
       icon: "⏳",
       title: "悔棋请求已送出",
       at: username,
       body: [field("等待答复", withSideIcon(sideString))],
-      tips: ["对方回复「同意」或「拒绝」即可表决"]
+      tips: ["对方回复「同意」或「拒绝」即可表决；30 秒等不到答复会自动作废"]
     }));
   });
   ctx.command("cchess.认输", "认输并结束对局").action(async ({ session }) => {
@@ -823,7 +836,7 @@ function apply(ctx, config) {
         session,
         byLose ? "lose" : "win",
         byLose ? "总输场排行榜" : "总胜场排行榜",
-        byLose ? "🍂" : "🏆",
+        "📋",
         size
       );
     }
@@ -842,7 +855,7 @@ function apply(ctx, config) {
         win: 0
       });
       return await sendMessage(session, panel({
-        icon: "🔍",
+        icon: "📋",
         title: "棋士档案",
         at: session.username,
         body: [field("查询对象", username), "尚无对局记录，静待首战。"],
@@ -853,7 +866,7 @@ function apply(ctx, config) {
     const total = win + lose;
     const winRate = total === 0 ? "—" : `${(win / total * 100).toFixed(1)}%`;
     return await sendMessage(session, panel({
-      icon: "🔍",
+      icon: "📋",
       title: "棋士档案",
       at: session.username,
       body: [
@@ -867,8 +880,8 @@ function apply(ctx, config) {
   });
   function notStartedPanel(username) {
     return panel({
-      icon: "⚠️",
-      title: "棋局尚未开始",
+      icon: "💡",
+      title: "对局尚未开始",
       at: username,
       body: ["当前频道还没有进行中的对局。"],
       tips: ["「cchess.开始」入座并对弈", "「cchess.开始 人机」挑战皮卡鱼"]
@@ -877,8 +890,8 @@ function apply(ctx, config) {
   __name(notStartedPanel, "notStartedPanel");
   function alreadyStartedPanel(username) {
     return panel({
-      icon: "⚠️",
-      title: "棋局已经开战",
+      icon: "💡",
+      title: "对局已经开战",
       at: username,
       body: ["本局尚未结束，不必重开。"],
       tips: ["「cchess.认输」结束本局", "「cchess.结束」强制清盘"]
@@ -887,7 +900,7 @@ function apply(ctx, config) {
   __name(alreadyStartedPanel, "alreadyStartedPanel");
   function notJoinedPanel(username) {
     return panel({
-      icon: "⚠️",
+      icon: "💡",
       title: "你尚未入座",
       at: username,
       body: ["先入座，才好落子。"],
@@ -906,7 +919,7 @@ function apply(ctx, config) {
   __name(analyzingPanel, "analyzingPanel");
   function notYourTurnPanel(username, yourSide, currentSide) {
     return panel({
-      icon: "⚠️",
+      icon: "⏳",
       title: "尚未轮到你",
       at: username,
       body: [field("你的阵营", withSideIcon(yourSide)), field("当前轮走", withSideIcon(currentSide))],
@@ -916,7 +929,7 @@ function apply(ctx, config) {
   __name(notYourTurnPanel, "notYourTurnPanel");
   function invalidMovePanel(username, reason) {
     return panel({
-      icon: "❌",
+      icon: "⚠️",
       title: reason,
       at: username,
       body: ["请确认着法是否合乎棋规。"],
@@ -937,7 +950,7 @@ function apply(ctx, config) {
   function invalidLeaderboardSizePanel(username) {
     return panel({
       icon: "⚠️",
-      title: "榜单人数有误",
+      title: "排行榜人数有误",
       at: username,
       body: ["请输入不小于 0 的整数。"],
       tips: ["例如：cchess.战绩 榜 10"]
@@ -945,7 +958,12 @@ function apply(ctx, config) {
   }
   __name(invalidLeaderboardSizePanel, "invalidLeaderboardSizePanel");
   async function renderBoard(channelId) {
-    return import_koishi.h.image(await drawChessBoard(channelId), imageMimeType).toString();
+    try {
+      return import_koishi.h.image(await drawChessBoard(channelId), imageMimeType).toString();
+    } catch (error) {
+      logger.warn("棋盘渲染失败，本次只发文本：%s", error.message);
+      return void 0;
+    }
   }
   __name(renderBoard, "renderBoard");
   async function settleVictory(channelId, winSide, loseSide, title, options = {}) {
@@ -1044,7 +1062,7 @@ function apply(ctx, config) {
         icon: "⚠️",
         title: "悔棋被拒",
         at: username,
-        body: ["落子无悔，棋局继续。"],
+        body: ["落子无悔，对局继续。"],
         image: await renderBoard(channelId)
       }));
     }
@@ -1640,15 +1658,15 @@ function apply(ctx, config) {
     for (let col = 0; col < 9; col++) {
       const x = columnAt(isFlipBoard ? 8 - col : col);
       label(FILES[col], x, 30, 22, FRAME.onSurfaceVariant);
-      label(String(col + 1), x, 64, 22, FRAME.outline);
+      label(String(col + 1), x, 64, 22, FRAME.onSurfaceVariant);
       label(RED_FILES[col], x, FRAME_HEIGHT - 62, 24, FRAME.onSurfaceVariant);
-      label(FILES[col], x, FRAME_HEIGHT - 26, 22, FRAME.outline);
+      label(FILES[col], x, FRAME_HEIGHT - 26, 22, FRAME.onSurfaceVariant);
     }
     for (let row = 0; row < 10; row++) {
       const y = rowAt(isFlipBoard ? 9 - row : row);
       const text = String(9 - row);
-      label(text, 19, y, 22, FRAME.outline);
-      label(text, FRAME_WIDTH - 19, y, 22, FRAME.outline);
+      label(text, 19, y, 22, FRAME.onSurfaceVariant);
+      label(text, FRAME_WIDTH - 19, y, 22, FRAME.onSurfaceVariant);
     }
     return canvas.toBuffer(imageMimeType);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cchess",
   "description": "Koishi 的中国象棋插件。",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [