koishi-plugin-ggcevo-game 1.4.36 → 1.4.37

package/lib/boss/attackhandling.d.ts

@@ -1,12 +1,13 @@
 import { Context } from 'koishi';
 import { Config } from '../index';
-export declare function handlePrimaryAttack(ctx: Context, session: any, handle: any, 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): Promise<{
     initialDamage: number;
     currentHP: number;
     isDefeated: boolean;
     hasCrit: boolean;
     effectMessage: string[];
     passiveMessages: string[];
+    ignoreMessage: any[];
     radiationApplied: boolean;
     freezing: boolean;
     bileStacks: boolean;
@@ -15,6 +16,7 @@ export declare function handlePrimaryAttack(ctx: Context, session: any, handle:
 }>;
 export declare function handleScatterAttack(ctx: Context, session: any, handle: string, config: Config, equippedWeapon: any, targetBoss: any, weaponName: string, activeBosses: any[]): Promise<{
     scatterEffectMessages: string[];
+    ignoreMessage: string[];
     extraDamages: {
         name: string;
         damage: number;
@@ -36,8 +38,8 @@ export declare function calculateRewards(ctx: Context, handle: string, totalDama
     techMessage: string;
 }>;
 export declare function updateSignRecord(ctx: Context, handle: string, reward: number): Promise<void>;
-export declare function buildResultMessage(session: any, weaponName: string, targetBoss: any, primaryResult: any, scatterResult: any, finalReward: number, maxHP: number, careerMessage: string, techMessage: string, redcrystalMessage: string): string;
-export declare function handleBroadcasts(ctx: Context, groupIds: string[], bossEventBroadcast: string[] | string | null, cleanerRewardBroadcast: string[] | null, isPrimaryAttack: boolean): Promise<void>;
+export declare function buildResultMessage(session: any, weaponName: string, targetBoss: any, primaryResult: any, scatterResult: any, finalReward: number, careerMessage: string, techMessage: string, redcrystalMessage: string): string;
+export declare function handleBroadcasts(ctx: Context, groupIds: string[], bossEventBroadcast: string[] | string | null, cleanerRewardBroadcast: string[] | null): Promise<void>;
 export declare function updateBossDamageRecord(ctx: Context, handle: string, playerName: string, bossGroupId: number, damageAmount: number): Promise<void>;
 export declare function updateTaskProgress(ctx: Context, handle: string, taskUpdates: {
     taskId: number;

package/lib/index.js

@@ -3817,7 +3817,7 @@ var BattleEffectProcessor = {
     const effectiveLayers = Math.min(currentLayers, 20);
     const buffMultiplier = effectiveLayers * 0.025;
     if (effectiveLayers > 0) {
-      messages.push(`☢️ 【辐射增伤】：当前${currentLayers}层，伤害提升${(effectiveLayers * 2.5).toFixed(1)}%`);
+      messages.push(`☢️ 【辐射增伤】：当前${currentLayers}层，所受伤害提升${(effectiveLayers * 2.5).toFixed(1)}%`);
       if (currentLayers > 20) {
         messages.push(`☢️ 注意：超过20层的辐射无效，不会提供额外增伤`);
       }
@@ -3853,7 +3853,7 @@ var BattleEffectProcessor = {
     const effectiveLayers = Math.min(currentLayers, 20);
     const buffMultiplier = effectiveLayers * 0.025;
     if (effectiveLayers > 0) {
-      messages.push(`❄️ 【寒冷增伤】：当前${currentLayers}层，伤害提升${(effectiveLayers * 2.5).toFixed(1)}%`);
+      messages.push(`❄️ 【寒冷增伤】：当前${currentLayers}层，所受伤害提升${(effectiveLayers * 2.5).toFixed(1)}%`);
       if (currentLayers > 20) {
         messages.push(`❄️ 注意：超过20层的寒冷无效，不会提供额外增伤`);
       }
@@ -4188,7 +4188,7 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
   if (!immune) {
     let adjustedNerfMultiplier = totalNerfMultiplier * (1 - ignoreRate);
     if (ignoreRate > 0 && totalNerfMultiplier > 0) {
-      messages.push(`🛡️ 无视减伤: 无视了${(ignoreRate * 100).toFixed(1)}%减伤效果`);
+      messages.push(`🗡️ 无视减伤: 无视了${(ignoreRate * 100).toFixed(1)}%减伤效果`);
       messages.push(`  减伤系数由${(totalNerfMultiplier * 100).toFixed(1)}%降低至${(adjustedNerfMultiplier * 100).toFixed(1)}%`);
     }
     const damageMultiplier = 1 + totalBuffMultiplier - adjustedNerfMultiplier;
@@ -4387,6 +4387,7 @@ async function handlePrimaryAttack(ctx, session, handle, config, equippedWeapon,
     hasCrit: damageResult.hasCrit,
     effectMessage: damageResult.effectMessage,
     passiveMessages: EffectProcessor.messages,
+    ignoreMessage: ignoreReduction.messages,
     radiationApplied: EffectProcessor.radiationLayerAdded,
     freezing: EffectProcessor.coldLayerAdded,
     bileStacks: EffectProcessor.bileDetonationTrigger,
@@ -4398,6 +4399,7 @@ __name(handlePrimaryAttack, "handlePrimaryAttack");
 async function handleScatterAttack(ctx, session, handle, config, equippedWeapon, targetBoss, weaponName, activeBosses) {
   const secondaryTargets = activeBosses.filter((boss) => boss.name !== targetBoss.name);
   const scatterEffectMessages = [];
+  const ignoreMessage = [];
   const extraDamages = [];
   const actuallyDead = [];
   const taskUpdates = [];
@@ -4418,11 +4420,11 @@ async function handleScatterAttack(ctx, session, handle, config, equippedWeapon,
       secondaryTarget
     );
     const secondaryDamage = Math.round(damageResult.damage * scatterRatio);
-    const ignoreReduction = await handleIgnoreReductionEffects(ctx, handle, weaponName, targetBoss);
-    const EffectProcessor = applyPassiveEffects(targetBoss, activeBosses, weaponName, secondaryDamage, ignoreReduction.ignoreRate);
+    const ignoreReduction = await handleIgnoreReductionEffects(ctx, handle, weaponName, secondaryTarget);
+    const EffectProcessor = applyPassiveEffects(secondaryTarget, activeBosses, weaponName, secondaryDamage, ignoreReduction.ignoreRate);
     const actualDamage = EffectProcessor.finalDamage;
     await saveAndClearStats(ctx);
-    const [currentboss] = await ctx.database.get("ggcevo_boss", { name: targetBoss.name });
+    const [currentboss] = await ctx.database.get("ggcevo_boss", { name: secondaryTarget.name });
     const currentHP = currentboss.HP;
     extraDamages.push({
       name: secondaryTarget.name,
@@ -4445,12 +4447,14 @@ async function handleScatterAttack(ctx, session, handle, config, equippedWeapon,
     }
     const isDead = currentHP <= 0;
     scatterEffectMessages.push(...EffectProcessor.messages.map((m) => ` 对 ${secondaryTarget.name} ${m}`));
+    ignoreMessage.push(...ignoreReduction.messages.map((m) => ` 对 ${secondaryTarget.name} ${m}`));
     if (isDead) {
       actuallyDead.push(secondaryTarget.name);
     }
   }
   return {
     scatterEffectMessages,
+    ignoreMessage,
     extraDamages,
     actuallyDead,
     taskUpdates
@@ -4539,7 +4543,6 @@ async function calculateRewards(ctx, handle, totalDamage) {
     careerMessage,
     redcrystalMessage,
     techMessage
-    // 新增：独立返回科技奖励信息
   };
 }
 __name(calculateRewards, "calculateRewards");
@@ -4551,12 +4554,17 @@ async function updateSignRecord(ctx, handle, reward) {
   }], ["handle"]);
 }
 __name(updateSignRecord, "updateSignRecord");
-function buildResultMessage(session, weaponName, targetBoss, primaryResult, scatterResult, finalReward, maxHP, careerMessage, techMessage, redcrystalMessage) {
+function buildResultMessage(session, weaponName, targetBoss, primaryResult, scatterResult, finalReward, careerMessage, techMessage, redcrystalMessage) {
+  const maxHP = getMaxHPByName2(targetBoss.name);
   const messages = [
     `🔥 ${session.username} 使用武器 ${weaponName} 对 ${targetBoss.name} 发起攻击！`,
     ...primaryResult.effectMessage.length > 0 ? [
       `⚡ 攻击效果：
 ${primaryResult.effectMessage.map((m) => `▸ ${m}`).join("\n")}`
+    ] : [],
+    ...primaryResult.ignoreMessage.length > 0 ? [
+      `🗡️ 无视减伤效果：
+${primaryResult.ignoreMessage.map((m) => `▸ ${m}`).join("\n")}`
     ] : [],
     ...primaryResult.passiveMessages.length > 0 ? [
       `🛡️ 被动效果：
@@ -4566,6 +4574,10 @@ ${primaryResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
   ];
   if (scatterResult) {
     messages.push(
+      ...scatterResult.ignoreMessage.length > 0 ? [
+        `🗡️ 无视减伤效果：
+${scatterResult.ignoreMessage.map((m) => `▸ ${m}`).join("\n")}`
+      ] : [],
       `⚡ 散射效果：
 ${scatterResult.scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`,
       `散射伤害：`,
@@ -4596,7 +4608,7 @@ ${scatterResult.scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`,
   return messages.filter((line) => line).join("\n");
 }
 __name(buildResultMessage, "buildResultMessage");
-async function handleBroadcasts(ctx, groupIds, bossEventBroadcast, cleanerRewardBroadcast, isPrimaryAttack) {
+async function handleBroadcasts(ctx, groupIds, bossEventBroadcast, cleanerRewardBroadcast) {
   const broadcastMessages = [];
   if (bossEventBroadcast) {
     const bossMsg = Array.isArray(bossEventBroadcast) ? bossEventBroadcast.join("\n") : bossEventBroadcast;
@@ -7287,11 +7299,6 @@ ${validTypes.join("、")}`;
     if (!weaponData.isantiair && targetBoss.groupId === 5) {
       return "您当前装备的武器无法攻击空中目标！";
     }
-    const bossGroup = bossPool.find(
-      (g) => g.main.name === targetBoss.name || g.minions.some((m) => m.name === targetBoss.name)
-    );
-    if (!bossGroup) return "无法获取异形组配置。";
-    const maxHP = targetBoss.type === "主宰" ? bossGroup.main.maxHP : bossGroup.minions.find((m) => m.name === targetBoss.name)?.maxHP || 0;
     const primaryAttackResult = await handlePrimaryAttack(
       ctx,
       session,
@@ -7374,7 +7381,6 @@ ${validTypes.join("、")}`;
       primaryAttackResult,
       scatterResult,
       finalReward,
-      maxHP,
       careerMessage,
       techMessage,
       redcrystalMessage
@@ -7385,8 +7391,7 @@ ${validTypes.join("、")}`;
       ctx,
       groupId,
       bossEventBroadcast,
-      cleanerRewardBroadcast,
-      !isScatterAttack
+      cleanerRewardBroadcast
     );
   });
   ctx.command("ggcevo/攻击假人").option("tags", "-t <tags:string> 添加BOSS标签(逗号分隔)").action(async (argv) => {

package/package.json

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