koishi-plugin-ggcevo-game 1.4.6 → 1.4.8

package/lib/index.js

@@ -525,7 +525,7 @@ var spaceStationCrewConfig = [
   {
     professionName: "警卫长",
     effect: "攻击伤害+5%，攻击获得的金币+100%",
-    requirements: "当期伤害榜前十名",
+    requirements: "当期伤害榜前二十名",
     Jobtransfer: true,
     costcoins: 3e3
   },
@@ -696,11 +696,12 @@ async function checkTransferRequirements(ctx, handle, profession) {
         return { success: false, message: "需要当前职业为警卫员下士" };
       }
       if (!mainBoss) return { success: false, message: "当前暂无伤害榜。" };
-      const top10 = await ctx.database.select("ggcevo_boss_damage").where({ bossGroupId: mainBoss.groupId }).orderBy("totalDamage", "desc").limit(10).execute();
-      const isInTop10 = top10.some((r) => r.handle === handle);
+      const top20 = await ctx.database.select("ggcevo_boss_damage").where({ bossGroupId: mainBoss.groupId }).orderBy("totalDamage", "desc").limit(20).execute();
+      const isInTop202 = top20.some((r) => r.handle === handle);
       return {
-        success: isInTop10,
-        message: "需要当期伤害榜前十名"
+        success: isInTop202,
+        message: isInTop202 ? "" : "需要当期伤害榜前二十名"
+        // 消息提示更新为前二十名
       };
     }
     case "武器中士":
