koishi-plugin-ggcevo-game 1.6.66 → 1.6.68

package/lib/boss/BattleEffectProcessor.d.ts

@@ -585,7 +585,7 @@ export declare const BattleEffectProcessor: {
         fusionExplosionTriggered: boolean;
         messages: string[];
     };
-    handleBurnEffect: (targetBoss: any, weaponName: string, equippedWeapon: any) => {
+    handleBurnEffect: (targetBoss: any, weaponName: string, equippedWeapon: any, isImmuneFire: boolean) => {
         messages: string[];
         targetUpdates: {
             name: string;

package/lib/index.js

@@ -3950,9 +3950,12 @@ var BattleEffectProcessor = {
     return null;
   }, "handleFusionCannonEffect"),
   // 在 BattleEffectProcessor 对象中添加以下函数
-  handleBurnEffect: /* @__PURE__ */ __name(function(targetBoss, weaponName, equippedWeapon) {
+  handleBurnEffect: /* @__PURE__ */ __name(function(targetBoss, weaponName, equippedWeapon, isImmuneFire) {
     const messages = [];
     let burnLayerAdded = false;
+    if (isImmuneFire) {
+      return null;
+    }
     const isBurnWeapon = weaponName === "焚烧枪" || weaponName === "龙息霰弹枪";
     if (!isBurnWeapon) {
       return null;
@@ -4413,7 +4416,7 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
   if (fusionEffect) {
     messages.push(...fusionEffect.messages);
   }
-  const burnEffectResult = BattleEffectProcessor.handleBurnEffect(targetBoss, weaponName, equippedWeapon);
+  const burnEffectResult = BattleEffectProcessor.handleBurnEffect(targetBoss, weaponName, equippedWeapon, isImmuneFire);
   if (burnEffectResult) {
     messages.push(...burnEffectResult.messages);
     if (burnEffectResult.targetUpdates) {
@@ -5770,8 +5773,7 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
     if (itemConfig2.id === 1) {
       return {
         success: false,
-        message: "暂时被禁用了。",
-        isDefeated: false
+        message: "暂时被禁用了。"
       };
       const activeSentry = await ctx.database.get("ggcevo_boss", {
         name: "空间站哨枪塔",
@@ -5779,8 +5781,7 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       });
       if (!activeSentry.length) return {
         success: false,
-        message: "⚠️ 目标「空间站哨枪塔」未存活",
-        isDefeated: false
+        message: "⚠️ 目标「空间站哨枪塔」未存活"
       };
       const [SentryTower] = await ctx.database.get("ggcevo_boss", {
         name: "空间站哨枪塔",
@@ -5809,15 +5810,13 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       });
       return {
         success: true,
-        message: `成功引爆${itemName}，对空间站哨枪塔造成${damageValue}点伤害，获得等额金币。`,
-        isDefeated: false
+        message: `成功引爆${itemName}，对空间站哨枪塔造成${damageValue}点伤害，获得等额金币。`
       };
     }
     if (itemConfig2.id === 2) {
       if (!target) return {
         success: false,
-        message: "您未选择合适的目标。",
-        isDefeated: false
+        message: "您未选择合适的目标。"
       };
       const [targetboss] = await ctx.database.get("ggcevo_boss", {
         name: target,
@@ -5825,29 +5824,25 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       });
       if (!targetboss) return {
         success: false,
-        message: "无法找到指定的目标。",
-        isDefeated: false
+        message: "无法找到指定的目标。"
       };
       if (targetboss.skills.includes("开天眼")) {
         return {
           success: false,
-          message: `目标免疫闪光弹，无法使用此物品。`,
-          isDefeated: false
+          message: `目标免疫闪光弹，无法使用此物品。`
         };
       }
       if (targetboss.tags.includes("建筑") || targetboss.tags.includes("重型") || targetboss.skills.includes("开天眼")) {
         return {
           success: false,
-          message: `目标${target}拥有"${targetboss.tags.includes("建筑") ? "建筑" : "重型"}"标签，无法使用此物品。`,
-          isDefeated: false
+          message: `目标${target}拥有"${targetboss.tags.includes("建筑") ? "建筑" : "重型"}"标签，无法使用此物品。`
         };
       }
       const currentCount = targetboss?.skillStacks || 0;
       if (currentCount <= 0) {
         return {
           success: false,
-          message: `目标${target}的技能层数已为0，无需使用此物品。`,
-          isDefeated: false
+          message: `目标${target}的技能层数已为0，无需使用此物品。`
         };
       }
       const newCount = Math.max(0, currentCount - 10);
@@ -5859,15 +5854,13 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       );
       return {
         success: true,
-        message: `成功使用${itemName}，使${target}的技能层数减少10层`,
-        isDefeated: false
+        message: `成功使用${itemName}，使${target}的技能层数减少10层`
       };
     }
     if (itemConfig2.id === 4) {
       if (!target) return {
         success: false,
-        message: "您未选择合适的目标。",
-        isDefeated: false
+        message: "您未选择合适的目标。"
       };
       const [targetboss] = await ctx.database.get("ggcevo_boss", {
         name: target,
@@ -5876,14 +5869,12 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       if (targetboss.skills.includes("质粒增殖")) {
         return {
           success: false,
-          message: `目标免疫脉冲手雷，无法使用此物品。`,
-          isDefeated: false
+          message: `目标免疫脉冲手雷，无法使用此物品。`
         };
       }
       if (!targetboss || targetboss?.energy === 0) return {
         success: false,
-        message: "您无法对没有能量的目标使用。",
-        isDefeated: false
+        message: "您无法对没有能量的目标使用。"
       };
       await ctx.database.set(
         "ggcevo_boss",
@@ -5893,15 +5884,13 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       );
       return {
         success: true,
-        message: `成功使用${itemName}，消耗${target}500点能量`,
-        isDefeated: false
+        message: `成功使用${itemName}，消耗${target}500点能量`
       };
     }
     if (itemConfig2.id === 9) {
       if (!target) return {
         success: false,
-        message: "使用燃烧弹需要指定目标。",
-        isDefeated: false
+        message: "使用燃烧弹需要指定目标。"
       };
       const [targetBoss] = await ctx.database.get("ggcevo_boss", {
         name: target,
@@ -5909,15 +5898,13 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       });
       if (!targetBoss) return {
         success: false,
-        message: `目标「${target}」未存活或不存在。`,
-        isDefeated: false
+        message: `目标「${target}」未存活或不存在。`
       };
       const aerialTargets = ["吸血蝙蝠首领", "吸血蝙蝠", "猛毒异兽", "剧毒蝙蝠"];
       if (aerialTargets.includes(targetBoss.name)) {
         return {
           success: false,
-          message: "无法对空中目标使用。",
-          isDefeated: false
+          message: "无法对空中目标使用。"
         };
       }
       const immuneSkills = ["猎手异形", "环境适应"];
@@ -5926,8 +5913,7 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       );
       if (isImmune) return {
         success: false,
-        message: `目标「${target}」免疫燃烧效果。`,
-        isDefeated: false
+        message: `目标「${target}」免疫燃烧效果。`
       };
       const baseLayers = 5;
       let bonusLayers = 0;
@@ -5954,15 +5940,13 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       const careerBonusMsg = playerCareer === "纵火狂" ? `（纵火狂使用莫洛托夫燃烧弹的效果提高100%）` : "";
       return {
         success: true,
-        message: `成功使用${itemName}，目标「${target}」的燃烧层数增加${totalLayers}层${careerBonusMsg}`,
-        isDefeated: false
+        message: `成功使用${itemName}，目标「${target}」的燃烧层数增加${totalLayers}层${careerBonusMsg}`
       };
     }
     if (itemConfig2.id === 10) {
       if (!target) return {
         success: false,
-        message: "使用铝热炸弹需要指定目标。",
-        isDefeated: false
+        message: "使用铝热炸弹需要指定目标。"
       };
       const [targetBoss] = await ctx.database.get("ggcevo_boss", {
         name: target,
@@ -5970,22 +5954,19 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       });
       if (!targetBoss) return {
         success: false,
-        message: `目标「${target}」未存活或不存在。`,
-        isDefeated: false
+        message: `目标「${target}」未存活或不存在。`
       };
       const aerialTargets = ["吸血蝙蝠首领", "吸血蝙蝠", "猛毒异兽", "剧毒蝙蝠"];
       if (aerialTargets.includes(targetBoss.name)) {
         return {
           success: false,
-          message: "无法对空中目标使用。",
-          isDefeated: false
+          message: "无法对空中目标使用。"
         };
       }
       if (targetBoss.HP === 1) {
         return {
           success: false,
-          message: `目标「${target}」血量已是1点，无法使用${itemName}。`,
-          isDefeated: false
+          message: `目标「${target}」血量已是1点，无法使用${itemName}。`
         };
       }
       let baseDamage = 100;
@@ -6020,22 +6001,18 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       const lowHpMsg = newHP === 1 ? "，目标血量已降至1点" : "";
       return {
         success: true,
-        message: `成功使用${itemName}，对${isBuilding ? "建筑目标" : "目标"}「${target}」造成${actualDamage}点伤害${lowHpMsg}${careerBonusMsg}`,
-        isDefeated: false
-        // 永远不会消灭目标
+        message: `成功使用${itemName}，对${isBuilding ? "建筑目标" : "目标"}「${target}」造成${actualDamage}点伤害${lowHpMsg}${careerBonusMsg}`
       };
     }
     return {
       success: false,
-      message: `${itemName} 无法使用。`,
-      isDefeated: false
+      message: `${itemName} 无法使用。`
     };
   } catch (error) {
     console.error("物品效果处理失败:", error);
     return {
       success: false,
-      message: "⚠️ 物品效果处理异常，已回滚操作。",
-      isDefeated: false
+      message: "⚠️ 物品效果处理异常，已回滚操作。"
     };
   }
 }
@@ -11506,25 +11483,11 @@ ${discountReason}` : "",
         { handle, itemId: targetItem.itemId },
         { quantity: newQuantity }
       );
-      const allDeadTargets = [];
-      if (effectResult.isDefeated) {
-        allDeadTargets.push(target);
-      }
-      const deathResults = await handleDeathTargets(ctx, allDeadTargets, session.username, handle);
-      bossEventBroadcast = deathResults.bossBroadcast;
-      cleanerRewardBroadcast = deathResults.cleanerBroadcast;
       await session.send(
         `✅ 成功使用 ${itemNameConfirmed}
 剩余数量：${newQuantity}
 触发效果：${effectResult.message}`
       );
-      const groupId = [...config.groupId];
-      await handleBroadcasts(
-        ctx,
-        groupId,
-        bossEventBroadcast,
-        cleanerRewardBroadcast
-      );
     } catch (error) {
       ctx.logger("GGCEVO").error(error);
       return "⚠️ 物品使用失败，请联系管理员";
@@ -11609,7 +11572,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     let itemBonusRate = 0;
     let miningRobotBonus = 0;
     const miningItem = warehouseItems.find((item) => item.itemId === 8);
-    if (miningItem) {
+    if (miningItem && career.group === "辛迪加海盗") {
       miningRobotBonus = (10 + miningItem.bonus) / 100;
       itemBonusRate += miningRobotBonus;
     }

package/lib/utils.d.ts

@@ -15,7 +15,6 @@ export declare function calculateTotalPower(ctx: Context, config: Config, handle
 export declare function applyItemEffect(ctx: Context, session: any, handle: string, itemConfig: any, target?: string): Promise<{
     success: boolean;
     message: string;
-    isDefeated: boolean;
 }>;
 export declare function handleTechUpgrade(ctx: Context, handle: string, target: string): Promise<string>;
 export declare function handleWeaponUpgrade(ctx: Context, handle: string, target: string): Promise<string>;

package/package.json

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