koishi-plugin-ggcevo-game 1.4.74 → 1.4.76

package/lib/boss/BattleEffectProcessor.d.ts

@@ -2,6 +2,7 @@ export interface BattleStatistics {
     name: string;
     hpChange: number;
     energyChange: number;
+    armorChange: number;
     tagsAdded: string[];
     tagsRemoved: string[];
     skillsAdded: string[];
@@ -398,7 +399,7 @@ export declare const BattleEffectProcessor: {
             name: string;
             updates: Partial<BattleStatistics>;
         } | null;
-        buffMultiplier: number;
+        armorReduction: number;
         layerAdded: boolean;
     } | null;
     handleColdEffect: (targetBoss: any, weaponName: string) => {
@@ -501,13 +502,24 @@ export declare const BattleEffectProcessor: {
         messages: string[];
         buffMultiplier?: undefined;
     };
-    handleBurrowAmbush: (targetBoss: any, nestlingNames?: string[]) => {
+    handleBurrowAmbush: (targetBoss: any, activeBosses: any[], nestlingNames?: string[]) => {
         messages: string[];
         targetUpdates: {
             name: any;
-            updates: Partial<BattleStatistics>;
+            updates: {
+                skillsRemoved: string[];
+            };
         };
-        spawnNewBossMark: string;
+        spawnNewBossMark?: undefined;
+    } | {
+        messages: string[];
+        targetUpdates: {
+            name: any;
+            updates: {
+                skillsRemoved: string[];
+            };
+        };
+        spawnNewBossMark: string[];
     };
     handleWeakeningSpit: (targetBoss: any, activeBosses: any[]) => any;
     handleHealingSwarm: (targetBoss: any, activeBosses: any[]) => {
@@ -553,6 +565,14 @@ export declare const BattleEffectProcessor: {
         messages: string[];
         spawnNewBossMark: string;
     };
+    handlePulseRifleEffect: (weaponName: string, targetBoss: any) => {
+        pulseGrenadeTriggered: boolean;
+        targetUpdates: {
+            name: string;
+            updates: Partial<BattleStatistics>;
+        } | null;
+        messages: string[];
+    };
 };
 /**
  * 统一处理所有被动效果（包含伤害修正、免疫检查、状态更新等）

package/lib/boss/attackhandling.d.ts

@@ -51,4 +51,4 @@ export declare function testAttackFunction(ctx: Context, session: any, handle: s
     passiveMessages: string[];
     ignoreMessage: any[];
 }>;
-export declare function createNestlingBosses(ctx: any, nestlingName: string): Promise<any>;
+export declare function createNestlingBosses(ctx: any, nestlingNames: string | string[]): Promise<any[]>;

package/lib/database.d.ts

@@ -122,12 +122,15 @@ export interface WeaponInventory {
     installedMods: string[];
     equipped: boolean;
     comboCount: number;
+    pityCounter: number;
 }
 export interface BossInfo {
     name: string;
     groupId: number;
     type: string;
     HP: number;
+    energy: number;
+    armor: number;
     tags: string[];
     skills: string[];
     skillStacks: number;
@@ -135,7 +138,6 @@ export interface BossInfo {
     statusLayers: number;
     radiationLayers: number;
     coldLayers: number;
-    energy: number;
     lastWeaponName: string;
     isActive: boolean;
     respawnTime: Date;

package/lib/index.js

@@ -148,7 +148,7 @@ var weaponConfig = {
     damage: 25,
     armorDamageReduction: 1,
     description: "喷射稳定的液氮恒流，对长时间接触者造成致命的损伤",
-    specialeffect: "攻击使目标叠加[寒冷]层数，每层使其受到的伤害提高2.5%（上限50%）",
+    specialeffect: "攻击时为目标附加[寒冷]效果，每层使目标受到的伤害提高2.5%（最多提高50%）",
     price: 775,
     redCrystalCost: 7,
     isantiair: false,
@@ -165,7 +165,7 @@ var weaponConfig = {
     damage: 24,
     armorDamageReduction: 0.5,
     description: "一种经过改造的电动工具，可对近距离的目标放出高压电",
-    specialeffect: "攻击消耗目标200点能量",
+    specialeffect: "每次攻击消耗目标200点能量值",
     price: 750,
     redCrystalCost: 7,
     isantiair: true,
@@ -181,7 +181,7 @@ var weaponConfig = {
     damage: 27,
     armorDamageReduction: 0.75,
     description: "一种高度危险性的武器，设计用辐射照射并伤害敌人",
-    specialeffect: "攻击使无机械标签的[生物]目标叠加[辐射]层数，每层使其受到的伤害提高2.5%（上限50%）",
+    specialeffect: "攻击无[机械]标签的[生物]目标时附加[辐射]效果，每层使目标受到的伤害提高2.5%（最多提高50%）",
     price: 825,
     redCrystalCost: 8,
     isantiair: true,
@@ -197,7 +197,7 @@ var weaponConfig = {
     damage: 27,
     armorDamageReduction: 0,
     description: "激光步枪的变种，采用折射技术升级",
-    specialeffect: "触发散射攻击，对非主目标造成120%基础伤害",
+    specialeffect: "攻击触发散射，对次要目标造成120%基础伤害",
     price: 1450,
     redCrystalCost: 14,
     isantiair: true,
@@ -212,7 +212,7 @@ var weaponConfig = {
     damage: 29,
     armorDamageReduction: 0.75,
     description: "面对护盾目标而开发的武器",
-    specialeffect: "攻击[护盾]目标时无视50%减伤",
+    specialeffect: "对[护盾]目标无视50%伤害减免",
     price: 1050,
     redCrystalCost: 10,
     isantiair: true,
@@ -244,7 +244,7 @@ var weaponConfig = {
     damage: 36,
     armorDamageReduction: 1,
     description: "一种原型能量武器，能够发射强大的脉冲",
-    specialeffect: "攻击使目标技能层数减少2层",
+    specialeffect: "攻击减少目标2层技能层数",
     price: 1500,
     redCrystalCost: 15,
     isantiair: true,
@@ -351,12 +351,12 @@ var weaponConfig = {
     damage: 80,
     armorDamageReduction: -1,
     description: "一件传奇武器",
-    specialeffect: "暴击率+25%；若连续3次攻击没暴击，则下一次攻击必定暴击",
+    specialeffect: "暴击率提高25%；连续3次未暴击时，下次攻击必定暴击",
     price: 6400,
     redCrystalCost: 200,
     isantiair: true,
     tagEffects: {
-      "重甲": 1.75
+      "重甲": 1.5
     }
   },
   "龙息霰弹枪": {
@@ -398,7 +398,7 @@ var weaponConfig = {
     damage: 100,
     armorDamageReduction: 0,
     description: "优雅而独特的武器",
-    specialeffect: "无视100%减伤",
+    specialeffect: "无视目标100%伤害减免",
     price: 6400,
     redCrystalCost: 200,
     isantiair: false,
@@ -411,7 +411,7 @@ var weaponConfig = {
     damage: 100,
     armorDamageReduction: 1,
     description: "一件传奇武器",
-    specialeffect: "攻击消耗目标500点能量",
+    specialeffect: "攻击触发散射，对次要目标造成30%基础伤害；每次攻击消耗目标500点能量值",
     price: 6400,
     redCrystalCost: 200,
     isantiair: true,
@@ -426,7 +426,7 @@ var weaponConfig = {
     damage: 80,
     armorDamageReduction: 0,
     description: "一件传奇武器",
-    specialeffect: "每次攻击有33%概率发射一枚特殊的榴弹，造成50%的额外伤害，并减少目标0.25护甲；若连续2次攻击没发射榴弹，则下一次攻击必定发射",
+    specialeffect: "无法暴击；无视50%伤害减免；33%几率发射脉冲榴弹，额外造成50%伤害并降低目标0.5护甲值",
     price: 6400,
     redCrystalCost: 200,
     isantiair: true,
@@ -455,21 +455,21 @@ var weaponConfig = {
 var modConfig = {
   "动能增幅": {
     cost: 1750,
-    effect: "伤害+15%",
+    effect: "伤害提高15%",
     // 规范术语
     exclusiveTo: "",
     isExclusive: false
   },
   "棱镜水晶": {
-    cost: 2250,
-    effect: "暴击率+10%",
+    cost: 2050,
+    effect: "暴击率提升10%",
     // 保持原描述
     exclusiveTo: "",
     isExclusive: false
   },
   "破甲模块": {
     cost: 1250,
-    effect: "无视10%减伤",
+    effect: "无视目标10%伤害减免",
     // 术语统一
     exclusiveTo: "",
     isExclusive: false
@@ -477,43 +477,37 @@ var modConfig = {
   // 专属模组修改
   "裂甲核心": {
     cost: 750,
-    effect: "伤害+40%，无视40%减伤",
-    // 统一伤害/防御描述
+    effect: "伤害提高40%，无视目标40%伤害减免",
     exclusiveTo: "高斯步枪",
     isExclusive: true
   },
   "棱镜超载核心": {
-    cost: 2550,
-    effect: "暴击率+20%；若连续4次攻击没暴击，则下一次攻击必定暴击",
-    // 保持原描述
+    cost: 2250,
+    effect: "暴击率提升20%；连续4次未暴击时，下次攻击必定暴击",
     exclusiveTo: "激光步枪",
     isExclusive: true
   },
   "助燃核心": {
     cost: 2550,
     effect: "对[惧热]目标造成300%伤害，对[生物]目标造成200%伤害",
-    // 规范标签引用和效果描述
     exclusiveTo: "焚烧枪",
     isExclusive: true
   },
   "光束曲射晶片": {
     cost: 2750,
-    effect: "触发散射攻击，对非主目标造成100%基础伤害",
-    // 明确机制命名
+    effect: "攻击触发散射，对次要目标造成100%基础伤害",
     exclusiveTo: "碎骨步枪",
     isExclusive: true
   },
   "金刚石瞄准镜": {
     cost: 2250,
-    effect: "无视20%减伤",
-    // 术语统一
+    effect: "无视目标20%伤害减免",
     exclusiveTo: "侦察步枪",
     isExclusive: true
   },
   "微型聚变核心": {
     cost: 2750,
-    effect: "连续攻击叠加[伤害提升]，每层提高7.5%伤害（上限6层）",
-    // 机制命名和数值规范化
+    effect: "连续攻击叠加[聚变]效果，每层提高7.5%伤害（最多6层）",
     exclusiveTo: "聚变磁轨枪",
     isExclusive: true
   }
@@ -1506,7 +1500,7 @@ var bossPool = [
       {
         name: "巢穴雷兽",
         type: "子代",
-        maxHP: 4e3,
+        maxHP: 2500,
         maxShield: 0,
         maxEnergy: 0,
         armor: 15,
@@ -1518,7 +1512,7 @@ var bossPool = [
       {
         name: "巢穴战士",
         type: "子代",
-        maxHP: 2e3,
+        maxHP: 1500,
         maxShield: 0,
         maxEnergy: 0,
         armor: 4,
@@ -1530,7 +1524,7 @@ var bossPool = [
       {
         name: "巢穴甲虫",
         type: "子代",
-        maxHP: 3e3,
+        maxHP: 2e3,
         maxShield: 0,
         maxEnergy: 0,
         armor: 10,
@@ -1551,6 +1545,8 @@ function updateStatsByName(name2, updates) {
     // 键与 name 一致
     hpChange: 0,
     energyChange: 0,
+    armorChange: 0,
+    // 新增字段初始化
     tagsAdded: [],
     tagsRemoved: [],
     skillsAdded: [],
@@ -1573,6 +1569,7 @@ function updateStatsByName(name2, updates) {
     statusLayersChanged: existing.statusLayersChanged + (updates.statusLayersChanged ?? 0),
     radiationLayersChange: existing.radiationLayersChange + (updates.radiationLayersChange ?? 0),
     coldLayersChange: existing.coldLayersChange + (updates.coldLayersChange ?? 0),
+    armorChange: existing.armorChange + (updates.armorChange ?? 0),
     // 数组类型：合并（新增内容追加到现有数组）
     tagsAdded: [...existing.tagsAdded, ...updates.tagsAdded ?? []],
     tagsRemoved: [...existing.tagsRemoved, ...updates.tagsRemoved ?? []],
@@ -3042,12 +3039,8 @@ var BattleEffectProcessor = {
     const messages = [];
     let layerAdded = false;
     const currentLayers = targetBoss.radiationLayers || 0;
-    const effectiveLayers = Math.min(currentLayers, 20);
-    const buffMultiplier = effectiveLayers * 0.025;
-    if (effectiveLayers > 0) {
-      messages.push(`☢️ 【辐射】：当前${currentLayers}层，受到的伤害+${(effectiveLayers * 2.5).toFixed(1)}%`);
-      if (currentLayers > 20) {
-      }
+    const armorReduction = currentLayers * 0.05;
+    if (currentLayers > 0) {
     }
     let targetUpdates = null;
     if (weaponName === "伽马枪" && // 使用伽马枪
@@ -3056,18 +3049,20 @@ var BattleEffectProcessor = {
       targetUpdates = {
         name: targetBoss.name,
         updates: {
-          radiationLayersChange: 1
+          radiationLayersChange: 1,
           // 辐射层数增加1
+          armorChange: -0.05
+          // 同时削减0.05护甲值（永久生效）
         }
       };
       const newLayers = currentLayers + 1;
-      messages.push(`☢️ 【伽马枪】武器效果：获得1层「辐射」`);
+      messages.push(`☢️ 【伽马枪】武器效果：获得1层「辐射」并削减0.05护甲值`);
       layerAdded = true;
     }
     return {
       messages,
       targetUpdates,
-      buffMultiplier,
+      armorReduction,
       layerAdded
       // 返回层数增加标记
     };
@@ -3428,29 +3423,41 @@ var BattleEffectProcessor = {
     const messages = [`🐛 【虫巢思维】生效：存在${livingNestlings}只巢穴子代，受到的伤害-${nerfMultiplier * 100}%`];
     return { nerfMultiplier, messages };
   }, "handleHiveMind"),
-  // 爆虫伏击 - 血量低于50%时，立即随机孵化1只巢穴子代并移除技能
-  handleBurrowAmbush: /* @__PURE__ */ __name(function(targetBoss, nestlingNames = ["巢穴雷兽", "巢穴战士", "巢穴甲虫"]) {
+  // 爆虫伏击 - 血量低于50%时，立即孵化巢穴子代直至上限（生效后移除）
+  handleBurrowAmbush: /* @__PURE__ */ __name(function(targetBoss, activeBosses, nestlingNames = ["巢穴雷兽", "巢穴战士", "巢穴甲虫"]) {
     if (!targetBoss.skills.includes("爆虫伏击")) return null;
     const maxHP = getMaxHPByName(targetBoss.name);
     const hpPercent = targetBoss.HP / maxHP;
     if (hpPercent >= 0.5) return null;
-    const randomBossName = nestlingNames[Math.floor(Math.random() * nestlingNames.length)];
-    const messages = [
-      `🕳️ 【爆虫伏击】触发：生命值≤50%，需要孵化1只${randomBossName}`,
-      `🕳️ 【爆虫伏击】技能移除`
-    ];
+    const existingTypes = activeBosses.filter((boss) => boss.isActive && nestlingNames.includes(boss.name)).map((boss) => boss.name);
+    const needSpawn = nestlingNames.filter(
+      (name2) => !existingTypes.includes(name2)
+      // 当前尚未存在
+    );
+    if (needSpawn.length === 0) {
+      return {
+        messages: [
+          "🕳️ 【爆虫伏击】触发：生命值≤50%，但所有巢穴子代已存在，无需孵化",
+          "🕳️ 【爆虫伏击】技能移除"
+        ],
+        targetUpdates: {
+          name: targetBoss.name,
+          updates: { skillsRemoved: ["爆虫伏击"] }
+        }
+      };
+    }
+    const spawnMessages = needSpawn.map(
+      (name2) => `🕳️ 【爆虫伏击】触发：孵化1只${name2}`
+    );
+    spawnMessages.push("🕳️ 【爆虫伏击】技能移除");
     return {
-      messages,
+      messages: spawnMessages,
       targetUpdates: {
-        // 添加目标boss更新数据
         name: targetBoss.name,
-        updates: {
-          skillsRemoved: ["爆虫伏击"]
-          // 移除此技能
-        }
+        updates: { skillsRemoved: ["爆虫伏击"] }
       },
-      spawnNewBossMark: randomBossName
-      // 返回生成标记
+      spawnNewBossMark: needSpawn
+      // 返回需要孵化的子代名称数组
     };
   }, "handleBurrowAmbush"),
   // 虚弱喷吐 - 孵化场存活时减伤80%，死亡时增伤20%
@@ -3463,7 +3470,7 @@ var BattleEffectProcessor = {
     if (hatcheryExists) {
       effect = { nerfMultiplier: 0.8, messages: ["🤢 【虚弱喷吐】生效：孵化场存活，受到的伤害-80%"] };
     } else {
-      effect = { buffMultiplier: 0.2, messages: ["☠️ 【虚弱喷吐】生效：孵化场死亡，受到的伤害+20%"] };
+      effect = { buffMultiplier: 0, messages: [] };
     }
     return effect;
   }, "handleWeakeningSpit"),
@@ -3512,7 +3519,7 @@ var BattleEffectProcessor = {
   }, "handleHealingSwarm"),
   // 释放信息素 - 所有存活巢穴子代减伤20%
   handleReleasePheromones: /* @__PURE__ */ __name(function(targetBoss) {
-    if (!targetBoss.name.includes("巢穴雷兽") && !targetBoss.name.includes("巢穴战士") && !targetBoss.name.includes("巢穴甲虫") && !targetBoss.name.includes("孵化场")) return null;
+    if (!targetBoss.name.includes("巢穴雷兽") && !targetBoss.name.includes("巢穴战士") && !targetBoss.name.includes("巢穴甲虫") && !targetBoss.name.includes("孵化场") && !targetBoss.name.includes("虫群女王")) return null;
     const messages = [`🌬️ 【释放信息素】生效：受到的伤害-20%`];
     const nerfMultiplier = 0.2;
     return { messages, nerfMultiplier };
@@ -3591,7 +3598,30 @@ var BattleEffectProcessor = {
       messages: [`🥚 【孵化】触发：成功孵化1只${randomBossName}`],
       spawnNewBossMark: randomBossName
     };
-  }, "handleHatching")
+  }, "handleHatching"),
+  // M4AE脉冲步枪特殊效果处理
+  handlePulseRifleEffect: /* @__PURE__ */ __name(function(weaponName, targetBoss) {
+    const messages = [];
+    let targetUpdates = null;
+    let pulseGrenadeTriggered = false;
+    if (weaponName !== "M4AE脉冲步枪") return null;
+    if (Math.random() < 0.33) {
+      pulseGrenadeTriggered = true;
+      targetUpdates = {
+        name: targetBoss.name,
+        updates: {
+          armorChange: -0.5
+          // 负值表示削减护甲
+        }
+      };
+      messages.push(`💥 【脉冲榴弹】触发：额外造成50%伤害，削减目标0.5点护甲值`);
+    } else return null;
+    return {
+      pulseGrenadeTriggered,
+      targetUpdates,
+      messages
+    };
+  }, "handlePulseRifleEffect")
 };
 function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCrit, ignoreRate, careerData) {
   const messages = [];
@@ -3675,6 +3705,13 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
       updateStatsByName(solarFlareResult.targetUpdates.name, solarFlareResult.targetUpdates.updates);
     }
   }
