koishi-plugin-ggcevo-game 1.3.11 → 1.3.13

package/lib/index.js

@@ -613,7 +613,7 @@ function apply(ctx, config) {
     },
     "进食": {
       effect: 0,
-      description: "当“吸血”层数达到10层时，自身将会消耗所有层数回复20%的最大生命值"
+      description: "当“吸血”层数达到10层后，下一次受到攻击，将会消耗所有层数回复自身20%的最大生命值"
     },
     "嗜血狂暴": {
       effect: 0,
@@ -1611,40 +1611,44 @@ function apply(ctx, config) {
       let totalReduction = 0;
       if (targetBoss.skills.includes("吸血唾液")) {
         totalReduction += bloodStacks * 0.05;
+        if (bloodStacks > 0) {
+          messages.push(`🩸 【吸血唾液】技能生效：本次攻击减伤${bloodStacks * 5}%`);
+        }
       }
       if (targetBoss.skills.includes("嗜血狂暴") && currentHP / maxHP < 0.5) {
         totalReduction += 0.2;
+        messages.push(`🔥 【嗜血狂暴】技能生效：血量低于50%，本次攻击额外减伤20%`);
       }
       if (totalReduction > 0) {
         newDamage = Math.floor(initialDamage * (1 - totalReduction));
-        messages.push(
-          `🩸 【吸血唾液】生效：当前层数${bloodStacks}，下次受到伤害减伤${bloodStacks * 5}%` + (targetBoss.skills.includes("嗜血狂暴") && currentHP / maxHP < 0.5 ? `🔥 【嗜血狂暴】生效：血量低于50%触发20%减伤` : "")
-        );
       }
       if (targetBoss.skills.includes("吐血") && bloodStacks < 1) {
         newDamage = Math.floor(newDamage * 1.1);
-        messages.push(`💔 【吐血】生效：无“吸血”层数受到伤害+10%`);
+        messages.push(`💔 【吐血】技能生效：无“吸血”层数受到伤害+10%`);
       }
       return newDamage !== initialDamage ? { initialDamage: newDamage, messages } : null;
     }, "handleBloodEffects"),
-    // 处理吸血层数叠加和进食触发
     handleBloodCount: /* @__PURE__ */ __name(async function(ctx2, targetBoss, currentHP, maxHP) {
       let messages = [];
       let updatedHP = currentHP;
-      let newStacks = targetBoss.Skillcountpoints || 0;
-      newStacks += 1;
+      const oldStacks = targetBoss.Skillcountpoints || 0;
+      if (oldStacks >= 10 && targetBoss.skills.includes("进食")) {
+        const heal = Math.floor(maxHP * 0.2);
+        updatedHP = Math.min(currentHP + heal, maxHP);
+        await ctx2.database.set("ggcevo_boss", { name: targetBoss.name }, { Skillcountpoints: 0 });
+        messages.push(`🍽️ 【进食】技能生效：回复20%最大生命值(+${heal}HP)，层数清零`);
+        return { updatedHP, messages };
+      }
+      let newStacks = oldStacks + 1;
       if (targetBoss.skills.includes("嗜血狂暴") && currentHP / maxHP < 0.5) {
         newStacks += 1;
-        messages.push(`🔥 【嗜血狂暴】生效：额外叠加1层吸血，当前层数${newStacks}`);
+        messages.push(`🔥 【嗜血狂暴】技能生效：额外叠加1层“吸血”`);
       }
       newStacks = Math.min(newStacks, 10);
-      await ctx2.database.set("ggcevo_boss", { name: targetBoss.name }, { Skillcountpoints: newStacks });
-      if (newStacks >= 10 && targetBoss.skills.includes("进食")) {
-        const heal = Math.floor(maxHP * 0.2);
-        updatedHP = Math.min(currentHP + heal, maxHP);
-        await ctx2.database.set("ggcevo_boss", { name: targetBoss.name }, { Skillcountpoints: 0 });
-        messages.push(`🍽️ 【进食】生效：回复20%最大生命值(+${heal}HP)，层数清零`);
+      if (oldStacks < 10 && newStacks >= 10) {
+        messages.push(`🩸 吸血层数达到${newStacks}，下次攻击将触发【进食】！`);
       }
+      await ctx2.database.set("ggcevo_boss", { name: targetBoss.name }, { Skillcountpoints: newStacks });
       return { updatedHP, messages };
     }, "handleBloodCount"),
     // 伽马枪辐射层数处理（攻击后触发）
@@ -1656,8 +1660,7 @@ function apply(ctx, config) {
         skills: isNewRadiation ? [...targetBoss.skills, "辐射"] : targetBoss.skills,
         Vulnerability: isNewRadiation ? 1 : targetBoss.Vulnerability + 1
       });
-      const [updatedBoss] = await ctx2.database.get("ggcevo_boss", { name: targetBoss.name });
-      const layerMsg = isNewRadiation ? `☢️ 获得【辐射】效果(当前层数1)` : `☢️ 辐射层数+1`;
+      const layerMsg = isNewRadiation ? `☢️ 获得【辐射】效果` : `☢️ 辐射层数+1`;
       messages.push(`${targetBoss.name} ${layerMsg}`);
       return { messages };
     }, "handleGammaRadiation"),
@@ -1675,7 +1678,7 @@ function apply(ctx, config) {
       return {
         damage: amplifiedDamage,
         messages: radiationLayers > 0 ? [
-          `☢️ 【辐射】生效：当前${radiationLayers}层辐射，本次攻击受到伤害+${radiationLayers}%`
+          `☢️ 【辐射】效果触发：当前${radiationLayers}层辐射，本次攻击受到伤害+${radiationLayers}%`
         ] : []
       };
     }, "calculateRadiationDamage"),
@@ -1686,12 +1689,10 @@ function apply(ctx, config) {
       if (currentHP <= 0 && !targetBoss.skills.includes("求生本能I") && !targetBoss.skills.includes("求生本能II")) {
         return { currentHP, messages: [], skillUpdates: [], initialDamage };
       }
-      if (weaponName === "伽马枪" && targetBoss.tags.includes("生物") && !targetBoss.tags.includes("机械")) {
-        const radiationCalc = this.calculateRadiationDamage(targetBoss, initialDamage);
-        if (radiationCalc.messages.length > 0) {
-          messages.push(...radiationCalc.messages);
-          initialDamage = radiationCalc.damage;
-        }
+      const radiationCalc = this.calculateRadiationDamage(targetBoss, initialDamage);
+      if (radiationCalc.messages.length > 0) {
+        messages.push(...radiationCalc.messages);
+        initialDamage = radiationCalc.damage;
       }
       const bloodEffectResult = this.handleBloodEffects(targetBoss, initialDamage, currentHP, maxHP);
       if (bloodEffectResult) {
@@ -3982,7 +3983,7 @@ ${achievementList.join("\n")}`;
       pageNum < totalPages ? `输入 pk榜 ${pageNum + 1} 查看下一页` : "已是最后一页"
     ].join("\n");
   });
-  ctx.command("ggcevo/切换pk", "切换玩家对战状态").action(async ({ session }) => {
+  ctx.command("ggcevo/切换pk", "切换玩家对战状态").alias("切换pk状态").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "您暂未绑定句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo-game",
   "description": "《星际争霸2》咕咕虫-evolved地图的专属游戏助手插件，集成天梯排行、抽奖系统、签到福利、兑换商城等丰富功能。",
-  "version": "1.3.11",
+  "version": "1.3.13",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [