koishi-plugin-ggcevo-game 1.4.40 → 1.4.42

package/lib/boss/BattleEffectProcessor.d.ts

@@ -80,14 +80,14 @@ export declare const BattleEffectProcessor: {
         nerfMultiplier: number;
         messages: string[];
     };
-    handleSurvivalInstinctI: (targetBoss: any) => {
+    handleSurvivalInstinctI: (targetBoss: any, damageAmount: number) => {
         messages: string[];
         targetUpdates: {
             name: string;
             updates: Partial<BattleStatistics>;
         } | null;
     } | null;
-    handleSurvivalInstinctII: (targetBoss: any) => {
+    handleSurvivalInstinctII: (targetBoss: any, damageAmount: number) => {
         messages: string[];
         targetUpdates: {
             name: string;
@@ -301,8 +301,7 @@ export declare const BattleEffectProcessor: {
             updates: Partial<BattleStatistics>;
         } | null;
     } | null;
-    /** 复苏处理（免疫死亡并回复） */
-    handleRevival: (targetBoss: any) => {
+    handleRevival: (targetBoss: any, damageAmount: number) => {
         messages: string[];
         targetUpdates: {
             name: string;
@@ -318,7 +317,7 @@ export declare const BattleEffectProcessor: {
         } | null;
     } | null;
     /** 远古预兆处理（概率免疫能量伤害）- 增加boost参数 */
-    handleAncientOmen: (targetBoss: any, weaponData: any, boost: number) => {
+    handleAncientOmen: (targetBoss: any, weaponData: any, boost?: number) => {
         isImmune: boolean;
         messages: string[];
         targetUpdates: {

package/lib/index.js

@@ -1542,15 +1542,18 @@ async function calculateTotalDamage(ctx, session, config, equippedWeapon, target
   const weaponConfigEntry = Object.entries(weaponConfig).find(([_, c]) => c.id === equippedWeapon.weaponId);
   const [weaponName, weaponData] = weaponConfigEntry;
   const baseDamage = weaponData.damage * (1 + 0.1 * equippedWeapon.level);
+  const levelBonusPercent = (0.1 * equippedWeapon.level * 100).toFixed(0);
+  effectMessage.push(`🔫 ${weaponName}Lv.${equippedWeapon.level}：基础伤害+${levelBonusPercent}%`);
   let totalAdditive = 0;
   const tagAdditive = await calculateTagMultiplier(weaponData, finalTags, equippedWeapon);
   totalAdditive += tagAdditive;
-  const { totalModAdd, hasCrit } = calculateModifiers(
+  const { totalModAdd, hasCrit, modMessages } = calculateModifiers(
     equippedWeapon,
     weaponName,
     await checkCritRhythm(ctx, handle)
   );
   totalAdditive += totalModAdd;
+  effectMessage.push(...modMessages);
   const careerBonus = await calculateCareerAdditive(ctx, handle, weaponData.type, weaponData.id);
   totalAdditive += careerBonus.value;
   if (careerBonus.message) effectMessage.push(careerBonus.message);
@@ -1566,7 +1569,6 @@ async function calculateTotalDamage(ctx, session, config, equippedWeapon, target
   let finalDamage = baseDamage * (1 + totalAdditive);
   if (finalDamage < 1) {
     finalDamage = 1;
-    effectMessage.push("⚠️ 触发伤害保底机制：强制造成1点伤害");
   }
   return {
     damage: Math.round(finalDamage),
@@ -1607,33 +1609,45 @@ __name(calculateTagMultiplier, "calculateTagMultiplier");
 function calculateModifiers(equippedWeapon, weaponName, hasCritRhythm) {
   let totalModAdd = 0;
   let hasCrit = false;
+  const modMessages = [];
   let crystalCrit = 0;
   let overloadCrit = 0;
   let rhythmCrit = 0;
   let weaponCrit = 0;
   if (weaponName === "MK-4激光步枪") {
     weaponCrit = 80;
+    modMessages.push(`🔫 【MK-4激光步枪】武器效果：暴击率+${weaponCrit}%`);
   }
   equippedWeapon.installedMods.forEach((mod) => {
     if (mod === "动能增幅") {
       totalModAdd += 0.2;
+      modMessages.push(`🛠️ 【动能增幅】生效：攻击伤害+20%`);
     }
     if (mod === "裂甲核心" && weaponName === modConfig[mod].exclusiveTo) {
       totalModAdd += 0.4;
+      modMessages.push(`🛠️ 【裂甲核心】生效：攻击伤害+40%`);
     }
     if (mod === "棱镜水晶") {
       crystalCrit = 20;
+      modMessages.push(`🛠️ 【棱镜水晶】生效：暴击率+20%`);
     }
     if (mod === "棱镜超载核心" && weaponName === modConfig[mod].exclusiveTo) {
       overloadCrit = 80;
+      modMessages.push(`🛠️ 【棱镜超载核心】生效：暴击率+80%`);
     }
   });
   rhythmCrit = hasCritRhythm ? 20 : 0;
+  if (hasCritRhythm) {
+    modMessages.push(`🎵 暴击韵律祈愿：暴击率+20%`);
+  }
   const totalCritRate = Math.min(
     crystalCrit + overloadCrit + rhythmCrit + weaponCrit,
     // 包含武器专属暴击
     100
   );
+  if (totalCritRate > 0) {
+    modMessages.push(`🎯 总暴击率：${totalCritRate}%`);
+  }
   if (totalCritRate > 0) {
     const roll = Math.random() * 100;
     if (roll <= totalCritRate) {
@@ -1641,7 +1655,12 @@ function calculateModifiers(equippedWeapon, weaponName, hasCritRhythm) {
       totalModAdd += 1;
     }
   }
-  return { totalModAdd, hasCrit };
+  return {
+    totalModAdd,
+    hasCrit,
+    modMessages
+    // 返回模块消息数组
+  };
 }
 __name(calculateModifiers, "calculateModifiers");
 async function calculateCareerAdditive(ctx, handle, weaponType, weaponId) {
@@ -2642,22 +2661,25 @@ var BattleEffectProcessor = {
     }
     return null;
   }, "handleStressShellII"),
-  handleSurvivalInstinctI: /* @__PURE__ */ __name(function(targetBoss) {
+  // 求生本能I (修改后)
+  handleSurvivalInstinctI: /* @__PURE__ */ __name(function(targetBoss, damageAmount) {
     const messages = [];
     if (!targetBoss.skills.includes("求生本能I")) {
       return null;
     }
     const targetMaxHP = getMaxHPByName(targetBoss.name);
-    const currentHP = targetBoss.HP;
-    if (currentHP !== 0) {
+    const isLethal = damageAmount >= targetBoss.HP;
+    if (!isLethal) {
       return null;
     }
     const selfHealAmount = Math.round(targetMaxHP * 0.3);
     const updates = {
       hpChange: selfHealAmount,
+      // 回复生命值
       skillsRemoved: ["求生本能I"]
+      // 移除技能
     };
-    messages.push(`❤️ 【求生本能I】触发：濒死时，回复${selfHealAmount}点生命值`);
+    messages.push(`❤️ 【求生本能I】触发：承受致命伤害时，回复${selfHealAmount}点生命值`);
     messages.push(`❤️ 【求生本能I】技能移除`);
     return {
       messages,
@@ -2667,14 +2689,15 @@ var BattleEffectProcessor = {
       }
     };
   }, "handleSurvivalInstinctI"),
-  handleSurvivalInstinctII: /* @__PURE__ */ __name(function(targetBoss) {
+  // 求生本能II (修改后)
+  handleSurvivalInstinctII: /* @__PURE__ */ __name(function(targetBoss, damageAmount) {
     const messages = [];
     if (!targetBoss.skills.includes("求生本能II")) {
       return null;
     }
     const targetMaxHP = getMaxHPByName(targetBoss.name);
-    const currentHP = targetBoss.HP;
-    if (currentHP !== 0) {
+    const isLethal = damageAmount >= targetBoss.HP;
+    if (!isLethal) {
       return null;
     }
     const selfHealAmount = Math.round(targetMaxHP * 0.5);
@@ -2684,7 +2707,7 @@ var BattleEffectProcessor = {
       skillsRemoved: ["求生本能II"]
       // 移除的技能
     };
-    messages.push(`❤️ 【求生本能II】触发：濒死时，回复${selfHealAmount}点生命值`);
+    messages.push(`❤️ 【求生本能II】触发：承受致命伤害时，回复${selfHealAmount}点生命值`);
     messages.push(`❤️ 【求生本能II】技能移除`);
     return {
       messages,
@@ -3506,6 +3529,7 @@ var BattleEffectProcessor = {
     }
     return { nerfMultiplier, doubleAstralWind, messages };
   }, "handleMindFrenzy"),
+  //宇宙能量
   handleCosmicEnergy: /* @__PURE__ */ __name(function(targetBoss, damage) {
     if (!targetBoss.skills.includes("宇宙能量")) {
       return null;
@@ -3549,13 +3573,14 @@ var BattleEffectProcessor = {
       }
     };
   }, "handleCosmicEnergy"),
-  /** 复苏处理（免疫死亡并回复） */
-  handleRevival: /* @__PURE__ */ __name(function(targetBoss) {
+  // 复苏 (修改后)
+  handleRevival: /* @__PURE__ */ __name(function(targetBoss, damageAmount) {
     const messages = [];
     if (!targetBoss.skills.includes("复苏")) {
       return null;
     }
-    if (targetBoss.HP !== 0) {
+    const isLethal = damageAmount >= targetBoss.HP;
+    if (!isLethal) {
       return null;
     }
     const maxHP = getMaxHPByName(targetBoss.name);
@@ -3566,7 +3591,7 @@ var BattleEffectProcessor = {
       name: targetBoss.name,
       updates: {
         hpChange: healAmount,
-        // 回复50%最大生命值
+        // 回复60%最大生命值
         energyChange: energyGain,
         // 回复100%能量
         skillsRemoved: ["复苏"],
@@ -3608,7 +3633,7 @@ var BattleEffectProcessor = {
     };
   }, "handleBladeOfLight"),
   /** 远古预兆处理（概率免疫能量伤害）- 增加boost参数 */
-  handleAncientOmen: /* @__PURE__ */ __name(function(targetBoss, weaponData, boost) {
+  handleAncientOmen: /* @__PURE__ */ __name(function(targetBoss, weaponData, boost = 0) {
     const messages = [];
     let isImmune = false;
     let targetUpdates = null;
@@ -3976,21 +4001,12 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     messages.push(...lightningResult.messages);
   }
   const coldImmuneEffects = [
-    {
-      effect: BattleEffectProcessor.handleFrostEvolution,
-      args: [targetBoss, weaponName, damage]
-    },
     {
       effect: BattleEffectProcessor.handleColdAdaptation,
       args: [targetBoss, weaponName]
     }
   ];
-  const fireImmuneEffects = [
-    {
-      effect: BattleEffectProcessor.handleFlameAlien,
-      args: [targetBoss, weaponName, damage]
-    }
-  ];
+  const fireImmuneEffects = [];
   const chanceImmuneEffects = [
     {
       effect: BattleEffectProcessor.handleDeadlyHit,
@@ -4019,7 +4035,7 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
       updateStatsByName(solarFlareResult.targetUpdates.name, solarFlareResult.targetUpdates.updates);
     }
   }
-  const carpetBombResult = processEffect(BattleEffectProcessor.handleCarpetBombing, targetBoss);
+  const carpetBombResult = BattleEffectProcessor.handleCarpetBombing(targetBoss);
   if (carpetBombResult) {
     isolatedImmunityMark = carpetBombResult.tempMark || false;
     if (carpetBombResult.nerfMultiplier) {
@@ -4038,6 +4054,8 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     { effect: BattleEffectProcessor.handleEnergyBlackhole, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleColossalRampage, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleVomit, args: [targetBoss] },
+    { effect: BattleEffectProcessor.handleRampage, args: [targetBoss] },
+    { effect: BattleEffectProcessor.handleHyperRangeShift, args: [targetBoss] },
     // 双参数效果
     { effect: BattleEffectProcessor.handleStructuralArmor, args: [targetBoss, weaponData] },
     { effect: BattleEffectProcessor.handleDisguise, args: [targetBoss, weaponName] },
@@ -4045,9 +4063,7 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     { effect: BattleEffectProcessor.handleIsolated, args: [targetBoss, activeBosses, isolatedImmunityMark] },
     { effect: BattleEffectProcessor.handleInfectedSpaceStation, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleInfernalBomb, args: [targetBoss, activeBosses] },
-    { effect: BattleEffectProcessor.handleHunterAlien, args: [targetBoss, activeBosses, weaponName] },
-    { effect: BattleEffectProcessor.handleRampage, args: [targetBoss, activeBosses] },
-    { effect: BattleEffectProcessor.handleHyperRangeShift, args: [targetBoss] }
+    { effect: BattleEffectProcessor.handleHunterAlien, args: [targetBoss, activeBosses, weaponName] }
   ];
   for (const effectItem of damageAdjustEffects) {
     const result = processEffect(effectItem.effect, ...effectItem.args);
@@ -4088,15 +4104,11 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     { effect: BattleEffectProcessor.handleFrostRegeneration, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleFrostAura, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleSentryGun, args: [targetBoss, activeBosses] },
-    { effect: BattleEffectProcessor.handleSurvivalInstinctI, args: [targetBoss] },
-    { effect: BattleEffectProcessor.handleSurvivalInstinctII, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleMoldGrowth, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleElectricShockwave, args: [targetBoss] },
     { effect: BattleEffectProcessor.handlePulse, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleFeeding, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleBurningBurrow, args: [targetBoss] },
-    { effect: BattleEffectProcessor.handleRevival, args: [targetBoss] },
-    { effect: BattleEffectProcessor.handleCosmicEnergy, args: [targetBoss, damage] },
     { effect: BattleEffectProcessor.handleBombardmentGuide, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleOverdriveShield, args: [targetBoss, activeBosses] }
   ];
@@ -4180,18 +4192,80 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     layerReduced = layerReduceResult.reductionSuccess || false;
   }
   let finalDamage = damage;
-  if (!immune) {
-    let adjustedNerfMultiplier = totalNerfMultiplier * (1 - ignoreRate);
-    const damageMultiplier = 1 + totalBuffMultiplier - adjustedNerfMultiplier;
-    finalDamage = Math.max(1, Math.round(damage * damageMultiplier));
-    if (finalDamage > 0) {
-      updateStatsByName(targetBoss.name, {
-        hpChange: -finalDamage
-      });
+  let adjustedNerfMultiplier = totalNerfMultiplier * (1 - ignoreRate);
+  const damageMultiplier = 1 + totalBuffMultiplier - adjustedNerfMultiplier;
+  finalDamage = Math.max(1, Math.round(damage * damageMultiplier));
+  const frostEvolutionResult = BattleEffectProcessor.handleFrostEvolution(
+    targetBoss,
+    weaponName,
+    finalDamage
+    // 使用最新计算的finalDamage
+  );
+  if (frostEvolutionResult) {
+    messages.push(...frostEvolutionResult.messages);
+    if (frostEvolutionResult.targetUpdates) {
+      updateStatsByName(frostEvolutionResult.targetUpdates.name, frostEvolutionResult.targetUpdates.updates);
+    }
+    if (frostEvolutionResult.isImmune) {
+      immune = true;
+      finalDamage = 0;
     }
-  } else {
+  }
+  const flameAlienResult = BattleEffectProcessor.handleFlameAlien(
+    targetBoss,
+    weaponName,
+    finalDamage
+    // 使用最新计算的finalDamage
+  );
+  if (flameAlienResult) {
+    messages.push(...flameAlienResult.messages);
+    if (flameAlienResult.targetUpdates) {
+      updateStatsByName(flameAlienResult.targetUpdates.name, flameAlienResult.targetUpdates.updates);
+    }
+    if (flameAlienResult.isImmune) {
+      immune = true;
+      finalDamage = 0;
+    }
+  }
+  const cosmicEnergyResult = BattleEffectProcessor.handleCosmicEnergy(
+    targetBoss,
+    finalDamage
+    // 使用最新计算的finalDamage
+  );
+  if (cosmicEnergyResult) {
+    messages.push(...cosmicEnergyResult.messages);
+    if (cosmicEnergyResult.targetUpdates) {
+      updateStatsByName(cosmicEnergyResult.targetUpdates.name, cosmicEnergyResult.targetUpdates.updates);
+    }
+  }
+  if (immune) {
     finalDamage = 0;
   }
+  const isLethal = finalDamage >= targetBoss.HP && finalDamage > 0;
+  const survivalSkills = [
+    { func: BattleEffectProcessor.handleSurvivalInstinctI, name: "求生本能I" },
+    { func: BattleEffectProcessor.handleSurvivalInstinctII, name: "求生本能II" },
+    { func: BattleEffectProcessor.handleRevival, name: "复苏" }
+  ];
+  let revivalTriggered = false;
+  if (isLethal) {
+    for (const skill of survivalSkills) {
+      if (targetBoss.skills.includes(skill.name)) {
+        const result = skill.func(targetBoss, finalDamage);
+        if (result) {
+          updateStatsByName(result.targetUpdates.name, result.targetUpdates.updates);
+          messages.push(...result.messages);
+          revivalTriggered = true;
+          break;
+        }
+      }
+    }
+  }
+  if (!revivalTriggered && !immune && finalDamage > 0) {
+    updateStatsByName(targetBoss.name, {
+      hpChange: -finalDamage
+    });
+  }
   return {
     finalDamage,
     messages,
@@ -4726,7 +4800,7 @@ async function handleIgnoreReductionEffects(ctx, handle, weaponName, targetBoss)
     }
     if (careerData.career === "猩红杀手" && weaponName === "侦察步枪") {
       ignoreEffects.push(0.2);
-      messages.push(`🎯 【猩红杀手】职业效果：无视20%减伤效果`);
+      messages.push(`🎯 猩红杀手职业：无视20%减伤效果`);
     }
   }, "handleCareerEffects");
   await handleCareerEffects();
@@ -5303,7 +5377,7 @@ function apply(ctx, config) {
       const [itemName, itemData] = entry;
       return itemData.description ? `${itemName} x ${userItem.quantity}：${itemData.description}` : `${itemName} x ${userItem.quantity}`;
     });
-    return `【${handle}的背包】
+    return `【${session.username}的背包】
 ${itemDetails.join("\n")}`;
   });
   ctx.command("ggcevo/签到").action(async (argv) => {
@@ -6969,12 +7043,12 @@ ${validTypes.join("、")}`;
       return [
         `${statusIcon} ${weaponName} ${statusText}`,
         `等级：Lv.${w.level} | 改装槽：${w.modificationSlots}`,
-        `伤害：${currentDamage.toFixed(1)}`,
+        `基础伤害：${currentDamage.toFixed(1)}`,
         `改装：${mods}`
       ].join("\n");
     }));
     return [
-      `🛡️ ${handle}的武器仓库`,
+      `🛡️ ${session.username}的武器仓库`,
       '使用"装备 武器名称"来装备武器',
       "⚡表示当前装备武器",
       "──────────────",
@@ -8151,7 +8225,7 @@ ${validTypes.join("、")}`;
     ]);
     const totalRewards = signData[0]?.totalRewards || 0;
     const redcrystal = careerData[0]?.redcrystal || 0;
-    const message = [`【${handle}的仓库】`];
+    const message = [`【${session.username}的仓库】`];
     message.push(`💰 金币：${totalRewards}`);
     if (careerData[0]?.group === "辛迪加海盗") {
       message.push(`🔴 红晶：${redcrystal}`);

package/package.json

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