koishi-plugin-ggcevo-game 1.4.27 → 1.4.29

package/lib/boss/boss.d.ts

@@ -39,7 +39,7 @@ export declare const bossPool: readonly [{
         maxHP: number;
         energy: number;
         tags: ("重甲" | "生物" | "惧热" | "异形" | "重型")[];
-        passive: ("冰霜进化" | "冰霜环绕")[];
+        passive: ("冰霜环绕" | "冰霜进化")[];
     };
     minions: {
         name: string;
@@ -47,7 +47,7 @@ export declare const bossPool: readonly [{
         maxHP: number;
         energy: number;
         tags: ("生物" | "惧热" | "异形")[];
-        passive: ("弱化形态" | "冰霜回复" | "冰霜进化")[];
+        passive: ("冰霜回复" | "弱化形态" | "冰霜进化")[];
     }[];
 }, {
     main: {
@@ -172,7 +172,7 @@ export declare const bossPool: readonly [{
         maxHP: number;
         energy: number;
         tags: ("重甲" | "护盾" | "生物" | "灵能" | "异形")[];
-        passive: ("星界之风" | "宇宙能量" | "复苏" | "光影之刃" | "远古预兆" | "超视距穿梭")[];
+        passive: ("星界之风" | "宇宙能量" | "复苏" | "光影之刃" | "远古预兆" | "闪电冲锋" | "超视距穿梭")[];
     };
     minions: {
         name: string;

package/lib/boss/passive.d.ts

@@ -97,7 +97,7 @@ export declare const passiveConfig: {
     };
     readonly 能源虹吸: {
         readonly effect: 0;
-        readonly description: "拥有“能量”机制。当“能量”≥80%的时候，受到的伤害-50%; 当“能量”≥50%的时候，受到的伤害-30%";
+        readonly description: "当“能量”≥80%的时候，受到的伤害-50%; 当“能量”≥50%的时候，受到的伤害-30%";
     };
     readonly 电能立场: {
         readonly effect: 0;
@@ -129,11 +129,11 @@ export declare const passiveConfig: {
     };
     readonly 腐蚀胆汁: {
         readonly effect: 0;
-        readonly description: "当“胆汁”达到10层后，下一次受到攻击将治愈所有存活异形1000点血量并清空层数";
+        readonly description: "当“胆汁”达到10层后，下一次受到攻击将回复所有存活异形1000点血量并清空层数";
     };
     readonly 火焰吐息: {
         readonly effect: 0;
-        readonly description: "当“胆汁”达到20层后，下一次攻击将治愈所有存活异形50%的最大生命值并清空层数";
+        readonly description: "当“胆汁”达到20层后，下一次攻击将回复所有存活异形50%的最大生命值并清空层数";
     };
     readonly 太阳耀斑: {
         readonly effect: 0;
@@ -165,19 +165,19 @@ export declare const passiveConfig: {
     };
     readonly 星界之风: {
         readonly effect: 0;
-        readonly description: "受到伤害时，有5%的概率回复所有存活异形500点血量";
+        readonly description: "受到伤害时，有5%的概率回复所有存活异形200点血量";
     };
     readonly 心灵狂热: {
         readonly effect: 0;
-        readonly description: "当血量低于50%时，进入心灵狂热状态，受到的伤害-50%";
+        readonly description: "当血量低于50%时，进入心灵狂热状态，受到的伤害-20%，并且触发“星界之风”技能的概率翻倍";
     };
     readonly 宇宙能量: {
         readonly effect: 0;
-        readonly description: "拥有“能量”机制; 受到攻击时回复与该攻击伤害等额的“能量”; 若“能量”已满，则回复与该攻击伤害等额的血量";
+        readonly description: "受到攻击时回复与该攻击伤害等额的“能量”; 若“能量”已满，则回复溢出伤害值的血量";
     };
     readonly 复苏: {
         readonly effect: 0;
-        readonly description: "受到致命伤害时，免于死亡并且快速回复50%的血量和100%的能量，并且获得“灵能构造炉”技能(触发后移除)";
+        readonly description: "受到致命伤害时，免于死亡，快速回复自身50%的最大生命值和100%的“能量”，并且获得“灵能构造炉”技能(触发后移除)";
     };
     readonly 光影之刃: {
         readonly effect: 0;
@@ -185,19 +185,23 @@ export declare const passiveConfig: {
     };
     readonly 远古预兆: {
         readonly effect: 0;
-        readonly description: "受到伤害时，有5%的概率免疫此次伤害并且回复100点“能量”，每层“光影之刃”额外提供1%的概率";
+        readonly description: "受到伤害时，有1%的概率免疫此次伤害并且回复100点“能量”";
+    };
+    readonly 闪电冲锋: {
+        readonly effect: 0;
+        readonly description: "每层“光影之刃”使触发“星界之风”，“远古预兆”和“灵能构造炉”技能的概率+1%";
     };
     readonly 超视距穿梭: {
         readonly effect: 0;
-        readonly description: "当“能量”≥30%时，每层“光影之刃”使受到的伤害-5%";
+        readonly description: "当“能量”≥30%时，每层“光影之刃”使受到的伤害-5%; 当“能量”≥60%时，每层“光影之刃”使受到的伤害-10%; 当“能量”≤10%时，每层“光影之刃”使受到的伤害+5%";
     };
     readonly 灵能构造炉: {
         readonly effect: 0;
-        readonly description: "受到攻击后，有5%的概率会随机获得以下4个技能之一(天启超载护盾，塌缩脉冲，地毯式轰炸，轰炸引导)，每层“光影之刃”额外提供1%的概率";
+        readonly description: "受到攻击后，有1%的概率会随机获得以下4个技能之一(天启超载护盾，塌缩脉冲，地毯式轰炸，轰炸引导)";
     };
     readonly 天启超载护盾: {
         readonly effect: 0;
-        readonly description: "受到伤害后，有10%的概率消耗所有“光影之刃”层数，回复所有存活异形X点血量(X为“光影之刃”层数 x 100)";
+        readonly description: "受到伤害后，有5%的概率回复所有存活异形X点血量(X为“光影之刃”层数 x 10)";
     };
     readonly 塌缩脉冲: {
         readonly effect: 0;
@@ -205,10 +209,10 @@ export declare const passiveConfig: {
     };
     readonly 地毯式轰炸: {
         readonly effect: 0;
-        readonly description: "我心中的怒火胜过千万个太阳！移除自身的“孤立无援”，并使受到的伤害-50%";
+        readonly description: "我心中的怒火胜过千万个太阳！移除自身的“孤立无援”，并使受到的伤害-100%";
     };
     readonly 轰炸引导: {
         readonly effect: 0;
-        readonly description: "受到伤害后，有10%的概率概率消耗所有“光影之刃”层数，回复自身X点“能量”(X为“光影之刃”层数 x 100)";
+        readonly description: "受到伤害后，有10%的概率概率回复自身X点“能量”(X为“光影之刃”层数 x 50)";
     };
 };

package/lib/boss/passivehandler.d.ts

@@ -38,7 +38,7 @@ export declare const PassiveHandler: {
         messages: string[];
         skillUpdates: {
             name: any;
-            remove: ("冰霜环绕" | "寒霜地狱" | "冰霜回复" | "弱化形态" | "异形甲壳" | "孤立无援" | "冰霜进化" | "应激甲壳I" | "应激甲壳II" | "求生本能I" | "求生本能II" | "冷适应" | "感染空间站" | "病毒云" | "霉菌滋生" | "岗哨机枪" | "结构装甲" | "吸血唾液" | "进食" | "嗜血狂暴" | "吐血" | "电能导体" | "超导体" | "能量虹吸" | "能源虹吸" | "电能立场" | "电能冲击波" | "脉冲" | "能量黑洞" | "火焰异形" | "庞兽狂暴" | "灼烧粘液" | "腐蚀胆汁" | "火焰吐息" | "太阳耀斑" | "燃烧潜地" | "炼狱爆弹" | "猎手异形" | "狂暴" | "伪装" | "致命一击" | "星界之风" | "心灵狂热" | "宇宙能量" | "复苏" | "光影之刃" | "远古预兆" | "超视距穿梭" | "灵能构造炉" | "天启超载护盾" | "塌缩脉冲" | "地毯式轰炸" | "轰炸引导")[];
+            remove: ("冰霜环绕" | "寒霜地狱" | "冰霜回复" | "弱化形态" | "异形甲壳" | "孤立无援" | "冰霜进化" | "应激甲壳I" | "应激甲壳II" | "求生本能I" | "求生本能II" | "冷适应" | "感染空间站" | "病毒云" | "霉菌滋生" | "岗哨机枪" | "结构装甲" | "吸血唾液" | "进食" | "嗜血狂暴" | "吐血" | "电能导体" | "超导体" | "能量虹吸" | "能源虹吸" | "电能立场" | "电能冲击波" | "脉冲" | "能量黑洞" | "火焰异形" | "庞兽狂暴" | "灼烧粘液" | "腐蚀胆汁" | "火焰吐息" | "太阳耀斑" | "燃烧潜地" | "炼狱爆弹" | "猎手异形" | "狂暴" | "伪装" | "致命一击" | "星界之风" | "心灵狂热" | "宇宙能量" | "复苏" | "光影之刃" | "远古预兆" | "闪电冲锋" | "超视距穿梭" | "灵能构造炉" | "天启超载护盾" | "塌缩脉冲" | "地毯式轰炸" | "轰炸引导")[];
         }[];
     };
     handleInfectedStation: (ctx: Context, targetBoss: any) => Promise<{
@@ -56,7 +56,8 @@ export declare const PassiveHandler: {
         messages: string[];
     };
     handleBloodEffects: (targetBoss: any, currentHP: number, maxHP: number) => {
-        damageMultiplier: number;
+        buffAmount: number;
+        nerfAmount: number;
         messages: string[];
     };
     handleBloodCount: (ctx: Context, targetBoss: any, currentHP: number, maxHP: number) => Promise<{
@@ -181,8 +182,9 @@ export declare const PassiveHandler: {
     handlePulseDisruptor: (ctx: Context, targetBoss: any, weaponName: string) => Promise<{
         messages: string[];
     }>;
-    handleStellarWind: (ctx: Context, targetBoss: any, initialDamage: number, activeBosses: any[], bossGroup: BossPoolItem) => Promise<{
+    handleStellarWind: (ctx: Context, targetBoss: any, initialDamage: number, currentHP: number, maxHP: number, activeBosses: any[], bossGroup: BossPoolItem) => Promise<{
         messages: string[];
+        updatedHP: number;
     }>;
     handlePsychicFrenzy: (targetBoss: any, currentHP: number, maxHP: number) => {
         damageMultiplier: number;
@@ -200,7 +202,8 @@ export declare const PassiveHandler: {
         messages: string[];
     }>;
     handleHyperspaceSkip: (targetBoss: any) => {
-        damageMultiplier: number;
+        reduction: number;
+        increase: number;
         messages: string[];
     };
     handleRevival: (ctx: Context, targetBoss: any, currentHP: number, maxHP: number) => Promise<{
@@ -210,8 +213,9 @@ export declare const PassiveHandler: {
     handleConstructor: (ctx: Context, targetBoss: any) => Promise<{
         messages: string[];
     }>;
-    handleTyrsShield: (ctx: Context, targetBoss: any, activeBosses: any[], bossGroup: BossPoolItem) => Promise<{
+    handleTyrsShield: (ctx: Context, targetBoss: any, currentHP: number, activeBosses: any[], bossGroup: BossPoolItem) => Promise<{
         messages: string[];
+        updatedHP: number;
     }>;
     handleCollapsePulse: (ctx: Context, targetBoss: any) => Promise<{
         messages: string[];

package/lib/index.js

@@ -237,7 +237,7 @@ var weaponConfig = {
     category: "能量武器",
     damage: 32,
     description: "一种原型能量武器，能够发射强大的脉冲",
-    specialeffect: "攻击减少目标2层技能计数",
+    specialeffect: "攻击使目标的技能层数减少2层",
     price: 1500,
     redCrystalCost: 15,
     isantiair: true,
@@ -250,7 +250,7 @@ var weaponConfig = {
     damage: 88,
     description: "一件传奇武器",
     specialeffect: "",
-    price: 7500,
+    price: 6400,
     redCrystalCost: 150,
     isantiair: true,
     tagEffects: {
@@ -266,7 +266,7 @@ var weaponConfig = {
     damage: 70,
     description: "一件传奇武器",
     specialeffect: "攻击暴击率+80%",
-    price: 7500,
+    price: 6400,
     redCrystalCost: 150,
     isantiair: true,
     tagEffects: {
@@ -280,7 +280,7 @@ var weaponConfig = {
     damage: 80,
     description: "这是传说中的武器",
     specialeffect: "",
-    price: 7500,
+    price: 6400,
     redCrystalCost: 150,
     isantiair: false,
     tagEffects: {
@@ -295,7 +295,7 @@ var weaponConfig = {
     damage: 120,
     description: "一件传奇武器",
     specialeffect: "",
-    price: 7500,
+    price: 6400,
     redCrystalCost: 150,
     isantiair: true,
     tagEffects: {
@@ -309,7 +309,7 @@ var weaponConfig = {
     damage: 100,
     description: "优雅而独特的武器",
     specialeffect: "无视目标100%的减伤效果",
-    price: 7500,
+    price: 6400,
     redCrystalCost: 150,
     isantiair: false,
     tagEffects: {}
@@ -321,7 +321,7 @@ var weaponConfig = {
     damage: 100,
     description: "一件传奇武器",
     specialeffect: "攻击消耗目标500点能量",
-    price: 7500,
+    price: 6400,
     redCrystalCost: 150,
     isantiair: true,
     tagEffects: {
@@ -335,7 +335,7 @@ var weaponConfig = {
     damage: 60,
     description: "一件传奇武器",
     specialeffect: "攻击无视目标80%的减伤效果",
-    price: 7500,
+    price: 6400,
     redCrystalCost: 150,
     isantiair: true,
     tagEffects: {
@@ -349,7 +349,7 @@ var weaponConfig = {
     damage: 90,
     description: "一件传奇武器",
     specialeffect: "",
-    price: 7500,
+    price: 6400,
     redCrystalCost: 150,
     isantiair: true,
     tagEffects: {
@@ -553,10 +553,10 @@ var spaceStationCrewConfig = [
   },
   {
     professionName: "武器中士",
-    effect: "攻击伤害+15%; 购买武器(非传奇)享有20%的折扣",
+    effect: "攻击伤害+15%; 购买武器享有50%的折扣",
     requirements: "当期伤害榜累计造成100及以上伤害",
     Jobtransfer: true,
-    costcoins: 2e3
+    costcoins: 3e3
   },
   {
     professionName: "医疗专家",
@@ -1237,16 +1237,16 @@ var bossPool = [
       id: 9,
       name: "宇宙界主",
       type: "主宰",
-      maxHP: 25e3,
+      maxHP: 2e4,
       energy: 1e3,
       tags: asBossTags(["重甲", "护盾", "生物", "灵能", "异形"]),
-      passive: asPassives(["宇宙能量", "复苏", "光影之刃", "远古预兆", "星界之风", "超视距穿梭"])
+      passive: asPassives(["宇宙能量", "复苏", "光影之刃", "闪电冲锋", "远古预兆", "星界之风", "超视距穿梭"])
     },
     minions: [
       {
         name: "宇宙战将",
         type: "子代",
-        maxHP: 7500,
+        maxHP: 5e3,
         energy: 0,
         tags: asBossTags(["重甲", "护盾", "生物", "灵能", "异形"]),
         passive: asPassives(["弱化形态", "心灵狂热", "星界之风"])
@@ -1355,7 +1355,7 @@ var passiveConfig = {
   },
   "能源虹吸": {
     effect: 0,
-    description: "拥有“能量”机制。当“能量”≥80%的时候，受到的伤害-50%; 当“能量”≥50%的时候，受到的伤害-30%"
+    description: "当“能量”≥80%的时候，受到的伤害-50%; 当“能量”≥50%的时候，受到的伤害-30%"
   },
   "电能立场": {
     effect: 0,
@@ -1387,11 +1387,11 @@ var passiveConfig = {
   },
   "腐蚀胆汁": {
     effect: 0,
-    description: "当“胆汁”达到10层后，下一次受到攻击将治愈所有存活异形1000点血量并清空层数"
+    description: "当“胆汁”达到10层后，下一次受到攻击将回复所有存活异形1000点血量并清空层数"
   },
   "火焰吐息": {
     effect: 0,
-    description: "当“胆汁”达到20层后，下一次攻击将治愈所有存活异形50%的最大生命值并清空层数"
+    description: "当“胆汁”达到20层后，下一次攻击将回复所有存活异形50%的最大生命值并清空层数"
   },
   "太阳耀斑": {
     effect: 0,
@@ -1423,19 +1423,19 @@ var passiveConfig = {
   },
   "星界之风": {
     effect: 0,
-    description: "受到伤害时，有5%的概率回复所有存活异形500点血量"
+    description: "受到伤害时，有5%的概率回复所有存活异形200点血量"
   },
   "心灵狂热": {
     effect: 0,
-    description: "当血量低于50%时，进入心灵狂热状态，受到的伤害-50%"
+    description: "当血量低于50%时，进入心灵狂热状态，受到的伤害-20%，并且触发“星界之风”技能的概率翻倍"
   },
   "宇宙能量": {
     effect: 0,
-    description: "拥有“能量”机制; 受到攻击时回复与该攻击伤害等额的“能量”; 若“能量”已满，则回复与该攻击伤害等额的血量"
+    description: "受到攻击时回复与该攻击伤害等额的“能量”; 若“能量”已满，则回复溢出伤害值的血量"
   },
   "复苏": {
     effect: 0,
-    description: "受到致命伤害时，免于死亡并且快速回复50%的血量和100%的能量，并且获得“灵能构造炉”技能(触发后移除)"
+    description: "受到致命伤害时，免于死亡，快速回复自身50%的最大生命值和100%的“能量”，并且获得“灵能构造炉”技能(触发后移除)"
   },
   "光影之刃": {
     effect: 0,
@@ -1443,19 +1443,23 @@ var passiveConfig = {
   },
   "远古预兆": {
     effect: 0,
-    description: "受到伤害时，有5%的概率免疫此次伤害并且回复100点“能量”，每层“光影之刃”额外提供1%的概率"
+    description: "受到伤害时，有1%的概率免疫此次伤害并且回复100点“能量”"
+  },
+  "闪电冲锋": {
+    effect: 0,
+    description: "每层“光影之刃”使触发“星界之风”，“远古预兆”和“灵能构造炉”技能的概率+1%"
   },
   "超视距穿梭": {
     effect: 0,
-    description: "当“能量”≥30%时，每层“光影之刃”使受到的伤害-5%"
+    description: "当“能量”≥30%时，每层“光影之刃”使受到的伤害-5%; 当“能量”≥60%时，每层“光影之刃”使受到的伤害-10%; 当“能量”≤10%时，每层“光影之刃”使受到的伤害+5%"
   },
   "灵能构造炉": {
     effect: 0,
-    description: "受到攻击后，有5%的概率会随机获得以下4个技能之一(天启超载护盾，塌缩脉冲，地毯式轰炸，轰炸引导)，每层“光影之刃”额外提供1%的概率"
+    description: "受到攻击后，有1%的概率会随机获得以下4个技能之一(天启超载护盾，塌缩脉冲，地毯式轰炸，轰炸引导)"
   },
   "天启超载护盾": {
     effect: 0,
-    description: "受到伤害后，有10%的概率消耗所有“光影之刃”层数，回复所有存活异形X点血量(X为“光影之刃”层数 x 100)"
+    description: "受到伤害后，有5%的概率回复所有存活异形X点血量(X为“光影之刃”层数 x 10)"
   },
   "塌缩脉冲": {
     effect: 0,
@@ -1463,11 +1467,11 @@ var passiveConfig = {
   },
   "地毯式轰炸": {
     effect: 0,
-    description: "我心中的怒火胜过千万个太阳！移除自身的“孤立无援”，并使受到的伤害-50%"
+    description: "我心中的怒火胜过千万个太阳！移除自身的“孤立无援”，并使受到的伤害-100%"
   },
   "轰炸引导": {
     effect: 0,
-    description: "受到伤害后，有10%的概率概率消耗所有“光影之刃”层数，回复自身X点“能量”(X为“光影之刃”层数 x 100)"
+    description: "受到伤害后，有10%的概率概率回复自身X点“能量”(X为“光影之刃”层数 x 50)"
   }
 };
 
@@ -2015,13 +2019,7 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       );
       return {
         success: true,
-        message: `成功使用${itemName}，使${target}的技能层数减少${reducedAmount}层（当前：${newCount}层）。`
-      };
-    }
-    if (itemConfig2.id === 3 || itemConfig2.id === 5) {
-      return {
-        success: false,
-        message: `此物品无法使用。`
+        message: `成功使用${itemName}，使${target}的技能层数减少10层`
       };
     }
     if (itemConfig2.id === 4) {
@@ -2045,7 +2043,7 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       );
       return {
         success: true,
-        message: `成功使用${itemName}，消耗${target}500点能量。`
+        message: `成功使用${itemName}，消耗${target}500点能量`
       };
     }
     return {
@@ -2623,28 +2621,36 @@ var PassiveHandler = {
       messages: [`🛡️ 【结构装甲】生效：${msg}`]
     };
   }, "handleStructuralArmor"),
-  // 吸血效果处理（返回综合系数）
+  // 修改 handleBloodEffects 函数
   handleBloodEffects: /* @__PURE__ */ __name(function(targetBoss, currentHP, maxHP) {
     if (!targetBoss.skills.includes("吸血唾液")) return null;
     const bloodStacks = targetBoss.Skillcountpoints || 0;
-    let damageMultiplier = 0;
+    let buffAmount = 0;
+    let nerfAmount = 0;
     const messages = [];
-    if (targetBoss.skills.includes("吸血唾液")) {
+    if (bloodStacks > 0) {
       const reduction = bloodStacks * 0.05;
-      damageMultiplier -= reduction;
-      if (bloodStacks > 0) {
-        messages.push(`🩸 【吸血唾液】生效：受到的伤害-${bloodStacks * 5}%`);
-      }
+      nerfAmount += reduction;
+      messages.push(`🩸 【吸血唾液】生效：受到的伤害-${(reduction * 100).toFixed(0)}%`);
     }
     if (targetBoss.skills.includes("嗜血狂暴") && currentHP / maxHP < 0.5) {
-      damageMultiplier -= 0.2;
+      nerfAmount += 0.2;
       messages.push(`🔥 【嗜血狂暴】生效：进入狂暴状态，受到的伤害-20%`);
     }
     if (targetBoss.skills.includes("吐血") && bloodStacks < 1) {
-      damageMultiplier += 0.2;
-      messages.push(`💔 【吐血】生效：无“吸血”层数，受到的伤害+20%`);
+      buffAmount += 0.2;
+      messages.push(`💔 【吐血】生效：无"吸血"层数，受到的伤害+20%`);
     }
-    return { damageMultiplier, messages };
+    if (buffAmount > 0 || nerfAmount > 0) {
+      return {
+        buffAmount,
+        // 正值增伤系数
+        nerfAmount,
+        // 正值减伤系数
+        messages
+      };
+    }
+    return null;
   }, "handleBloodEffects"),
   handleBloodCount: /* @__PURE__ */ __name(async function(ctx, targetBoss, currentHP, maxHP) {
     if (!targetBoss.skills.includes("吸血唾液")) {
@@ -3060,7 +3066,7 @@ var PassiveHandler = {
       { Skillcountpoints: 0 }
     );
     const messages = [
-      `🟢 【腐蚀胆汁】生效：消耗10层"胆汁"，治愈所有存活异形`
+      `🟢 【腐蚀胆汁】生效：消耗10层"胆汁"，治疗所有存活异形`
     ];
     const updates = [];
     let updatedHP = currentHP;
@@ -3101,7 +3107,7 @@ var PassiveHandler = {
       { Skillcountpoints: 0 }
     );
     const messages = [
-      `🐲 【火焰吐息】生效：消耗20层"胆汁"，治愈所有存活异形50%的最大生命值`
+      `🐲 【火焰吐息】生效：消耗20层"胆汁"，治疗所有存活异形50%的最大生命值`
     ];
     const updates = [];
     let updatedHP = currentHP;
@@ -3377,19 +3383,30 @@ var PassiveHandler = {
     };
   }, "handlePulseDisruptor"),
   // === 星界之风 ===
-  handleStellarWind: /* @__PURE__ */ __name(async (ctx, targetBoss, initialDamage, activeBosses, bossGroup) => {
+  handleStellarWind: /* @__PURE__ */ __name(async (ctx, targetBoss, initialDamage, currentHP, maxHP, activeBosses, bossGroup) => {
     if (!targetBoss.skills.includes("星界之风") || initialDamage === 0) return null;
-    if (Math.random() * 100 < 5) {
+    let baseChance = 5;
+    const hasPsychicFrenzy = targetBoss.skills.includes("心灵狂热");
+    const isInFrenzy = targetBoss.HP / maxHP < 0.5;
+    if (hasPsychicFrenzy && isInFrenzy) {
+      baseChance *= 2;
+    }
+    let lightbladeStacks = 0;
+    if (targetBoss.skills.includes("闪电冲锋")) {
+      lightbladeStacks = targetBoss?.Skillcountpoints || 0;
+    }
+    const triggerChance = baseChance + lightbladeStacks;
+    if (Math.random() * 100 < triggerChance) {
       const groupMembers = activeBosses.filter(
         (b) => b.groupId === targetBoss.groupId && b.HP > 0
       );
       const updates = [];
-      const messages = ["🌠 【星界之风】生效：治疗所有存活异形500点血量"];
+      const messages = [`🌠 【星界之风】生效：治疗所有存活异形200点血量`];
       for (const member of groupMembers) {
-        const maxHP = PassiveHandler.getMemberConfig(member.name, bossGroup)?.maxHP;
-        if (!maxHP) continue;
-        const healAmount = 500;
-        const newHP = Math.min(member.HP + healAmount, maxHP);
+        const maxHP2 = PassiveHandler.getMemberConfig(member.name, bossGroup)?.maxHP;
+        if (!maxHP2) continue;
+        const healAmount = 200;
+        const newHP = Math.min(member.HP + healAmount, maxHP2);
         updates.push(
           ctx.database.set(
             "ggcevo_boss",
@@ -3399,8 +3416,10 @@ var PassiveHandler = {
         );
         messages.push(`${member.name} +${healAmount}HP`);
       }
+      if (hasPsychicFrenzy && isInFrenzy) {
+      }
       await Promise.all(updates);
-      return { messages };
+      return { messages, updatedHP: currentHP + 200 };
     }
     return null;
   }, "handleStellarWind"),
@@ -3409,8 +3428,11 @@ var PassiveHandler = {
     if (!targetBoss.skills.includes("心灵狂热")) return null;
     if (currentHP / maxHP < 0.5) {
       return {
-        damageMultiplier: -0.5,
-        messages: [`🌀 【心灵狂热】生效：进入心灵狂热状态，受到的伤害-50%`]
+        damageMultiplier: -0.2,
+        // 受到的伤害-20%
+        messages: [
+          `🌀 【心灵狂热】生效：进入心灵狂热状态，受到的伤害-20%`
+        ]
       };
     }
     return null;
@@ -3424,25 +3446,30 @@ var PassiveHandler = {
     const energyToAdd = Math.min(initialDamage, availableSpace);
     const newEnergy = currentEnergy + energyToAdd;
     let healAmount = 0;
+    let messages = [];
+    if (energyToAdd > 0) {
+      messages.push(`获得${energyToAdd}点能量`);
+    }
     if (newEnergy >= maxEnergy) {
       const overflow = initialDamage - energyToAdd;
       if (overflow > 0) {
         const maxHP = PassiveHandler.getMemberConfig(targetBoss.name, bossGroup)?.maxHP || 0;
         if (maxHP > 0) {
           healAmount = Math.min(overflow, maxHP - targetBoss.HP);
+          messages.push(`能量溢出回复${healAmount}点生命值`);
         }
       }
     }
+    if (energyToAdd === 0 && healAmount === 0) {
+      return null;
+    }
     await ctx.database.set(
       "ggcevo_boss",
       { name: targetBoss.name },
       { energy: newEnergy }
     );
     return {
-      messages: [
-        `🌌 【宇宙能量】生效：获得${energyToAdd}点能量`,
-        healAmount > 0 ? `💫 能量溢出，回复${healAmount}点生命值` : ""
-      ].filter(Boolean),
+      messages: [`🌌 【宇宙能量】生效：${messages.join("，")}`],
       healAmount
     };
   }, "handleCosmicEnergy"),
@@ -3457,15 +3484,18 @@ var PassiveHandler = {
       { Skillcountpoints: newStacks }
     );
     return {
-      messages: [`✨ 【光影之刃】生效：获得1层光影之刃`]
+      messages: [`✨ 【光影之刃】生效：获得1层“光影之刃”`]
     };
   }, "handleLightblade"),
   // === 远古预兆 ===
   handleAncientOmen: /* @__PURE__ */ __name(async (ctx, targetBoss) => {
     if (!targetBoss.skills.includes("远古预兆")) return null;
-    const lightbladeStacks = targetBoss.Skillcountpoints || 0;
-    const immuneChance = 5 + lightbladeStacks;
-    if (Math.random() * 100 < immuneChance) {
+    let lightbladeStacks = 0;
+    if (targetBoss.skills.includes("闪电冲锋")) {
+      lightbladeStacks = targetBoss?.Skillcountpoints || 0;
+    }
+    const totalChance = 1 + lightbladeStacks;
+    if (Math.random() * 100 < totalChance) {
       const maxEnergy = 1e3;
       const currentEnergy = targetBoss.energy || 0;
       const newEnergy = Math.min(currentEnergy + 100, maxEnergy);
@@ -3477,8 +3507,7 @@ var PassiveHandler = {
       return {
         immune: true,
         messages: [
-          `🔮 【远古预兆】生效：免疫此次伤害`,
-          `⚡ 回复100点能量`
+          `🔮 【远古预兆】生效：免疫此次伤害，并且回复100点能量`
         ]
       };
     }
@@ -3490,25 +3519,34 @@ var PassiveHandler = {
     const maxEnergy = 1e3;
     const currentEnergy = targetBoss.energy || 0;
     const lightbladeStacks = targetBoss.Skillcountpoints || 0;
-    if (currentEnergy >= maxEnergy * 0.3) {
-      const reduction = lightbladeStacks * 0.05;
-      if (reduction > 0) {
-        return {
-          damageMultiplier: -reduction,
-          messages: [
-            `🚀 【超视距穿梭】生效：能量>30%`,
-            `🪞 当前${lightbladeStacks}层光影之刃，减伤${(reduction * 100).toFixed(0)}%`
-          ]
-        };
-      }
+    let reduction = 0;
+    let increase = 0;
+    const messages = [];
+    if (currentEnergy <= maxEnergy * 0.1) {
+      increase = lightbladeStacks * 0.05;
+      messages.push(`能量≤10%：受到的伤害+${(increase * 100).toFixed(0)}%`);
+    } else if (currentEnergy >= maxEnergy * 0.6) {
+      reduction = lightbladeStacks * 0.1;
+      messages.push(`能量≥60%：受到的伤害-${(reduction * 100).toFixed(0)}%`);
+    } else if (currentEnergy >= maxEnergy * 0.3) {
+      reduction = lightbladeStacks * 0.05;
+      messages.push(`能量≥30%：受到的伤害-${(reduction * 100).toFixed(0)}%`);
+    }
+    if (reduction > 0 || increase > 0) {
+      return {
+        reduction,
+        increase,
+        messages: [
+          `🚀 【超视距穿梭】生效：${messages.join(" | ")} (当前${lightbladeStacks}层光影之刃)`
+        ]
+      };
     }
     return null;
   }, "handleHyperspaceSkip"),
   // === 复苏 ===
   handleRevival: /* @__PURE__ */ __name(async function(ctx, targetBoss, currentHP, maxHP) {
     if (!targetBoss.skills.includes("复苏") || currentHP > 0) return null;
-    const healAmount = Math.floor(maxHP * 0.5);
-    const updatedHP = Math.min(currentHP + healAmount, maxHP);
+    const updatedHP = maxHP * 0.5;
     const maxEnergy = 1e3;
     let newSkills = targetBoss.skills;
     if (!newSkills.includes("灵能构造炉")) {
@@ -3527,9 +3565,7 @@ var PassiveHandler = {
     return {
       updatedHP,
       messages: [
-        `🔥 【复苏】生效：免于死亡，回复50%最大生命值`,
-        `⚡ 能量回复为100%`,
-        `获得新技能【灵能构造炉】`
+        `🔥 【复苏】生效：免于死亡，回复自身50%的最大生命值和100%的“能量”，并且获得新技能【灵能构造炉】`
       ]
     };
   }, "handleRevival"),
@@ -3547,13 +3583,16 @@ var PassiveHandler = {
       );
       return {
         messages: [
-          `⚙️ 【灵能构造炉】生效：所有技能已获取完毕，该技能已移除`
+          `⚙️ 【灵能构造炉】生效：所有技能已获取完毕，此技能已移除`
         ]
       };
     }
-    const lightbladeStacks = targetBoss.Skillcountpoints || 0;
-    const triggerChance = 5 + lightbladeStacks;
-    if (Math.random() * 100 < triggerChance) {
+    let lightbladeStacks = 0;
+    if (targetBoss.skills.includes("闪电冲锋")) {
+      lightbladeStacks = targetBoss.Skillcountpoints || 0;
+    }
+    const totalChance = 1 + lightbladeStacks;
+    if (Math.random() * 100 < totalChance) {
       const availableSkills = allSkills.filter(
         (skill) => !targetBoss.skills.includes(skill)
       );
@@ -3567,28 +3606,27 @@ var PassiveHandler = {
       );
       return {
         messages: [
-          `⚙️ 【灵能构造炉】生效：获得新技能【${randomSkill}】`,
-          `剩余可获取技能：${availableSkills.length - 1}/${allSkills.length}`
+          `⚙️ 【灵能构造炉】生效：获得新技能【${randomSkill}】`
         ]
       };
     }
     return null;
   }, "handleConstructor"),
-  // === 天启超载护盾 ===
-  handleTyrsShield: /* @__PURE__ */ __name(async function(ctx, targetBoss, activeBosses, bossGroup) {
+  // 修改后 - 移除了层数清零操作
+  handleTyrsShield: /* @__PURE__ */ __name(async function(ctx, targetBoss, currentHP, activeBosses, bossGroup) {
     if (!targetBoss.skills.includes("天启超载护盾")) return null;
     const lightbladeStacks = targetBoss.Skillcountpoints || 0;
     if (lightbladeStacks === 0) return null;
-    const triggerChance = 10;
+    const triggerChance = 5;
     if (Math.random() * 100 < triggerChance) {
       const groupMembers = activeBosses.filter(
         (b) => b.groupId === targetBoss.groupId && b.HP > 0
       );
-      const healAmount = lightbladeStacks * 100;
+      const healAmount = lightbladeStacks * 10;
       const updates = [];
-      const messages = [`🛡️ 【天启超载护盾】生效：消耗${lightbladeStacks}层光影之刃，治疗所有存活异形`];
+      const messages = [`🛡️ 【天启超载护盾】生效：治疗所有存活异形`];
       for (const member of groupMembers) {
-        const maxHP = (await this.getMemberConfig(member.name, bossGroup))?.maxHP;
+        const maxHP = this.getMemberConfig(member.name, bossGroup)?.maxHP;
         if (!maxHP) continue;
         const heal = Math.min(healAmount, maxHP - member.HP);
         if (heal > 0) {
@@ -3603,15 +3641,12 @@ var PassiveHandler = {
           messages.push(`${member.name} +${heal}HP`);
         }
       }
-      updates.push(
-        ctx.database.set(
-          "ggcevo_boss",
-          { name: targetBoss.name },
-          { Skillcountpoints: 0 }
-        )
-      );
       await Promise.all(updates);
-      return { messages };
+      return {
+        messages,
+        updatedHP: currentHP + healAmount
+        // 不再清除层数
+      };
     }
     return null;
   }, "handleTyrsShield"),
@@ -3648,41 +3683,36 @@ var PassiveHandler = {
           { name: targetBoss.name },
           { skills: newSkills }
         );
-        messages.push(`💣 【地毯式轰炸】生效：移除孤立无援技能`);
+        messages.push(`🔥 【地毯式轰炸】生效：移除“孤立无援”`);
       } else {
-        messages.push(`💣 【地毯式轰炸】生效：`);
       }
-      damageMultiplier = -0.5;
-      messages.push(`🔥 我心中的怒火胜过千万个太阳！受到的伤害-50%`);
+      damageMultiplier = -1;
+      messages.push(`🔥 【地毯式轰炸】生效：我心中的怒火胜过千万个太阳！受到的伤害-100%`);
     }
     return {
       messages,
       damageMultiplier
     };
   }, "handleCarpetBombing"),
-  // === 轰炸引导 ===
+  // 修改后 - 移除了层数清零操作
   handleBombardmentGuidance: /* @__PURE__ */ __name(async function(ctx, targetBoss) {
     if (!targetBoss.skills.includes("轰炸引导")) return null;
     const lightbladeStacks = targetBoss.Skillcountpoints || 0;
     if (lightbladeStacks === 0) return null;
     const triggerChance = 10;
     if (Math.random() * 100 < triggerChance) {
-      const energyGain = lightbladeStacks * 100;
+      const energyGain = lightbladeStacks * 50;
       const maxEnergy = 1e3;
       const currentEnergy = targetBoss.energy || 0;
       const newEnergy = Math.min(currentEnergy + energyGain, maxEnergy);
       await ctx.database.set(
         "ggcevo_boss",
         { name: targetBoss.name },
-        {
-          energy: newEnergy,
-          Skillcountpoints: 0
-        }
+        { energy: newEnergy }
       );
       return {
         messages: [
-          `🎯 【轰炸引导】生效：消耗${lightbladeStacks}层光影之刃`,
-          `⚡ 回复${energyGain}点能量`
+          `🎯 【轰炸引导】生效：回复${energyGain}点能量`
         ]
       };
     }
@@ -3815,7 +3845,12 @@ var PassiveHandler = {
     }
     const bloodEffect = this.handleBloodEffects(targetBoss, currentHP, maxHP);
     if (bloodEffect) {
-      nerfMultiplier += bloodEffect.damageMultiplier;
+      if (bloodEffect.buffAmount > 0) {
+        buffMultiplier += bloodEffect.buffAmount;
+      }
+      if (bloodEffect.nerfAmount > 0) {
+        nerfMultiplier -= bloodEffect.nerfAmount;
+      }
       messages.push(...bloodEffect.messages);
     }
     const siphonResult = this.handleEnergySiphon(targetBoss, currentHP, maxHP);
@@ -3859,7 +3894,12 @@ var PassiveHandler = {
     }
     const hyperspaceResult = this.handleHyperspaceSkip(targetBoss);
     if (hyperspaceResult) {
-      nerfMultiplier += hyperspaceResult.damageMultiplier;
+      if (hyperspaceResult.reduction > 0) {
+        nerfMultiplier -= hyperspaceResult.reduction;
+      }
+      if (hyperspaceResult.increase > 0) {
+        buffMultiplier += hyperspaceResult.increase;
+      }
       messages.push(...hyperspaceResult.messages);
     }
     const frenzyResult = this.handlePsychicFrenzy(targetBoss, currentHP, maxHP);
@@ -3972,21 +4012,16 @@ var PassiveHandler = {
         }
       }
     }
-    const stellarWindResult = await this.handleStellarWind(ctx, targetBoss, initialDamage, activeBosses, bossGroup);
+    const stellarWindResult = await this.handleStellarWind(ctx, targetBoss, initialDamage, currentHP, maxHP, activeBosses, bossGroup);
     if (stellarWindResult) {
+      currentHP = stellarWindResult.updatedHP;
       messages.push(...stellarWindResult.messages);
     }
-    const shieldResult = await this.handleTyrsShield(ctx, targetBoss, activeBosses, bossGroup);
+    const shieldResult = await this.handleTyrsShield(ctx, targetBoss, currentHP, activeBosses, bossGroup);
     if (shieldResult) {
+      currentHP = shieldResult.updatedHP;
       messages.push(...shieldResult.messages);
     }
-    const cosmicResult = await this.handleCosmicEnergy(ctx, targetBoss, finalDamage, bossGroup);
-    if (cosmicResult) {
-      messages.push(...cosmicResult.messages);
-      if (cosmicResult.healAmount > 0) {
-        currentHP = Math.min(targetBoss.HP + cosmicResult.healAmount, maxHP);
-      }
-    }
     const survivalResult = this.handleSurvivalInstinct(targetBoss, currentHP, maxHP);
     if (survivalResult) {
       currentHP = survivalResult.updatedHP;
@@ -4014,10 +4049,6 @@ var PassiveHandler = {
     if (arcRifleResult) {
       messages.push(...arcRifleResult.messages);
     }
-    const constructorResult = await this.handleConstructor(ctx, targetBoss);
-    if (constructorResult) {
-      messages.push(...constructorResult.messages);
-    }
     const coldAdaptResult = await this.handleColdAdaptation(ctx, targetBoss, weaponName);
     if (coldAdaptResult) {
       messages.push(...coldAdaptResult.messages);
@@ -4039,14 +4070,21 @@ var PassiveHandler = {
     if (CollapsepulseResult) {
       messages.push(...CollapsepulseResult.messages);
     }
-    const tagChangeResult = await this.handleConductorTagChange(ctx, targetBoss, currentHP, maxHP);
-    if (tagChangeResult) {
-      messages.push(...tagChangeResult.messages);
+    const bileStackResult = await this.handleBileStacking(ctx, targetBoss, skipBileStacking);
+    if (bileStackResult) {
+      messages.push(...bileStackResult.messages);
     }
     const shockwaveResult = await this.handleEnergyShockwave(ctx, targetBoss);
     if (shockwaveResult) {
       messages.push(...shockwaveResult.messages);
     }
+    const cosmicResult = await this.handleCosmicEnergy(ctx, targetBoss, finalDamage, bossGroup);
+    if (cosmicResult) {
+      messages.push(...cosmicResult.messages);
+      if (cosmicResult.healAmount > 0) {
+        currentHP = Math.min(targetBoss.HP + cosmicResult.healAmount, maxHP);
+      }
+    }
     const guidanceResult = await this.handleBombardmentGuidance(ctx, targetBoss);
     if (guidanceResult) {
       messages.push(...guidanceResult.messages);
@@ -4056,15 +4094,19 @@ var PassiveHandler = {
       messages.push(...gammaRadResult.messages);
       radiationApplied = gammaRadResult.radiationApplied;
     }
-    const bileStackResult = await this.handleBileStacking(ctx, targetBoss, skipBileStacking);
-    if (bileStackResult) {
-      messages.push(...bileStackResult.messages);
-    }
     const coldEffectResult = await this.handleColdEffect(ctx, targetBoss, weaponName);
     if (coldEffectResult) {
       messages.push(...coldEffectResult.messages);
       freezing = coldEffectResult.freezing;
     }
+    const tagChangeResult = await this.handleConductorTagChange(ctx, targetBoss, currentHP, maxHP);
+    if (tagChangeResult) {
+      messages.push(...tagChangeResult.messages);
+    }
+    const constructorResult = await this.handleConstructor(ctx, targetBoss);
+    if (constructorResult) {
+      messages.push(...constructorResult.messages);
+    }
     return {
       currentHP,
       messages,
@@ -6559,11 +6601,8 @@ ${items.join("、")}
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     const discountDetails = [];
-    let totalDiscount = 0;
     if (careerData?.career === "武器中士") {
-      const weaponSpecialistDiscount = 20;
-      totalDiscount += weaponSpecialistDiscount;
-      discountDetails.push(`▸ 🎖️ 武器中士职业：${weaponSpecialistDiscount}%折扣`);
+      discountDetails.push(`▸ 🎖️ 武器中士职业：50%折扣`);
     }
     const activeWish = await ctx.database.get("ggcevo_Wish_Record", {
       handle,
@@ -6573,11 +6612,8 @@ ${items.join("、")}
       isused: false
     }).then((records) => records[0]);
     if (activeWish) {
-      const grasshopperDiscount = 20;
-      totalDiscount += grasshopperDiscount;
-      discountDetails.push(`▸ 🦗 蚱蜢优购祈愿：${grasshopperDiscount}%折扣`);
+      discountDetails.push(`▸ 🦗 蚱蜢优购祈愿：20%折扣`);
     }
-    totalDiscount = Math.min(totalDiscount, 100);
     const categoryStats = Object.values(weaponConfig).filter((weapon) => weapon.price !== 0).reduce((stats, weapon) => {
       stats[weapon.category] = (stats[weapon.category] || 0) + 1;
       return stats;
@@ -6586,8 +6622,8 @@ ${items.join("、")}
       return [
         "🏪 咕咕武器库分类 🏪",
         '使用 "武器库 分类名称" 查看详细列表',
-        totalDiscount > 0 && `💰 折扣明细：
-${discountDetails.length ? `${discountDetails.join("\n")}` : ""}`,
+        discountDetails.length > 0 && `💰 折扣明细：
+${discountDetails.join("\n")}`,
         "====================",
         ...Object.entries(categoryStats).map(([catName, count]) => `▸ ${catName} (${count}种)`),
         "===================="
@@ -6597,12 +6633,19 @@ ${discountDetails.length ? `${discountDetails.join("\n")}` : ""}`,
       return `无效武器分类，可用分类：
 ${Object.keys(categoryStats).join("、")}`;
     }
-    const isLegendaryCategory = category === "传奇武器";
     const items = Object.entries(weaponConfig).filter(([_, config2]) => config2.category === category && config2.price !== 0).map(([name2, config2]) => {
-      const shouldApplyDiscount = !isLegendaryCategory && config2.category !== "传奇武器";
-      const displayPrice = shouldApplyDiscount ? Math.floor(config2.price * (100 - totalDiscount) / 100) : config2.price;
-      const showOriginalPrice = shouldApplyDiscount && totalDiscount > 0;
-      const priceDisplay = showOriginalPrice ? `${displayPrice}金币 (原价${config2.price})` : `${displayPrice}金币`;
+      let applicableDiscount = 0;
+      if (careerData?.career === "武器中士") {
+        applicableDiscount += 50;
+      }
+      if (config2.category !== "传奇武器" && activeWish) {
+        applicableDiscount += 20;
+      }
+      let priceDisplay = `${config2.price}金币`;
+      if (applicableDiscount > 0) {
+        const discountedPrice = Math.floor(config2.price * (100 - applicableDiscount) / 100);
+        priceDisplay = `${discountedPrice}金币 (原价${config2.price})`;
+      }
       let tagEffectsDesc = "▸ 无特殊加成效果";
       if (config2.tagEffects && Object.keys(config2.tagEffects).length > 0) {
         tagEffectsDesc = Object.entries(config2.tagEffects).map(([tag, multiplier]) => `▸ 对${tag}目标造成${(multiplier * 100).toFixed(0)}%伤害`).join("\n");
@@ -6620,16 +6663,13 @@ ${Object.keys(categoryStats).join("、")}`;
         "------------------"
       ].filter(Boolean).join("\n");
     });
-    const permissionNotice = isLegendaryCategory ? '⚠️ 注意：购买传奇武器需要"传奇武器购买权限"' : null;
-    const discountInfo = totalDiscount > 0 && !isLegendaryCategory ? `💰 折扣明细：
-${discountDetails.length ? `${discountDetails.join("\n")}` : ""}` : null;
+    const permissionNotice = category === "传奇武器" ? "⚠️ 购买传奇武器要求：人类联盟阵营+武器系统5级+情报副官/武器中士职业+传奇武器购买权限" : null;
     return [
       `🏪 咕咕武器库 - ${category} 🏪`,
       '使用"购买 武器名称"指令进行购买',
+      discountDetails.length > 0 ? `💰 折扣明细：
+${discountDetails.join("\n")}` : "",
       permissionNotice,
-      // 新增权限提示
-      discountInfo,
-      // 原有折扣信息
       "====================",
       ...items,
       items.length === 0 ? "⚠️ 该分类下暂无可用武器" : ""
@@ -6725,39 +6765,35 @@ ${validTypes.join("、")}`;
     let totalDiscount = 0;
     let discountDetails = [];
     let activeWish = null;
-    if (!isLegendaryWeapon) {
-      if (isWeapon) {
-        activeWish = await ctx.database.get("ggcevo_Wish_Record", {
-          handle,
-          wishname: "蚱蜢优购",
-          startTime: { $lte: /* @__PURE__ */ new Date() },
-          endTime: { $gte: /* @__PURE__ */ new Date() },
-          isused: false
-        }).then((records) => records[0] || null);
-        if (activeWish) {
-          const wishDiscount = 20;
-          totalDiscount += wishDiscount;
-          discountDetails.push(`🦗 蚱蜢优购祈愿：${wishDiscount}%折扣`);
-        }
-      }
-      if (isWeapon && careerData?.career === "武器中士") {
-        const specialistDiscount = 20;
-        totalDiscount += specialistDiscount;
-        discountDetails.push(`🎖️ 武器中士职业：${specialistDiscount}%折扣`);
+    if (isWeapon && careerData?.career === "武器中士") {
+      const specialistDiscount = 50;
+      totalDiscount += specialistDiscount;
+      discountDetails.push(`🎖️ 武器中士职业：${specialistDiscount}%折扣`);
+    }
+    if (!isLegendaryWeapon && isWeapon) {
+      activeWish = await ctx.database.get("ggcevo_Wish_Record", {
+        handle,
+        wishname: "蚱蜢优购",
+        startTime: { $lte: /* @__PURE__ */ new Date() },
+        endTime: { $gte: /* @__PURE__ */ new Date() },
+        isused: false
+      }).then((records) => records[0] || null);
+      if (activeWish) {
+        const wishDiscount = 20;
+        totalDiscount += wishDiscount;
+        discountDetails.push(`🦗 蚱蜢优购祈愿：${wishDiscount}%折扣`);
       }
-      totalDiscount = Math.min(totalDiscount, 100);
     }
+    totalDiscount = Math.min(totalDiscount, 100);
     let actualPrice = config2.price;
-    if (!isLegendaryWeapon && totalDiscount > 0) {
+    if (totalDiscount > 0) {
       actualPrice = Math.floor(config2.price * (100 - totalDiscount) / 100);
       actualPrice = Math.max(actualPrice, 1);
     }
     if ((signInfo?.totalRewards || 0) < actualPrice) {
       let priceInfo = `需要 ${actualPrice} 金币`;
       if (discountDetails.length > 0) {
-        priceInfo += `(原价${config2.price})`;
-      } else if (isLegendaryWeapon) {
-        priceInfo = `需要 ${actualPrice} 金币 (传奇武器无折扣)`;
+        priceInfo += ` (原价${config2.price})`;
       }
       return `❌ 金币不足，${priceInfo}`;
     }
@@ -6812,20 +6848,18 @@ ${validTypes.join("、")}`;
     });
     let message = `✅ 成功购买${isWeapon ? "武器" : "物品"}「${item}」
 `;
-    if (isLegendaryWeapon) {
+    if (discountDetails.length > 0) {
+      message += `花费 ${actualPrice} 金币 (原价${config2.price} 金币)`;
+      message += `
+💰 折扣明细：
+▸ ${discountDetails.join("\n▸ ")}`;
+    } else {
       message += `花费 ${actualPrice} 金币`;
+    }
+    if (isLegendaryWeapon) {
       const [permissions] = await ctx.database.get("ggcevo_purchasepermissions", { handle });
       message += `
 扣除 1 次传奇武器购买权限，剩余次数：${permissions?.legendarypermissions || 0}`;
-    } else {
-      if (discountDetails.length > 0) {
-        message += `花费 ${actualPrice} 金币 (原价${config2.price} 金币)`;
-        message += `
-💰 折扣明细：
-▸ ${discountDetails.join("\n▸ ")}`;
-      } else {
-        message += `花费 ${actualPrice} 金币`;
-      }
     }
     if (isWeapon) {
       if (isAutoEquipped) {

package/package.json

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