koishi-plugin-ggcevo-game 1.4.11 → 1.4.12

package/lib/boss/passivehandler.d.ts

@@ -38,7 +38,7 @@ export declare const PassiveHandler: {
         messages: string[];
         skillUpdates: {
             name: any;
-            remove: ("冰霜环绕" | "寒霜地狱" | "冰霜回复" | "弱化形态" | "异形甲壳" | "孤立无援" | "冰霜进化" | "应激甲壳I" | "应激甲壳II" | "求生本能I" | "求生本能II" | "冷适应" | "感染空间站" | "病毒云" | "霉菌滋生" | "岗哨机枪" | "结构装甲" | "吸血唾液" | "进食" | "嗜血狂暴" | "吐血" | "电能导体" | "超导体" | "能量虹吸" | "能源虹吸" | "电能立场" | "电能冲击波" | "脉冲" | "能量黑洞" | "火焰异形" | "庞兽狂暴" | "灼烧粘液" | "腐蚀胆汁" | "火焰吐息" | "太阳耀斑" | "燃烧潜地" | "炼狱爆弹" | "猎手异形" | "狂暴" | "伪装" | "致命一击")[];
+            remove: ("弱化形态" | "异形甲壳" | "孤立无援" | "冰霜回复" | "冰霜进化" | "冰霜环绕" | "寒霜地狱" | "应激甲壳I" | "应激甲壳II" | "求生本能I" | "求生本能II" | "冷适应" | "感染空间站" | "病毒云" | "霉菌滋生" | "岗哨机枪" | "结构装甲" | "吸血唾液" | "进食" | "嗜血狂暴" | "吐血" | "电能导体" | "超导体" | "能量虹吸" | "能源虹吸" | "电能立场" | "电能冲击波" | "脉冲" | "能量黑洞" | "火焰异形" | "庞兽狂暴" | "灼烧粘液" | "腐蚀胆汁" | "火焰吐息" | "太阳耀斑" | "燃烧潜地" | "炼狱爆弹" | "猎手异形" | "狂暴" | "伪装" | "致命一击")[];
         }[];
     };
     handleInfectedStation: (ctx: Context, targetBoss: any) => Promise<{
@@ -105,6 +105,9 @@ export declare const PassiveHandler: {
     handleArcWelderEffect: (ctx: Context, targetBoss: any, weaponName: string) => Promise<{
         messages: string[];
     }>;
+    handleArcRifleEffect: (ctx: Context, targetBoss: any, weaponName: string, messages: string[]) => Promise<{
+        drainAmount: number;
+    }>;
     handleGiantRage: (targetBoss: any, currentHP: number, maxHP: number) => {
         damageMultiplier: number;
         messages: string[];
@@ -148,7 +151,7 @@ export declare const PassiveHandler: {
         damageMultiplier: number;
         messages: string[];
     };
-    handleHunterAlien: (ctx: Context, targetBoss: any, weaponName: string, activeBosses: any[]) => Promise<{
+    handleHunterAlien: (ctx: Context, targetBoss: any, weaponName: string) => Promise<{
         immune: boolean;
         messages: string[];
         damageMultiplier?: undefined;
@@ -171,10 +174,13 @@ export declare const PassiveHandler: {
     };
     handleCorrosionModule: (installedMods: string[]) => number;
     handleParticlePhaseEffect: (targetBoss: any, weaponName: string) => number;
-    handleIgnoreReductionEffects: (ctx: Context, userId: string, weaponName: string, targetBoss: any, totalMultiplier: number) => Promise<{
-        damageMultiplier: number;
+    handleIgnoreReductionEffects: (ctx: Context, handle: string, weaponName: string, targetBoss: any, nerfMultiplier: number) => Promise<{
+        ignoreRate: number;
         messages: any[];
     }>;
+    handlePulseDisruptor: (ctx: Context, targetBoss: any, weaponName: string) => Promise<{
+        messages: string[];
+    }>;
     handlePassives: (ctx: Context, handle: string, targetBoss: any, initialDamage: number, currentHP: number, maxHP: number, weaponName: string, weaponData: any, activeBosses: any[], bossGroup: any) => Promise<{
         currentHP: any;
         messages: any;

package/lib/index.js

@@ -237,7 +237,7 @@ var weaponConfig = {
     category: "能量武器",
     damage: 32,
     description: "一种原型能量武器，能够发射强大的脉冲",
-    specialeffect: "攻击减少目标的2层技能计数",
+    specialeffect: "攻击减少目标2层技能计数",
     price: 1500,
     redCrystalCost: 15,
     isantiair: true,
@@ -263,14 +263,14 @@ var weaponConfig = {
     id: 102,
     type: "能量武器",
     category: "传奇武器",
-    damage: 50,
+    damage: 70,
     description: "一件传奇武器",
-    specialeffect: "攻击暴击率80%",
+    specialeffect: "攻击暴击率+80%",
     price: 7500,
     redCrystalCost: 150,
     isantiair: true,
     tagEffects: {
-      "重甲": 2
+      "重甲": 1.5
     }
   },
   "龙息霰弹枪": {
@@ -460,6 +460,22 @@ var SyndicatedItems = {
     price: 0,
     redCrystalCost: 10,
     effects: "此物品存放于仓库自动生效(阵营必须为辛迪加海盗)。主动发起的PK对战结果为失败时上交给对方的金币-50%"
+  },
+  "雷达面罩": {
+    id: 6,
+    type: "设备工具",
+    description: "一个复杂的雷达面罩，用于远距离侦察或探测隐藏单位",
+    price: 0,
+    redCrystalCost: 25,
+    effects: "此物品存放于仓库自动生效(阵营必须为辛迪加海盗)。使用武器攻击时，无视目标10%的减伤效果"
+  },
+  "气喇叭": {
+    id: 7,
+    type: "设备工具",
+    description: "气喇叭一直被用于展示纯粹的勇气",
+    price: 0,
+    redCrystalCost: 30,
+    effects: "此物品存放于仓库自动生效(阵营必须为辛迪加海盗)。主动发起的PK对战结果为胜利时将获得辛迪加海盗总部发放的等额金币作为奖励"
   }
 };
 var initDefaultItems = {
@@ -598,7 +614,7 @@ var syndicatePirateConfig = [
     effect: "武器等级上限为7级; 升级武器享有10%的折扣; 解锁M4AE脉冲步枪(传奇)购买权限",
     requirements: "至少拥有一把6级及以上等级的武器",
     Jobtransfer: true,
-    costredcrystal: 40
+    costredcrystal: 35
   },
   {
     professionName: "猩红杀手",
@@ -802,31 +818,31 @@ var Spacestationtechnology = [
         level: 1,
         cost: 500,
         description: "提高挖矿效率，每日签到金币奖励+5%",
-        careerBonus: "深空矿工/情报副官: 每日签到金币奖励+10%"
+        careerBonus: "每日签到金币奖励+10%"
       },
       {
         level: 2,
         cost: 1750,
         description: "提高挖矿效率，每日签到金币奖励+10%",
-        careerBonus: "深空矿工/情报副官: 每日签到金币奖励+20%; 解锁太空“挖矿”权限"
+        careerBonus: "每日签到金币奖励+20%; 解锁太空“挖矿”权限"
       },
       {
         level: 3,
         cost: 2950,
         description: "提高挖矿效率，每日签到金币奖励+15%",
-        careerBonus: "深空矿工/情报副官: 每日签到金币奖励+30%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高20%"
+        careerBonus: "每日签到金币奖励+30%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高20%"
       },
       {
         level: 4,
         cost: 4250,
         description: "提高挖矿效率，每日签到金币奖励+20%",
-        careerBonus: "深空矿工/情报副官: 每日签到金币奖励+40%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高40%"
+        careerBonus: "每日签到金币奖励+40%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高40%"
       },
       {
         level: 5,
         cost: 5375,
         description: "提高挖矿效率，每日签到金币奖励+25%",
-        careerBonus: "深空矿工/情报副官: 每日签到金币奖励+50%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高60%，并且单次挖矿时间上限增加至48小时"
+        careerBonus: "每日签到金币奖励+50%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高60%，并且单次挖矿时间上限增加至48小时"
       }
     ]
   },
@@ -841,31 +857,31 @@ var Spacestationtechnology = [
         level: 1,
         cost: 500,
         description: "提升空间站武器等级，升级武器享有5%的折扣",
-        careerBonus: "武器中士/情报副官: 升级武器享有10%的折扣"
+        careerBonus: "升级武器享有10%的折扣"
       },
       {
         level: 2,
         cost: 1500,
         description: "提升空间站武器等级，升级武器享有10%的折扣",
-        careerBonus: "武器中士/情报副官: 升级武器享有20%的折扣"
+        careerBonus: "升级武器享有20%的折扣"
       },
       {
         level: 3,
         cost: 2550,
         description: "提升空间站武器等级，升级武器享有15%的折扣",
-        careerBonus: "武器中士/情报副官: 升级武器享有30%的折扣"
+        careerBonus: "升级武器享有30%的折扣"
       },
       {
         level: 4,
         cost: 3950,
         description: "提升空间站武器等级，升级武器享有20%的折扣",
-        careerBonus: "武器中士/情报副官: 在升级武器享有40%的折扣"
+        careerBonus: "在升级武器享有40%的折扣"
       },
       {
         level: 5,
         cost: 4650,
         description: "提升空间站武器等级，升级武器享有25%的折扣",
-        careerBonus: "武器中士/情报副官: 升级武器享有50%的折扣; 解锁传奇武器购买权限1次"
+        careerBonus: "升级武器享有50%的折扣; 解锁传奇武器购买权限1次"
       }
     ]
   },
@@ -879,13 +895,13 @@ var Spacestationtechnology = [
         level: 1,
         cost: 750,
         description: "重启武器升级站，武器改装通用模块享有5%的折扣",
-        careerBonus: "武器中士/情报副官: 武器改装通用模块享有10%的折扣"
+        careerBonus: "武器改装通用模块享有10%的折扣"
       },
       {
         level: 2,
         cost: 1e3,
         description: "重启高级武器改装站，武器改装通用模块享有10%的折扣",
-        careerBonus: "武器中士/情报副官: 武器改装通用模块享有20%的折扣; 武器改装专属模块享有10%的折扣"
+        careerBonus: "武器改装通用模块享有20%的折扣; 武器改装专属模块享有10%的折扣"
       }
     ]
   },
@@ -900,31 +916,70 @@ var Spacestationtechnology = [
         level: 1,
         cost: 500,
         description: "重启安防参数代码，攻击获得的金币+5%",
-        careerBonus: "警卫员下士/警卫长/情报副官: 攻击获得的金币+10%"
+        careerBonus: "攻击获得的金币+10%"
       },
       {
         level: 2,
         cost: 2050,
         description: "提高空间站安防系统强度，攻击获得的金币+10%",
-        careerBonus: "警卫员下士/警卫长/情报副官: 攻击获得的金币+20%"
+        careerBonus: "攻击获得的金币+20%"
       },
       {
         level: 3,
         cost: 3250,
         description: "进一步提高空间站安防系统强度，攻击获得的金币+15%",
-        careerBonus: "警卫员下士/警卫长/情报副官: 攻击获得的金币+30%"
+        careerBonus: "攻击获得的金币+30%"
       },
       {
         level: 4,
         cost: 4250,
         description: "大幅提高空间站安防系统强度，攻击获得的金币+20%",
-        careerBonus: "警卫员下士/警卫长/情报副官: 攻击获得的金币+40%"
+        careerBonus: "攻击获得的金币+40%"
       },
       {
         level: 5,
         cost: 5350,
         description: "完全恢复空间站安防系统，攻击获得的金币+25%",
-        careerBonus: "警卫员下士/警卫长/情报副官: 攻击获得的金币+50%; 获得一次打开安全军械库防爆门的权限，可以随机获得一把传奇武器"
+        careerBonus: "攻击获得的金币+50%; 获得一次打开安全军械库防爆门的权限，可以随机获得一把传奇武器"
+      }
+    ]
+  },
+  {
+    techId: 5,
+    techname: "关键系统固件",
+    careerNames: ["舰长", "情报副官"],
+    // 新增职业名称字段
+    maxLevel: 5,
+    levels: [
+      {
+        level: 1,
+        cost: 500,
+        description: "升级空间站关键系统，完成任务奖励+5%",
+        careerBonus: "完成任务奖励+10%"
+      },
+      {
+        level: 2,
+        cost: 1250,
+        description: "升级空间站关键系统，完成任务奖励+10%",
+        careerBonus: "完成任务奖励+20%"
+      },
+      {
+        level: 3,
+        cost: 2250,
+        description: "升级空间站关键系统，完成任务奖励+15%",
+        careerBonus: "完成任务奖励+30%"
+      },
+      {
+        level: 4,
+        cost: 2950,
+        description: "升级空间站关键系统，完成任务奖励+20%",
+        careerBonus: "完成任务奖励+40%，移除签到7日以下奖励区间"
+      },
+      {
+        level: 5,
+        cost: 3550,
+        description: "升级空间站关键系统，完成任务奖励+25%",
+        careerBonus: "完成任务奖励+50%，移除签到14日以下奖励区间"
       }
     ]
   }
@@ -1456,6 +1511,10 @@ function calculateModifiers(equippedWeapon, weaponName, hasCritRhythm) {
   let crystalCrit = 0;
   let overloadCrit = 0;
   let rhythmCrit = 0;
+  let weaponCrit = 0;
+  if (weaponName === "MK-4激光步枪") {
+    weaponCrit = 80;
+  }
   equippedWeapon.installedMods.forEach((mod) => {
     if (mod === "动能增幅") {
       totalModAdd += 0.2;
@@ -1472,7 +1531,8 @@ function calculateModifiers(equippedWeapon, weaponName, hasCritRhythm) {
   });
   rhythmCrit = hasCritRhythm ? 20 : 0;
   const totalCritRate = Math.min(
-    crystalCrit + overloadCrit + rhythmCrit,
+    crystalCrit + overloadCrit + rhythmCrit + weaponCrit,
+    // 包含武器专属暴击
     100
   );
   if (totalCritRate > 0) {
@@ -2777,6 +2837,24 @@ var PassiveHandler = {
     }
     return { messages };
   }, "handleArcWelderEffect"),
+  // 在 PassiveHandler 对象中添加新的处理函数
+  handleArcRifleEffect: /* @__PURE__ */ __name(async function(ctx, targetBoss, weaponName, messages) {
+    if (weaponName !== "DG-3电弧步枪") return null;
+    const currentEnergy = targetBoss.energy || 0;
+    const drainAmount = Math.min(500, currentEnergy);
+    const newEnergy = currentEnergy - drainAmount;
+    if (drainAmount <= 0) {
+      return null;
+    }
+    await ctx.database.set(
+      "ggcevo_boss",
+      { name: targetBoss.name },
+      { energy: newEnergy }
+    );
+    targetBoss.energy = newEnergy;
+    messages.push(`⚡ 【DG-3电弧步枪】生效：消耗目标${drainAmount}点能量`);
+    return { drainAmount };
+  }, "handleArcRifleEffect"),
   // 庞兽狂暴处理（血量低于50%时减伤）
   handleGiantRage: /* @__PURE__ */ __name(function(targetBoss, currentHP, maxHP) {
     if (!targetBoss.skills.includes("庞兽狂暴")) return null;
@@ -3034,7 +3112,7 @@ var PassiveHandler = {
     };
   }, "handleHellfireBomb"),
   // 猎手异形处理（Hunter Alien）
-  handleHunterAlien: /* @__PURE__ */ __name(async function(ctx, targetBoss, weaponName, activeBosses) {
+  handleHunterAlien: /* @__PURE__ */ __name(async function(ctx, targetBoss, weaponName) {
     if (!targetBoss.skills.includes("猎手异形")) return null;
     if (weaponName === "焚烧枪" || weaponName === "零度之下") {
       return {
@@ -3042,6 +3120,7 @@ var PassiveHandler = {
         messages: [`🛡️ 【猎手异形】生效：免疫${weaponName === "焚烧枪" ? "火焰" : "寒冷"}伤害`]
       };
     }
+    const activeBosses = await ctx.database.get("ggcevo_boss", { isActive: true });
     const otherAlive = activeBosses.some(
       (boss) => boss.groupId === targetBoss.groupId && boss.name !== targetBoss.name && boss.HP > 0
     );
@@ -3108,67 +3187,92 @@ var PassiveHandler = {
     if (!targetBoss || weaponName !== "粒子相位枪") return 0;
     return targetBoss.tags.includes("护盾") ? 0.5 : 0;
   }, "handleParticlePhaseEffect"),
-  // 修复handleIgnoreReductionEffects函数，确保始终返回有效对象
-  handleIgnoreReductionEffects: /* @__PURE__ */ __name(async (ctx, userId, weaponName, targetBoss, totalMultiplier) => {
-    const fallbackResult = {
-      damageMultiplier: totalMultiplier,
-      messages: []
-    };
-    try {
-      if (totalMultiplier >= 0) {
-        return fallbackResult;
-      }
-      const weaponConfigData = weaponConfig[weaponName];
-      if (!weaponConfigData) {
-        return fallbackResult;
-      }
-      const [equippedWeapon] = await ctx.database.get("ggcevo_equipment", {
-        weaponId: weaponConfigData.id,
-        handle: userId,
-        equipped: true
-      });
-      if (!equippedWeapon || !equippedWeapon.installedMods) {
-        return fallbackResult;
-      }
-      const ignoreEffects = [];
+  // 修改后的无视减伤处理函数
+  handleIgnoreReductionEffects: /* @__PURE__ */ __name(async (ctx, handle, weaponName, targetBoss, nerfMultiplier) => {
+    if (nerfMultiplier >= 0) return null;
+    const ignoreEffects = [];
+    let messages = [];
+    if (weaponName === "光剑") {
+      ignoreEffects.push(1);
+      messages.push(`⚔️ 【光剑】特效：无视目标100%减伤效果`);
+    } else if (weaponName === "M4AE脉冲步枪") {
+      ignoreEffects.push(0.8);
+      messages.push(`🔫 【M4AE脉冲步枪】特效：无视目标80%减伤效果`);
+    }
+    if (weaponName !== "光剑" && weaponName !== "M4AE脉冲步枪") {
       const particleEffect = PassiveHandler.handleParticlePhaseEffect(targetBoss, weaponName);
       if (particleEffect > 0) {
         ignoreEffects.push(particleEffect);
-      }
-      const corrosionEffect = PassiveHandler.handleCorrosionModule(equippedWeapon.installedMods);
-      if (corrosionEffect > 0) {
-        ignoreEffects.push(corrosionEffect);
-      }
-      if (ignoreEffects.length === 0) {
-        return fallbackResult;
-      }
-      const totalIgnoreRate = ignoreEffects.reduce((sum, rate) => sum + rate, 0);
-      const originalMultiplier = totalMultiplier;
-      const effectiveMultiplier = totalMultiplier * (1 - totalIgnoreRate);
-      const messages = [];
-      if (particleEffect > 0) {
         messages.push(`⚡ 【粒子相位枪】特效：无视护盾目标${particleEffect * 100}%减伤效果`);
       }
-      if (corrosionEffect > 0) {
-        messages.push(`⚡ 【破甲模块】生效：无视目标${corrosionEffect * 100}%减伤效果`);
+      const weaponConfigData = weaponConfig[weaponName];
+      if (weaponConfigData) {
+        const [equippedWeapon] = await ctx.database.get("ggcevo_equipment", {
+          weaponId: weaponConfigData.id,
+          handle,
+          equipped: true
+        });
+        if (equippedWeapon?.installedMods?.includes("破甲模块")) {
+          const corrosionEffect = 0.2;
+          ignoreEffects.push(corrosionEffect);
+          messages.push(`⚡ 【破甲模块】生效：无视目标${corrosionEffect * 100}%减伤效果`);
+        }
+      }
+    }
+    try {
+      const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
+      if (careerData?.group === "辛迪加海盗") {
+        const [radarMask] = await ctx.database.get("ggcevo_warehouse", {
+          handle,
+          itemId: 6
+          // 雷达面罩ID
+        });
+        if (radarMask && radarMask.quantity > 0) {
+          const radarEffect = 0.1;
+          ignoreEffects.push(radarEffect);
+          messages.push(`🛰️ 【雷达面罩】生效：无视目标${radarEffect * 100}%减伤效果`);
+        }
       }
-      messages.push(
-        `⚡ 减伤系数由${(originalMultiplier * 100).toFixed(0)}% → ${(effectiveMultiplier * 100).toFixed(0)}%`
-      );
-      return {
-        damageMultiplier: effectiveMultiplier,
-        messages
-      };
     } catch (error) {
-      ctx.logger("PassiveHandler").warn("处理无视减伤效果失败", error);
-      return fallbackResult;
+      console.error("检查雷达面罩效果时出错:", error);
+    }
+    if (ignoreEffects.length === 0) {
+      return null;
     }
+    const totalIgnoreRate = Math.min(1, ignoreEffects.reduce((sum, rate) => sum + rate, 0));
+    return {
+      ignoreRate: totalIgnoreRate,
+      messages
+    };
   }, "handleIgnoreReductionEffects"),
-  // 统一处理被动技能
+  // 在PassiveHandler对象中添加处理脉冲扰乱枪效果的方法
+  handlePulseDisruptor: /* @__PURE__ */ __name(async function(ctx, targetBoss, weaponName) {
+    if (weaponName !== "脉冲扰乱枪") {
+      return null;
+    }
+    const currentSkillCount = targetBoss.Skillcountpoints || 0;
+    if (currentSkillCount <= 0) {
+      return null;
+    }
+    const newCount = Math.max(0, currentSkillCount - 2);
+    await ctx.database.set(
+      "ggcevo_boss",
+      { name: targetBoss.name },
+      { Skillcountpoints: newCount }
+    );
+    targetBoss.Skillcountpoints = newCount;
+    return {
+      messages: [
+        `⚡ 【脉冲扰乱枪】特效：减少${targetBoss.name} 2层技能计数(当前${newCount}层)`
+      ]
+    };
+  }, "handlePulseDisruptor"),
+  // 修改后的伤害处理函数
   handlePassives: /* @__PURE__ */ __name(async function(ctx, handle, targetBoss, initialDamage, currentHP, maxHP, weaponName, weaponData, activeBosses, bossGroup) {
     let messages = [];
     let skillUpdates = [];
-    let totalMultiplier = 0;
+    let buffMultiplier = 0;
+    let nerfMultiplier = 0;
     let radiationApplied = false;
     let freezing = false;
     let bileStacks = 0;
@@ -3236,7 +3340,7 @@ var PassiveHandler = {
         initialDamage: 0
       };
     }
-    const hunterImmune = await this.handleHunterAlien(ctx, targetBoss, weaponName, activeBosses);
+    const hunterImmune = await this.handleHunterAlien(ctx, targetBoss, weaponName);
     if (hunterImmune?.immune) {
       return {
         currentHP: targetBoss.HP,
@@ -3248,92 +3352,114 @@ var PassiveHandler = {
     targetBoss.skills.forEach((skill) => {
       const config = passiveConfig[skill];
       if (config && config.effect !== void 0 && config.effect !== 0) {
-        totalMultiplier += config.effect;
+        if (config.effect > 0) {
+          buffMultiplier += config.effect;
+        } else {
+          nerfMultiplier += config.effect;
+        }
         const effectPercent = Math.round(config.effect * 100);
-        messages.push(`📚 【${skill}】生效，受到的伤害${config.effect > 0 ? "+" : ""}${effectPercent}%`);
+        const effectSign = config.effect > 0 ? "+" : "";
+        messages.push(`📚 【${skill}】生效：受到的伤害${effectSign}${effectPercent}%`);
       }
     });
+    const radiationCalc = this.calculateRadiationDamage(targetBoss);
+    if (radiationCalc) {
+      buffMultiplier += radiationCalc.damageMultiplier;
+      messages.push(...radiationCalc.messages);
+    }
+    const coldDamageResult = this.calculateColdDamage(targetBoss);
+    if (coldDamageResult) {
+      buffMultiplier += coldDamageResult.damageMultiplier;
+      messages.push(...coldDamageResult.messages);
+    }
     const infectionResult = await this.handleInfectedStation(ctx, targetBoss);
     if (infectionResult) {
-      totalMultiplier += infectionResult.damageMultiplier;
+      nerfMultiplier += infectionResult.damageMultiplier;
       messages.push(...infectionResult.messages);
     }
     const armorResult = this.handleStructuralArmor(targetBoss, weaponData);
     if (armorResult) {
-      totalMultiplier += armorResult.damageMultiplier;
+      nerfMultiplier += armorResult.damageMultiplier;
       messages.push(...armorResult.messages);
     }
     const bloodEffect = this.handleBloodEffects(targetBoss, currentHP, maxHP);
     if (bloodEffect) {
-      totalMultiplier += bloodEffect.damageMultiplier;
+      nerfMultiplier += bloodEffect.damageMultiplier;
       messages.push(...bloodEffect.messages);
     }
     const siphonResult = this.handleEnergySiphon(targetBoss, currentHP, maxHP);
     if (siphonResult) {
-      totalMultiplier += siphonResult.damageMultiplier;
+      nerfMultiplier += siphonResult.damageMultiplier;
       messages.push(...siphonResult.messages);
     }
     const powerSiphonResult = this.handlePowerSiphon(targetBoss);
     if (powerSiphonResult) {
-      totalMultiplier += powerSiphonResult.damageMultiplier;
+      nerfMultiplier += powerSiphonResult.damageMultiplier;
       messages.push(...powerSiphonResult.messages);
     }
     const giantRageResult = this.handleGiantRage(targetBoss, currentHP, maxHP);
     if (giantRageResult) {
-      totalMultiplier += giantRageResult.damageMultiplier;
+      nerfMultiplier += giantRageResult.damageMultiplier;
       messages.push(...giantRageResult.messages);
     }
     const hellfireBombResult = this.handleHellfireBomb(targetBoss, activeBosses);
     if (hellfireBombResult) {
-      totalMultiplier += hellfireBombResult.damageMultiplier;
+      nerfMultiplier += hellfireBombResult.damageMultiplier;
       messages.push(...hellfireBombResult.messages);
     }
     const disguiseResult = await this.handleDisguise(ctx, targetBoss, weaponName, initialDamage);
     if (disguiseResult) {
-      totalMultiplier += disguiseResult.damageMultiplier;
+      nerfMultiplier += disguiseResult.damageMultiplier;
       messages.push(...disguiseResult.messages);
     }
     if (hunterImmune && !hunterImmune.immune) {
-      totalMultiplier += hunterImmune.damageMultiplier;
+      const multiplier = hunterImmune.damageMultiplier;
+      if (multiplier > 0) {
+        buffMultiplier += multiplier;
+      } else {
+        nerfMultiplier += multiplier;
+      }
       messages.push(...hunterImmune.messages);
     }
     const rageResult = this.handleRage(targetBoss, currentHP, maxHP);
     if (rageResult) {
-      totalMultiplier += rageResult.damageMultiplier;
+      nerfMultiplier += rageResult.damageMultiplier;
       messages.push(...rageResult.messages);
     }
-    const radiationCalc = this.calculateRadiationDamage(targetBoss);
-    if (radiationCalc) {
-      totalMultiplier += radiationCalc.damageMultiplier;
-      messages.push(...radiationCalc.messages);
-    }
-    const coldDamageResult = this.calculateColdDamage(targetBoss);
-    if (coldDamageResult) {
-      totalMultiplier += coldDamageResult.damageMultiplier;
-      messages.push(...coldDamageResult.messages);
+    if (solarFlareResult.messages.length > 0) {
+      messages.push(...solarFlareResult.messages);
     }
+    let baseMultiplier = buffMultiplier + nerfMultiplier;
     const ignoreReductionResult = await this.handleIgnoreReductionEffects(
       ctx,
       handle,
       weaponName,
       targetBoss,
-      totalMultiplier
+      nerfMultiplier
+      // 只传入减伤部分
     );
-    if (ignoreReductionResult && ignoreReductionResult.messages && ignoreReductionResult.messages.length > 0) {
-      totalMultiplier = ignoreReductionResult.damageMultiplier;
-      messages.push(...ignoreReductionResult.messages);
-    }
-    if (solarFlareResult.messages.length > 0) {
-      messages.push(...solarFlareResult.messages);
-    }
-    const originalMultiplier = totalMultiplier;
+    let effectiveMultiplier = baseMultiplier;
+    let appliedIgnoreMessages = [];
+    let effectiveNerf = nerfMultiplier;
+    if (ignoreReductionResult) {
+      appliedIgnoreMessages = ignoreReductionResult.messages;
+      effectiveNerf = nerfMultiplier * (1 - ignoreReductionResult.ignoreRate);
+      effectiveMultiplier = buffMultiplier + effectiveNerf;
+    }
+    const originalMultiplier = effectiveMultiplier;
     if (originalMultiplier < -1) {
       messages.push(`⚠️ 触发伤害保底机制：强制造成1点伤害`);
     }
-    let finalDamage = initialDamage * (1 + totalMultiplier);
+    let finalDamage = initialDamage * (1 + effectiveMultiplier);
     finalDamage = Math.floor(finalDamage);
     finalDamage = Math.max(finalDamage, 1);
     currentHP = targetBoss.HP - finalDamage;
+    if (appliedIgnoreMessages.length > 0) {
+      messages.push(...appliedIgnoreMessages);
+      messages.push(
+        `⚡ 减伤效果：${(nerfMultiplier * 100).toFixed(0)}% → ${(effectiveNerf * 100).toFixed(0)}%`
+      );
+    }
     if (currentHP <= 0 && !targetBoss.skills.includes("求生本能I") && !targetBoss.skills.includes("求生本能II")) {
       return {
         currentHP,
@@ -3403,6 +3529,22 @@ var PassiveHandler = {
         }
       }
     }
+    const pulseDisruptorResult = await this.handlePulseDisruptor(
+      ctx,
+      targetBoss,
+      weaponName
+    );
+    if (pulseDisruptorResult) {
+      messages.push(...pulseDisruptorResult.messages);
+    }
+    const arcResult = await this.handleArcWelderEffect(ctx, targetBoss, weaponName);
+    if (arcResult) {
+      messages.push(...arcResult.messages);
+    }
+    const arcRifleResult = await this.handleArcRifleEffect(ctx, targetBoss, weaponName, messages);
+    if (arcRifleResult) {
+      messages.push(...arcRifleResult.messages);
+    }
     const coldAdaptResult = await this.handleColdAdaptation(ctx, targetBoss, weaponName);
     if (coldAdaptResult) {
       messages.push(...coldAdaptResult.messages);
@@ -3420,10 +3562,6 @@ var PassiveHandler = {
     if (tagChangeResult) {
       messages.push(...tagChangeResult.messages);
     }
-    const arcResult = await this.handleArcWelderEffect(ctx, targetBoss, weaponName);
-    if (arcResult) {
-      messages.push(...arcResult.messages);
-    }
     const shockwaveResult = await this.handleEnergyShockwave(ctx, targetBoss);
     if (shockwaveResult) {
       messages.push(...shockwaveResult.messages);
@@ -4590,12 +4728,30 @@ ${itemDetails.join("\n")}`;
       } else if (monthlyDays === 28) {
         tickets = 7;
       }
-      if (monthlyDays < 7) basePoints = getRandomInt(20, 40);
-      else if (monthlyDays < 14) basePoints = getRandomInt(40, 60);
-      else if (monthlyDays < 21) basePoints = getRandomInt(60, 80);
-      else if (monthlyDays < 28) basePoints = getRandomInt(80, 100);
-      else basePoints = getRandomInt(100, 200);
+      const [systemFirmwareTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 5 }).catch(() => [{ level: 0 }]);
+      const systemFirmwareLevel = Math.min(systemFirmwareTech?.level || 0, 5);
       const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
+      const shouldApplyBonus = careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData.career) && systemFirmwareLevel >= 4;
+      if (shouldApplyBonus) {
+        if (systemFirmwareLevel === 4) {
+          if (monthlyDays < 14) basePoints = getRandomInt(40, 60);
+          else if (monthlyDays < 21) basePoints = getRandomInt(60, 80);
+          else if (monthlyDays < 28) basePoints = getRandomInt(80, 100);
+          else basePoints = getRandomInt(100, 200);
+          messages.push(`🛰️ 关键系统固件科技Lv4：移除签到7日以下奖励区间`);
+        } else if (systemFirmwareLevel === 5) {
+          if (monthlyDays < 21) basePoints = getRandomInt(60, 80);
+          else if (monthlyDays < 28) basePoints = getRandomInt(80, 100);
+          else basePoints = getRandomInt(100, 200);
+          messages.push(`🛰️ 关键系统固件科技Lv5：移除签到14日以下奖励区间`);
+        }
+      } else {
+        if (monthlyDays < 7) basePoints = getRandomInt(20, 40);
+        else if (monthlyDays < 14) basePoints = getRandomInt(40, 60);
+        else if (monthlyDays < 21) basePoints = getRandomInt(60, 80);
+        else if (monthlyDays < 28) basePoints = getRandomInt(80, 100);
+        else basePoints = getRandomInt(100, 200);
+      }
       if (careerData?.group === "人类联盟") {
         totalBonus += 0.2;
         messages.push("🏛️ 人类联盟阵营：+20%金币");
@@ -4618,7 +4774,7 @@ ${itemDetails.join("\n")}`;
         }
         if (careerData.career === "深空矿工") {
           totalBonus += 0.5;
-          messages.push("🎖️ 深空矿工职业：+50%金币");
+          messages.push("⛏️ 深空矿工职业：+50%金币");
         }
       }
       if (careerData?.group === "辛迪加海盗") {
@@ -4628,7 +4784,7 @@ ${itemDetails.join("\n")}`;
           const additionalBonus = Math.min(humanPlayersCount, 50);
           const credBonus = 0.5 + additionalBonus / 100;
           totalBonus += credBonus;
-          messages.push(`💎 CRED-17设备：+50%金币 (额外+${additionalBonus}%金币)`);
+          messages.push(`💎 CRED-17生效：+50%金币 (额外+${additionalBonus}%金币)`);
         }
       }
       const [meowEffect] = await ctx.database.get("ggcevo_Wish_Record", {
@@ -5729,6 +5885,19 @@ ${items.join("、")}
         computerExpertProtection = true;
         goldTransfer = 0;
       }
+      let hornEffect = false;
+      let extraGold = 0;
+      if (isWin && initiatorCareer?.group === "辛迪加海盗") {
+        const [hornItem] = await ctx.database.get("ggcevo_warehouse", {
+          handle: initiatorHandle,
+          itemId: 7
+          // 气喇叭ID
+        });
+        if (hornItem && hornItem.quantity > 0) {
+          hornEffect = true;
+          extraGold = goldTransfer;
+        }
+      }
       await ctx.database.withTransaction(async () => {
         await ctx.database.upsert("ggcevo_pk", [
           // 发起者记录
@@ -5769,7 +5938,11 @@ ${items.join("、")}
             redcrystal: (initiatorCareer?.redcrystal || 0) + redcrystalAdd
           }], ["handle"]);
         }
-        if (computerExpertProtection) {
+        if (hornEffect) {
+          await ctx.database.set("ggcevo_sign", initiatorHandle, {
+            totalRewards: initiatorGold + goldTransfer + extraGold
+          });
+        } else if (computerExpertProtection) {
         } else {
           if (isWin) {
             await ctx.database.set("ggcevo_sign", targetHandle, {
@@ -5810,7 +5983,10 @@ ${items.join("、")}
         result.push(`💸 您从口袋里拿出了${goldTransfer}枚金币上交给对方`);
       }
       if (mp3Effect) {
-        result.push(`💿 MP3播放器设备：挑战者PK失败时上交的金币减少50%`);
+        result.push(`💿 MP3播放器生效：挑战者PK失败时上交的金币减少50%`);
+      }
+      if (hornEffect) {
+        result.push(`📯 气喇叭生效：辛迪加海盗总部为您发放了额外${extraGold}金币奖励！`);
       }
       if (initiatorCareer?.group === "辛迪加海盗") {
         result.push(`🔴 辛迪加海盗阵营：+1枚红晶`);
@@ -7423,7 +7599,7 @@ ${validTypes.join("、")}`;
         '使用 "科技 科技名称" 查看详细信息',
         isIntelligenceOfficer ? [
           "💰 当前折扣：",
-          "🎖️ 情报副官：10%"
+          "🎖️ 情报副官职业：10%"
         ].join("\n") : "",
         "====================",
         ...techList,
@@ -7452,7 +7628,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     if (isIntelligenceOfficer) {
       discountInfo = [
         "💰 当前折扣：",
-        "🎖️ 情报副官：10%"
+        "🎖️ 情报副官职业：10%"
       ];
     }
     return [
@@ -7557,7 +7733,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     }
     reportLines.push(rewardLine);
     if (tech.level >= 3) {
-      reportLines.push(`🔧 采掘系统 Lv.${tech.level}：金币+${multiplier * 100}%`);
+      reportLines.push(`🔧 采掘系统科技Lv.${tech.level}(矿骡)：+${multiplier * 100}%金币`);
     }
     reportLines.push(`🏆 历史总挖矿收益：${record.totalMined + total}金币`);
     reportLines.push("💡 已自动开始下一轮挖矿");
@@ -7621,49 +7797,84 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     ].join("\n");
   });
   ctx.command("ggcevo/完成任务 <name:text>", "完成指定任务领取奖励").usage('输入"完成任务 任务名称"来完成任务并领取奖励').action(async ({ session }, name2) => {
-    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "⚠️ 需要先绑定游戏句柄";
-    const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
-    if (await ctx.database.get("ggcevo_blacklist", { handle }).then((r) => r.length)) {
-      return "⛔ 您已被列入黑名单。";
-    }
-    const taskEntry = Object.entries(Tasklist).find(
-      ([taskName2]) => taskName2.includes(name2)
-    );
-    if (!name2) return "请输入“完成任务 任务名称”领取任务奖励";
-    if (!taskEntry) return `⚠️ 未找到名称包含"${name2}"的任务`;
-    const [taskName, taskConfig] = taskEntry;
-    const [taskData] = await ctx.database.get("ggcevo_task", {
-      handle,
-      taskId: taskConfig.id
-    });
-    if (!taskData) return `⚠️ 您尚未开始"${taskName}"任务`;
-    if (taskData.progress < taskConfig.target) {
-      return `⚠️ 任务进度不足！当前进度：${taskData.progress}/${taskConfig.target}`;
+    try {
+      const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
+      if (!profile) return "⚠️ 需要先绑定游戏句柄";
+      const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+      if (await ctx.database.get("ggcevo_blacklist", { handle }).then((r) => r.length)) {
+        return "⛔ 您已被列入黑名单。";
+      }
+      if (!name2) return '请输入"完成任务 任务名称"领取任务奖励';
+      const taskEntry = Object.entries(Tasklist).find(
+        ([taskName2]) => taskName2.includes(name2)
+      );
+      if (!taskEntry) return `⚠️ 未找到名称包含"${name2}"的任务`;
+      const [taskName, taskConfig] = taskEntry;
+      const [taskData] = await ctx.database.get("ggcevo_task", {
+        handle,
+        taskId: taskConfig.id
+      });
+      if (!taskData) return `⚠️ 您尚未开始"${taskName}"任务`;
+      if (taskData.progress < taskConfig.target) {
+        return `⚠️ 任务进度不足！当前进度：${taskData.progress}/${taskConfig.target}`;
+      }
+      const newProgress = taskData.progress - taskConfig.target;
+      const newCompletions = taskData.Completions + 1;
+      const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
+      const [systemFirmwareTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 5 }).catch(() => [{ level: 0 }]);
+      const techLevel = Math.min(systemFirmwareTech?.level || 0, 5);
+      let baseReward = taskConfig.price;
+      let actualReward = baseReward;
+      let bonusMessage = "";
+      let bonusPercent = 0;
+      if (techLevel > 0) {
+        const normalBonus = [0, 5, 10, 15, 20, 25][techLevel];
+        const careerBonus = careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData.career) ? [0, 10, 20, 30, 40, 50][techLevel] : 0;
+        bonusPercent = Math.max(normalBonus, careerBonus);
+        if (bonusPercent > 0) {
+          actualReward = Math.round(baseReward * (1 + bonusPercent / 100));
+          bonusMessage = `(含科技加成 +${bonusPercent}%)`;
+        }
+      }
+      await ctx.database.set("ggcevo_task", {
+        handle,
+        taskId: taskConfig.id
+      }, {
+        progress: newProgress,
+        Completions: newCompletions
+      });
+      const [signData] = await ctx.database.get("ggcevo_sign", { handle });
+      await ctx.database.upsert("ggcevo_sign", [{
+        handle,
+        totalRewards: (signData?.totalRewards || 0) + actualReward
+      }], ["handle"]);
+      const [updatedSignData] = await ctx.database.get("ggcevo_sign", { handle });
+      const response = [
+        `🎉 恭喜您成功完成【${taskName}】任务！`,
+        `任务奖励：${actualReward}金币（基础值：${baseReward}金币）`
+      ];
+      if (bonusPercent > 0) {
+        let bonusType = "";
+        if (careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData.career)) {
+          bonusType = "(职业专属加成)";
+        } else {
+          bonusType = "(普通加成)";
+        }
+        response.push(`⚙️ 关键系统固件科技Lv.${techLevel}：+${bonusPercent}%金币`);
+      }
+      response.push(
+        `累计完成次数：${newCompletions}次`,
+        `剩余进度点数：${newProgress}`,
+        `当前拥有金币：${updatedSignData.totalRewards}`
+      );
+      if (newProgress >= taskConfig.target) {
+        response.push(`💡 当前剩余进度可再完成${Math.floor(newProgress / taskConfig.target)}次任务`);
+      }
+      return response.join("\n");
+    } catch (error) {
+      console.error("完成任务命令时发生错误:", error);
+      return "处理任务时发生错误，请稍后重试。";
     }
-    const newProgress = taskData.progress - taskConfig.target;
-    const newCompletions = taskData.Completions + 1;
-    await ctx.database.set("ggcevo_task", {
-      handle,
-      taskId: taskConfig.id
-    }, {
-      progress: newProgress,
-      Completions: newCompletions
-    });
-    const [signData] = await ctx.database.get("ggcevo_sign", { handle });
-    await ctx.database.upsert("ggcevo_sign", [{
-      handle,
-      totalRewards: (signData?.totalRewards || 0) + taskConfig.price
-    }], ["handle"]);
-    const [updatedSignData] = await ctx.database.get("ggcevo_sign", { handle });
-    return [
-      `🎉 恭喜您成功完成【${taskName}】任务！`,
-      `任务奖励：${taskConfig.price}金币`,
-      `累计完成次数：${newCompletions}次`,
-      `剩余进度点数：${newProgress}`,
-      `当前拥有金币：${updatedSignData.totalRewards}`,
-      newProgress >= taskConfig.target ? `💡 当前剩余进度可再完成${Math.floor(newProgress / taskConfig.target)}次任务` : ``
-    ].join("\n");
   });
 }
 __name(apply, "apply");

package/lib/items.d.ts

@@ -39,6 +39,22 @@ export declare const SyndicatedItems: {
         redCrystalCost: number;
         effects: string;
     };
+    雷达面罩: {
+        id: number;
+        type: string;
+        description: string;
+        price: number;
+        redCrystalCost: number;
+        effects: string;
+    };
+    气喇叭: {
+        id: number;
+        type: string;
+        description: string;
+        price: number;
+        redCrystalCost: number;
+        effects: string;
+    };
 };
 export declare const initDefaultItems: {
     咕咕币: {

package/package.json

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