koishi-plugin-ggcevo-game 1.4.65 → 1.4.67

package/lib/boss/BattleEffectProcessor.d.ts

@@ -501,7 +501,7 @@ export declare const BattleEffectProcessor: {
  * @param activeBosses 当前所有活跃Boss列表
  * @returns 包含最终伤害值和所有效果消息的对象
  */
-export declare function applyPassiveEffects(targetBoss: any, activeBosses: any[], weaponName: string, damage: number, hasCrit: boolean, ignoreRate: number): {
+export declare function applyPassiveEffects(targetBoss: any, activeBosses: any[], weaponName: string, damage: number, hasCrit: boolean, ignoreRate: number, careerData: any): {
     finalDamage: number;
     messages: string[];
     radiationLayerAdded: boolean;

package/lib/boss/attackhandling.d.ts

@@ -1,6 +1,6 @@
 import { Context } from 'koishi';
 import { Config } from '../index';
-export declare function handlePrimaryAttack(ctx: Context, session: any, handle: string, config: Config, equippedWeapon: any, targetBoss: any, activeBosses: any[], weaponName: string): Promise<{
+export declare function handlePrimaryAttack(ctx: Context, session: any, handle: string, config: Config, equippedWeapon: any, targetBoss: any, activeBosses: any[], weaponName: string, careerData: any): Promise<{
     initialDamage: number;
     currentHP: number;
     isDefeated: boolean;
@@ -14,7 +14,7 @@ export declare function handlePrimaryAttack(ctx: Context, session: any, handle:
     pulseApplied: boolean;
     arcApplied: boolean;
 }>;
-export declare function handleScatterAttack(ctx: Context, session: any, handle: string, config: Config, equippedWeapon: any, targetBoss: any, weaponName: string, activeBosses: any[]): Promise<{
+export declare function handleScatterAttack(ctx: Context, session: any, handle: string, config: Config, equippedWeapon: any, targetBoss: any, weaponName: string, activeBosses: any[], careerData: any): Promise<{
     scatterEffectMessages: string[];
     extraDamages: {
         name: string;
@@ -44,7 +44,7 @@ export declare function updateTaskProgress(ctx: Context, handle: string, taskUpd
     taskId: number;
     count: number;
 }[]): Promise<void>;
-export declare function testAttackFunction(ctx: Context, session: any, handle: string, config: Config, equippedWeapon: any, targetBoss: any, activeBosses: any[], weaponName: string): Promise<{
+export declare function testAttackFunction(ctx: Context, session: any, handle: string, config: Config, equippedWeapon: any, targetBoss: any, activeBosses: any[], weaponName: string, careerData: any): Promise<{
     initialDamage: number;
     hasCrit: boolean;
     effectMessage: string[];

package/lib/boss/damagecalculation.d.ts

@@ -1,7 +1,8 @@
 import { Context } from 'koishi';
 import { Config } from '../index';
-export declare function calculateTotalDamage(ctx: Context, session: any, config: Config, equippedWeapon: any, targetBoss: any): Promise<{
+export declare function calculateTotalDamage(ctx: Context, session: any, config: Config, equippedWeapon: any, targetBoss: any, careerData: any): Promise<{
     damage: number;
+    baseDamage: number;
     hasCrit: boolean;
     effectMessage: string[];
 }>;

package/lib/index.js

@@ -36,7 +36,7 @@ var weaponConfig = {
     id: 1,
     type: "实弹武器",
     category: "实弹武器",
-    damage: 10,
+    damage: 13,
     armorDamageReduction: 1,
     // 每点护甲减伤1点伤害
     description: "标准配置武器，中距离作战利器",
@@ -68,7 +68,7 @@ var weaponConfig = {
     id: 3,
     type: "热能武器",
     category: "热能武器",
-    damage: 20,
+    damage: 23,
     armorDamageReduction: 0.25,
     description: "基于热能的强大武器，烧烬一切",
     specialeffect: "",
@@ -100,7 +100,7 @@ var weaponConfig = {
     id: 5,
     type: "实弹武器",
     category: "实弹武器",
-    damage: 20,
+    damage: 16,
     armorDamageReduction: 1,
     description: "一种改造后的采矿切割机，有效对抗重甲目标",
     specialeffect: "",
@@ -145,16 +145,16 @@ var weaponConfig = {
     id: 8,
     type: "热能武器",
     category: "热能武器",
-    damage: 22,
+    damage: 25,
     armorDamageReduction: 1,
     description: "喷射稳定的液氮恒流，对长时间接触者造成致命的损伤",
-    specialeffect: "攻击使目标叠加“寒冷”层数，每层使其受到的伤害+2.5%(至多+50%)",
+    specialeffect: "攻击使目标叠加[寒冷]层数，每层使其受到的伤害提高2.5%（上限50%）",
     price: 775,
     redCrystalCost: 7,
     isantiair: false,
     tagEffects: {
-      "惧寒": 2,
-      "灵能": 1.5,
+      "惧寒": 1.5,
+      "灵能": 1.2,
       "护盾": 0.5
     }
   },
@@ -162,7 +162,7 @@ var weaponConfig = {
     id: 9,
     type: "能量武器",
     category: "能量武器",
-    damage: 25,
+    damage: 24,
     armorDamageReduction: 0.5,
     description: "一种经过改造的电动工具，可对近距离的目标放出高压电",
     specialeffect: "攻击消耗目标200点能量",
@@ -178,16 +178,15 @@ var weaponConfig = {
     id: 10,
     type: "热能武器",
     category: "热能武器",
-    damage: 24,
+    damage: 27,
     armorDamageReduction: 0.75,
     description: "一种高度危险性的武器，设计用辐射照射并伤害敌人",
-    specialeffect: "攻击使生物目标(无机械标签)叠加“辐射”层数，每层使其受到的伤害+2.5%(至多+50%)",
+    specialeffect: "攻击使无机械标签的[生物]目标叠加[辐射]层数，每层使其受到的伤害提高2.5%（上限50%）",
     price: 825,
     redCrystalCost: 8,
     isantiair: true,
     tagEffects: {
-      "生物": 1.5,
-      "护盾": 0.5,
+      "生物": 1.2,
       "机械": 0.2
     }
   },
@@ -195,10 +194,10 @@ var weaponConfig = {
     id: 11,
     type: "能量武器",
     category: "能量武器",
-    damage: 30,
+    damage: 27,
     armorDamageReduction: 0,
     description: "激光步枪的变种，采用折射技术升级",
-    specialeffect: "拥有“散射”效果，对其他目标造成50%的伤害",
+    specialeffect: "触发散射攻击，对非主目标造成120%基础伤害",
     price: 1450,
     redCrystalCost: 14,
     isantiair: true,
@@ -210,22 +209,22 @@ var weaponConfig = {
     id: 12,
     type: "能量武器",
     category: "能量武器",
-    damage: 30,
+    damage: 29,
     armorDamageReduction: 0.75,
     description: "面对护盾目标而开发的武器",
-    specialeffect: "攻击无视护盾目标50%的减伤效果",
+    specialeffect: "攻击[护盾]目标时无视50%减伤",
     price: 1050,
     redCrystalCost: 10,
     isantiair: true,
     tagEffects: {
-      "护盾": 1.8
+      "护盾": 1.75
     }
   },
   "动力钻头": {
     id: 13,
     type: "实弹武器",
     category: "实弹武器",
-    damage: 30,
+    damage: 32,
     armorDamageReduction: 0.5,
     description: "这种强大的钻头是由那些想把矿工SCV上的大螺丝用作武器的人创造的",
     specialeffect: "",
@@ -235,17 +234,17 @@ var weaponConfig = {
     tagEffects: {
       "建筑": 2,
       "重甲": 1.5,
-      "机械": 1.5
+      "机械": 1.2
     }
   },
   "脉冲扰乱枪": {
     id: 14,
     type: "能量武器",
     category: "能量武器",
-    damage: 40,
+    damage: 36,
     armorDamageReduction: 1,
     description: "一种原型能量武器，能够发射强大的脉冲",
-    specialeffect: "攻击使目标的技能层数减少2层",
+    specialeffect: "攻击使目标技能层数减少2层",
     price: 1500,
     redCrystalCost: 15,
     isantiair: true,
@@ -316,7 +315,7 @@ var weaponConfig = {
     id: 19,
     type: "能量武器",
     category: "能量武器",
-    damage: 35,
+    damage: 30,
     armorDamageReduction: 1,
     description: "这是在一位高级灵能者的帮助下，解析灵能力量制作出的高科技武器",
     specialeffect: "",
@@ -349,10 +348,10 @@ var weaponConfig = {
     id: 102,
     type: "能量武器",
     category: "传奇武器",
-    damage: 70,
+    damage: 75,
     armorDamageReduction: -1,
     description: "一件传奇武器",
-    specialeffect: "暴击率+80%",
+    specialeffect: "暴击率+25%",
     price: 6400,
     redCrystalCost: 200,
     isantiair: true,
@@ -373,7 +372,8 @@ var weaponConfig = {
     isantiair: false,
     tagEffects: {
       "惧热": 2,
-      "轻甲": 1.5
+      "轻甲": 1.5,
+      "生物": 1.2
     }
   },
   "DSR-55反器材步枪": {
@@ -398,7 +398,7 @@ var weaponConfig = {
     damage: 100,
     armorDamageReduction: 0,
     description: "优雅而独特的武器",
-    specialeffect: "无视目标100%的减伤效果",
+    specialeffect: "无视100%减伤",
     price: 6400,
     redCrystalCost: 200,
     isantiair: false,
@@ -426,7 +426,7 @@ var weaponConfig = {
     damage: 60,
     armorDamageReduction: 0,
     description: "一件传奇武器",
-    specialeffect: "攻击无视目标80%的减伤效果",
+    specialeffect: "无视80%减伤",
     price: 6400,
     redCrystalCost: 200,
     isantiair: true,
@@ -455,58 +455,65 @@ var weaponConfig = {
 var modConfig = {
   "动能增幅": {
     cost: 1750,
-    effect: "伤害+20%",
+    effect: "伤害+15%",
+    // 规范术语
     exclusiveTo: "",
     isExclusive: false
   },
   "棱镜水晶": {
     cost: 2250,
-    effect: "暴击率+20%",
+    effect: "暴击率+10%",
+    // 保持原描述
     exclusiveTo: "",
     isExclusive: false
   },
   "破甲模块": {
     cost: 1250,
-    effect: "攻击无视目标10%的减伤效果",
+    effect: "无视10%减伤",
+    // 术语统一
     exclusiveTo: "",
     isExclusive: false
   },
-  // 新增专属模块
+  // 专属模组修改
   "裂甲核心": {
     cost: 750,
-    effect: "攻击伤害+40%，攻击无视目标的40%减伤效果",
+    effect: "伤害+40%，无视40%减伤",
+    // 统一伤害/防御描述
     exclusiveTo: "高斯步枪",
-    // 指定专属武器
     isExclusive: true
-    // 标记为专属模块
   },
   "棱镜超载核心": {
-    cost: 3050,
-    effect: "暴击率+80%",
+    cost: 2550,
+    effect: "暴击率+20%",
+    // 保持原描述
     exclusiveTo: "激光步枪",
     isExclusive: true
   },
   "助燃核心": {
     cost: 2550,
-    effect: "对惧热目标改为造成300%伤害，对生物目标改为造成200%伤害",
+    effect: "对[惧热]目标造成300%伤害，对[生物]目标造成200%伤害",
+    // 规范标签引用和效果描述
     exclusiveTo: "焚烧枪",
     isExclusive: true
   },
   "光束曲射晶片": {
     cost: 2750,
-    effect: "攻击时造成散射，只能对其他目标造成50%的伤害",
+    effect: "触发散射攻击，对非主目标造成100%基础伤害",
+    // 明确机制命名
     exclusiveTo: "碎骨步枪",
     isExclusive: true
   },
   "金刚石瞄准镜": {
     cost: 2250,
-    effect: "无视目标20%的减伤效果",
+    effect: "无视20%减伤",
+    // 术语统一
     exclusiveTo: "侦察步枪",
     isExclusive: true
   },
   "微型聚变核心": {
     cost: 2750,
-    effect: "连续攻击每次提高7.5%的伤害（至多提高45%）",
+    effect: "连续攻击叠加[伤害提升]，每层提高7.5%伤害（上限6层）",
+    // 机制命名和数值规范化
     exclusiveTo: "聚变磁轨枪",
     isExclusive: true
   }
@@ -718,7 +725,7 @@ var syndicatePirateConfig = [
   },
   {
     professionName: "猩红杀手",
-    effect: "“侦察步枪”攻击伤害+15%; 使用“侦察步枪”攻击时每1点护甲减少0点伤害; 购买DSR-55反器材步枪(传奇)享有50%的折扣",
+    effect: "“侦察步枪”攻击伤害+15%; 使用“侦察步枪”攻击时每1点护甲减少1点伤害; 购买DSR-55反器材步枪(传奇)享有50%的折扣",
     requirements: "“侦察步枪”武器等级≥3级",
     Jobtransfer: true,
     costredcrystal: 30
@@ -930,31 +937,31 @@ var Spacestationtechnology = [
         level: 1,
         cost: 500,
         description: "提高挖矿效率，每日签到金币奖励+5%",
-        careerBonus: "每日签到金币奖励+10%"
+        careerBonus: "每日签到金币奖励额外+5%"
       },
       {
         level: 2,
         cost: 1750,
         description: "提高挖矿效率，每日签到金币奖励+10%",
-        careerBonus: "每日签到金币奖励+20%; 解锁太空“挖矿”权限"
+        careerBonus: "每日签到金币奖励额外+10%; 解锁太空“挖矿”权限"
       },
       {
         level: 3,
         cost: 2950,
         description: "提高挖矿效率，每日签到金币奖励+15%",
-        careerBonus: "每日签到金币奖励+30%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高20%"
+        careerBonus: "每日签到金币奖励额外+15%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高20%"
       },
       {
         level: 4,
         cost: 4250,
         description: "提高挖矿效率，每日签到金币奖励+20%",
-        careerBonus: "每日签到金币奖励+40%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高40%"
+        careerBonus: "每日签到金币奖励额外+20%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高40%"
       },
       {
         level: 5,
         cost: 5375,
         description: "提高挖矿效率，每日签到金币奖励+25%",
-        careerBonus: "每日签到金币奖励+50%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高60%，并且单次挖矿时间上限增加至48小时"
+        careerBonus: "每日签到金币奖励额外+25%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高60%，并且单次挖矿时间上限增加至48小时"
       }
     ]
   },
@@ -969,31 +976,31 @@ var Spacestationtechnology = [
         level: 1,
         cost: 500,
         description: "提升空间站武器等级，升级武器享有5%的折扣",
-        careerBonus: "升级武器享有10%的折扣"
+        careerBonus: "升级武器额外享有5%的折扣"
       },
       {
         level: 2,
         cost: 1500,
         description: "提升空间站武器等级，升级武器享有10%的折扣",
-        careerBonus: "升级武器享有20%的折扣"
+        careerBonus: "升级武器额外享有10%的折扣"
       },
       {
         level: 3,
         cost: 2550,
         description: "提升空间站武器等级，升级武器享有15%的折扣",
-        careerBonus: "升级武器享有30%的折扣"
+        careerBonus: "升级武器额外享有15%的折扣"
       },
       {
         level: 4,
         cost: 3950,
         description: "提升空间站武器等级，升级武器享有20%的折扣",
-        careerBonus: "在升级武器享有40%的折扣"
+        careerBonus: "升级武器额外享有20%的折扣"
       },
       {
         level: 5,
         cost: 4650,
         description: "提升空间站武器等级，升级武器享有25%的折扣",
-        careerBonus: "升级武器享有50%的折扣; 解锁传奇武器购买权限1次"
+        careerBonus: "升级武器额外享有25%的折扣; 解锁传奇武器购买权限1次"
       }
     ]
   },
@@ -1007,13 +1014,13 @@ var Spacestationtechnology = [
         level: 1,
         cost: 750,
         description: "重启武器升级站，武器改装通用模块享有5%的折扣",
-        careerBonus: "武器改装通用模块享有10%的折扣"
+        careerBonus: "武器改装通用模块额外享有5%的折扣"
       },
       {
         level: 2,
         cost: 1e3,
         description: "重启高级武器改装站，武器改装通用模块享有5%的折扣; 武器改装专属模块享有5%的折扣",
-        careerBonus: "武器改装通用模块享有10%的折扣; 武器改装专属模块享有10%的折扣"
+        careerBonus: "武器改装通用模块额外享有5%的折扣; 武器改装专属模块额外享有5%的折扣"
       }
     ]
   },
@@ -1028,31 +1035,31 @@ var Spacestationtechnology = [
         level: 1,
         cost: 500,
         description: "重启安防参数代码，攻击获得的金币+5%",
-        careerBonus: "攻击获得的金币+10%"
+        careerBonus: "攻击获得的金币额外+5%"
       },
       {
         level: 2,
         cost: 2050,
         description: "提高空间站安防系统强度，攻击获得的金币+10%",
-        careerBonus: "攻击获得的金币+20%"
+        careerBonus: "攻击获得的金币额外+10%"
       },
       {
         level: 3,
         cost: 3250,
         description: "进一步提高空间站安防系统强度，攻击获得的金币+15%",
-        careerBonus: "攻击获得的金币+30%"
+        careerBonus: "攻击获得的金币额外+15%"
       },
       {
         level: 4,
         cost: 4250,
         description: "大幅提高空间站安防系统强度，攻击获得的金币+20%",
-        careerBonus: "攻击获得的金币+40%"
+        careerBonus: "攻击获得的金币额外+20%"
       },
       {
         level: 5,
         cost: 5350,
         description: "完全恢复空间站安防系统，攻击获得的金币+25%",
-        careerBonus: "攻击获得的金币+50%; 获得一次打开安全军械库防爆门的权限，可以随机获得一把传奇武器"
+        careerBonus: "攻击获得的金币额外+25%; 获得一次打开安全军械库防爆门的权限，可以随机获得一把传奇武器"
       }
     ]
   },
@@ -1067,31 +1074,31 @@ var Spacestationtechnology = [
         level: 1,
         cost: 500,
         description: "升级空间站关键系统，完成任务奖励+5%",
-        careerBonus: "完成任务奖励+10%"
+        careerBonus: "完成任务奖励额外+5%"
       },
       {
         level: 2,
         cost: 1250,
         description: "升级空间站关键系统，完成任务奖励+10%",
-        careerBonus: "完成任务奖励+20%"
+        careerBonus: "完成任务奖励额外+10%"
       },
       {
         level: 3,
         cost: 2250,
         description: "升级空间站关键系统，完成任务奖励+15%",
-        careerBonus: "完成任务奖励+30%，移除签到7日以下奖励区间"
+        careerBonus: "完成任务奖励额外+15%，移除签到7日以下奖励区间"
       },
       {
         level: 4,
         cost: 2950,
         description: "升级空间站关键系统，完成任务奖励+20%",
-        careerBonus: "完成任务奖励+40%，移除签到14日以下奖励区间"
+        careerBonus: "完成任务奖励额外+20%，移除签到14日以下奖励区间"
       },
       {
         level: 5,
         cost: 3550,
         description: "升级空间站关键系统，完成任务奖励+25%",
-        careerBonus: "完成任务奖励+50%，移除签到21日以下奖励区间"
+        careerBonus: "完成任务奖励额外+25%，移除签到21日以下奖励区间"
       }
     ]
   }
@@ -3339,7 +3346,7 @@ var BattleEffectProcessor = {
     };
   }, "handleToxicAssault")
 };
-function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCrit, ignoreRate) {
+function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCrit, ignoreRate, careerData) {
   const messages = [];
   let immune = false;
   let totalBuffMultiplier = 0;
@@ -3608,10 +3615,16 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
   let finalDamage = damage;
   let adjustedNerfMultiplier = totalNerfMultiplier * (1 - ignoreRate);
   const damageMultiplier = 1 + totalBuffMultiplier - adjustedNerfMultiplier;
-  finalDamage = Math.max(1, Math.round(damage * damageMultiplier));
+  finalDamage = damage * damageMultiplier;
   if (hasCrit) {
     finalDamage *= 2;
   }
+  let armorDamageReduction = weaponData.armorDamageReduction || 0;
+  if (careerData?.career === "猩红杀手" && weaponName === "侦察步枪") {
+    armorDamageReduction = 1;
+  }
+  const armorReduction = armorDamageReduction * getArmorByName(targetBoss.name);
+  finalDamage = Math.max(Math.round(finalDamage - armorReduction), 1);
   const frostEvolutionResult = BattleEffectProcessor.handleFrostEvolution(
     targetBoss,
     weaponName,
@@ -3921,7 +3934,7 @@ var passiveConfig = {
   },
   "剧毒突袭": {
     type: "强化效果",
-    description: "「毒性唾液」≥20层时，受击消耗所有层数并使强化下5次触发的「酸蚀池」"
+    description: "「毒性唾液」≥20层时，受击消耗所有层数并强化下5次触发的「酸蚀池」"
   }
 };
 
@@ -3939,7 +3952,7 @@ var wishConfig = {
     },
     {
       name: "王权增幅",
-      effect: "攻击伤害+10%"
+      effect: "伤害+10%"
     },
     {
       name: "金柚赐福",
@@ -3954,7 +3967,7 @@ var wishConfig = {
   rare: [
     {
       name: "悲鸣之锋",
-      effect: "攻击伤害+10% (武器等级0)，每级武器等级额外+10%"
+      effect: "伤害+10% (武器等级0)，每级武器等级额外+10%"
     },
     {
       name: "精灵双倍",
@@ -3966,7 +3979,7 @@ var wishConfig = {
     },
     {
       name: "暴击韵律",
-      effect: "攻击暴击率+20%"
+      effect: "暴击率+20%"
     },
     {
       name: "酥手空空",
@@ -4645,26 +4658,18 @@ var legendaryDiscounts = {
 };
 
 // src/boss/damagecalculation.ts
-async function calculateTotalDamage(ctx, session, config, equippedWeapon, targetBoss) {
+async function calculateTotalDamage(ctx, session, config, equippedWeapon, targetBoss, careerData) {
   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 = initialDamage * (1 + levelBonusRate * equippedWeapon.level);
-  effectMessage.push(`🔫 ${weaponName} Lv.${equippedWeapon.level}：基础伤害${Math.round(baseDamage)}`);
+  const baseDamage = weaponData.damage * (1 + levelBonusRate * equippedWeapon.level);
+  effectMessage.push(`🔫 ${weaponName} Lv.${equippedWeapon.level}：基础伤害${baseDamage.toFixed(1)}`);
   const tagAdditive = await calculateTagMultiplier(weaponData, finalTags, equippedWeapon);
   const tagMultiplier = 1 + tagAdditive;
   if (tagAdditive !== 0) {
@@ -4688,7 +4693,8 @@ async function calculateTotalDamage(ctx, session, config, equippedWeapon, target
   effectMessage.push(...critSources);
   finalDamage = Math.max(finalDamage, 1);
   return {
-    damage: Math.round(finalDamage),
+    damage: finalDamage,
+    baseDamage,
     hasCrit,
     effectMessage
   };
@@ -4698,12 +4704,12 @@ async function calculateCrit(ctx, handle, equippedWeapon, weaponName) {
   let critRate = 0;
   const critSources = [];
   if (equippedWeapon.installedMods?.includes("棱镜水晶")) {
-    critRate += 20;
-    critSources.push("🔼 棱镜水晶：暴击率+20%");
+    critRate += 10;
+    critSources.push("🔼 棱镜水晶：暴击率+10%");
   }
   if (equippedWeapon.installedMods?.includes("棱镜超载核心") && modConfig["棱镜超载核心"]?.exclusiveTo === weaponName) {
-    critRate += 80;
-    critSources.push("🔼 棱镜超载核心：暴击率+80%");
+    critRate += 20;
+    critSources.push("🔼 棱镜超载核心：暴击率+20%");
   }
   const [critRhythm] = await ctx.database.get("ggcevo_wish", {
     handle,
@@ -4716,10 +4722,9 @@ async function calculateCrit(ctx, handle, equippedWeapon, weaponName) {
     critSources.push("🎵 暴击韵律祈愿：暴击率+20%");
   }
   if (weaponName === "MK-4激光步枪") {
-    critRate += 80;
-    critSources.push("🔫 MK-4激光步枪：暴击率+80%");
+    critRate += 25;
+    critSources.push("🔫 MK-4激光步枪：暴击率+25%");
   }
-  critSources.push(`📊 本次攻击总暴击率：${critRate}%`);
   return {
     hasCrit: Math.random() * 100 < critRate,
     critSources
@@ -4746,12 +4751,12 @@ function calculateModifiers(equippedWeapon, weaponName) {
   let totalModAdd = 0;
   const modMessages = [];
   if (equippedWeapon.installedMods?.includes("动能增幅")) {
-    totalModAdd += 0.2;
-    modMessages.push(`🛠️ 【动能增幅】：伤害加成+20%`);
+    totalModAdd += 0.15;
+    modMessages.push(`🛠️ 【动能增幅】：伤害+15%`);
   }
   if (equippedWeapon.installedMods?.includes("裂甲核心") && weaponName === modConfig["裂甲核心"]?.exclusiveTo) {
     totalModAdd += 0.4;
-    modMessages.push(`🛠️ 【裂甲核心】：伤害加成+40%`);
+    modMessages.push(`🛠️ 【裂甲核心】：伤害+40%`);
   }
   if (equippedWeapon.installedMods?.includes("微型聚变核心")) {
     const currentCombo = equippedWeapon?.comboCount || 0;
@@ -4760,7 +4765,7 @@ function calculateModifiers(equippedWeapon, weaponName) {
     const effectiveStacks = Math.min(currentCombo, maxStacks);
     const bonusDamage = effectiveStacks * bonusPerCombo;
     totalModAdd += bonusDamage;
-    modMessages.push(`🛠️ 【微型聚变核心】：连击加成+${(bonusDamage * 100).toFixed(0)}%`);
+    modMessages.push(`🛠️ 【微型聚变核心】：攻击伤害+${(bonusDamage * 100).toFixed(0)}%`);
   }
   return {
     totalModAdd,
@@ -4994,10 +4999,10 @@ async function handleBossDefeatRewards(ctx, targetBoss) {
   return { rewardMessages };
 }
 __name(handleBossDefeatRewards, "handleBossDefeatRewards");
-async function handlePrimaryAttack(ctx, session, handle, config, equippedWeapon, targetBoss, activeBosses, weaponName) {
-  const damageResult = await calculateTotalDamage(ctx, session, config, equippedWeapon, targetBoss);
+async function handlePrimaryAttack(ctx, session, handle, config, equippedWeapon, targetBoss, activeBosses, weaponName, careerData) {
+  const damageResult = await calculateTotalDamage(ctx, session, config, equippedWeapon, targetBoss, careerData);
   const ignoreReduction = await handleIgnoreReductionEffects(ctx, handle, weaponName, targetBoss);
-  const EffectProcessor = applyPassiveEffects(targetBoss, activeBosses, weaponName, damageResult.damage, damageResult.hasCrit, ignoreReduction.ignoreRate);
+  const EffectProcessor = applyPassiveEffects(targetBoss, activeBosses, weaponName, damageResult.damage, damageResult.hasCrit, ignoreReduction.ignoreRate, careerData);
   const initialDamage = EffectProcessor.finalDamage;
   await saveAndClearStats(ctx);
   const [currentboss] = await ctx.database.get("ggcevo_boss", { name: targetBoss.name });
@@ -5019,7 +5024,7 @@ async function handlePrimaryAttack(ctx, session, handle, config, equippedWeapon,
   };
 }
 __name(handlePrimaryAttack, "handlePrimaryAttack");
-async function handleScatterAttack(ctx, session, handle, config, equippedWeapon, targetBoss, weaponName, activeBosses) {
+async function handleScatterAttack(ctx, session, handle, config, equippedWeapon, targetBoss, weaponName, activeBosses, careerData) {
   const secondaryTargets = activeBosses.filter((boss) => boss.name !== targetBoss.name);
   const scatterEffectMessages = [];
   const extraDamages = [];
@@ -5028,10 +5033,10 @@ async function handleScatterAttack(ctx, session, handle, config, equippedWeapon,
   let scatterRatio = 0;
   if (weaponName === "碎骨步枪") {
     scatterEffectMessages.push("🔆 【光束曲射晶片】触发散射攻击！");
-    scatterRatio = 0.5;
+    scatterRatio = 1;
   } else if (weaponName === "中子步枪") {
     scatterEffectMessages.push("🔆 【中子步枪】触发散射攻击！");
-    scatterRatio = 0.5;
+    scatterRatio = 1.2;
   }
   for (const secondaryTarget of secondaryTargets) {
     const damageResult = await calculateTotalDamage(
@@ -5039,11 +5044,12 @@ async function handleScatterAttack(ctx, session, handle, config, equippedWeapon,
       session,
       config,
       equippedWeapon,
-      secondaryTarget
+      secondaryTarget,
+      careerData
     );
-    const secondaryDamage = Math.round(damageResult.damage * scatterRatio);
+    const secondaryDamage = Math.round(damageResult.baseDamage * scatterRatio);
     const ignoreReduction = await handleIgnoreReductionEffects(ctx, handle, weaponName, secondaryTarget);
-    const EffectProcessor = applyPassiveEffects(secondaryTarget, activeBosses, weaponName, secondaryDamage, damageResult.hasCrit, ignoreReduction.ignoreRate);
+    const EffectProcessor = applyPassiveEffects(secondaryTarget, activeBosses, weaponName, secondaryDamage, damageResult.hasCrit, ignoreReduction.ignoreRate, careerData);
     const actualDamage = EffectProcessor.finalDamage;
     await saveAndClearStats(ctx);
     const [currentboss] = await ctx.database.get("ggcevo_boss", { name: secondaryTarget.name });
@@ -5397,10 +5403,10 @@ async function handleIgnoreReductionEffects(ctx, handle, weaponName, targetBoss)
   };
 }
 __name(handleIgnoreReductionEffects, "handleIgnoreReductionEffects");
-async function testAttackFunction(ctx, session, handle, config, equippedWeapon, targetBoss, activeBosses, weaponName) {
-  const damageResult = await calculateTotalDamage(ctx, session, config, equippedWeapon, targetBoss);
+async function testAttackFunction(ctx, session, handle, config, equippedWeapon, targetBoss, activeBosses, weaponName, careerData) {
+  const damageResult = await calculateTotalDamage(ctx, session, config, equippedWeapon, targetBoss, careerData);
   const ignoreReduction = await handleIgnoreReductionEffects(ctx, handle, weaponName, targetBoss);
-  const EffectProcessor = applyPassiveEffects(targetBoss, activeBosses, weaponName, damageResult.damage, damageResult.hasCrit, ignoreReduction.ignoreRate);
+  const EffectProcessor = applyPassiveEffects(targetBoss, activeBosses, weaponName, damageResult.damage, damageResult.hasCrit, ignoreReduction.ignoreRate, careerData);
   const initialDamage = EffectProcessor.finalDamage;
   return {
     initialDamage,
@@ -7988,6 +7994,7 @@ ${validTypes.join("、")}`;
     if (!weaponData.isantiair && (targetBoss.groupId === 5 || targetBoss.groupId === 10)) {
       return "您当前装备的武器无法攻击空中目标！";
     }
+    const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     const primaryAttackResult = await handlePrimaryAttack(
       ctx,
       session,
@@ -7996,7 +8003,8 @@ ${validTypes.join("、")}`;
       equippedWeapon,
       targetBoss,
       activeBosses,
-      weaponName
+      weaponName,
+      careerData
     );
     const allDeadTargets = [];
     if (primaryAttackResult.isDefeated) {
@@ -8014,7 +8022,8 @@ ${validTypes.join("、")}`;
         equippedWeapon,
         targetBoss,
         weaponName,
-        activeBosses
+        activeBosses,
+        careerData
       );
       scatterResult.actuallyDead.forEach((name2) => {
         const deadBoss = activeBosses.find((b) => b.name === name2);
@@ -8146,6 +8155,7 @@ ${validTypes.join("、")}`;
     const activeBosses = [dummyBoss];
     const weaponConfigEntry = Object.entries(weaponConfig).find(([_, c]) => c.id === equippedWeapon.weaponId);
     const [weaponName] = weaponConfigEntry;
+    const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     try {
       const testResult = await testAttackFunction(
         ctx,
@@ -8155,7 +8165,8 @@ ${validTypes.join("、")}`;
         equippedWeapon,
         dummyBoss,
         activeBosses,
-        weaponName
+        weaponName,
+        careerData
       );
       const layerInfo = [];
       if (skillStacks > 0) layerInfo.push(`技能层数: ${skillStacks}`);

package/lib/weapons.d.ts

@@ -152,7 +152,6 @@ export declare const weaponConfig: {
         isantiair: boolean;
         tagEffects: {
             生物: number;
-            护盾: number;
             机械: number;
         };
     };
@@ -339,6 +338,7 @@ export declare const weaponConfig: {
         tagEffects: {
             惧热: number;
             轻甲: number;
+            生物: number;
         };
     };
     'DSR-55\u53CD\u5668\u6750\u6B65\u67AA': {

package/lib/wish.d.ts

@@ -7,7 +7,7 @@ export declare const wishConfig: {
         readonly effect: "下一次升级武器享有20%的折扣";
     }, {
         readonly name: "王权增幅";
-        readonly effect: "攻击伤害+10%";
+        readonly effect: "伤害+10%";
     }, {
         readonly name: "金柚赐福";
         readonly effect: "立即获得250枚金币";
@@ -17,7 +17,7 @@ export declare const wishConfig: {
     }];
     readonly rare: readonly [{
         readonly name: "悲鸣之锋";
-        readonly effect: "攻击伤害+10% (武器等级0)，每级武器等级额外+10%";
+        readonly effect: "伤害+10% (武器等级0)，每级武器等级额外+10%";
     }, {
         readonly name: "精灵双倍";
         readonly effect: "下一次击败主宰时可获得双倍的金币和咕咕币奖励";
@@ -26,7 +26,7 @@ export declare const wishConfig: {
         readonly effect: "签到获得双倍的金币和咕咕币";
     }, {
         readonly name: "暴击韵律";
-        readonly effect: "攻击暴击率+20%";
+        readonly effect: "暴击率+20%";
     }, {
         readonly name: "酥手空空";
         readonly effect: "立即失去50枚金币";

package/package.json

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