+  const pulseEffect = BattleEffectProcessor.handlePulseRifleEffect(weaponName, targetBoss);
+  if (pulseEffect) {
+    messages.push(...pulseEffect.messages);
+    if (pulseEffect.targetUpdates) {
+      updateStatsByName(pulseEffect.targetUpdates.name, pulseEffect.targetUpdates.updates);
+    }
+  }
   const carpetBombResult = BattleEffectProcessor.handleCarpetBombing(targetBoss);
   if (carpetBombResult) {
     isolatedImmunityMark = carpetBombResult.tempMark || false;
@@ -3791,7 +3828,7 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
     // 6. 淬毒撕咬
     { effect: BattleEffectProcessor.handlePoisonedBite, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleHealingSwarm, args: [targetBoss, activeBosses] },
-    { effect: BattleEffectProcessor.handleBurrowAmbush, args: [targetBoss] }
+    { effect: BattleEffectProcessor.handleBurrowAmbush, args: [targetBoss, activeBosses] }
   ];
   for (const effectItem of healingEffects) {
     processEffect(effectItem.effect, ...effectItem.args);
@@ -3836,9 +3873,6 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
   const radiationResult = BattleEffectProcessor.handleRadiationEffect(targetBoss, weaponName);
   if (radiationResult) {
     messages.push(...radiationResult.messages);
-    if (radiationResult.buffMultiplier) {
-      totalBuffMultiplier += radiationResult.buffMultiplier;
-    }
     if (radiationResult.targetUpdates) {
       updateStatsByName(radiationResult.targetUpdates.name, radiationResult.targetUpdates.updates);
     }
@@ -3875,6 +3909,9 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
   let adjustedNerfMultiplier = totalNerfMultiplier * (1 - ignoreRate);
   const damageMultiplier = 1 + totalBuffMultiplier - adjustedNerfMultiplier;
   finalDamage = damage * damageMultiplier;
+  if (pulseEffect?.pulseGrenadeTriggered) {
+    finalDamage *= 1.5;
+  }
   if (hasCrit) {
     finalDamage *= 2;
   }
@@ -3882,11 +3919,14 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
   if (careerData?.career === "猩红杀手" && weaponName === "侦察步枪") {
     armorDamageReduction = 1;
   }
-  armor = getArmorByName(targetBoss.name);
+  armor = targetBoss.armor;
   if (targetBoss.name === "测试假人") {
     armor = targetBoss.armor;
   }
   const armorReduction = armorDamageReduction * armor;
+  if (armorReduction !== 0) {
+    messages.push(`护甲减伤: ${armorReduction.toFixed(2)}点`);
+  }
   finalDamage = Math.max(Math.round(finalDamage - armorReduction), 1);
   const frostEvolutionResult = BattleEffectProcessor.handleFrostEvolution(
     targetBoss,
@@ -4207,11 +4247,11 @@ var passiveConfig = {
   },
   "爆虫伏击": {
     type: "",
-    description: "血量低于50%时，立即随机孵化1只巢穴子代（生效后移除）"
+    description: "血量低于50%时，立即孵化巢穴子代直至上限（生效后移除）"
   },
   "虚弱喷吐": {
     type: "",
-    description: "当孵化场存活时，受到的伤害降低80%；孵化场死亡时，受到的伤害提高20%"
+    description: "当孵化场存活时，受到的伤害降低80%"
   },
   "治愈虫群": {
     type: "",
@@ -4219,7 +4259,7 @@ var passiveConfig = {
   },
   "释放信息素": {
     type: "",
-    description: "所有存活的其他异形受到的伤害降低20%"
+    description: "所有存活的异形受到的伤害降低20%"
   },
   "恐吓尖啸": {
     type: "",
@@ -4438,6 +4478,7 @@ async function activateNextBossGroup(ctx, currentBossId = null) {
     // 新增标签字段
     skills: [...nextBossGroup.main.passive],
     energy: nextBossGroup.main.maxEnergy,
+    armor: nextBossGroup.main.armor,
     groupId: nextBossGroup.id,
     isActive: true,
     respawnTime: /* @__PURE__ */ new Date()
@@ -4451,6 +4492,7 @@ async function activateNextBossGroup(ctx, currentBossId = null) {
       // 新增标签字段
       skills: [...minion.passive],
       energy: minion.maxEnergy,
+      armor: minion.armor,
       groupId: nextBossGroup.id,
       isActive: true,
       respawnTime: /* @__PURE__ */ new Date()
@@ -4995,14 +5037,33 @@ async function calculateTotalDamage(ctx, session, config, equippedWeapon, target
 __name(calculateTotalDamage, "calculateTotalDamage");
 async function calculateCrit(ctx, handle, equippedWeapon, weaponName) {
   let critRate = 0;
+  const pityCounter = equippedWeapon?.pityCounter || 0;
   const critSources = [];
+  if (weaponName === "M4AE脉冲步枪") {
+    return {
+      hasCrit: false,
+      critSources: []
+    };
+  }
+  if (weaponName === "MK-4激光步枪" && pityCounter >= 3) {
+    return {
+      hasCrit: true,
+      critSources: ["🔫 MK-4激光步枪：保底暴击"]
+    };
+  }
+  if (equippedWeapon.installedMods?.includes("棱镜超载核心") && modConfig["棱镜超载核心"]?.exclusiveTo === weaponName && pityCounter >= 4) {
+    return {
+      hasCrit: true,
+      critSources: ["⚙️ 棱镜超载核心模组：保底暴击"]
+    };
+  }
   if (equippedWeapon.installedMods?.includes("棱镜水晶")) {
     critRate += 10;
-    critSources.push("🔼 棱镜水晶：暴击率+10%");
+    critSources.push("⚙️ 棱镜水晶：暴击率+10%");
   }
   if (equippedWeapon.installedMods?.includes("棱镜超载核心") && modConfig["棱镜超载核心"]?.exclusiveTo === weaponName) {
     critRate += 20;
-    critSources.push("🔼 棱镜超载核心：暴击率+20%");
+    critSources.push("⚙️ 棱镜超载核心：暴击率+20%");
   }
   const [critRhythm] = await ctx.database.get("ggcevo_wish", {
     handle,
@@ -5339,6 +5400,9 @@ async function handleScatterAttack(ctx, session, handle, config, equippedWeapon,
   } else if (weaponName === "中子步枪") {
     scatterEffectMessages.push("🔆 【中子步枪】触发散射攻击！");
     scatterRatio = 1.2;
+  } else if (weaponName === "DG-3电弧步枪") {
+    scatterEffectMessages.push("🔆 【DG-3电弧步枪】触发散射攻击！");
+    scatterRatio = 0.3;
   }
   for (const secondaryTarget of secondaryTargets) {
     const damageResult = await calculateTotalDamage(
@@ -5418,11 +5482,14 @@ async function handleDeathTargets(ctx, deadTargets, killerName, killerHandle) {
         "🏆 伤害排行榜奖励：",
         ...rewardMessages
       );
+    } else if (deadBoss.name === "巢穴雷兽" || deadBoss.name === "巢穴战士" || deadBoss.name === "巢穴甲虫") {
+      await ctx.database.remove("ggcevo_boss", { name: deadBoss.name });
     } else {
-      await ctx.database.set("ggcevo_boss", { groupId: deadBoss.groupId }, {
+      await ctx.database.upsert("ggcevo_boss", [{
+        name: deadBoss.name,
         isActive: false,
         HP: 0
-      });
+      }], ["name"]);
     }
   }
   return {
@@ -5598,6 +5665,10 @@ async function updateDatabaseWithStats(ctx, stats) {
     const newEnergy = boss.energy + stats.energyChange;
     updateData.energy = Math.max(0, Math.min(maxEnergy, newEnergy));
   }
+  if (stats.armorChange !== 0) {
+    const newarmor = boss.armor + stats.armorChange;
+    updateData.armor = newarmor;
+  }
   if (stats.skillStacksChanged !== 0) {
     const newStacks = boss.skillStacks + stats.skillStacksChanged;
     updateData.skillStacks = Math.max(0, Math.min(maxStacks, newStacks));
@@ -5650,8 +5721,8 @@ async function handleIgnoreReductionEffects(ctx, handle, weaponName, targetBoss)
       ignoreEffects.push(1);
       messages.push(`⚔️ 【光剑】武器效果：无视100%减伤效果`);
     } else if (weaponName === "M4AE脉冲步枪") {
-      ignoreEffects.push(0.8);
-      messages.push(`🔫 【M4AE脉冲步枪】武器效果：无视80%减伤效果`);
+      ignoreEffects.push(0.5);
+      messages.push(`🔫 【M4AE脉冲步枪】武器效果：无视50%减伤效果`);
     } else if (weaponName === "粒子相位枪" && targetBoss?.tags.includes("护盾")) {
       ignoreEffects.push(0.5);
       messages.push(`⚡ 【粒子相位枪】武器效果：无视50%减伤效果`);
@@ -5719,31 +5790,37 @@ async function testAttackFunction(ctx, session, handle, config, equippedWeapon,
   };
 }
 __name(testAttackFunction, "testAttackFunction");
-async function createNestlingBosses(ctx, nestlingName) {
-  let foundMinion = null;
-  let groupId = null;
-  for (const bossGroup of bossPool) {
-    const minion = bossGroup.minions.find((m) => m.name === nestlingName);
-    if (minion) {
-      foundMinion = minion;
-      groupId = bossGroup.id;
-      break;
-    }
-  }
-  if (!foundMinion) {
-    throw new Error(`未知的巢穴子代名称: ${nestlingName}`);
-  }
-  return ctx.database.create("ggcevo_boss", {
-    name: foundMinion.name,
-    type: foundMinion.type,
-    HP: foundMinion.maxHP,
-    tags: foundMinion.tags,
-    skills: [...foundMinion.passive],
-    energy: foundMinion.maxEnergy,
-    groupId,
-    isActive: true,
-    respawnTime: /* @__PURE__ */ new Date()
-  });
+async function createNestlingBosses(ctx, nestlingNames) {
+  const names = Array.isArray(nestlingNames) ? nestlingNames : [nestlingNames];
+  const createdBosses = [];
+  for (const name2 of names) {
+    let foundMinion = null;
+    let groupId = null;
+    for (const bossGroup of bossPool) {
+      const minion = bossGroup.minions.find((m) => m.name === name2);
+      if (minion) {
+        foundMinion = minion;
+        groupId = bossGroup.id;
+        break;
+      }
+    }
+    if (!foundMinion) {
+      throw new Error(`未知的巢穴子代名称: ${name2}`);
+    }
+    const createdBoss = await ctx.database.create("ggcevo_boss", {
+      name: foundMinion.name,
+      type: foundMinion.type,
+      HP: foundMinion.maxHP,
+      tags: foundMinion.tags,
+      skills: [...foundMinion.passive],
+      energy: foundMinion.maxEnergy,
+      groupId,
+      isActive: true,
+      respawnTime: /* @__PURE__ */ new Date()
+    });
+    createdBosses.push(createdBoss);
+  }
+  return createdBosses;
 }
 __name(createNestlingBosses, "createNestlingBosses");
 
@@ -5928,8 +6005,9 @@ function apply(ctx, config) {
     modificationSlots: "unsigned",
     installedMods: "list",
     equipped: "boolean",
-    comboCount: "unsigned"
+    comboCount: "unsigned",
     // 新增：记录连续攻击次数的计数器
+    pityCounter: "unsigned"
   }, {
     primary: ["handle", "weaponId"]
   });
@@ -5939,6 +6017,7 @@ function apply(ctx, config) {
     type: "string",
     HP: "unsigned",
     energy: "unsigned",
+    armor: "integer",
     tags: "list",
     skills: "list",
     skillStacks: "unsigned",
@@ -6047,6 +6126,7 @@ function apply(ctx, config) {
       const currentGroupId = group.groupId;
       await ctx.database.remove("ggcevo_boss_damage", {});
       await ctx.database.remove("ggcevo_boss", {});
+      await ctx.database.set("ggcevo_weapons", {}, { comboCount: 0 });
       const newBossGroup = await activateNextBossGroup(ctx, currentGroupId);
       await ctx.broadcast(
         groupId,
@@ -7973,7 +8053,8 @@ ${validTypes.join("、")}`;
           level: 0,
           modificationSlots: 1,
           equipped: false,
-          comboCount: 0
+          comboCount: 0,
+          pityCounter: 0
         }], ["handle", "weaponId"]);
         const equippedCount = await ctx.database.select("ggcevo_weapons").where({ handle, equipped: true }).execute((row) => import_koishi.$.count(row.weaponId));
         if (equippedCount === 0) {
@@ -8414,6 +8495,21 @@ ${validTypes.join("、")}`;
     }, {
       comboCount: 0
     });
+    if (!primaryAttackResult.hasCrit) {
+      await ctx.database.set("ggcevo_weapons", {
+        handle,
+        weaponId: equippedWeapon.weaponId
+      }, {
+        pityCounter: (equippedWeapon?.pityCounter || 0) + 1
+      });
+    } else {
+      await ctx.database.set("ggcevo_weapons", {
+        handle,
+        weaponId: equippedWeapon.weaponId
+      }, {
+        pityCounter: 0
+      });
+    }
     const resultMessage = buildResultMessage(
       session,
       weaponName,
@@ -8582,7 +8678,7 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
     if (bossGroup.main.maxEnergy > 0) {
       result.push(`⚡ 能量：${mainBoss.energy}/1000`);
     }
-    result.push(`🛡️ 护甲：${bossGroup.main.armor || 0}`);
+    result.push(`🛡️ 护甲：${mainBoss.armor || 0}`);
     result.push(`🏷️ 标签：${mainBoss.tags?.join("、") || "无"}`);
     if (mainBoss.radiationLayers > 0) {
       result.push(`☢️ 辐射：${mainBoss.radiationLayers}层`);
@@ -8646,7 +8742,7 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
         if (minionConfig && minionConfig.maxEnergy > 0) {
           minionInfo.push(`⚡ 能量：${minion.energy}/1000`);
         }
-        minionInfo.push(`🛡️ 护甲：${minionConfig?.armor || 0}`);
+        minionInfo.push(`🛡️ 护甲：${minion.armor || 0}`);
         minionInfo.push(`🏷️ 标签：${minion.tags?.join("、") || "无"}`);
         if (minion.radiationLayers > 0) {
           minionInfo.push(`☢️ 辐射：${minion.radiationLayers}层`);
@@ -8711,6 +8807,7 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
     }
     await ctx.database.remove("ggcevo_boss_damage", {});
     await ctx.database.remove("ggcevo_boss", {});
+    await ctx.database.set("ggcevo_weapons", {}, { comboCount: 0 });
     await ctx.database.create("ggcevo_boss", {
       name: bossConfig.main.name,
       type: "主宰",
@@ -8718,6 +8815,7 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
       tags: bossConfig.main.tags,
       skills: [...bossConfig.main.passive],
       energy: bossConfig.main.maxEnergy,
+      armor: bossConfig.main.armor,
       groupId: groupid,
       isActive: true,
       respawnTime: /* @__PURE__ */ new Date()
@@ -8734,6 +8832,7 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
         tags: minion.tags,
         skills: [...minion.passive],
         energy: minion.maxEnergy,
+        armor: minion.armor,
         groupId: groupid,
         isActive: true,
         respawnTime: /* @__PURE__ */ new Date()
@@ -9382,7 +9481,8 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
           modificationSlots: 1,
           installedMods: [],
           equipped: false,
-          comboCount: 0
+          comboCount: 0,
+          pityCounter: 0
         });
         const equippedCount = await ctx.database.select("ggcevo_weapons").where({ handle, equipped: true }).execute((row) => import_koishi.$.count(row.weaponId));
         if (equippedCount === 0) {

package/package.json

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