koishi-plugin-ggcevo-game 1.4.28 → 1.4.30

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: {

package/lib/boss/passive.d.ts

@@ -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;
@@ -173,11 +173,11 @@ export declare const passiveConfig: {
     };
     readonly 宇宙能量: {
         readonly effect: 0;
-        readonly description: "受到攻击时回复与该攻击伤害等额的“能量”; 若“能量”已满，则回复与该攻击伤害等额的血量";
+        readonly description: "受到攻击时回复与该攻击伤害等额的“能量”; 若“能量”已满，则回复溢出伤害值的血量";
     };
     readonly 复苏: {
         readonly effect: 0;
-        readonly description: "受到致命伤害时，免于死亡，快速回复自身100%的最大生命值和100%的“能量”，并且获得“灵能构造炉”技能(触发后移除)";
+        readonly description: "受到致命伤害时，免于死亡，快速回复自身50%的最大生命值和100%的“能量”，并且获得“灵能构造炉”技能(触发后移除)";
     };
     readonly 光影之刃: {
         readonly effect: 0;
@@ -197,11 +197,11 @@ export declare const passiveConfig: {
     };
     readonly 灵能构造炉: {
         readonly effect: 0;
-        readonly description: "受到攻击后，有5%的概率会随机获得以下4个技能之一(天启超载护盾，塌缩脉冲，地毯式轰炸，轰炸引导)";
+        readonly description: "受到攻击后，有1%的概率会随机获得以下4个技能之一(天启超载护盾，塌缩脉冲，地毯式轰炸，轰炸引导)";
     };
     readonly 天启超载护盾: {
         readonly effect: 0;
-        readonly description: "受到伤害后，有10%的概率回复所有存活异形X点血量(X为“光影之刃”层数 x 50)";
+        readonly description: "受到伤害后，有5%的概率回复所有存活异形X点血量(X为“光影之刃”层数 x 10)";
     };
     readonly 塌缩脉冲: {
         readonly effect: 0;
@@ -209,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<{
@@ -182,8 +182,9 @@ export declare const PassiveHandler: {
     handlePulseDisruptor: (ctx: Context, targetBoss: any, weaponName: string) => Promise<{
         messages: string[];
     }>;
-    handleStellarWind: (ctx: Context, targetBoss: any, initialDamage: number, maxHP: 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;
@@ -212,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: "医疗专家",
@@ -1387,11 +1387,11 @@ var passiveConfig = {
   },
   "腐蚀胆汁": {
     effect: 0,
-    description: "当“胆汁”达到10层后，下一次受到攻击将治愈所有存活异形1000点血量并清空层数"
+    description: "当“胆汁”达到10层后，下一次受到攻击将回复所有存活异形1000点血量并清空层数"
   },
   "火焰吐息": {
     effect: 0,
-    description: "当“胆汁”达到20层后，下一次攻击将治愈所有存活异形50%的最大生命值并清空层数"
+    description: "当“胆汁”达到20层后，下一次攻击将回复所有存活异形50%的最大生命值并清空层数"
   },
   "太阳耀斑": {
     effect: 0,
@@ -1431,11 +1431,11 @@ var passiveConfig = {
   },
   "宇宙能量": {
     effect: 0,
-    description: "受到攻击时回复与该攻击伤害等额的“能量”; 若“能量”已满，则回复与该攻击伤害等额的血量"
+    description: "受到攻击时回复与该攻击伤害等额的“能量”; 若“能量”已满，则回复溢出伤害值的血量"
   },
   "复苏": {
     effect: 0,
-    description: "受到致命伤害时，免于死亡，快速回复自身100%的最大生命值和100%的“能量”，并且获得“灵能构造炉”技能(触发后移除)"
+    description: "受到致命伤害时，免于死亡，快速回复自身50%的最大生命值和100%的“能量”，并且获得“灵能构造炉”技能(触发后移除)"
   },
   "光影之刃": {
     effect: 0,
@@ -1455,11 +1455,11 @@ var passiveConfig = {
   },
   "灵能构造炉": {
     effect: 0,
-    description: "受到攻击后，有5%的概率会随机获得以下4个技能之一(天启超载护盾，塌缩脉冲，地毯式轰炸，轰炸引导)"
+    description: "受到攻击后，有1%的概率会随机获得以下4个技能之一(天启超载护盾，塌缩脉冲，地毯式轰炸，轰炸引导)"
   },
   "天启超载护盾": {
     effect: 0,
-    description: "受到伤害后，有10%的概率回复所有存活异形X点血量(X为“光影之刃”层数 x 50)"
+    description: "受到伤害后，有5%的概率回复所有存活异形X点血量(X为“光影之刃”层数 x 10)"
   },
   "塌缩脉冲": {
     effect: 0,
@@ -1467,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)"
   }
 };
 
@@ -2019,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) {
@@ -2049,7 +2043,7 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
       );
       return {
         success: true,
-        message: `成功使用${itemName}，消耗${target}500点能量。`
+        message: `成功使用${itemName}，消耗${target}500点能量`
       };
     }
     return {
@@ -3072,7 +3066,7 @@ var PassiveHandler = {
       { Skillcountpoints: 0 }
     );
     const messages = [
-      `🟢 【腐蚀胆汁】生效：消耗10层"胆汁"，治愈所有存活异形`
+      `🟢 【腐蚀胆汁】生效：消耗10层"胆汁"，治疗所有存活异形`
     ];
     const updates = [];
     let updatedHP = currentHP;
@@ -3113,7 +3107,7 @@ var PassiveHandler = {
       { Skillcountpoints: 0 }
     );
     const messages = [
-      `🐲 【火焰吐息】生效：消耗20层"胆汁"，治愈所有存活异形50%的最大生命值`
+      `🐲 【火焰吐息】生效：消耗20层"胆汁"，治疗所有存活异形50%的最大生命值`
     ];
     const updates = [];
     let updatedHP = currentHP;
@@ -3389,7 +3383,7 @@ var PassiveHandler = {
     };
   }, "handlePulseDisruptor"),
   // === 星界之风 ===
-  handleStellarWind: /* @__PURE__ */ __name(async (ctx, targetBoss, initialDamage, maxHP, activeBosses, bossGroup) => {
+  handleStellarWind: /* @__PURE__ */ __name(async (ctx, targetBoss, initialDamage, currentHP, maxHP, activeBosses, bossGroup) => {
     if (!targetBoss.skills.includes("星界之风") || initialDamage === 0) return null;
     let baseChance = 5;
     const hasPsychicFrenzy = targetBoss.skills.includes("心灵狂热");
@@ -3407,12 +3401,16 @@ var PassiveHandler = {
         (b) => b.groupId === targetBoss.groupId && b.HP > 0
       );
       const updates = [];
-      const messages = [`🌠 【星界之风】生效：治疗所有存活异形200点血量`];
+      const messages = [`🌠 【星界之风】生效：治疗所有存活异形`];
+      let updatedHP = currentHP;
       for (const member of groupMembers) {
-        const maxHP2 = PassiveHandler.getMemberConfig(member.name, bossGroup)?.maxHP;
-        if (!maxHP2) continue;
+        const memberConfig = PassiveHandler.getMemberConfig(member.name, bossGroup);
+        if (!memberConfig) continue;
+        const maxMemberHP = memberConfig.maxHP;
         const healAmount = 200;
-        const newHP = Math.min(member.HP + healAmount, maxHP2);
+        const actualHeal = Math.min(healAmount, maxMemberHP - member.HP);
+        if (actualHeal <= 0) continue;
+        const newHP = member.HP + actualHeal;
         updates.push(
           ctx.database.set(
             "ggcevo_boss",
@@ -3420,12 +3418,16 @@ var PassiveHandler = {
             { HP: newHP }
           )
         );
-        messages.push(`${member.name} +${healAmount}HP`);
+        messages.push(`${member.name} +${actualHeal}HP`);
+        if (member.name === targetBoss.name) {
+          updatedHP = newHP;
+        }
       }
-      if (hasPsychicFrenzy && isInFrenzy) {
+      if (updates.length === 0) {
+        return null;
       }
       await Promise.all(updates);
-      return { messages };
+      return { messages, updatedHP };
     }
     return null;
   }, "handleStellarWind"),
@@ -3454,7 +3456,7 @@ var PassiveHandler = {
     let healAmount = 0;
     let messages = [];
     if (energyToAdd > 0) {
-      messages.push(`🌌 获得${energyToAdd}点能量`);
+      messages.push(`获得${energyToAdd}点能量`);
     }
     if (newEnergy >= maxEnergy) {
       const overflow = initialDamage - energyToAdd;
@@ -3462,7 +3464,7 @@ var PassiveHandler = {
         const maxHP = PassiveHandler.getMemberConfig(targetBoss.name, bossGroup)?.maxHP || 0;
         if (maxHP > 0) {
           healAmount = Math.min(overflow, maxHP - targetBoss.HP);
-          messages.push(`💫 能量溢出回复${healAmount}点生命值`);
+          messages.push(`能量溢出回复${healAmount}点生命值`);
         }
       }
     }
@@ -3527,30 +3529,23 @@ var PassiveHandler = {
     const lightbladeStacks = targetBoss.Skillcountpoints || 0;
     let reduction = 0;
     let increase = 0;
-    const effectParts = [];
-    if (currentEnergy >= maxEnergy * 0.3) {
-      const baseReduction = lightbladeStacks * 0.05;
-      reduction += baseReduction;
-      effectParts.push(`能量≥30%：减伤${(baseReduction * 100).toFixed(0)}%`);
-      if (currentEnergy >= maxEnergy * 0.6) {
-        const bonusReduction = lightbladeStacks * 0.05;
-        reduction += bonusReduction;
-        effectParts.push(`能量≥60%：额外减伤${(bonusReduction * 100).toFixed(0)}%`);
-      }
-    }
+    const messages = [];
     if (currentEnergy <= maxEnergy * 0.1) {
       increase = lightbladeStacks * 0.05;
-      effectParts.push(`能量≤10%：增伤${(increase * 100).toFixed(0)}%`);
+      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) {
-      const effectDescription = effectParts.join("，");
       return {
         reduction,
-        // 返沪减伤系数（正值）
         increase,
-        // 返沪增伤系数（正值）
         messages: [
-          `🚀 【超视距穿梭】生效：${effectDescription}(当前${lightbladeStacks}层光影之刃)`
+          `🚀 【超视距穿梭】生效：${messages.join(" | ")} (当前${lightbladeStacks}层光影之刃)`
         ]
       };
     }
@@ -3559,7 +3554,7 @@ var PassiveHandler = {
   // === 复苏 ===
   handleRevival: /* @__PURE__ */ __name(async function(ctx, targetBoss, currentHP, maxHP) {
     if (!targetBoss.skills.includes("复苏") || currentHP > 0) return null;
-    const updatedHP = maxHP;
+    const updatedHP = maxHP * 0.5;
     const maxEnergy = 1e3;
     let newSkills = targetBoss.skills;
     if (!newSkills.includes("灵能构造炉")) {
@@ -3578,7 +3573,7 @@ var PassiveHandler = {
     return {
       updatedHP,
       messages: [
-        `🔥 【复苏】生效：免于死亡，回复自身100%的最大生命值和100%的“能量”，并且获得新技能【灵能构造炉】`
+        `🔥 【复苏】生效：免于死亡，回复自身50%的最大生命值和100%的“能量”，并且获得新技能【灵能构造炉】`
       ]
     };
   }, "handleRevival"),
@@ -3604,7 +3599,7 @@ var PassiveHandler = {
     if (targetBoss.skills.includes("闪电冲锋")) {
       lightbladeStacks = targetBoss.Skillcountpoints || 0;
     }
-    const totalChance = 5 + lightbladeStacks;
+    const totalChance = 1 + lightbladeStacks;
     if (Math.random() * 100 < totalChance) {
       const availableSkills = allSkills.filter(
         (skill) => !targetBoss.skills.includes(skill)
@@ -3626,38 +3621,47 @@ var PassiveHandler = {
     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 * 50;
+      const healPerStack = 10;
+      const totalHeal = lightbladeStacks * healPerStack;
       const updates = [];
       const messages = [`🛡️ 【天启超载护盾】生效：治疗所有存活异形`];
+      let updatedHP = currentHP;
       for (const member of groupMembers) {
-        const maxHP = this.getMemberConfig(member.name, bossGroup)?.maxHP;
-        if (!maxHP) continue;
-        const heal = Math.min(healAmount, maxHP - member.HP);
-        if (heal > 0) {
-          const newHP = member.HP + heal;
-          updates.push(
-            ctx.database.set(
-              "ggcevo_boss",
-              { name: member.name },
-              { HP: newHP }
-            )
-          );
-          messages.push(`${member.name} +${heal}HP`);
+        const memberConfig = PassiveHandler.getMemberConfig(member.name, bossGroup);
+        if (!memberConfig) continue;
+        const maxMemberHP = memberConfig.maxHP;
+        const actualHeal = Math.min(totalHeal, maxMemberHP - member.HP);
+        if (actualHeal <= 0) continue;
+        const newHP = member.HP + actualHeal;
+        updates.push(
+          ctx.database.set(
+            "ggcevo_boss",
+            { name: member.name },
+            { HP: newHP }
+          )
+        );
+        messages.push(`${member.name} +${actualHeal}HP`);
+        if (member.name === targetBoss.name) {
+          updatedHP = newHP;
         }
       }
+      if (updates.length === 0) {
+        return null;
+      }
       await Promise.all(updates);
       return {
-        messages
-        // 不再清除层数
+        messages,
+        updatedHP
+        // 返回当前目标的新HP（如果被治疗）
       };
     }
     return null;
@@ -3698,8 +3702,8 @@ var PassiveHandler = {
         messages.push(`🔥 【地毯式轰炸】生效：移除“孤立无援”`);
       } else {
       }
-      damageMultiplier = -0.5;
-      messages.push(`🔥 【地毯式轰炸】生效：我心中的怒火胜过千万个太阳！受到的伤害-50%`);
+      damageMultiplier = -1;
+      messages.push(`🔥 【地毯式轰炸】生效：我心中的怒火胜过千万个太阳！受到的伤害-100%`);
     }
     return {
       messages,
@@ -3713,7 +3717,7 @@ var PassiveHandler = {
     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);
@@ -4024,12 +4028,14 @@ var PassiveHandler = {
         }
       }
     }
-    const stellarWindResult = await this.handleStellarWind(ctx, targetBoss, initialDamage, maxHP, 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 survivalResult = this.handleSurvivalInstinct(targetBoss, currentHP, maxHP);
@@ -6611,11 +6617,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,
@@ -6625,11 +6628,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;
@@ -6638,8 +6638,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}种)`),
         "===================="
@@ -6649,12 +6649,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");
@@ -6672,16 +6679,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 ? "⚠️ 该分类下暂无可用武器" : ""
@@ -6777,39 +6781,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}`;
     }
@@ -6864,20 +6864,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) {
@@ -7336,7 +7334,7 @@ ${validTypes.join("、")}`;
         // 这里添加符号
       ] : [],
       `📊 理论伤害值：${damage}${hasCrit ? " (✨ 暴击)" : ""}`,
-      "💡 提示：使用 -t 重甲,生物……(标签之间用英文逗号分隔) 添加测试标签"
+      "💡 提示：使用 -t 重甲,生物(标签之间用英文逗号分隔) 添加测试标签"
     ].filter((line) => line).join("\n");
   });
   ctx.command("ggcevo/伤害榜 [page]", "查看当前主宰伤害排名").usage("输入 伤害榜 [页码] 查看对应页的排行榜，每页10条").action(async (_, page) => {

package/package.json

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