koishi-plugin-maple-dice-v2 0.0.5 → 0.0.7

package/lib/index.js

@@ -34,14 +34,30 @@ var DiceRoller = class {
     __name(this, "DiceRoller");
   }
   static parseDice(expression) {
-    if (!expression) {
+    if (!expression || expression.trim() === "") {
       expression = "1d100";
     }
     expression = expression.replace(/\s+/g, "").toLowerCase();
     const diceRegex = /^(\d+)?d(\d+)(?:([+\-*/])(\d+))?$/;
-    const match = expression.match(diceRegex);
+    let match = expression.match(diceRegex);
     if (!match) {
-      throw new Error("无效的掷骰表达式。正确格式: r xdy[+-*/]z");
+      if (/^\d+d$/.test(expression)) {
+        expression = expression + "100";
+        match = expression.match(diceRegex);
+      } else if (/^d\d+$/.test(expression)) {
+        expression = "1" + expression;
+        match = expression.match(diceRegex);
+      } else if (/^\d+$/.test(expression)) {
+        expression = expression + "d100";
+        match = expression.match(diceRegex);
+      }
+    }
+    if (!match) {
+      expression = "1d100";
+      match = expression.match(diceRegex);
+      if (!match) {
+        throw new Error("无效的掷骰表达式。正确格式: r xdy[+-*/]z");
+      }
     }
     const count = match[1] ? parseInt(match[1]) : 1;
     const sides = parseInt(match[2]);
@@ -53,6 +69,9 @@ var DiceRoller = class {
     if (count > 100) {
       throw new Error("一次最多只能掷 100 个骰子");
     }
+    if (operator === "/" && modifier === 0) {
+      throw new Error("除数不能为0");
+    }
     const rolls = [];
     for (let i = 0; i < count; i++) {
       rolls.push(Math.floor(Math.random() * sides) + 1);
@@ -70,9 +89,6 @@ var DiceRoller = class {
         total = diceTotal * modifier;
         break;
       case "/":
-        if (modifier === 0) {
-          throw new Error("除数不能为0");
-        }
         total = Math.floor(diceTotal / modifier);
         break;
       default:
@@ -262,18 +278,26 @@ function apply(ctx, config) {
       const diceCommands = ["r", "ra", "rb", "rp"];
       if (diceCommands.includes(commandName)) {
         try {
+          let result = "";
           switch (commandName) {
             case "r":
-              return await handleRCommand(session, args);
+              result = await handleRCommand(session, args);
+              break;
             case "ra":
-              return await handleRACommand(session, args);
+              result = await handleRACommand(session, args);
+              break;
             case "rb":
-              return await handleRBCommand(session, args);
+              result = await handleRBCommand(session, args);
+              break;
             case "rp":
-              return await handleRPCommand(session, args);
+              result = await handleRPCommand(session, args);
+              break;
+          }
+          if (result) {
+            session.send(result);
           }
         } catch (error) {
-          return `错误: ${error.message}`;
+          session.send(`错误: ${error.message}`);
         }
       }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-maple-dice-v2",
   "description": "-",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/lib/index.d.ts

@@ -1,24 +0,0 @@
-import { Context, Schema } from 'koishi';
-export declare const name = "maple-dice-v2";
-export declare const using: readonly ["database"];
-declare module 'koishi' {
-    interface Tables {
-        'maple-dice-responses': DiceResponse;
-    }
-}
-interface DiceResponse {
-    id: number;
-    level: string;
-    content: string;
-    author: string;
-    group: string;
-    created: Date;
-}
-export interface Config {
-    defaultSkill: number;
-    replyMode: 'global' | 'group' | 'personal';
-    commandPrefixes: string[];
-}
-export declare const Config: Schema<Config>;
-export declare function apply(ctx: Context, config: Config): void;
-export {};