koishi-plugin-ggcevo-game 1.4.61 → 1.4.63

package/lib/index.js

@@ -37,10 +37,12 @@ var weaponConfig = {
     type: "实弹武器",
     category: "实弹武器",
     damage: 10,
+    armorDamageReduction: 1,
+    // 每点护甲减伤1点伤害
     description: "标准配置武器，中距离作战利器",
     specialeffect: "",
     price: 100,
-    redCrystalCost: 5,
+    redCrystalCost: 1,
     isantiair: true,
     tagEffects: {
       "轻甲": 1.5
@@ -52,15 +54,14 @@ var weaponConfig = {
     type: "能量武器",
     category: "能量武器",
     damage: 23,
+    armorDamageReduction: 0,
     description: "先进激光武器，远距离精准打击",
     specialeffect: "",
     price: 300,
-    redCrystalCost: 5,
+    redCrystalCost: 3,
     isantiair: true,
     tagEffects: {
-      "重甲": 1.5,
-      // 对重甲目标造成150%伤害
-      "护盾": 0.5
+      "重甲": 1.5
     }
   },
   "焚烧枪": {
@@ -68,14 +69,15 @@ var weaponConfig = {
     type: "热能武器",
     category: "热能武器",
     damage: 20,
+    armorDamageReduction: 0.25,
     description: "基于热能的强大武器，烧烬一切",
     specialeffect: "",
     price: 450,
-    redCrystalCost: 5,
+    redCrystalCost: 4,
     isantiair: false,
     tagEffects: {
-      "惧热": 2,
-      "生物": 1.5,
+      "惧热": 1.5,
+      "生物": 1.2,
       "护盾": 0.5
     }
   },
@@ -84,25 +86,26 @@ var weaponConfig = {
     type: "能量武器",
     category: "能量武器",
     damage: 28,
+    armorDamageReduction: 0,
     description: "由激光步枪改良而来，高效的对重甲武器",
     specialeffect: "",
     price: 850,
-    redCrystalCost: 10,
+    redCrystalCost: 8,
     isantiair: true,
     tagEffects: {
-      "重甲": 1.8,
-      "护盾": 0.2
+      "重甲": 1.75
     }
   },
   "等离子切割机": {
     id: 5,
     type: "实弹武器",
     category: "实弹武器",
-    damage: 12,
+    damage: 20,
+    armorDamageReduction: 1,
     description: "一种改造后的采矿切割机，有效对抗重甲目标",
     specialeffect: "",
     price: 150,
-    redCrystalCost: 5,
+    redCrystalCost: 1,
     isantiair: true,
     tagEffects: {
       "建筑": 2,
@@ -114,44 +117,45 @@ var weaponConfig = {
     id: 6,
     type: "实弹武器",
     category: "实弹武器",
-    damage: 28,
+    damage: 48,
+    armorDamageReduction: 4,
     description: "近距离攻击武器，专为遭遇战设计使用",
     specialeffect: "",
     price: 325,
-    redCrystalCost: 5,
+    redCrystalCost: 3,
     isantiair: false,
     tagEffects: {
-      "轻甲": 2,
-      "重甲": 0.5
+      "轻甲": 1.5
     }
   },
   "侦察步枪": {
     id: 7,
     type: "实弹武器",
     category: "实弹武器",
-    damage: 50,
+    damage: 60,
+    armorDamageReduction: 3,
     description: "用于隐秘射击的最佳武器，但是无法穿透护甲",
     specialeffect: "",
     price: 550,
-    redCrystalCost: 10,
+    redCrystalCost: 5,
     isantiair: true,
-    tagEffects: {
-      "重甲": 0.2
-    }
+    tagEffects: {}
   },
   "零度之下": {
     id: 8,
     type: "热能武器",
     category: "热能武器",
     damage: 22,
+    armorDamageReduction: 1,
     description: "喷射稳定的液氮恒流，对长时间接触者造成致命的损伤",
     specialeffect: "攻击使目标叠加“寒冷”层数，每层使其受到的伤害+2.5%(至多+50%)",
     price: 775,
-    redCrystalCost: 10,
+    redCrystalCost: 7,
     isantiair: false,
     tagEffects: {
       "惧寒": 2,
-      "灵能": 1.5
+      "灵能": 1.5,
+      "护盾": 0.5
     }
   },
   "弧焊枪": {
@@ -159,10 +163,11 @@ var weaponConfig = {
     type: "能量武器",
     category: "能量武器",
     damage: 25,
+    armorDamageReduction: 0.5,
     description: "一种经过改造的电动工具，可对近距离的目标放出高压电",
     specialeffect: "攻击消耗目标200点能量",
     price: 750,
-    redCrystalCost: 10,
+    redCrystalCost: 7,
     isantiair: true,
     tagEffects: {
       "机械": 2,
@@ -174,13 +179,15 @@ var weaponConfig = {
     type: "热能武器",
     category: "热能武器",
     damage: 24,
+    armorDamageReduction: 0.75,
     description: "一种高度危险性的武器，设计用辐射照射并伤害敌人",
     specialeffect: "攻击使生物目标(无机械标签)叠加“辐射”层数，每层使其受到的伤害+2.5%(至多+50%)",
     price: 825,
-    redCrystalCost: 10,
+    redCrystalCost: 8,
     isantiair: true,
     tagEffects: {
       "生物": 1.5,
+      "护盾": 0.5,
       "机械": 0.2
     }
   },
@@ -189,10 +196,11 @@ var weaponConfig = {
     type: "能量武器",
     category: "能量武器",
     damage: 30,
+    armorDamageReduction: 0,
     description: "激光步枪的变种，采用折射技术升级",
     specialeffect: "拥有“散射”效果，对其他目标造成50%的伤害",
     price: 1450,
-    redCrystalCost: 15,
+    redCrystalCost: 14,
     isantiair: true,
     tagEffects: {
       "灵能": 1.2
@@ -203,14 +211,14 @@ var weaponConfig = {
     type: "能量武器",
     category: "能量武器",
     damage: 30,
+    armorDamageReduction: 0.75,
     description: "面对护盾目标而开发的武器",
     specialeffect: "攻击无视护盾目标50%的减伤效果",
     price: 1050,
-    redCrystalCost: 15,
+    redCrystalCost: 10,
     isantiair: true,
     tagEffects: {
-      "护盾": 1.8,
-      "重甲": 0.2
+      "护盾": 1.8
     }
   },
   "动力钻头": {
@@ -218,10 +226,11 @@ var weaponConfig = {
     type: "实弹武器",
     category: "实弹武器",
     damage: 30,
+    armorDamageReduction: 0.5,
     description: "这种强大的钻头是由那些想把矿工SCV上的大螺丝用作武器的人创造的",
     specialeffect: "",
     price: 1e3,
-    redCrystalCost: 15,
+    redCrystalCost: 10,
     isantiair: true,
     tagEffects: {
       "建筑": 2,
@@ -233,7 +242,8 @@ var weaponConfig = {
     id: 14,
     type: "能量武器",
     category: "能量武器",
-    damage: 35,
+    damage: 40,
+    armorDamageReduction: 1,
     description: "一种原型能量武器，能够发射强大的脉冲",
     specialeffect: "攻击使目标的技能层数减少2层",
     price: 1500,
@@ -246,6 +256,7 @@ var weaponConfig = {
     type: "热能武器",
     category: "热能武器",
     damage: 50,
+    armorDamageReduction: 0.5,
     description: "发射非常坚固的专属榴弹，对具有坚固防御的目标几乎没有效果",
     specialeffect: "",
     price: 2e3,
@@ -261,16 +272,16 @@ var weaponConfig = {
     id: 16,
     type: "能量武器",
     category: "能量武器",
-    damage: 60,
+    damage: 64,
+    armorDamageReduction: 4,
     description: "用于解决高生命值目标的次时代武器，擅长对付护盾耗尽或没有护甲的敌人",
     specialeffect: "",
     price: 1750,
-    redCrystalCost: 20,
+    redCrystalCost: 17,
     isantiair: true,
     tagEffects: {
       "生物": 1.5,
-      "护盾": 0.2,
-      "重甲": 0.2
+      "护盾": 0.5
     }
   },
   "聚变磁轨枪": {
@@ -278,18 +289,52 @@ var weaponConfig = {
     type: "能量武器",
     category: "能量武器",
     damage: 58,
+    armorDamageReduction: 0,
     description: "一种实验性的超级武器，能造成巨大的伤害",
     specialeffect: "",
     price: 1550,
-    redCrystalCost: 20,
+    redCrystalCost: 15,
     isantiair: true,
     tagEffects: {}
   },
+  "M134轮转机枪": {
+    id: 18,
+    type: "实弹武器",
+    category: "实弹武器",
+    damage: 50,
+    armorDamageReduction: 0.1,
+    description: "二十一世纪的武器，经过修改以减少后坐力并提高远程精度",
+    specialeffect: "",
+    price: 2e3,
+    redCrystalCost: 20,
+    isantiair: true,
+    tagEffects: {
+      "轻甲": 1.5
+    }
+  },
+  "星灼灵焰炮": {
+    id: 19,
+    type: "能量武器",
+    category: "能量武器",
+    damage: 35,
+    armorDamageReduction: 1,
+    description: "这是在一位高级灵能者的帮助下，解析灵能力量制作出的高科技武器",
+    specialeffect: "",
+    price: 1550,
+    redCrystalCost: 15,
+    isantiair: true,
+    tagEffects: {
+      "机械": 2,
+      "建筑": 2,
+      "异形": 2
+    }
+  },
   "外星电浆": {
     id: 101,
     type: "能量武器",
     category: "传奇武器",
     damage: 88,
+    armorDamageReduction: 3,
     description: "一件传奇武器",
     specialeffect: "",
     price: 6400,
@@ -297,8 +342,7 @@ var weaponConfig = {
     isantiair: true,
     tagEffects: {
       "生物": 2,
-      "护盾": 0.5,
-      "重甲": 0.5
+      "护盾": 0.5
     }
   },
   "MK-4激光步枪": {
@@ -306,8 +350,9 @@ var weaponConfig = {
     type: "能量武器",
     category: "传奇武器",
     damage: 70,
+    armorDamageReduction: -1,
     description: "一件传奇武器",
-    specialeffect: "攻击暴击率+80%",
+    specialeffect: "暴击率+80%",
     price: 6400,
     redCrystalCost: 200,
     isantiair: true,
@@ -320,6 +365,7 @@ var weaponConfig = {
     type: "实弹武器",
     category: "传奇武器",
     damage: 80,
+    armorDamageReduction: 0,
     description: "这是传说中的武器",
     specialeffect: "",
     price: 6400,
@@ -334,7 +380,8 @@ var weaponConfig = {
     id: 104,
     type: "实弹武器",
     category: "传奇武器",
-    damage: 130,
+    damage: 125,
+    armorDamageReduction: -2,
     description: "一件传奇武器",
     specialeffect: "",
     price: 6400,
@@ -349,6 +396,7 @@ var weaponConfig = {
     type: "能量武器",
     category: "传奇武器",
     damage: 100,
+    armorDamageReduction: 0,
     description: "优雅而独特的武器",
     specialeffect: "无视目标100%的减伤效果",
     price: 6400,
@@ -361,6 +409,7 @@ var weaponConfig = {
     type: "能量武器",
     category: "传奇武器",
     damage: 100,
+    armorDamageReduction: 1,
     description: "一件传奇武器",
     specialeffect: "攻击消耗目标500点能量",
     price: 6400,
@@ -375,6 +424,7 @@ var weaponConfig = {
     type: "能量武器",
     category: "传奇武器",
     damage: 60,
+    armorDamageReduction: 0,
     description: "一件传奇武器",
     specialeffect: "攻击无视目标80%的减伤效果",
     price: 6400,
@@ -389,6 +439,7 @@ var weaponConfig = {
     type: "能量武器",
     category: "传奇武器",
     damage: 90,
+    armorDamageReduction: 0,
     description: "一件传奇武器",
     specialeffect: "",
     price: 6400,
@@ -415,47 +466,41 @@ var modConfig = {
     isExclusive: false
   },
   "破甲模块": {
-    cost: 2750,
-    effect: "攻击无视目标20%的减伤效果",
+    cost: 1250,
+    effect: "攻击无视目标15%的减伤效果",
     exclusiveTo: "",
     isExclusive: false
   },
   // 新增专属模块
   "裂甲核心": {
     cost: 750,
-    effect: "伤害+40%，对重甲目标改为造成150%伤害",
+    effect: "攻击伤害+40%，攻击无视目标的40%减伤效果",
     exclusiveTo: "高斯步枪",
     // 指定专属武器
     isExclusive: true
     // 标记为专属模块
   },
   "棱镜超载核心": {
-    cost: 2750,
+    cost: 3050,
     effect: "暴击率+80%",
     exclusiveTo: "激光步枪",
     isExclusive: true
   },
   "助燃核心": {
     cost: 2550,
-    effect: "对惧热目标改为造成300%伤害; 对生物目标改为造成200%伤害",
+    effect: "对惧热目标改为造成300%伤害，对生物目标改为造成200%伤害",
     exclusiveTo: "焚烧枪",
     isExclusive: true
   },
   "光束曲射晶片": {
     cost: 2750,
-    effect: "拥有“散射”效果，对其他目标造成50%的伤害",
-    exclusiveTo: "碎骨步枪",
-    isExclusive: true
-  },
-  "护盾崩解核心": {
-    cost: 1250,
-    effect: "对护盾目标改为造成80%伤害",
+    effect: "攻击时造成散射，只能对其他目标造成50%的伤害",
     exclusiveTo: "碎骨步枪",
     isExclusive: true
   },
   "金刚石瞄准镜": {
-    cost: 1250,
-    effect: "对重甲目标改为造成80%伤害",
+    cost: 2250,
+    effect: "无视目标50%的减伤效果",
     exclusiveTo: "侦察步枪",
     isExclusive: true
   },
@@ -673,7 +718,7 @@ var syndicatePirateConfig = [
   },
   {
     professionName: "猩红杀手",
-    effect: "“侦察步枪”攻击伤害+15%; 使用“侦察步枪”攻击时无视目标20%的减伤效果; 购买DSR-55反器材步枪(传奇)享有50%的折扣",
+    effect: "“侦察步枪”攻击伤害+15%; 使用“侦察步枪”攻击时每1点护甲减少0点伤害; 购买DSR-55反器材步枪(传奇)享有50%的折扣",
     requirements: "“侦察步枪”武器等级≥3级",
     Jobtransfer: true,
     costredcrystal: 30
@@ -1057,47 +1102,42 @@ var Tasklist = {
   "伽马辐射": {
     id: 1,
     type: "可重复任务",
-    description: "利用【伽马枪】武器对目标造成辐射伤害",
     target: 1,
     price: 50,
     redCrystalCost: 0,
-    condition: "使用伽马枪攻击目标并成功增加其辐射层数"
+    condition: "使用【伽马枪】攻击目标并成功增加其辐射层数"
   },
   "绝对零度": {
     id: 2,
     type: "可重复任务",
-    description: "利用【零度之下】武器对目标造成寒冷伤害",
     target: 1,
     price: 50,
     redCrystalCost: 0,
-    condition: "使用零度之下攻击目标并成功增加其寒冷层数"
+    condition: "使用【零度之下】攻击目标并成功增加其寒冷层数"
   },
   "胆汁引爆": {
     id: 3,
     type: "可重复任务",
-    description: "利用【焚烧枪】武器引爆目标的胆汁",
     target: 1,
     price: 200,
     redCrystalCost: 0,
-    condition: "使用焚烧枪攻击目标并成功引爆其≥10层的胆汁"
+    condition: "使用【焚烧枪】攻击目标并成功引爆其≥10层的胆汁"
   },
   "脉冲干扰": {
     id: 4,
     type: "可重复任务",
-    description: "利用【脉冲扰乱枪】武器干扰目标的技能释放",
     target: 1,
     price: 75,
     redCrystalCost: 0,
-    condition: "使用脉冲扰乱枪攻击目标并成功减少其技能层数"
+    condition: "使用【脉冲扰乱枪】攻击目标并成功减少其技能层数"
   },
-  "弧能消耗": {
+  "能量消耗": {
     id: 5,
     type: "可重复任务",
-    description: "利用【弧焊枪】武器消耗目标的能量",
     target: 1,
     price: 75,
     redCrystalCost: 0,
-    condition: "使用弧焊枪攻击目标并成功消耗其能量"
+    condition: "使用【弧焊枪】或【DG-3电弧步枪】攻击目标并成功消耗其能量"
   }
 };
 
@@ -1109,7 +1149,10 @@ var bossPool = [
       name: "异齿猛兽首领",
       type: "主宰",
       maxHP: 15e3,
+      maxShield: 5e3,
       maxEnergy: 0,
+      armor: 9,
+      shieldArmor: 25,
       maxStacks: 0,
       tags: ["重甲", "生物", "异形"],
       passive: ["异形甲壳"]
@@ -1119,7 +1162,10 @@ var bossPool = [
         name: "异齿猛兽",
         type: "子代",
         maxHP: 5e3,
+        maxShield: 1e3,
         maxEnergy: 0,
+        armor: 6,
+        shieldArmor: 20,
         maxStacks: 0,
         tags: ["重甲", "生物", "重型", "异形"],
         passive: ["弱化形态", "异形甲壳"]
@@ -1132,7 +1178,10 @@ var bossPool = [
       name: "寒冰王蛇",
       type: "主宰",
       maxHP: 15e3,
+      maxShield: 0,
       maxEnergy: 0,
+      armor: 6,
+      shieldArmor: 0,
       maxStacks: 0,
       tags: ["重甲", "生物", "惧热", "重型", "异形"],
       passive: ["冰霜环绕", "冰霜进化"]
@@ -1142,7 +1191,10 @@ var bossPool = [
         name: "冰蛇",
         type: "子代",
         maxHP: 5e3,
+        maxShield: 0,
         maxEnergy: 0,
+        armor: 4,
+        shieldArmor: 0,
         maxStacks: 0,
         tags: ["生物", "惧热", "异形"],
         passive: ["弱化形态", "冰霜回复", "冰霜进化"]
@@ -1155,7 +1207,10 @@ var bossPool = [
       name: "莽兽",
       type: "主宰",
       maxHP: 12e3,
+      maxShield: 0,
       maxEnergy: 0,
+      armor: 8,
+      shieldArmor: 0,
       maxStacks: 0,
       tags: ["重甲", "生物", "重型", "异形"],
       passive: ["应激甲壳II", "求生本能II", "冷适应"]
@@ -1165,18 +1220,24 @@ var bossPool = [
         name: "狂暴畸变体",
         type: "子代",
         maxHP: 4e3,
+        maxShield: 0,
         maxEnergy: 0,
+        armor: 5,
+        shieldArmor: 0,
         maxStacks: 0,
-        tags: ["重甲", "生物", "重型", "异形"],
+        tags: ["重甲", "生物", "重型", "极地", "异形"],
         passive: ["弱化形态", "应激甲壳I", "求生本能I", "冷适应"]
       },
       {
         name: "剧毒畸变体",
         type: "子代",
         maxHP: 4e3,
+        maxShield: 0,
         maxEnergy: 0,
+        armor: 7,
+        shieldArmor: 0,
         maxStacks: 0,
-        tags: ["重甲", "生物", "重型", "异形"],
+        tags: ["重甲", "生物", "重型", "极地", "异形"],
         passive: ["弱化形态", "应激甲壳I", "求生本能I", "冷适应"]
       }
     ]
@@ -1187,7 +1248,10 @@ var bossPool = [
       name: "空间站感染虫",
       type: "主宰",
       maxHP: 1e4,
+      maxShield: 0,
       maxEnergy: 0,
+      armor: 5,
+      shieldArmor: 0,
       maxStacks: 0,
       tags: ["重甲", "生物", "机械", "异形"],
       passive: ["感染空间站", "病毒云", "霉菌滋生"]
@@ -1197,7 +1261,10 @@ var bossPool = [
         name: "机械感染虫",
         type: "子代",
         maxHP: 3e3,
+        maxShield: 0,
         maxEnergy: 0,
+        armor: 4,
+        shieldArmor: 0,
         maxStacks: 0,
         tags: ["重甲", "生物", "机械", "异形"],
         passive: ["弱化形态", "病毒云", "霉菌滋生"]
@@ -1206,7 +1273,10 @@ var bossPool = [
         name: "空间站哨枪塔",
         type: "子代",
         maxHP: 5e3,
+        maxShield: 0,
         maxEnergy: 0,
+        armor: 6.5,
+        shieldArmor: 0,
         maxStacks: 10,
         tags: ["重甲", "机械", "建筑"],
         passive: ["岗哨机枪", "结构装甲"]
@@ -1219,7 +1289,10 @@ var bossPool = [
       name: "吸血蝙蝠首领",
       type: "主宰",
       maxHP: 12e3,
+      maxShield: 0,
       maxEnergy: 0,
+      armor: 2.5,
+      shieldArmor: 0,
       maxStacks: 20,
       tags: ["生物", "异形"],
       passive: ["吸血唾液", "进食", "吐血", "嗜血狂暴"]
@@ -1229,7 +1302,10 @@ var bossPool = [
         name: "吸血蝙蝠",
         type: "子代",
         maxHP: 4e3,
+        maxShield: 0,
         maxEnergy: 0,
+        armor: 2.5,
+        shieldArmor: 0,
         maxStacks: 20,
         tags: ["生物", "异形"],
         passive: ["弱化形态", "吸血唾液", "进食", "吐血"]
@@ -1241,20 +1317,26 @@ var bossPool = [
     main: {
       name: "亚电主宰者",
       type: "主宰",
-      maxHP: 2e4,
+      maxHP: 2e3,
+      maxShield: 2e4,
       maxEnergy: 1e3,
+      armor: 0,
+      shieldArmor: 4,
       maxStacks: 0,
-      tags: ["护盾", "灵能", "重型", "异形"],
+      tags: ["重甲", "灵能", "重型", "异形"],
       passive: ["超导体", "能源虹吸", "电能冲击波", "电能立场", "脉冲", "能量黑洞"]
     },
     minions: [
       {
         name: "亚电能者",
         type: "子代",
-        maxHP: 6e3,
+        maxHP: 1e3,
+        maxShield: 5e3,
         maxEnergy: 0,
+        armor: 1,
+        shieldArmor: 4,
         maxStacks: 0,
-        tags: ["护盾", "灵能", "异形"],
+        tags: ["重甲", "灵能", "异形"],
         passive: ["弱化形态", "超导体", "能源虹吸", "能量黑洞"]
       }
     ]
@@ -1264,8 +1346,11 @@ var bossPool = [
     main: {
       name: "烈焰庞兽",
       type: "主宰",
-      maxHP: 2e4,
+      maxHP: 15e3,
+      maxShield: 5e3,
       maxEnergy: 0,
+      armor: 5,
+      shieldArmor: 20,
       maxStacks: 20,
       tags: ["重甲", "生物", "惧寒", "重型", "异形"],
       passive: ["火焰异形", "庞兽狂暴", "灼烧粘液", "炼狱爆弹", "火焰吐息", "太阳耀斑"]
@@ -1275,7 +1360,10 @@ var bossPool = [
         name: "火焰甲虫",
         type: "子代",
         maxHP: 5e3,
+        maxShield: 1e3,
         maxEnergy: 0,
+        armor: 5,
+        shieldArmor: 15,
         maxStacks: 20,
         tags: ["重甲", "生物", "惧寒", "异形"],
         passive: ["弱化形态", "火焰异形", "灼烧粘液", "腐蚀胆汁", "燃烧潜地"]
@@ -1288,7 +1376,10 @@ var bossPool = [
       name: "狂猎猛禽首领",
       type: "主宰",
       maxHP: 2e4,
+      maxShield: 0,
       maxEnergy: 0,
+      armor: 3,
+      shieldArmor: 0,
       maxStacks: 0,
       tags: ["生物", "异形"],
       passive: ["猎手异形", "致命一击", "狂暴", "伪装"]
@@ -1298,7 +1389,10 @@ var bossPool = [
         name: "狂猎猛禽1",
         type: "子代",
         maxHP: 5e3,
+        maxShield: 0,
         maxEnergy: 0,
+        armor: 2.5,
+        shieldArmor: 0,
         maxStacks: 0,
         tags: ["生物", "异形"],
         passive: ["弱化形态", "猎手异形", "狂暴", "伪装"]
@@ -1307,7 +1401,10 @@ var bossPool = [
         name: "狂猎猛禽2",
         type: "子代",
         maxHP: 5e3,
+        maxShield: 0,
         maxEnergy: 0,
+        armor: 2.5,
+        shieldArmor: 0,
         maxStacks: 0,
         tags: ["生物", "异形"],
         passive: ["弱化形态", "猎手异形", "狂暴", "伪装"]
@@ -1320,9 +1417,12 @@ var bossPool = [
       name: "宇宙界主",
       type: "主宰",
       maxHP: 2e4,
+      maxShield: 2e3,
       maxEnergy: 1e3,
+      armor: 2,
+      shieldArmor: 0,
       maxStacks: 50,
-      tags: ["重甲", "护盾", "生物", "灵能", "异形"],
+      tags: ["重甲", "生物", "灵能", "异形"],
       passive: ["宇宙能量", "复苏", "光影之刃", "远古预兆", "星界之风", "超视距穿梭"]
     },
     minions: [
@@ -1330,9 +1430,12 @@ var bossPool = [
         name: "宇宙战将",
         type: "子代",
         maxHP: 5e3,
+        maxShield: 500,
         maxEnergy: 0,
+        armor: 1,
+        shieldArmor: 0,
         maxStacks: 0,
-        tags: ["重甲", "护盾", "生物", "灵能", "异形"],
+        tags: ["重甲", "生物", "灵能", "异形"],
         passive: ["弱化形态", "心灵狂热", "星界之风"]
       }
     ]
@@ -1343,7 +1446,10 @@ var bossPool = [
       name: "猛毒异兽",
       type: "主宰",
       maxHP: 2e4,
+      maxShield: 0,
       maxEnergy: 0,
+      armor: 4,
+      shieldArmor: 0,
       maxStacks: 20,
       tags: ["生物", "异形"],
       passive: ["毒性唾液", "剧毒狂暴", "毒气波", "淬毒撕咬", "酸蚀池", "剧毒突袭"]
@@ -1353,7 +1459,10 @@ var bossPool = [
         name: "剧毒蝙蝠",
         type: "子代",
         maxHP: 5e3,
+        maxShield: 0,
         maxEnergy: 0,
+        armor: 3,
+        shieldArmor: 0,
         maxStacks: 20,
         tags: ["轻甲", "生物", "异形"],
         passive: ["弱化形态", "毒性唾液", "毒气波", "淬毒撕咬", "酸蚀池"]
@@ -1453,6 +1562,39 @@ function getMaxStacksByName(bossName) {
   return void 0;
 }
 __name(getMaxStacksByName, "getMaxStacksByName");
+function getMaxShieldByName(bossName) {
+  if (bossName === "测试假人") return 0;
+  for (const boss of bossPool) {
+    if (boss.main.name === bossName) return boss.main.maxShield;
+    for (const minion of boss.minions) {
+      if (minion.name === bossName) return minion.maxShield;
+    }
+  }
+  return void 0;
+}
+__name(getMaxShieldByName, "getMaxShieldByName");
+function getArmorByName(bossName) {
+  if (bossName === "测试假人") return 0;
+  for (const boss of bossPool) {
+    if (boss.main.name === bossName) return boss.main.armor;
+    for (const minion of boss.minions) {
+      if (minion.name === bossName) return minion.armor;
+    }
+  }
+  return void 0;
+}
+__name(getArmorByName, "getArmorByName");
+function getShieldArmorByName(bossName) {
+  if (bossName === "测试假人") return 0;
+  for (const boss of bossPool) {
+    if (boss.main.name === bossName) return boss.main.shieldArmor;
+    for (const minion of boss.minions) {
+      if (minion.name === bossName) return minion.shieldArmor;
+    }
+  }
+  return void 0;
+}
+__name(getShieldArmorByName, "getShieldArmorByName");
 var BattleEffectProcessor = {
   // 弱化形态
   handleWeakForm: /* @__PURE__ */ __name(function(targetBoss) {
@@ -1497,13 +1639,13 @@ var BattleEffectProcessor = {
     }
     return null;
   }, "handleIsolated"),
-  handleFrostRegeneration: /* @__PURE__ */ __name(function(targetBoss, activeBosses, maxStatsMap) {
+  handleFrostRegeneration: /* @__PURE__ */ __name(function(targetBoss, activeBosses, maxStatsForTarget) {
     const messages = [];
     const otherUpdates = [];
     if (!targetBoss.skills.includes("冰霜回复")) {
       return null;
     }
-    const targetMaxHP = maxStatsMap[targetBoss.name].maxHP;
+    const targetMaxHP = maxStatsForTarget.maxHP;
     const currentHP = targetBoss.HP;
     if (currentHP > targetMaxHP * 0.3) {
       return null;
@@ -1521,7 +1663,7 @@ var BattleEffectProcessor = {
     );
     otherSurvivingBosses.forEach((otherBoss) => {
       const otherName = otherBoss.name;
-      const otherMaxHP = maxStatsMap[otherBoss.name].maxHP;
+      const otherMaxHP = maxStatsForTarget.maxHP;
       const otherHealAmount = Math.round(otherMaxHP * 0.1);
       otherUpdates.push({
         name: otherName,
@@ -2831,7 +2973,7 @@ var BattleEffectProcessor = {
     const effectiveLayers = Math.min(currentLayers, 20);
     const buffMultiplier = effectiveLayers * 0.025;
     if (effectiveLayers > 0) {
-      messages.push(`☢️ 【辐射】：当前${currentLayers}层，受到的伤害+${(effectiveLayers * 2.5).toFixed(1)}%（已达上限50%）`);
+      messages.push(`☢️ 【辐射】：当前${currentLayers}层，受到的伤害+${(effectiveLayers * 2.5).toFixed(1)}%`);
       if (currentLayers > 20) {
       }
     }
@@ -2866,7 +3008,7 @@ var BattleEffectProcessor = {
     const effectiveLayers = Math.min(currentLayers, 20);
     const buffMultiplier = effectiveLayers * 0.025;
     if (effectiveLayers > 0) {
-      messages.push(`❄️ 【寒冷】：当前${currentLayers}层，受到的伤害+${(effectiveLayers * 2.5).toFixed(1)}%（已达上限50%）`);
+      messages.push(`❄️ 【寒冷】：当前${currentLayers}层，受到的伤害+${(effectiveLayers * 2.5).toFixed(1)}%`);
       if (currentLayers > 20) {
       }
     }
@@ -2892,12 +3034,12 @@ var BattleEffectProcessor = {
     };
   }, "handleColdEffect"),
   // 统一的武器能量消耗处理函数
-  handleWeaponEnergyDrain: /* @__PURE__ */ __name(function(targetBoss, weaponName, maxStatsMap) {
+  handleWeaponEnergyDrain: /* @__PURE__ */ __name(function(targetBoss, weaponName, maxStatsForTarget) {
     const weaponEnergyDrain = {
       "弧焊枪": 200,
       "DG-3电弧步枪": 500
     };
-    const targetmaxEnergy = maxStatsMap[targetBoss.name].maxEnergy;
+    const targetmaxEnergy = maxStatsForTarget.maxEnergy;
     const drainValue = weaponEnergyDrain[weaponName];
     if (!drainValue || targetmaxEnergy === 0) {
       return null;
@@ -2925,13 +3067,14 @@ var BattleEffectProcessor = {
     };
   }, "handleWeaponEnergyDrain"),
   // 统一的武器层数减少处理函数
-  handleWeaponLayerReduction: /* @__PURE__ */ __name(function(targetBoss, weaponName) {
+  handleWeaponLayerReduction: /* @__PURE__ */ __name(function(targetBoss, weaponName, maxStatsForTarget) {
     const weaponLayerReduction = {
       "脉冲扰乱枪": 2
       // 可以在这里添加其他武器及其减少层数
     };
+    const maxStacks = maxStatsForTarget.maxStacks;
     const reductionAmount = weaponLayerReduction[weaponName];
-    if (!reductionAmount) {
+    if (!reductionAmount || maxStacks === 0) {
       return null;
     }
     const messages = [];
@@ -3139,7 +3282,7 @@ var BattleEffectProcessor = {
         vulnerableType = "实弹武器";
         break;
     }
-    messages.push(`🛢️ 【酸蚀池】本次触发：${acidName}`);
+    messages.push(`🛢️ 本次攻击触发的【酸蚀池】：${acidName}`);
     if (enhanced) {
       if (weaponType === resistType) {
         nerfMultiplier = 1;
@@ -3149,8 +3292,8 @@ var BattleEffectProcessor = {
       }
     } else {
       if (weaponType === resistType) {
-        nerfMultiplier = 0.8;
-        messages.push(`🛢️ 【酸蚀池】生效：受到${resistType}伤害-80%`);
+        nerfMultiplier = 0.5;
+        messages.push(`🛢️ 【酸蚀池】生效：受到${resistType}伤害-50%`);
       } else if (weaponType === vulnerableType) {
         buffMultiplier = 0.5;
         messages.push(`🛢️ 【酸蚀池】生效：受到${vulnerableType}伤害+50%`);
@@ -3196,7 +3339,7 @@ var BattleEffectProcessor = {
     };
   }, "handleToxicAssault")
 };
-function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignoreRate) {
+function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCrit, ignoreRate) {
   const messages = [];
   let immune = false;
   let totalBuffMultiplier = 0;
@@ -3229,7 +3372,11 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     if (!maxStatsMap[boss.name]) {
       maxStatsMap[boss.name] = {
         maxHP: getMaxHPByName(boss.name) || 0,
-        maxEnergy: getMaxEnergyByName(boss.name) || 0
+        maxEnergy: getMaxEnergyByName(boss.name) || 0,
+        maxStacks: getMaxStacksByName(boss.name) || 0,
+        maxShield: getMaxShieldByName(boss.name) || 0,
+        armor: getArmorByName(boss.name) || 0,
+        shieldArmor: getShieldArmorByName(boss.name) || 0
       };
     }
   }
@@ -3367,7 +3514,7 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     }
   }
   const healingEffects = [
-    { effect: BattleEffectProcessor.handleFrostRegeneration, args: [targetBoss, activeBosses, maxStatsMap] },
+    { effect: BattleEffectProcessor.handleFrostRegeneration, args: [targetBoss, activeBosses, maxStatsForTarget] },
     { effect: BattleEffectProcessor.handleFrostAura, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleSentryGun, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleMoldGrowth, args: [targetBoss, activeBosses] },
@@ -3442,7 +3589,7 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     }
     coldLayerAdded = coldResult.layerAdded;
   }
-  const energyDrainResult = BattleEffectProcessor.handleWeaponEnergyDrain(targetBoss, weaponName, maxStatsMap);
+  const energyDrainResult = BattleEffectProcessor.handleWeaponEnergyDrain(targetBoss, weaponName, maxStatsForTarget);
   if (energyDrainResult) {
     messages.push(...energyDrainResult.messages);
     if (energyDrainResult.targetUpdates) {
@@ -3450,7 +3597,7 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     }
     energyDrained = energyDrainResult.success || false;
   }
-  const layerReduceResult = BattleEffectProcessor.handleWeaponLayerReduction(targetBoss, weaponName);
+  const layerReduceResult = BattleEffectProcessor.handleWeaponLayerReduction(targetBoss, weaponName, maxStatsForTarget);
   if (layerReduceResult) {
     messages.push(...layerReduceResult.messages);
     if (layerReduceResult.targetUpdates) {
@@ -3462,6 +3609,9 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
   let adjustedNerfMultiplier = totalNerfMultiplier * (1 - ignoreRate);
   const damageMultiplier = 1 + totalBuffMultiplier - adjustedNerfMultiplier;
   finalDamage = Math.max(1, Math.round(damage * damageMultiplier));
+  if (hasCrit) {
+    finalDamage *= 2;
+  }
   const frostEvolutionResult = BattleEffectProcessor.handleFrostEvolution(
     targetBoss,
     weaponName,
@@ -3475,7 +3625,6 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     }
     if (frostEvolutionResult.isImmune) {
       immune = true;
-      finalDamage = 0;
     }
   }
   const flameAlienResult = BattleEffectProcessor.handleFlameAlien(
@@ -3491,7 +3640,6 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     }
     if (flameAlienResult.isImmune) {
       immune = true;
-      finalDamage = 0;
     }
   }
   const cosmicEnergyResult = BattleEffectProcessor.handleCosmicEnergy(
@@ -3757,7 +3905,7 @@ var passiveConfig = {
   },
   "剧毒狂暴": {
     type: "狂怒机制",
-    description: "生命值≤50%时，受击额外获得1层「吸血唾液」且受到的伤害降低20%"
+    description: "生命值≤50%时，受击额外获得1层「毒性唾液」且受到的伤害降低20%"
   },
   "毒气波": {
     type: "概率叠层",
@@ -3769,7 +3917,7 @@ var passiveConfig = {
   },
   "酸蚀池": {
     type: "随机抗性",
-    description: "每次受击将会从3种酸液中顺序选择一种释放（脓蚀酸池：受到实弹武器伤害降低80%，受到能量武器伤害提高50%；蚀骨酸池：受到能量武器伤害降低80%，受到热能武器伤害提高50%；焦熔酸池：受到热能武器的伤害降低80%，受到实弹武器伤害提高50%）"
+    description: "每次受击将会从3种酸液中顺序选择一种释放（脓蚀酸池：受到实弹武器伤害降低50%，受到能量武器伤害提高50%；蚀骨酸池：受到能量武器伤害降低50%，受到热能武器伤害提高50%；焦熔酸池：受到热能武器的伤害降低50%，受到实弹武器伤害提高50%）"
   },
   "剧毒突袭": {
     type: "强化效果",
@@ -4500,42 +4648,45 @@ var legendaryDiscounts = {
 async function calculateTotalDamage(ctx, session, config, equippedWeapon, targetBoss) {
   let effectMessage = [];
   const finalTags = targetBoss.tags || [];
+  let armorDamageReduction = 0;
   const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
   const { regionId, realmId, profileId } = profile;
   const handle = `${regionId}-S2-${realmId}-${profileId}`;
   const weaponConfigEntry = Object.entries(weaponConfig).find(([_, c]) => c.id === equippedWeapon.weaponId);
   const [weaponName, weaponData] = weaponConfigEntry;
+  const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
+  armorDamageReduction = weaponData.armorDamageReduction || 0;
+  if (careerData.career === "猩红杀手" && weaponName === "侦察步枪") {
+    armorDamageReduction = 0;
+  }
+  const armorReduction = armorDamageReduction * getArmorByName(targetBoss.name);
+  const initialDamage = Math.max(weaponData.damage - armorReduction, 1);
   const isLegendary = weaponData.category === "传奇武器";
   const levelBonusRate = isLegendary ? 0.05 : 0.1;
-  const baseDamage = weaponData.damage * (1 + levelBonusRate * equippedWeapon.level);
-  const bonusPercent = (levelBonusRate * equippedWeapon.level * 100).toFixed(0);
-  effectMessage.push(`🔫 ${weaponName} Lv.${equippedWeapon.level}：基础伤害+${bonusPercent}%` + (isLegendary ? "（传奇武器）" : ""));
-  let totalAdditive = 0;
+  const baseDamage = initialDamage * (1 + levelBonusRate * equippedWeapon.level);
+  effectMessage.push(`🔫 ${weaponName} Lv.${equippedWeapon.level}：基础伤害${Math.round(baseDamage)}`);
   const tagAdditive = await calculateTagMultiplier(weaponData, finalTags, equippedWeapon);
-  totalAdditive += tagAdditive;
-  const { totalModAdd, hasCrit, modMessages } = calculateModifiers(
-    equippedWeapon,
-    weaponName,
-    await checkCritRhythm(ctx, handle)
-  );
-  totalAdditive += totalModAdd;
+  const tagMultiplier = 1 + tagAdditive;
+  if (tagAdditive !== 0) {
+    const sign = tagAdditive >= 0 ? "+" : "";
+    effectMessage.push(`📌 标签加成：攻击伤害${sign}${Math.round(tagAdditive * 100)}%`);
+  }
+  const { totalModAdd, modMessages } = calculateModifiers(equippedWeapon, weaponName);
   effectMessage.push(...modMessages);
-  const careerBonus = await calculateCareerAdditive(ctx, handle, weaponData.type, weaponData.id);
-  totalAdditive += careerBonus.value;
-  if (careerBonus.message) effectMessage.push(careerBonus.message);
-  const wishAdditive = await calculateWishAdditive(ctx, handle, equippedWeapon);
-  totalAdditive += wishAdditive.value;
-  if (wishAdditive.message) effectMessage.push(wishAdditive.message);
+  const modMultiplier = 1 + totalModAdd;
+  const careerAddResult = await calculateCareerAdditive(ctx, handle, weaponData.type, weaponData.id, careerData);
+  if (careerAddResult.message) effectMessage.push(careerAddResult.message);
+  const wishAddResult = await calculateWishAdditive(ctx, handle, equippedWeapon);
+  if (wishAddResult.message) effectMessage.push(wishAddResult.message);
   const [rankRecord] = await ctx.database.get("ggcevo_rank", { handle, rankseason: config.rankseason });
   const rankAddResult = calculateRankAdditive(rankRecord);
-  totalAdditive += rankAddResult.value;
-  if (rankAddResult.message) {
-    effectMessage.push(rankAddResult.message);
-  }
-  let finalDamage = baseDamage * (1 + totalAdditive);
-  if (finalDamage < 1) {
-    finalDamage = 1;
-  }
+  if (rankAddResult.message) effectMessage.push(rankAddResult.message);
+  const otherAdditive = careerAddResult.value + wishAddResult.value + rankAddResult.value;
+  const otherMultiplier = 1 + otherAdditive;
+  let finalDamage = baseDamage * tagMultiplier * modMultiplier * otherMultiplier;
+  const { hasCrit, critSources } = await calculateCrit(ctx, handle, equippedWeapon, weaponName);
+  effectMessage.push(...critSources);
+  finalDamage = Math.max(finalDamage, 1);
   return {
     damage: Math.round(finalDamage),
     hasCrit,
@@ -4543,23 +4694,42 @@ async function calculateTotalDamage(ctx, session, config, equippedWeapon, target
   };
 }
 __name(calculateTotalDamage, "calculateTotalDamage");
-async function checkCritRhythm(ctx, handle) {
-  const [record] = await ctx.database.get("ggcevo_wish", {
+async function calculateCrit(ctx, handle, equippedWeapon, weaponName) {
+  let critRate = 0;
+  const critSources = [];
+  if (equippedWeapon.installedMods?.includes("棱镜水晶")) {
+    critRate += 20;
+    critSources.push("🔼 棱镜水晶：暴击率+20%");
+  }
+  if (equippedWeapon.installedMods?.includes("棱镜超载核心") && modConfig["棱镜超载核心"]?.exclusiveTo === weaponName) {
+    critRate += 80;
+    critSources.push("🔼 棱镜超载核心：暴击率+80%");
+  }
+  const [critRhythm] = await ctx.database.get("ggcevo_wish", {
     handle,
     wishname: "暴击韵律",
     startTime: { $lte: /* @__PURE__ */ new Date() },
     endTime: { $gte: /* @__PURE__ */ new Date() }
   });
-  return !!record;
+  if (critRhythm) {
+    critRate += 20;
+    critSources.push("🎵 暴击韵律祈愿：暴击率+20%");
+  }
+  if (weaponName === "MK-4激光步枪") {
+    critRate += 80;
+    critSources.push("🔫 MK-4激光步枪：暴击率+80%");
+  }
+  critSources.push(`📊 本次攻击总暴击率：${critRate}%`);
+  return {
+    hasCrit: Math.random() * 100 < critRate,
+    critSources
+  };
 }
-__name(checkCritRhythm, "checkCritRhythm");
+__name(calculateCrit, "calculateCrit");
 async function calculateTagMultiplier(weaponData, tags, equippedWeapon) {
   const MOD_EFFECTS = [
-    { mod: "裂甲核心", tag: "重甲", value: 1.5 },
     { mod: "助燃核心", tag: "惧热", value: 3 },
-    { mod: "助燃核心", tag: "生物", value: 2 },
-    { mod: "金刚石瞄准镜", tag: "重甲", value: 0.8 },
-    { mod: "护盾崩解核心", tag: "护盾", value: 0.8 }
+    { mod: "助燃核心", tag: "生物", value: 2 }
   ];
   let totalAdditive = 0;
   for (const tag of tags) {
@@ -4572,77 +4742,33 @@ async function calculateTagMultiplier(weaponData, tags, equippedWeapon) {
   return totalAdditive;
 }
 __name(calculateTagMultiplier, "calculateTagMultiplier");
-function calculateModifiers(equippedWeapon, weaponName, hasCritRhythm) {
+function calculateModifiers(equippedWeapon, weaponName) {
   let totalModAdd = 0;
-  let hasCrit = false;
   const modMessages = [];
-  let crystalCrit = 0;
-  let overloadCrit = 0;
-  let rhythmCrit = 0;
-  let weaponCrit = 0;
-  if (weaponName === "MK-4激光步枪") {
-    weaponCrit = 80;
-    modMessages.push(`🔫 【MK-4激光步枪】武器效果：暴击率+${weaponCrit}%`);
-  }
-  equippedWeapon.installedMods.forEach((mod) => {
-    if (mod === "动能增幅") {
-      totalModAdd += 0.2;
-      modMessages.push(`🛠️ 【动能增幅】生效：攻击伤害+20%`);
-    }
-    if (mod === "裂甲核心" && weaponName === modConfig[mod].exclusiveTo) {
-      totalModAdd += 0.4;
-      modMessages.push(`🛠️ 【裂甲核心】生效：攻击伤害+40%`);
-    }
-    if (mod === "棱镜水晶") {
-      crystalCrit = 20;
-      modMessages.push(`🛠️ 【棱镜水晶】生效：暴击率+20%`);
-    }
-    if (mod === "棱镜超载核心" && weaponName === modConfig[mod].exclusiveTo) {
-      overloadCrit = 80;
-      modMessages.push(`🛠️ 【棱镜超载核心】生效：暴击率+80%`);
-    }
-    if (mod === "微型聚变核心") {
-      const currentCombo = equippedWeapon?.comboCount || 0;
-      const maxStacks = 6;
-      const bonusPerCombo = 0.075;
-      const effectiveStacks = Math.min(currentCombo, maxStacks);
-      const bonusDamage = effectiveStacks * bonusPerCombo;
-      totalModAdd += bonusDamage;
-      if (currentCombo > 0) {
-        modMessages.push(
-          `🛠️ 【微型聚变核心】生效：攻击伤害+${(bonusDamage * 100).toFixed(0)}%` + (effectiveStacks < currentCombo ? `（已达上限45%）` : "")
-        );
-      }
-    }
-  });
-  rhythmCrit = hasCritRhythm ? 20 : 0;
-  if (hasCritRhythm) {
-    modMessages.push(`🎵 暴击韵律祈愿：暴击率+20%`);
+  if (equippedWeapon.installedMods?.includes("动能增幅")) {
+    totalModAdd += 0.2;
+    modMessages.push(`🛠️ 【动能增幅】：伤害加成+20%`);
   }
-  const totalCritRate = Math.min(
-    crystalCrit + overloadCrit + rhythmCrit + weaponCrit,
-    // 包含武器专属暴击
-    100
-  );
-  if (totalCritRate > 0) {
+  if (equippedWeapon.installedMods?.includes("裂甲核心") && weaponName === modConfig["裂甲核心"]?.exclusiveTo) {
+    totalModAdd += 0.4;
+    modMessages.push(`🛠️ 【裂甲核心】：伤害加成+40%`);
   }
-  if (totalCritRate > 0) {
-    const roll = Math.random() * 100;
-    if (roll <= totalCritRate) {
-      hasCrit = true;
-      totalModAdd += 1;
-    }
+  if (equippedWeapon.installedMods?.includes("微型聚变核心")) {
+    const currentCombo = equippedWeapon?.comboCount || 0;
+    const maxStacks = 6;
+    const bonusPerCombo = 0.075;
+    const effectiveStacks = Math.min(currentCombo, maxStacks);
+    const bonusDamage = effectiveStacks * bonusPerCombo;
+    totalModAdd += bonusDamage;
+    modMessages.push(`🛠️ 【微型聚变核心】：连击加成+${(bonusDamage * 100).toFixed(0)}%`);
   }
   return {
     totalModAdd,
-    hasCrit,
     modMessages
-    // 返回模块消息数组
   };
 }
 __name(calculateModifiers, "calculateModifiers");
-async function calculateCareerAdditive(ctx, handle, weaponType, weaponId) {
-  const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
+async function calculateCareerAdditive(ctx, handle, weaponType, weaponId, careerData) {
   let value = 0;
   let message = "";
   if (careerData?.career === "警卫长") {
@@ -4698,15 +4824,6 @@ async function calculateWishAdditive(ctx, handle, weapon) {
     value += levelBonus;
     messages.push(`🗡️ 悲鸣之锋祈愿：攻击伤害+${Math.round(levelBonus * 100)}%`);
   }
-  const [critRhythm] = await ctx.database.get("ggcevo_wish", {
-    handle,
-    wishname: "暴击韵律",
-    startTime: { $lte: /* @__PURE__ */ new Date() },
-    endTime: { $gte: /* @__PURE__ */ new Date() }
-  });
-  if (critRhythm) {
-    messages.push("🎵 暴击韵律祈愿：攻击暴击率+20%");
-  }
   return {
     value,
     message: messages.join("，")
@@ -4880,7 +4997,7 @@ __name(handleBossDefeatRewards, "handleBossDefeatRewards");
 async function handlePrimaryAttack(ctx, session, handle, config, equippedWeapon, targetBoss, activeBosses, weaponName) {
   const damageResult = await calculateTotalDamage(ctx, session, config, equippedWeapon, targetBoss);
   const ignoreReduction = await handleIgnoreReductionEffects(ctx, handle, weaponName, targetBoss);
-  const EffectProcessor = applyPassiveEffects(targetBoss, activeBosses, weaponName, damageResult.damage, ignoreReduction.ignoreRate);
+  const EffectProcessor = applyPassiveEffects(targetBoss, activeBosses, weaponName, damageResult.damage, damageResult.hasCrit, ignoreReduction.ignoreRate);
   const initialDamage = EffectProcessor.finalDamage;
   await saveAndClearStats(ctx);
   const [currentboss] = await ctx.database.get("ggcevo_boss", { name: targetBoss.name });
@@ -4926,7 +5043,7 @@ async function handleScatterAttack(ctx, session, handle, config, equippedWeapon,
     );
     const secondaryDamage = Math.round(damageResult.damage * scatterRatio);
     const ignoreReduction = await handleIgnoreReductionEffects(ctx, handle, weaponName, secondaryTarget);
-    const EffectProcessor = applyPassiveEffects(secondaryTarget, activeBosses, weaponName, secondaryDamage, ignoreReduction.ignoreRate);
+    const EffectProcessor = applyPassiveEffects(secondaryTarget, activeBosses, weaponName, secondaryDamage, damageResult.hasCrit, ignoreReduction.ignoreRate);
     const actualDamage = EffectProcessor.finalDamage;
     await saveAndClearStats(ctx);
     const [currentboss] = await ctx.database.get("ggcevo_boss", { name: secondaryTarget.name });
@@ -5169,11 +5286,11 @@ async function updateDatabaseWithStats(ctx, stats) {
     updateData.energy = Math.max(0, Math.min(maxEnergy, newEnergy));
   }
   if (stats.skillStacksChanged !== 0) {
-    updateData.skillStacks = Math.max(0, boss.skillStacks + stats.skillStacksChanged);
+    const newStacks = boss.skillStacks + stats.skillStacksChanged;
+    updateData.skillStacks = Math.max(0, Math.min(maxStacks, newStacks));
   }
   if (stats.skillStatusChanged !== 0) {
-    const newStatus = boss.skillStatus + stats.skillStatusChanged;
-    updateData.skillStatus = Math.max(0, Math.min(maxStacks, newStatus));
+    updateData.skillStatus = Math.max(0, boss.skillStatus + stats.skillStatusChanged);
   }
   if (stats.statusLayersChanged !== 0) {
     updateData.statusLayers = Math.max(0, boss.statusLayers + stats.statusLayersChanged);
@@ -5235,9 +5352,18 @@ async function handleIgnoreReductionEffects(ctx, handle, weaponName, targetBoss)
       handle,
       equipped: true
     });
-    if (equippedWeapon?.installedMods?.includes("破甲模块")) {
-      ignoreEffects.push(0.2);
-      messages.push(`⚡ 【破甲模块】生效：无视20%减伤效果`);
+    if (!equippedWeapon?.installedMods) return;
+    if (equippedWeapon.installedMods.includes("破甲模块")) {
+      ignoreEffects.push(0.15);
+      messages.push(`⚡ 【破甲模块】生效：无视15%减伤效果`);
+    }
+    if (weaponName === "高斯步枪" && equippedWeapon.installedMods.includes("裂甲核心")) {
+      ignoreEffects.push(0.4);
+      messages.push(`💥 【裂甲核心】生效：无视40%减伤效果`);
+    }
+    if (weaponName === "侦察步枪" && equippedWeapon.installedMods.includes("金刚石瞄准镜")) {
+      ignoreEffects.push(0.4);
+      messages.push(`💥 【金刚石瞄准镜】生效：无视50%减伤效果`);
     }
   }, "handlePiercingMod");
   handleWeaponEffect();
@@ -5273,7 +5399,7 @@ __name(handleIgnoreReductionEffects, "handleIgnoreReductionEffects");
 async function testAttackFunction(ctx, session, handle, config, equippedWeapon, targetBoss, activeBosses, weaponName) {
   const damageResult = await calculateTotalDamage(ctx, session, config, equippedWeapon, targetBoss);
   const ignoreReduction = await handleIgnoreReductionEffects(ctx, handle, weaponName, targetBoss);
-  const EffectProcessor = applyPassiveEffects(targetBoss, activeBosses, weaponName, damageResult.damage, ignoreReduction.ignoreRate);
+  const EffectProcessor = applyPassiveEffects(targetBoss, activeBosses, weaponName, damageResult.damage, damageResult.hasCrit, ignoreReduction.ignoreRate);
   const initialDamage = EffectProcessor.finalDamage;
   return {
     initialDamage,
@@ -7328,12 +7454,23 @@ ${Object.keys(categoryStats).join("、")}`;
         tagEffectsDesc = Object.entries(config2.tagEffects).map(([tag, multiplier]) => `▸ 对${tag}目标造成${(multiplier * 100).toFixed(0)}%伤害`).join("\n");
       }
       const specialEffect = config2.specialeffect ? `特殊效果：${config2.specialeffect}` : "";
+      const armorDamageDesc = (() => {
+        if (config2.armorDamageReduction === 0) {
+          return `护甲减伤：0`;
+        } else if (config2.armorDamageReduction > 0) {
+          return `护甲减伤：${config2.armorDamageReduction}（每点护甲扣除${config2.armorDamageReduction}点伤害）`;
+        } else {
+          return `护甲减伤：${config2.armorDamageReduction}（每点护甲增加${Math.abs(config2.armorDamageReduction)}点伤害）`;
+        }
+      })();
       return [
         `【${name2}】`,
         `武器类型：${config2.type}`,
         `基础伤害：${config2.damage}`,
+        armorDamageDesc,
+        // 添加这里
         `价格：${priceDisplay}`,
-        specialEffect,
+        config2.specialeffect && `特殊效果：${config2.specialeffect}`,
         "特性：",
         tagEffectsDesc,
         `描述：${config2.description}`,
@@ -7571,7 +7708,8 @@ ${validTypes.join("、")}`;
       const mods = w.installedMods.map((m) => m).join(" | ") || "无";
       return [
         `${statusIcon} ${weaponName} ${typeTag} ${statusText}`,
-        `等级：Lv.${w.level} | 改装槽：${w.modificationSlots} | 基础伤害：${damageFormatted}`,
+        `等级：Lv.${w.level} | 改装槽：${w.modificationSlots}`,
+        `基础伤害：${damageFormatted}`,
         `改装：${mods}`
       ].join("\n");
     }));
@@ -7647,20 +7785,36 @@ ${validTypes.join("、")}`;
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) return "⛔ 您已被列入黑名单。";
-    const isValidWeapon = weapon && weaponConfig[weapon]?.id !== void 0;
+    const [techData] = await ctx.database.get("ggcevo_tech", { handle, techId: 3 }).catch(() => [{ level: 0 }]);
+    const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
+    const techLevel = techData?.level || 0;
+    const isCareerMatch = ["武器中士", "情报副官"].includes(careerData?.career);
+    const calculateDiscountRate = /* @__PURE__ */ __name((isExclusive) => {
+      if (isExclusive) {
+        if (techLevel >= 2) {
+          const baseDiscount = 5;
+          const careerDiscount = isCareerMatch ? 10 : 0;
+          return Math.max(baseDiscount, careerDiscount);
+        }
+        return 0;
+      } else {
+        if (techLevel >= 1) {
+          const baseDiscount = 5;
+          const careerDiscount = isCareerMatch ? 10 : 0;
+          return Math.max(baseDiscount, careerDiscount);
+        }
+        return 0;
+      }
+    }, "calculateDiscountRate");
     const processModInstallation = /* @__PURE__ */ __name(async () => {
       const modInfo = modConfig[mod];
-      if (!modInfo) return "无效模块名称。";
+      if (!modInfo) return "❌ 无效模块名称。";
       if (!weapon || !weaponConfig[weapon]?.id) {
         const validWeapons = Object.keys(weaponConfig).filter((k) => weaponConfig[k].id);
         return `❌ 无效武器名称。可选武器：${validWeapons.join("、")}`;
       }
       const weaponId = weaponConfig[weapon].id;
-      const [equipment] = await ctx.database.get("ggcevo_weapons", {
-        handle,
-        weaponId
-        // 使用已验证的weaponId
-      });
+      const [equipment] = await ctx.database.get("ggcevo_weapons", { handle, weaponId });
       if (!equipment) {
         return `❌ 尚未获得【${weapon}】或武器名称错误`;
       }
@@ -7675,32 +7829,15 @@ ${validTypes.join("、")}`;
       if (equipment.installedMods.includes(mod)) {
         return "❌ 已安装相同模块。";
       }
-      const [techData] = await ctx.database.get("ggcevo_tech", { handle, techId: 3 }).catch(() => [{ level: 0 }]);
-      const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
-      const techLevel = techData?.level || 0;
-      const isCareerMatch = Spacestationtechnology.find((t) => t.techId === 3).careerNames.includes(careerData?.career);
-      let discountRate = 0;
-      if (careerData?.group === "人类联盟") {
-        if (modInfo.isExclusive) {
-          if (techLevel >= 2) {
-            const baseDiscount = 5;
-            const careerDiscount = 10;
-            discountRate = Math.max(baseDiscount, careerDiscount);
-          }
-        } else {
-          const baseDiscount = 5;
-          const careerDiscount = 10;
-          discountRate = Math.max(baseDiscount, careerDiscount);
-        }
-      }
+      const discountRate = calculateDiscountRate(modInfo.isExclusive);
       const actualCost = Math.floor(modInfo.cost * (1 - discountRate / 100));
       const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
       if ((signInfo?.totalRewards || 0) < actualCost) {
-        return `改装需要 ${actualCost} 金币，当前持有：${signInfo?.totalRewards || 0}`;
+        return `❌ 改装需要 ${actualCost} 金币，当前持有：${signInfo?.totalRewards || 0}`;
       }
       await ctx.database.set(
         "ggcevo_weapons",
-        { handle, weaponId: weaponConfig[weapon].id },
+        { handle, weaponId },
         { installedMods: [...equipment.installedMods, mod] }
       );
       await ctx.database.set("ggcevo_sign", { handle }, {
@@ -7709,41 +7846,28 @@ ${validTypes.join("、")}`;
       return [
         `✅ ${weapon} 成功安装 ${mod}！`,
         `花费金币：${actualCost}${discountRate > 0 ? ` (原价${modInfo.cost})` : ""}`,
-        discountRate > 0 && [
-          "💰 折扣明细：",
-          `▸ ⚙️ 武器升级平台Lv.${techLevel}：${discountRate}%折扣`
-        ].join("\n"),
+        discountRate > 0 && `💰 折扣明细：${discountRate}% (⚙️ Lv.${techLevel})`,
         `改装槽：${equipment.installedMods.length + 1}/${equipment.modificationSlots}`
       ].filter(Boolean).join("\n");
     }, "processModInstallation");
     const showModList = /* @__PURE__ */ __name(async () => {
-      const [techData] = await ctx.database.get("ggcevo_tech", { handle, techId: 3 }).catch(() => [{ level: 0 }]);
-      const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
-      const techLevel = techData?.level || 0;
-      const isCareerMatch = Spacestationtechnology.find((t) => t.techId === 3).careerNames.includes(careerData?.career);
-      const formatMod = /* @__PURE__ */ __name((name2, config2) => {
-        let discountRate = 0;
-        if (config2.isExclusive) {
-          if (techLevel >= 2 && isCareerMatch) discountRate = 10;
-        } else {
-          const baseDiscount = [5, 10][techLevel - 1] || 0;
-          const careerDiscount = techLevel >= 1 && isCareerMatch ? [10, 20][techLevel - 1] : 0;
-          discountRate = Math.max(baseDiscount, careerDiscount);
-        }
-        const actualPrice = Math.floor(config2.cost * (1 - discountRate / 100));
-        return [
-          `【${name2}】${config2.isExclusive ? ` (专属:${config2.exclusiveTo})` : ""}`,
-          `价格：${actualPrice}金币${discountRate > 0 ? ` (原价${config2.cost})` : ""}`,
-          `效果：${config2.effect}`,
-          "------------------"
-        ].filter(Boolean).join("\n");
-      }, "formatMod");
-      const baseUniversalDiscount = [5, 10][techLevel - 1] || 0;
-      const careerUniversalDiscount = techLevel >= 1 && isCareerMatch ? [10, 20][techLevel - 1] : 0;
-      const universalDiscountRate = Math.max(baseUniversalDiscount, careerUniversalDiscount);
-      const exclusiveDiscountRate = techLevel >= 2 && isCareerMatch ? 10 : 0;
-      if (isValidWeapon) {
-        const exclusiveMods = Object.entries(modConfig).filter(([_, m]) => m.isExclusive && m.exclusiveTo === weapon).map(([name2, cfg]) => formatMod(name2, cfg));
+      const buildModList = /* @__PURE__ */ __name((isExclusive) => {
+        const mods = Object.entries(modConfig).filter(([_, m]) => m.isExclusive === isExclusive).map(([name2, cfg]) => {
+          const discountRate = calculateDiscountRate(cfg.isExclusive);
+          const actualPrice = Math.floor(cfg.cost * (1 - discountRate / 100));
+          return [
+            `【${name2}】${cfg.isExclusive ? ` (专属:${cfg.exclusiveTo})` : ""}`,
+            `价格：${actualPrice}金币${discountRate > 0 ? ` (原价${cfg.cost})` : ""}`,
+            `效果：${cfg.effect}`,
+            "------------------"
+          ].join("\n");
+        });
+        if (mods.length === 0) return "该类别暂无可用模块";
+        return mods.join("\n");
+      }, "buildModList");
+      const universalDiscountRate = calculateDiscountRate(false);
+      const exclusiveDiscountRate = calculateDiscountRate(true);
+      if (weapon && weaponConfig[weapon]?.id) {
         return [
           `🛠️ ${weapon} 专属模块 🛠️`,
           "使用「改装 武器名称 模块名称」安装",
@@ -7751,10 +7875,9 @@ ${validTypes.join("、")}`;
           exclusiveDiscountRate > 0 && `💰 当前专属模块折扣：
 ▸ ⚙️ 武器升级平台Lv.${techLevel}：${exclusiveDiscountRate}%折扣`,
           "====================",
-          exclusiveMods.length ? exclusiveMods.join("\n") : "该武器暂无专属模块"
+          buildModList(true)
         ].filter(Boolean).join("\n");
       } else {
-        const universalMods = Object.entries(modConfig).filter(([_, m]) => !m.isExclusive).map(([name2, cfg]) => formatMod(name2, cfg));
         return [
           "🛠️ 通用武器模块 🛠️",
           "使用「改装 武器名称 模块名称」安装通用模块",
@@ -7762,7 +7885,7 @@ ${validTypes.join("、")}`;
           universalDiscountRate > 0 && `💰 当前通用模块折扣：
 ▸ ⚙️ 武器升级平台Lv.${techLevel}：${universalDiscountRate}%折扣`,
           "====================",
-          universalMods.join("\n")
+          buildModList(false)
         ].filter(Boolean).join("\n");
       }
     }, "showModList");
@@ -8100,6 +8223,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.tags?.join("、") || "无"}`);
     if (mainBoss.radiationLayers > 0) {
       result.push(`☢️ 辐射：${mainBoss.radiationLayers}层`);
@@ -8136,7 +8260,7 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
         default:
           acidText = "未知状态";
       }
-      result.push(`🧪 酸蚀池：${acidText}`);
+      result.push(`🧪 当前酸蚀池：${acidText}`);
     }
     if (mainBoss.lastWeaponName) {
       result.push(`🎭 记录武器：${mainBoss.lastWeaponName}`);
@@ -8154,6 +8278,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.tags?.join("、") || "无"}`);
         if (minion.radiationLayers > 0) {
           minionInfo.push(`☢️ 辐射：${minion.radiationLayers}层`);
@@ -8190,7 +8315,7 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
             default:
               acidText = "未知状态";
           }
-          minionInfo.push(`🧪 酸蚀池：${acidText}`);
+          minionInfo.push(`🧪 当前酸蚀池：${acidText}`);
         }
         if (minion.lastWeaponName) {
           minionInfo.push(`🎭 记录武器：${minion.lastWeaponName}`);
@@ -8408,7 +8533,7 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
       return `您输入的是错误的阵营名称，请选择有效阵营：${validFactions.join(" / ")}`;
     }
     const [existing] = await ctx.database.get("ggcevo_careers", { handle });
-    if (existing.group === "人类联盟" || existing.group === "辛迪加海盗") {
+    if (existing?.group === "人类联盟" || existing?.group === "辛迪加海盗") {
       return `你已经加入${existing.group}阵营，当前职业：${existing.career}`;
     }
     const [signData] = await ctx.database.get("ggcevo_sign", { handle });
@@ -9180,7 +9305,6 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         taskList.push([
           `▸ 【${taskName}】`,
           `类型: ${task2.type}`,
-          `目标: ${task2.target}次`,
           `奖励: ${task2.price}金币`,
           `进度: ${completionStatus}/${task2.target}`,
           "------------------"
@@ -9213,9 +9337,6 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       `当前进度: ${progress}/${task.target}`,
       `累计完成: ${completions}次`,
       "------------------",
-      "任务描述:",
-      task.description,
-      "------------------",
       "完成条件:",
       task.condition,
       "====================",