@@ -1918,7 +1919,7 @@ async function handleTechUpgrade(ctx, handle, target) {
   if (careerData.career === "情报副官") {
     discountApplied = true;
     actualCost = Math.floor(originalCost * 0.9);
-    discountDetails.push("🎖️ 情报副官：10%折扣");
+    discountDetails.push("🎖️ 情报副官职业：10%折扣");
   }
   const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
   if (signInfo?.totalRewards < actualCost) {
@@ -2007,7 +2008,7 @@ async function handleWeaponUpgrade(ctx, handle, target) {
   const isGunslinger = careerData?.career === "枪手";
   if (isGunslinger) {
     totalDiscount += 10;
-    discountDetails.push("🔫 枪手：10%折扣");
+    discountDetails.push("🔫 枪手职业：10%折扣");
   }
   if (careerData?.group === "人类联盟") {
     const [weaponTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 2 }).catch(() => [{ level: 0 }]);
@@ -2021,14 +2022,14 @@ async function handleWeaponUpgrade(ctx, handle, target) {
     if (weaponDiscount > 0) {
       totalDiscount += weaponDiscount;
       discountDetails.push(
-        `⚙️ 武器系统 Lv${techLevel}：${weaponDiscount}%折扣`
+        `⚙️ 武器系统科技Lv${techLevel}：${weaponDiscount}%折扣`
       );
     }
   }
   const activeWish = await checkFoxBlessing(ctx, handle);
   if (activeWish) {
     totalDiscount += 20;
-    discountDetails.push("🦊 灵狐升运：20%折扣");
+    discountDetails.push("🦊 灵狐升运祈愿：20%折扣");
   }
   totalDiscount = Math.min(totalDiscount, 100);
   const discountedCost = baseCost * (100 - totalDiscount) / 100;
@@ -2152,29 +2153,29 @@ ${priceInfo}`);
     discountNotice.push("💰 当前折扣：");
   }
   if (isGunslinger) {
-    discountNotice.push(`🔫 枪手：10%升级武器折扣`);
+    discountNotice.push(`🔫 枪手职业：10%升级武器折扣`);
   }
   if (isAlliance && hasTechDiscount) {
-    discountNotice.push(`⚙️ 武器系统 Lv${techLevel}：${techDiscountRate}%折扣`);
+    discountNotice.push(`⚙️ 武器系统科技Lv${techLevel}：${techDiscountRate}%折扣`);
   }
   if (hasFoxDiscount) {
-    discountNotice.push(`🦊 灵狐升运：20%折扣`);
+    discountNotice.push(`🦊 灵狐升运祈愿：20%折扣`);
   }
   if (!hasTechDiscount && !hasFoxDiscount && !hasGunslingerDiscount) {
     if (isAlliance) {
-      discountNotice.push("💡 提示：升级武器系统可获得折扣");
+      discountNotice.push("💡 提示：升级武器系统科技可获得折扣");
     } else if (careerData?.group === "辛迪加海盗") {
-      discountNotice.push("💡 提示：转职为枪手可获得折扣");
+      discountNotice.push("💡 提示：转职为枪手职业可获得折扣");
     } else {
       discountNotice.push("💡 提示：加入人类联盟或辛迪加海盗可获得折扣");
     }
   }
   if (isGunslinger) {
-    discountNotice.push("🔝 枪手特权：武器等级上限提升至7级");
+    discountNotice.push("🔝 枪手职业：武器等级上限提升至7级");
   }
   return [
     "⚡ 武器升级价格表 ⚡",
-    `武器等级上限: ${maxLevel}级（${isGunslinger ? "枪手职业特权" : "普通玩家"})`,
+    `武器等级上限: ${maxLevel}级（${isGunslinger ? "枪手职业" : "普通玩家"})`,
     "使用「升级 武器名称」对武器进行等级升级",
     ...discountNotice,
     "====================",
@@ -3709,8 +3710,6 @@ async function handleScatterAttack(ctx, session, config, handle, equippedWeapon,
     scatterEffectMessages.push("🔆 【中子步枪】触发散射攻击！");
     scatterRatio = 0.8;
   }
-  const baseDamage = weaponData.damage * (1 + 0.1 * equippedWeapon.level);
-  const secondaryDamage = Math.round(baseDamage * scatterRatio);
   for (const secondaryTarget of secondaryTargets) {
     const damageResult = await calculateTotalDamage(
       ctx,
@@ -3719,11 +3718,12 @@ async function handleScatterAttack(ctx, session, config, handle, equippedWeapon,
       equippedWeapon,
       secondaryTarget
     );
+    const secondaryDamage = Math.round(damageResult.damage * scatterRatio);
     const passiveResult = await PassiveHandler.handlePassives(
       ctx,
       handle,
       secondaryTarget,
-      damageResult.damage,
+      secondaryDamage,
       secondaryTarget.HP,
       getBossMaxHP(secondaryTarget),
       weaponName,
@@ -3875,10 +3875,10 @@ async function calculateRewards(ctx, handle, username, totalDamage) {
   let careerMessage = "";
   if (career === "警卫员下士") {
     careerMultiplier = 50;
-    careerMessage = "🛡️ 警卫员下士：+50%金币";
+    careerMessage = "🛡️ 警卫员下士职业：+50%金币";
   } else if (career === "警卫长") {
     careerMultiplier = 100;
-    careerMessage = "🛡️ 警卫长：+100%金币";
+    careerMessage = "🛡️ 警卫长职业：+100%金币";
   }
   const totalBonusPercent = careerMultiplier + techBonusPercent;
   const totalBonusFactor = 1 + totalBonusPercent / 100;
@@ -3889,7 +3889,7 @@ async function calculateRewards(ctx, handle, username, totalDamage) {
       handle,
       redcrystal: (careerData?.redcrystal || 0) + 1
     }], ["handle"]);
-    redcrystalMessage = "🔴 清洁工：+1枚红晶";
+    redcrystalMessage = "🔴 清洁工职业：+1枚红晶";
   }
   return {
     finalReward,
@@ -4599,7 +4599,7 @@ ${itemDetails.join("\n")}`;
       const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
       if (careerData?.group === "人类联盟") {
         totalBonus += 0.2;
-        messages.push("🏛️ 人类联盟：+20%金币");
+        messages.push("🏛️ 人类联盟阵营：+20%金币");
         const [userMiningTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 1 }).catch(() => [{ level: 0 }]);
         const techLevel = Math.min(userMiningTech?.level || 0, 5);
         const miningTechConfig = Spacestationtechnology.find((t) => t.techId === 1);
@@ -4614,12 +4614,12 @@ ${itemDetails.join("\n")}`;
           const finalBonus = Math.max(baseTechBonus, careerTechBonus);
           if (finalBonus > 0) {
             totalBonus += finalBonus / 100;
-            messages.push(`⚙️ 采掘系统 Lv${techLevel}：+${finalBonus}%金币`);
+            messages.push(`⚙️ 采掘系统科技Lv${techLevel}：+${finalBonus}%金币`);
           }
         }
         if (careerData.career === "深空矿工") {
           totalBonus += 0.5;
-          messages.push("🎖️ 深空矿工：+50%金币");
+          messages.push("🎖️ 深空矿工职业：+50%金币");
         }
       }
       if (careerData?.group === "辛迪加海盗") {
@@ -4629,7 +4629,7 @@ ${itemDetails.join("\n")}`;
           const additionalBonus = Math.min(humanPlayersCount, 50);
           const credBonus = 0.5 + additionalBonus / 100;
           totalBonus += credBonus;
-          messages.push(`💎 CRED-17：+50%金币 (${additionalBonus}名人类联盟玩家，额外+${additionalBonus}%金币)`);
+          messages.push(`💎 CRED-17设备：+50%金币 (额外+${additionalBonus}%金币)`);
         }
       }
       const [meowEffect] = await ctx.database.get("ggcevo_Wish_Record", {
@@ -4642,7 +4642,7 @@ ${itemDetails.join("\n")}`;
       if (meowEffect) {
         tickets *= 2;
         totalBonus += 1;
-        messages.push("🐾 喵喵财源：咕咕币+100%，金币+100%");
+        messages.push("🐾 喵喵财源祈愿：咕咕币+100%，金币+100%");
       }
       const finalPoints = Math.round(basePoints * (1 + totalBonus));
       let redCrystal = 0;
@@ -4658,7 +4658,7 @@ ${itemDetails.join("\n")}`;
         } else {
           redCrystal = 5;
         }
-        messages.push(`🎖️ 辛迪加财务经理：+${redCrystal}枚红晶`);
+        messages.push(`🎖️ 辛迪加财务经理职业：+${redCrystal}枚红晶`);
       }
       await ctx.database.withTransaction(async () => {
         await ctx.database.upsert("ggcevo_sign", [{
@@ -5804,20 +5804,20 @@ ${items.join("、")}
         result.push(`🛡️ 人类联盟：应战者PK失败时仅损失1%的金币`);
       }
       if (computerExpertProtection) {
-        result.push(`💻 计算机专家：应战者PK失败时不损失金币`);
+        result.push(`💻 计算机专家职业：应战者PK失败时不损失金币`);
       } else if (isWin) {
         result.push(`💰 您从对方的口袋里抢夺了${goldTransfer}枚金币`);
       } else {
         result.push(`💸 您从口袋里拿出了${goldTransfer}枚金币上交给对方`);
       }
       if (mp3Effect) {
-        result.push(`💿 MP3播放器：挑战者PK失败时上交的金币减少50%`);
+        result.push(`💿 MP3播放器设备：挑战者PK失败时上交的金币减少50%`);
       }
       if (initiatorCareer?.group === "辛迪加海盗") {
-        result.push(`🔴 辛迪加海盗：+1枚红晶`);
+        result.push(`🔴 辛迪加海盗阵营：+1枚红晶`);
       }
       if (isWin && initiatorCareer?.career === "辛迪加财务经理") {
-        result.push(`🎖️ 辛迪加财务经理：+1枚红晶`);
+        result.push(`🎖️ 辛迪加财务经理职业：+1枚红晶`);
       }
       result.push(`📅 剩余挑战次数：${config.dailyPKLimit - (initiatorPK.todayCount + 1)}`);
       return result.join("\n");
@@ -5869,7 +5869,7 @@ ${items.join("、")}
     if (careerData?.career === "武器中士") {
       const weaponSpecialistDiscount = 20;
       totalDiscount += weaponSpecialistDiscount;
-      discountDetails.push(`🎖️ 武器中士：${weaponSpecialistDiscount}%折扣`);
+      discountDetails.push(`🎖️ 武器中士职业：${weaponSpecialistDiscount}%折扣`);
     }
     const activeWish = await ctx.database.get("ggcevo_Wish_Record", {
       handle,
@@ -5881,7 +5881,7 @@ ${items.join("、")}
     if (activeWish) {
       const grasshopperDiscount = 20;
       totalDiscount += grasshopperDiscount;
-      discountDetails.push(`🦗 蚱蜢优购：${grasshopperDiscount}%折扣`);
+      discountDetails.push(`🦗 蚱蜢优购祈愿：${grasshopperDiscount}%折扣`);
     }
     totalDiscount = Math.min(totalDiscount, 100);
     const categoryStats = Object.values(weaponConfig).filter((weapon) => weapon.price !== 0).reduce((stats, weapon) => {
@@ -6035,13 +6035,13 @@ ${validTypes.join("、")}`;
         if (activeWish) {
           const wishDiscount = 20;
           totalDiscount += wishDiscount;
-          discountDetails.push(`🦗 蚱蜢优购：${wishDiscount}%折扣`);
+          discountDetails.push(`🦗 蚱蜢优购祈愿：${wishDiscount}%折扣`);
         }
       }
       if (isWeapon && careerData?.career === "武器中士") {
         const specialistDiscount = 20;
         totalDiscount += specialistDiscount;
-        discountDetails.push(`🎖️ 武器中士：${specialistDiscount}%折扣`);
+        discountDetails.push(`🎖️ 武器中士职业：${specialistDiscount}%折扣`);
       }
       totalDiscount = Math.min(totalDiscount, 100);
     }
@@ -6287,7 +6287,7 @@ ${validTypes.join("、")}`;
         `花费金币：${actualCost}${discountRate > 0 ? ` (原价${modInfo.cost})` : ""}`,
         discountRate > 0 && [
           "折扣明细：",
-          `⚙️ 武器升级平台 Lv${techLevel}：${discountRate}%`
+          `⚙️ 武器升级平台科技Lv${techLevel}：${discountRate}%`
         ].join("\n"),
         `改装槽：${equipment.installedMods.length + 1}/${equipment.modificationSlots}`
       ].filter(Boolean).join("\n");
@@ -6325,7 +6325,7 @@ ${validTypes.join("、")}`;
           "使用「改装 武器名称 模块名称」安装",
           "※ 每个武器只能安装一个专属模块",
           exclusiveDiscountRate > 0 && `💰 当前专属模块折扣：
-⚙️ 武器升级平台 Lv${techLevel}：${exclusiveDiscountRate}%`,
+⚙️ 武器升级平台科技Lv${techLevel}：${exclusiveDiscountRate}%`,
           "====================",
           exclusiveMods.length ? exclusiveMods.join("\n") : "该武器暂无专属模块"
         ].filter(Boolean).join("\n");
@@ -6336,7 +6336,7 @@ ${validTypes.join("、")}`;
           "使用「改装 武器名称 模块名称」安装通用模块",
           "使用「改装 武器名称」查询武器专属模块",
           universalDiscountRate > 0 && `💰 当前通用模块折扣：
-⚙️ 武器升级平台 Lv${techLevel}：${universalDiscountRate}%`,
+⚙️ 武器升级平台科技Lv${techLevel}：${universalDiscountRate}%`,
           "====================",
           universalMods.join("\n")
         ].filter(Boolean).join("\n");

package/package.json

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