koishi-plugin-cocoyyy-console 1.1.3-alpha.2 → 1.1.3-alpha.4

package/lib/index.js

@@ -2255,6 +2255,15 @@ async function questSituationPuzzle(content, config) {
     chatPrompt = [];
     chatHistory2 = [];
     clearGameTimeout();
+  } else {
+    clearGameTimeout();
+    setGameTimeout(async () => {
+      logger.info(`[SituationPuzzle Timeout]: 游戏已超时（${GAME_TIMEOUT_MINUTES}分钟），自动结束游戏`);
+      is_gaming = false;
+      chatPrompt = [];
+      chatHistory2 = [];
+      setGameTimeout(null);
+    }, GAME_TIMEOUT_MINUTES * 60 * 1e3);
   }
   return resp;
 }
@@ -2337,18 +2346,42 @@ function solve24(nodes) {
   return null;
 }
 __name(solve24, "solve24");
-function generate24Puzzle() {
+function calcDifficulty(expr) {
+  let score = 0;
+  if (expr.includes("/")) score += 2;
+  if (expr.includes("-")) score += 1;
+  let depth = 0;
+  let maxDepth = 0;
+  for (const ch of expr) {
+    if (ch === "(") {
+      depth++;
+      maxDepth = Math.max(maxDepth, depth);
+    } else if (ch === ")") {
+      depth--;
+    }
+  }
+  score += maxDepth;
+  if (expr.match(/\/\s*[1-9]/)) score += 1;
+  return score;
+}
+__name(calcDifficulty, "calcDifficulty");
+function generate24Puzzle(minScore = 6) {
   while (true) {
     const numbers = Array.from(
       { length: 4 },
       () => Math.floor(Math.random() * 13) + 1
     );
+    if (numbers.includes(1) && numbers.includes(2) && numbers.includes(3)) {
+      continue;
+    }
     const nodes = numbers.map((n) => ({
       value: n,
       expr: n.toString()
     }));
     const solution = solve24(nodes);
-    if (solution) {
+    if (!solution) continue;
+    const score = calcDifficulty(solution);
+    if (score >= minScore) {
       return {
         numbers,
         solution: `${solution} = 24`
@@ -2453,19 +2486,23 @@ function registerGameCommands(ctx, game_config, ai_config) {
       if (!is_at_bot(session)) return;
     }
     if (!now_game) return "未开始游戏";
-    if (now_game == gameList[0].command) return;
     if (is_thinking) return "正在思考，请耐心等待...";
     try {
       is_thinking = true;
       await session.send("正在结束游戏...");
       let resp_text = "";
       switch (now_game) {
+        case gameList[0].command:
+          await session.send("正在结束游戏...");
+          resp_text = await endSituationPuzzle(ai_config);
+          now_game = null;
+          return checkResp(resp_text);
         case gameList[1].command:
-          const resp = await getSolution();
+          resp_text = await getSolution();
           resp_text = `答案: ${getSolution()}`;
           now_game = null;
           clearGameTimeout();
-          return checkResp(resp);
+          return checkResp(resp_text);
         default:
           return;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cocoyyy-console",
   "description": "自用koishi插件，功能包含复读，记录黑历史，*人等",
-  "version": "1.1.3-alpha.2",
+  "version": "1.1.3-alpha.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [