koishi-plugin-smmcat-gensokyo 0.0.33 → 0.0.35

package/lib/index.js

@@ -405,13 +405,16 @@ var random = /* @__PURE__ */ __name((min, max) => {
   return Math.floor(Math.random() * (max - min + 1)) + min;
 }, "random");
 var generateHealthDisplay = /* @__PURE__ */ __name((current, total) => {
-  const ratio = current / total;
   const displayLength = 10;
-  const filledLength = Math.floor(ratio * displayLength);
+  const filledChar = "■";
+  const unfilledChar = "□";
+  const clampedCurrent = Math.max(0, Math.min(current, total));
+  const ratio = clampedCurrent / total;
+  const filledLength = Math.max(0, Math.min(Math.floor(ratio * displayLength), displayLength));
   const unfilledLength = displayLength - filledLength;
-  const filled = "■".repeat(filledLength);
-  const unfilled = "□".repeat(unfilledLength);
-  return filled + unfilled;
+  const filled = filledChar.repeat(filledLength);
+  const unfilled = unfilledChar.repeat(unfilledLength);
+  return `${filled}${unfilled} (${current}/${total})`;
 }, "generateHealthDisplay");
 var getFreeList = /* @__PURE__ */ __name((arr) => {
   let arrAdd = [...arr];
@@ -421,6 +424,40 @@ var getFreeList = /* @__PURE__ */ __name((arr) => {
   }
   return arrAdd;
 }, "getFreeList");
+var AsyncOperationQueue = class {
+  static {
+    __name(this, "AsyncOperationQueue");
+  }
+  queue;
+  running;
+  constructor() {
+    this.queue = [];
+    this.running = false;
+  }
+  async add(operation) {
+    return new Promise((resolve, reject) => {
+      this.queue.push({ operation, resolve, reject });
+      if (!this.running) {
+        this.process();
+      }
+    });
+  }
+  async process() {
+    if (this.queue.length === 0) {
+      this.running = false;
+      return;
+    }
+    this.running = true;
+    const { operation, resolve, reject } = this.queue.shift();
+    try {
+      const result = await operation();
+      resolve(result);
+    } catch (error) {
+      reject(error);
+    }
+    this.process();
+  }
+};
 
 // src/damage.ts
 var Damage = class {
@@ -3060,6 +3097,7 @@ function apply(ctx, config) {
     Monster.init(config, ctx);
     Props.init(config, ctx);
   });
+  const Queue = new AsyncOperationQueue();
   ctx.command("幻想乡");
   ctx.command("幻想乡/移动.上").action(async ({ session }) => {
     console.log(session.userId.slice(0, 6) + "触发了上移动");
@@ -3224,18 +3262,18 @@ function apply(ctx, config) {
       await BattleData.createBattleByMonster(session, [selectMonster]);
     } else {
       const selectMonster = areaInfo.monster;
-      await BattleData.createBattleByMonster(session, selectMonster);
+      await Queue.add(async () => await BattleData.createBattleByMonster(session, selectMonster));
     }
   });
   ctx.command("幻想乡/打怪攻击 <goal>").action(async ({ session }, goal) => {
     const userData = await User.getUserAttribute(session);
     if (!userData) return;
-    BattleData.play(session, "普攻", goal);
+    await Queue.add(async () => BattleData.play(session, "普攻", goal));
   });
   ctx.command("幻想乡/打怪技能 <skill> <goal>").action(async ({ session }, skill, goal) => {
     const userData = await User.getUserAttribute(session);
     if (!userData) return;
-    BattleData.play(session, skill, goal);
+    await Queue.add(async () => await BattleData.play(session, skill, goal));
   });
   ctx.command("幻想乡/打怪pk <goal>").action(async ({ session }, goal) => {
     const userData = await User.getUserAttribute(session);
@@ -3260,10 +3298,10 @@ function apply(ctx, config) {
     if (BattleData.isTeamByUserId(exist.userId)) {
       const teamItem = BattleData.teamListByUser(exist.userId);
       await session.send(`对方有组队，您将扮演攻击方与对方队伍进行战斗。`);
-      await BattleData.createBattleByUser(session, teamItem.map((item) => ({ userId: item.userId })));
+      await Queue.add(async () => await BattleData.createBattleByUser(session, teamItem.map((item) => ({ userId: item.userId }))));
     } else {
       await session.send(`您将扮演攻击方与对方进行战斗。`);
-      await BattleData.createBattleByUser(session, [{ userId: exist.userId }]);
+      await Queue.add(async () => await BattleData.createBattleByUser(session, [{ userId: exist.userId }]));
     }
   });
   ctx.command("幻想乡/道具使用 <props>").action(async ({ session }, props) => {
@@ -3376,7 +3414,7 @@ function apply(ctx, config) {
     await session.send(await ctx.puppeteer.render(html));
   });
   ctx.command("幻想乡/打怪逃跑").action(async ({ session }) => {
-    await BattleData.battleEscape(session);
+    await Queue.add(async () => await BattleData.battleEscape(session));
   });
 }
 __name(apply, "apply");

package/lib/utlis.d.ts

@@ -2,3 +2,10 @@ export declare const random: (min: number, max: number) => number;
 /** 血量可视化 */
 export declare const generateHealthDisplay: (current: number, total: number) => string;
 export declare const getFreeList: (arr: any[]) => any[];
+export declare class AsyncOperationQueue {
+    queue: any[];
+    running: boolean;
+    constructor();
+    add(operation: any): Promise<unknown>;
+    process(): Promise<void>;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-smmcat-gensokyo",
   "description": "名为《幻想乡》的文字冒险游戏",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [