koishi-plugin-ggcevo-game 1.4.40 → 1.4.41

package/lib/boss/BattleEffectProcessor.d.ts

@@ -80,14 +80,14 @@ export declare const BattleEffectProcessor: {
         nerfMultiplier: number;
         messages: string[];
     };
-    handleSurvivalInstinctI: (targetBoss: any) => {
+    handleSurvivalInstinctI: (targetBoss: any, damageAmount: number) => {
         messages: string[];
         targetUpdates: {
             name: string;
             updates: Partial<BattleStatistics>;
         } | null;
     } | null;
-    handleSurvivalInstinctII: (targetBoss: any) => {
+    handleSurvivalInstinctII: (targetBoss: any, damageAmount: number) => {
         messages: string[];
         targetUpdates: {
             name: string;
@@ -301,8 +301,7 @@ export declare const BattleEffectProcessor: {
             updates: Partial<BattleStatistics>;
         } | null;
     } | null;
-    /** 复苏处理（免疫死亡并回复） */
-    handleRevival: (targetBoss: any) => {
+    handleRevival: (targetBoss: any, damageAmount: number) => {
         messages: string[];
         targetUpdates: {
             name: string;

package/lib/index.js

@@ -2642,22 +2642,25 @@ var BattleEffectProcessor = {
     }
     return null;
   }, "handleStressShellII"),
-  handleSurvivalInstinctI: /* @__PURE__ */ __name(function(targetBoss) {
+  // 求生本能I (修改后)
+  handleSurvivalInstinctI: /* @__PURE__ */ __name(function(targetBoss, damageAmount) {
     const messages = [];
     if (!targetBoss.skills.includes("求生本能I")) {
       return null;
     }
     const targetMaxHP = getMaxHPByName(targetBoss.name);
-    const currentHP = targetBoss.HP;
-    if (currentHP !== 0) {
+    const isLethal = damageAmount >= targetBoss.HP;
+    if (!isLethal) {
       return null;
     }
     const selfHealAmount = Math.round(targetMaxHP * 0.3);
     const updates = {
       hpChange: selfHealAmount,
+      // 回复生命值
       skillsRemoved: ["求生本能I"]
+      // 移除技能
     };
-    messages.push(`❤️ 【求生本能I】触发：濒死时，回复${selfHealAmount}点生命值`);
+    messages.push(`❤️ 【求生本能I】触发：承受致命伤害时，回复${selfHealAmount}点生命值`);
     messages.push(`❤️ 【求生本能I】技能移除`);
     return {
       messages,
@@ -2667,14 +2670,15 @@ var BattleEffectProcessor = {
       }
     };
   }, "handleSurvivalInstinctI"),
-  handleSurvivalInstinctII: /* @__PURE__ */ __name(function(targetBoss) {
+  // 求生本能II (修改后)
+  handleSurvivalInstinctII: /* @__PURE__ */ __name(function(targetBoss, damageAmount) {
     const messages = [];
     if (!targetBoss.skills.includes("求生本能II")) {
       return null;
     }
     const targetMaxHP = getMaxHPByName(targetBoss.name);
-    const currentHP = targetBoss.HP;
-    if (currentHP !== 0) {
+    const isLethal = damageAmount >= targetBoss.HP;
+    if (!isLethal) {
       return null;
     }
     const selfHealAmount = Math.round(targetMaxHP * 0.5);
@@ -2684,7 +2688,7 @@ var BattleEffectProcessor = {
       skillsRemoved: ["求生本能II"]
       // 移除的技能
     };
-    messages.push(`❤️ 【求生本能II】触发：濒死时，回复${selfHealAmount}点生命值`);
+    messages.push(`❤️ 【求生本能II】触发：承受致命伤害时，回复${selfHealAmount}点生命值`);
     messages.push(`❤️ 【求生本能II】技能移除`);
     return {
       messages,
@@ -3549,13 +3553,14 @@ var BattleEffectProcessor = {
       }
     };
   }, "handleCosmicEnergy"),
-  /** 复苏处理（免疫死亡并回复） */
-  handleRevival: /* @__PURE__ */ __name(function(targetBoss) {
+  // 复苏 (修改后)
+  handleRevival: /* @__PURE__ */ __name(function(targetBoss, damageAmount) {
     const messages = [];
     if (!targetBoss.skills.includes("复苏")) {
       return null;
     }
-    if (targetBoss.HP !== 0) {
+    const isLethal = damageAmount >= targetBoss.HP;
+    if (!isLethal) {
       return null;
     }
     const maxHP = getMaxHPByName(targetBoss.name);
@@ -3566,7 +3571,7 @@ var BattleEffectProcessor = {
       name: targetBoss.name,
       updates: {
         hpChange: healAmount,
-        // 回复50%最大生命值
+        // 回复60%最大生命值
         energyChange: energyGain,
         // 回复100%能量
         skillsRemoved: ["复苏"],
@@ -4088,14 +4093,11 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     { effect: BattleEffectProcessor.handleFrostRegeneration, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleFrostAura, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleSentryGun, args: [targetBoss, activeBosses] },
-    { effect: BattleEffectProcessor.handleSurvivalInstinctI, args: [targetBoss] },
-    { effect: BattleEffectProcessor.handleSurvivalInstinctII, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleMoldGrowth, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleElectricShockwave, args: [targetBoss] },
     { effect: BattleEffectProcessor.handlePulse, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleFeeding, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleBurningBurrow, args: [targetBoss] },
-    { effect: BattleEffectProcessor.handleRevival, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleCosmicEnergy, args: [targetBoss, damage] },
     { effect: BattleEffectProcessor.handleBombardmentGuide, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleOverdriveShield, args: [targetBoss, activeBosses] }
@@ -4180,18 +4182,38 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     layerReduced = layerReduceResult.reductionSuccess || false;
   }
   let finalDamage = damage;
+  const isLethal = finalDamage >= targetBoss.HP && finalDamage > 0;
   if (!immune) {
     let adjustedNerfMultiplier = totalNerfMultiplier * (1 - ignoreRate);
     const damageMultiplier = 1 + totalBuffMultiplier - adjustedNerfMultiplier;
     finalDamage = Math.max(1, Math.round(damage * damageMultiplier));
-    if (finalDamage > 0) {
-      updateStatsByName(targetBoss.name, {
-        hpChange: -finalDamage
-      });
-    }
   } else {
     finalDamage = 0;
   }
+  const survivalSkills = [
+    { func: BattleEffectProcessor.handleSurvivalInstinctI, name: "求生本能I" },
+    { func: BattleEffectProcessor.handleSurvivalInstinctII, name: "求生本能II" },
+    { func: BattleEffectProcessor.handleRevival, name: "复苏" }
+  ];
+  let revivalTriggered = false;
+  if (isLethal) {
+    for (const skill of survivalSkills) {
+      if (targetBoss.skills.includes(skill.name)) {
+        const result = skill.func(targetBoss, finalDamage);
+        if (result) {
+          updateStatsByName(result.targetUpdates.name, result.targetUpdates.updates);
+          messages.push(...result.messages);
+          revivalTriggered = true;
+          break;
+        }
+      }
+    }
+  }
+  if (!revivalTriggered && !immune && finalDamage > 0) {
+    updateStatsByName(targetBoss.name, {
+      hpChange: -finalDamage
+    });
+  }
   return {
     finalDamage,
     messages,
@@ -5303,7 +5325,7 @@ function apply(ctx, config) {
       const [itemName, itemData] = entry;
       return itemData.description ? `${itemName} x ${userItem.quantity}：${itemData.description}` : `${itemName} x ${userItem.quantity}`;
     });
-    return `【${handle}的背包】
+    return `【${session.username}的背包】
 ${itemDetails.join("\n")}`;
   });
   ctx.command("ggcevo/签到").action(async (argv) => {
@@ -6974,7 +6996,7 @@ ${validTypes.join("、")}`;
       ].join("\n");
     }));
     return [
-      `🛡️ ${handle}的武器仓库`,
+      `🛡️ ${session.username}的武器列表`,
       '使用"装备 武器名称"来装备武器',
       "⚡表示当前装备武器",
       "──────────────",
@@ -8151,7 +8173,7 @@ ${validTypes.join("、")}`;
     ]);
     const totalRewards = signData[0]?.totalRewards || 0;
     const redcrystal = careerData[0]?.redcrystal || 0;
-    const message = [`【${handle}的仓库】`];
+    const message = [`【${session.username}的仓库】`];
     message.push(`💰 金币：${totalRewards}`);
     if (careerData[0]?.group === "辛迪加海盗") {
       message.push(`🔴 红晶：${redcrystal}`);

package/package.json

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