koishi-plugin-ggcevo-game 1.4.29 → 1.4.31

package/lib/boss/attackhandling.d.ts

@@ -11,6 +11,8 @@ export declare function handlePrimaryAttack(ctx: Context, session: any, config:
     radiationApplied: boolean;
     freezing: boolean;
     bileStacks: any;
+    pulseApplied: boolean;
+    arcApplied: boolean;
 }>;
 export declare function handleScatterAttack(ctx: Context, session: any, config: Config, handle: string, equippedWeapon: any, targetBoss: any, weaponName: string, weaponData: any, activeBosses: any[], bossGroup: any): Promise<{
     scatterEffectMessages: string[];

package/lib/boss/passivehandler.d.ts

@@ -105,6 +105,7 @@ export declare const PassiveHandler: {
     }>;
     handleArcWelderEffect: (ctx: Context, targetBoss: any, weaponName: string) => Promise<{
         messages: string[];
+        arcApplied: boolean;
     }>;
     handleArcRifleEffect: (ctx: Context, targetBoss: any, weaponName: string, messages: string[]) => Promise<{
         drainAmount: number;
@@ -181,6 +182,7 @@ export declare const PassiveHandler: {
     }>;
     handlePulseDisruptor: (ctx: Context, targetBoss: any, weaponName: string) => Promise<{
         messages: string[];
+        pulseApplied: boolean;
     }>;
     handleStellarWind: (ctx: Context, targetBoss: any, initialDamage: number, currentHP: number, maxHP: number, activeBosses: any[], bossGroup: BossPoolItem) => Promise<{
         messages: string[];
@@ -235,6 +237,8 @@ export declare const PassiveHandler: {
         bileStacks?: undefined;
         radiationApplied?: undefined;
         freezing?: undefined;
+        pulseApplied?: undefined;
+        arcApplied?: undefined;
     } | {
         currentHP: any;
         messages: any;
@@ -243,6 +247,8 @@ export declare const PassiveHandler: {
         bileStacks: any;
         radiationApplied?: undefined;
         freezing?: undefined;
+        pulseApplied?: undefined;
+        arcApplied?: undefined;
     } | {
         currentHP: number;
         messages: string[];
@@ -251,6 +257,18 @@ export declare const PassiveHandler: {
         radiationApplied: boolean;
         freezing: boolean;
         bileStacks?: undefined;
+        pulseApplied?: undefined;
+        arcApplied?: undefined;
+    } | {
+        currentHP: number;
+        messages: string[];
+        skillUpdates: any[];
+        initialDamage: number;
+        radiationApplied: boolean;
+        freezing: boolean;
+        pulseApplied: boolean;
+        arcApplied: boolean;
+        bileStacks?: undefined;
     }>;
     applySkillUpdates: (ctx: Context, skillUpdates: any[]) => Promise<void>;
 };

package/lib/index.js

@@ -1009,29 +1009,47 @@ var Tasklist = {
   "伽马辐射": {
     id: 1,
     type: "可重复任务",
-    description: "利用【伽马枪】武器对异形目标造成辐射伤害",
+    description: "利用【伽马枪】武器对目标造成辐射伤害",
     target: 1,
     price: 50,
     redCrystalCost: 0,
-    condition: "使用伽马枪攻击异形并成功使辐射层数+1"
+    condition: "使用伽马枪攻击目标并成功增加其辐射层数"
   },
   "绝对零度": {
     id: 2,
     type: "可重复任务",
-    description: "利用【零度之下】武器对异形目标造成寒冷伤害",
+    description: "利用【零度之下】武器对目标造成寒冷伤害",
     target: 1,
     price: 50,
     redCrystalCost: 0,
-    condition: "使用零度之下攻击异形并成功使寒冷层数+1"
+    condition: "使用零度之下攻击目标并成功增加其寒冷层数"
   },
   "胆汁引爆": {
     id: 3,
     type: "可重复任务",
-    description: "利用【焚烧枪】武器引爆异形目标的胆汁",
+    description: "利用【焚烧枪】武器引爆目标的胆汁",
     target: 1,
     price: 200,
     redCrystalCost: 0,
-    condition: "使用焚烧枪攻击异形并成功引爆≥10层的胆汁"
+    condition: "使用焚烧枪攻击异形并成功引爆其≥10层的胆汁"
+  },
+  "脉冲干扰": {
+    id: 4,
+    type: "可重复任务",
+    description: "利用【脉冲扰乱枪】武器干扰目标的技能释放",
+    target: 1,
+    price: 75,
+    redCrystalCost: 0,
+    condition: "使用脉冲扰乱枪攻击异形并成功减少其技能层数"
+  },
+  "弧能消耗": {
+    id: 5,
+    type: "可重复任务",
+    description: "利用【弧焊枪】武器消耗目标的能量",
+    target: 1,
+    price: 75,
+    redCrystalCost: 0,
+    condition: "使用弧焊枪攻击异形并成功消耗其能量"
   }
 };
 
@@ -2934,6 +2952,7 @@ var PassiveHandler = {
     if (weaponName !== "弧焊枪") return null;
     const currentEnergy = targetBoss.energy || 0;
     const messages = [];
+    let arcApplied = false;
     if (currentEnergy > 0) {
       const energyDrain = Math.min(200, currentEnergy);
       const newEnergy = currentEnergy - energyDrain;
@@ -2942,11 +2961,12 @@ var PassiveHandler = {
         { name: targetBoss.name },
         { energy: newEnergy }
       );
+      arcApplied = true;
       messages.push(`⚡ 【弧焊枪】武器效果：消耗目标200点能量`);
     } else {
       return null;
     }
-    return { messages };
+    return { messages, arcApplied };
   }, "handleArcWelderEffect"),
   // 在 PassiveHandler 对象中添加新的处理函数
   handleArcRifleEffect: /* @__PURE__ */ __name(async function(ctx, targetBoss, weaponName, messages) {
@@ -3366,6 +3386,7 @@ var PassiveHandler = {
       return null;
     }
     const currentSkillCount = targetBoss.Skillcountpoints || 0;
+    let pulseApplied = false;
     if (currentSkillCount <= 0) {
       return null;
     }
@@ -3375,11 +3396,12 @@ var PassiveHandler = {
       { name: targetBoss.name },
       { Skillcountpoints: newCount }
     );
-    targetBoss.Skillcountpoints = newCount;
+    pulseApplied = true;
     return {
       messages: [
-        `⚡ 【脉冲扰乱枪】武器效果：使${targetBoss.name}的技能层数减少2层(当前${newCount}层)`
-      ]
+        `⚡ 【脉冲扰乱枪】武器效果：使${targetBoss.name}的技能层数减少2层`
+      ],
+      pulseApplied
     };
   }, "handlePulseDisruptor"),
   // === 星界之风 ===
@@ -3401,12 +3423,16 @@ var PassiveHandler = {
         (b) => b.groupId === targetBoss.groupId && b.HP > 0
       );
       const updates = [];
-      const messages = [`🌠 【星界之风】生效：治疗所有存活异形200点血量`];
+      const messages = [`🌠 【星界之风】生效：治疗所有存活异形`];
+      let updatedHP = currentHP;
       for (const member of groupMembers) {
-        const maxHP2 = PassiveHandler.getMemberConfig(member.name, bossGroup)?.maxHP;
-        if (!maxHP2) continue;
+        const memberConfig = PassiveHandler.getMemberConfig(member.name, bossGroup);
+        if (!memberConfig) continue;
+        const maxMemberHP = memberConfig.maxHP;
         const healAmount = 200;
-        const newHP = Math.min(member.HP + healAmount, maxHP2);
+        const actualHeal = Math.min(healAmount, maxMemberHP - member.HP);
+        if (actualHeal <= 0) continue;
+        const newHP = member.HP + actualHeal;
         updates.push(
           ctx.database.set(
             "ggcevo_boss",
@@ -3414,12 +3440,16 @@ var PassiveHandler = {
             { HP: newHP }
           )
         );
-        messages.push(`${member.name} +${healAmount}HP`);
+        messages.push(`${member.name} +${actualHeal}HP`);
+        if (member.name === targetBoss.name) {
+          updatedHP = newHP;
+        }
       }
-      if (hasPsychicFrenzy && isInFrenzy) {
+      if (updates.length === 0) {
+        return null;
       }
       await Promise.all(updates);
-      return { messages, updatedHP: currentHP + 200 };
+      return { messages, updatedHP };
     }
     return null;
   }, "handleStellarWind"),
@@ -3622,30 +3652,38 @@ var PassiveHandler = {
       const groupMembers = activeBosses.filter(
         (b) => b.groupId === targetBoss.groupId && b.HP > 0
       );
-      const healAmount = lightbladeStacks * 10;
+      const healPerStack = 10;
+      const totalHeal = lightbladeStacks * healPerStack;
       const updates = [];
       const messages = [`🛡️ 【天启超载护盾】生效：治疗所有存活异形`];
+      let updatedHP = currentHP;
       for (const member of groupMembers) {
-        const maxHP = this.getMemberConfig(member.name, bossGroup)?.maxHP;
-        if (!maxHP) continue;
-        const heal = Math.min(healAmount, maxHP - member.HP);
-        if (heal > 0) {
-          const newHP = member.HP + heal;
-          updates.push(
-            ctx.database.set(
-              "ggcevo_boss",
-              { name: member.name },
-              { HP: newHP }
-            )
-          );
-          messages.push(`${member.name} +${heal}HP`);
+        const memberConfig = PassiveHandler.getMemberConfig(member.name, bossGroup);
+        if (!memberConfig) continue;
+        const maxMemberHP = memberConfig.maxHP;
+        const actualHeal = Math.min(totalHeal, maxMemberHP - member.HP);
+        if (actualHeal <= 0) continue;
+        const newHP = member.HP + actualHeal;
+        updates.push(
+          ctx.database.set(
+            "ggcevo_boss",
+            { name: member.name },
+            { HP: newHP }
+          )
+        );
+        messages.push(`${member.name} +${actualHeal}HP`);
+        if (member.name === targetBoss.name) {
+          updatedHP = newHP;
         }
       }
+      if (updates.length === 0) {
+        return null;
+      }
       await Promise.all(updates);
       return {
         messages,
-        updatedHP: currentHP + healAmount
-        // 不再清除层数
+        updatedHP
+        // 返回当前目标的新HP（如果被治疗）
       };
     }
     return null;
@@ -3726,6 +3764,8 @@ var PassiveHandler = {
     let nerfMultiplier = 0;
     let radiationApplied = false;
     let freezing = false;
+    let pulseApplied = false;
+    let arcApplied = false;
     let bileStacks = 0;
     const activeBosses = await ctx.database.get("ggcevo_boss", { isActive: true });
     const solarFlareResult = await this.handleSolarFlare(ctx, targetBoss, weaponName);
@@ -4040,10 +4080,12 @@ var PassiveHandler = {
     );
     if (pulseDisruptorResult) {
       messages.push(...pulseDisruptorResult.messages);
+      pulseApplied = pulseDisruptorResult.pulseApplied;
     }
     const arcResult = await this.handleArcWelderEffect(ctx, targetBoss, weaponName);
     if (arcResult) {
       messages.push(...arcResult.messages);
+      arcApplied = arcResult.arcApplied;
     }
     const arcRifleResult = await this.handleArcRifleEffect(ctx, targetBoss, weaponName, messages);
     if (arcRifleResult) {
@@ -4114,7 +4156,9 @@ var PassiveHandler = {
       initialDamage: finalDamage,
       radiationApplied,
       // 新增返回辐射应用标记
-      freezing
+      freezing,
+      pulseApplied,
+      arcApplied
     };
   }, "handlePassives"),
   // 应用技能更新到数据库（优化合并同名boss的更新）
@@ -4355,7 +4399,9 @@ async function handlePrimaryAttack(ctx, session, config, handle, equippedWeapon,
     passiveMessages: passiveResult.messages,
     radiationApplied: passiveResult.radiationApplied,
     freezing: passiveResult.freezing,
-    bileStacks: passiveResult.bileStacks
+    bileStacks: passiveResult.bileStacks,
+    pulseApplied: passiveResult.pulseApplied,
+    arcApplied: passiveResult.arcApplied
   };
 }
 __name(handlePrimaryAttack, "handlePrimaryAttack");
@@ -4411,6 +4457,12 @@ async function handleScatterAttack(ctx, session, config, handle, equippedWeapon,
     if (passiveResult.bileStacks >= 10) {
       taskUpdates.push({ taskId: 3, count: 1 });
     }
+    if (passiveResult.pulseApplied) {
+      taskUpdates.push({ taskId: 4, count: 1 });
+    }
+    if (passiveResult.arcApplied) {
+      taskUpdates.push({ taskId: 5, count: 1 });
+    }
     const isDead = newHP <= 0;
     await ctx.database.set("ggcevo_boss", { name: secondaryTarget.name }, {
       HP: Math.max(newHP, 0),
@@ -7240,6 +7292,12 @@ ${validTypes.join("、")}`;
     if (primaryAttackResult.bileStacks >= 10) {
       taskUpdates.push({ taskId: 3, count: 1 });
     }
+    if (primaryAttackResult.pulseApplied) {
+      taskUpdates.push({ taskId: 4, count: 1 });
+    }
+    if (primaryAttackResult.arcApplied) {
+      taskUpdates.push({ taskId: 5, count: 1 });
+    }
     if (scatterResult && scatterResult.taskUpdates) {
       scatterResult.taskUpdates.forEach((update) => {
         taskUpdates.push(update);
@@ -7318,7 +7376,7 @@ ${validTypes.join("、")}`;
         // 这里添加符号
       ] : [],
       `📊 理论伤害值：${damage}${hasCrit ? " (✨ 暴击)" : ""}`,
-      "💡 提示：使用 -t 重甲,生物……(标签之间用英文逗号分隔) 添加测试标签"
+      "💡 提示：添加测试标签: -t 重甲,生物(标签之间用英文逗号分隔)"
     ].filter((line) => line).join("\n");
   });
   ctx.command("ggcevo/伤害榜 [page]", "查看当前主宰伤害排名").usage("输入 伤害榜 [页码] 查看对应页的排行榜，每页10条").action(async (_, page) => {

package/lib/tasks.d.ts

@@ -26,4 +26,22 @@ export declare const Tasklist: {
         redCrystalCost: number;
         condition: string;
     };
+    脉冲干扰: {
+        id: number;
+        type: string;
+        description: string;
+        target: number;
+        price: number;
+        redCrystalCost: number;
+        condition: string;
+    };
+    弧能消耗: {
+        id: number;
+        type: string;
+        description: string;
+        target: number;
+        price: number;
+        redCrystalCost: number;
+        condition: string;
+    };
 };

package/package.json

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