koishi-plugin-ggcevo-game 1.3.60 → 1.3.62

package/lib/index.js

@@ -900,7 +900,7 @@ function apply(ctx, config) {
     },
     {
       professionName: "武器中士",
-      effect: "攻击伤害+15%",
+      effect: "攻击伤害+15%; 购买武器(非传奇)享有20%的折扣",
       requirements: "当期伤害榜累计造成100及以上伤害",
       Jobtransfer: true,
       costcoins: 2e3
@@ -914,7 +914,7 @@ function apply(ctx, config) {
     },
     {
       professionName: "情报副官",
-      effect: "升级空间站科技花费的金币是原价的80%",
+      effect: "升级空间站科技享有20%的折扣",
       requirements: "至少一个空间站科技等级≥3级",
       Jobtransfer: true,
       costcoins: 3e3
@@ -2142,7 +2142,7 @@ function apply(ctx, config) {
           { name: targetBoss.name },
           { energy: newEnergy }
         );
-        messages.push(`⚡ 【弧焊枪】触发特效：消耗目标${energyDrain}点能量`);
+        messages.push(`⚡ 【弧焊枪】触发特效：消耗目标200点能量`);
       } else {
         return null;
       }
@@ -2405,7 +2405,9 @@ function apply(ctx, config) {
       startTime: { $lte: /* @__PURE__ */ new Date() },
       endTime: { $gte: /* @__PURE__ */ new Date() },
       isused: false
+      // 只查询未使用过的双倍祈愿
     });
+    const doubleWishIds = doubleWishRecords.map((r) => r.id);
     const doubleWishHandles = new Set(doubleWishRecords.map((r) => r.handle));
     const top20 = damageRecords.slice(0, 20);
     top20.forEach((record, index) => {
@@ -2437,7 +2439,9 @@ function apply(ctx, config) {
       const reward = {
         guguCoins,
         gold,
-        playerName: record.playerName
+        playerName: record.playerName,
+        hasDoubleWish
+        // 标记该记录使用了双倍祈愿
       };
       rewardMap.set(record.handle, reward);
       const bonusNote = hasDoubleWish ? " (🧝‍♀ 精灵双倍祈愿生效)" : "";
@@ -2465,7 +2469,9 @@ function apply(ctx, config) {
         rewardMap.set(record.handle, {
           guguCoins,
           gold,
-          playerName: record.playerName
+          playerName: record.playerName,
+          hasDoubleWish
+          // 标记该记录使用了双倍祈愿
         });
       });
       rewardMessages.push(`其他参与者获得基础奖励: 3 咕咕币 + 500 金币`);
@@ -2495,6 +2501,12 @@ function apply(ctx, config) {
           quantity: (backpackData?.quantity || 0) + reward.guguCoins
         }], ["handle", "itemId"]);
       }
+      if (doubleWishIds.length > 0) {
+        await ctx2.database.set("ggcevo_Wish_Record", { id: { $in: doubleWishIds } }, {
+          isused: true
+          // 将使用过的双倍祈愿标记为已使用
+        });
+      }
     });
     return { rewardMessages };
   }
@@ -4570,7 +4582,13 @@ ${items.join("、")}
         const now2 = /* @__PURE__ */ new Date();
         const timeDiff = now2.getTime() - joinDate.getTime();
         const diffInDays = Math.floor(timeDiff / (1e3 * 60 * 60 * 24));
-        if (diffInDays < 30) {
+        const [targetPKRecord] = await ctx.database.get("ggcevo_pk", {
+          handle: targetHandle
+        });
+        const isNewPlayer = !targetPKRecord;
+        const hasProtection = diffInDays < 30;
+        const isPKDisabled = targetPKRecord && !targetPKRecord.enable;
+        if ((isNewPlayer || isPKDisabled) && hasProtection) {
           return `🛡️ 该玩家是人类联盟成员，尚在30天保护期内（剩余${30 - diffInDays}天），无法挑战`;
         }
       }
@@ -4829,13 +4847,28 @@ ${items.join("、")}
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const [techData] = await ctx.database.get("ggcevo_tech", { handle, techId: 2 }).catch(() => [{ level: 0 }]);
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
-    const techLevel = techData?.level || 0;
-    const isCareerMatch = Spacestationtechnology.find((t) => t.techId === 2).careerNames.includes(careerData?.career);
-    const BASE_DISCOUNTS = [0, 0, 0, 0, 0];
-    const CAREER_DISCOUNTS = [0, 0, 10, 15, 20];
-    const baseDiscount = techLevel > 0 ? BASE_DISCOUNTS[techLevel - 1] : 0;
-    const careerDiscount = isCareerMatch ? CAREER_DISCOUNTS[techLevel - 1] : 0;
-    const techDiscount = Math.max(baseDiscount, careerDiscount);
+    const group = careerData?.group || "";
+    const discountDetails = [];
+    let techDiscount = 0;
+    if (group === "人类联盟") {
+      const techLevel = techData?.level || 0;
+      if (techLevel > 0) {
+        const isCareerMatch = Spacestationtechnology.find((t) => t.techId === 2).careerNames.includes(careerData?.career);
+        const BASE_DISCOUNTS = [0, 0, 0, 0, 0];
+        const CAREER_DISCOUNTS = [0, 0, 10, 15, 20];
+        const baseDiscount = techLevel > 0 ? BASE_DISCOUNTS[techLevel - 1] : 0;
+        const careerDiscount = isCareerMatch ? CAREER_DISCOUNTS[techLevel - 1] : 0;
+        techDiscount = Math.max(baseDiscount, careerDiscount);
+        if (techDiscount > 0) {
+          discountDetails.push(`⚙️ 武器系统 Lv${techLevel}：${techDiscount}%`);
+        }
+      }
+    }
+    let weaponSpecialistDiscount = 0;
+    if (careerData?.career === "武器中士") {
+      weaponSpecialistDiscount = 20;
+      discountDetails.push(`🎖️ 武器中士：20%`);
+    }
     const activeWish = await ctx.database.get("ggcevo_Wish_Record", {
       handle,
       wishname: "蚱蜢优购",
@@ -4843,16 +4876,12 @@ ${items.join("、")}
       endTime: { $gte: /* @__PURE__ */ new Date() },
       isused: false
     }).then((records) => records[0]);
-    const grasshopperDiscount = activeWish ? 20 : 0;
-    let totalDiscount = techDiscount + grasshopperDiscount;
-    totalDiscount = Math.min(totalDiscount, 100);
-    const discountDetails = [];
-    if (techDiscount > 0) {
-      discountDetails.push(`武器系统 Lv${techLevel}：${techDiscount}%`);
-    }
+    let grasshopperDiscount = activeWish ? 20 : 0;
     if (grasshopperDiscount > 0) {
-      discountDetails.push(`蚱蜢优购：${grasshopperDiscount}%`);
+      discountDetails.push(`🦗 蚱蜢优购：${grasshopperDiscount}%`);
     }
+    let totalDiscount = techDiscount + weaponSpecialistDiscount + grasshopperDiscount;
+    totalDiscount = Math.min(totalDiscount, 100);
     const typeStats = Object.values(weaponConfig).filter((weapon) => weapon.price !== 0).reduce((stats, weapon) => {
       stats[weapon.type] = (stats[weapon.type] || 0) + 1;
       return stats;
@@ -4861,12 +4890,11 @@ ${items.join("、")}
       return [
         "🏪 咕咕武器库分类 🏪",
         '使用 "武器库 类型名称" 查看详细列表',
+        totalDiscount > 0 && `💰 当前折扣：
+${discountDetails.length ? `${discountDetails.join("\n")}` : ""}`,
         "====================",
         ...Object.entries(typeStats).map(([typeName, count]) => `▸ ${typeName} (${count}种)`),
-        "====================",
-        totalDiscount > 0 && `
-🔧 当前购买折扣：
-${discountDetails.length ? ` ${discountDetails.join(" \n ")}` : ""}`
+        "===================="
       ].filter(Boolean).join("\n");
     }
     if (!Object.keys(typeStats).includes(type)) {
@@ -4883,21 +4911,21 @@ ${Object.keys(typeStats).join("、")}`;
         `基础伤害：${config2.damage}`,
         `价格：${actualPrice}金币${totalDiscount > 0 ? ` (原价${config2.price})` : ""}`,
         specialEffect,
-        // 新增特殊效果显示
         "特性：",
         tagEffectsDesc,
-        `描述：${config2.description}`
+        `描述：${config2.description}`,
+        "------------------"
       ].filter(Boolean).join("\n");
     });
     return [
       `🏪 咕咕武器库 - ${type} 🏪`,
-      "使用“购买 武器名称”指令进行购买",
-      totalDiscount > 0 && `🔧 当前购买折扣：
-${discountDetails.length ? ` ${discountDetails.join(" \n ")}` : ""}`,
+      '使用"购买 武器名称"指令进行购买',
+      totalDiscount > 0 && `💰 当前折扣：
+${discountDetails.length ? `${discountDetails.join("\n")}` : ""}`,
       "====================",
       ...items,
       items.length === 0 ? "⚠️ 该分类下暂无可用武器" : ""
-    ].filter(Boolean).join("\n\n");
+    ].filter(Boolean).join("\n");
   });
   ctx.command("ggcevo/爆破库 [type]").usage("输入“爆破库”查看分类，或“爆破库 类型”查看详细物品").action(async ({ session }, type) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
@@ -4929,7 +4957,8 @@ ${validTypes.join("、")}`;
       `类型：${item.type}`,
       `价格：${item.price}金币`,
       `效果：${item.effects}`,
-      `描述：${item.description}`
+      `描述：${item.description}`,
+      "------------------"
     ].join("\n"));
     return [
       `💣 爆破装备库 - ${type} 💣`,
@@ -4937,7 +4966,7 @@ ${validTypes.join("、")}`;
       "====================",
       ...items,
       items.length === 0 ? "⚠️ 该分类下暂无可用物品" : ""
-    ].join("\n\n");
+    ].join("\n");
   });
   ctx.command("ggcevo/购买 <item>").action(async ({ session }, item) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
@@ -5204,7 +5233,7 @@ ${validTypes.join("、")}`;
       const actualCost = Math.floor(modInfo.cost * (1 - discountRate / 100));
       const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
       if ((signInfo?.totalRewards || 0) < actualCost) {
-        return `需要 ${actualCost} 金币，当前持有：${signInfo?.totalRewards || 0}`;
+        return `改装需要 ${actualCost} 金币，当前持有：${signInfo?.totalRewards || 0}`;
       }
       await ctx.database.set(
         "ggcevo_equipment",
@@ -5214,13 +5243,15 @@ ${validTypes.join("、")}`;
       await ctx.database.set("ggcevo_sign", { handle }, {
         totalRewards: signInfo.totalRewards - actualCost
       });
-      const discountMsg = discountRate > 0 ? `武器升级平台 Lv${techLevel} 折扣：${discountRate}%` : "";
       return [
         `✅ ${weapon} 成功安装 ${mod}！`,
-        discountMsg,
-        `花费金币：${actualCost}${discountRate > 0 ? `(原价${modInfo.cost})` : ""}`,
+        `花费金币：${actualCost}${discountRate > 0 ? ` (原价${modInfo.cost})` : ""}`,
+        discountRate > 0 && [
+          "折扣明细：",
+          `⚙️ 武器升级平台 Lv${techLevel}：${discountRate}%`
+        ].join("\n"),
         `改装槽：${equipment.installedMods.length + 1}/${equipment.modificationSlots}`
-      ].join("\n");
+      ].filter(Boolean).join("\n");
     }, "processModInstallation");
     const showModList = /* @__PURE__ */ __name(async () => {
       const [techData] = await ctx.database.get("ggcevo_tech", { handle, techId: 3 }).catch(() => [{ level: 0 }]);
@@ -5240,8 +5271,8 @@ ${validTypes.join("、")}`;
         return [
           `【${name2}】${config2.isExclusive ? ` (专属:${config2.exclusiveTo})` : ""}`,
           `价格：${actualPrice}金币${discountRate > 0 ? ` (原价${config2.cost})` : ""}`,
-          `效果：${config2.effect.replace(/▸/g, "▸ ")}`,
-          config2.isExclusive ? "※ 每个武器只能安装一个专属模块" : ""
+          `效果：${config2.effect}`,
+          "------------------"
         ].filter(Boolean).join("\n");
       }, "formatMod");
       const baseUniversalDiscount = [5, 10][techLevel - 1] || 0;
@@ -5253,20 +5284,23 @@ ${validTypes.join("、")}`;
         return [
           `🛠️ ${weapon} 专属模块 🛠️`,
           "使用「改装 武器名称 模块名称」安装",
-          exclusiveDiscountRate > 0 && `🔧 当前专属模块折扣：${exclusiveDiscountRate}% (武器升级平台 Lv${techLevel})`,
+          "※ 每个武器只能安装一个专属模块",
+          exclusiveDiscountRate > 0 && `💰 当前专属模块折扣：
+⚙️ 武器升级平台 Lv${techLevel}：${exclusiveDiscountRate}%`,
           "====================",
-          exclusiveMods.length ? exclusiveMods.join("\n\n") : "该武器暂无专属模块"
-        ].filter(Boolean).join("\n\n");
+          exclusiveMods.length ? exclusiveMods.join("\n") : "该武器暂无专属模块"
+        ].filter(Boolean).join("\n");
       } else {
         const universalMods = Object.entries(modConfig).filter(([_, m]) => !m.isExclusive).map(([name2, cfg]) => formatMod(name2, cfg));
         return [
           "🛠️ 通用武器模块 🛠️",
           "使用「改装 武器名称 模块名称」安装通用模块",
-          "输入「改装 武器名称」查询武器的专属模块",
-          universalDiscountRate > 0 && `🔧 当前通用模块折扣：${universalDiscountRate}% (武器升级平台 Lv${techLevel})`,
+          "使用「改装 武器名称」查询武器专属模块",
+          universalDiscountRate > 0 && `💰 当前通用模块折扣：
+⚙️ 武器升级平台 Lv${techLevel}：${universalDiscountRate}%`,
           "====================",
-          universalMods.join("\n\n")
-        ].filter(Boolean).join("\n\n");
+          universalMods.join("\n")
+        ].filter(Boolean).join("\n");
       }
     }, "showModList");
     if (mod) {
@@ -5568,13 +5602,12 @@ ${validTypes.join("、")}`;
       techId: 4
     });
     let techBonusPercent = 0;
-    if (securityTech && securityTech.level >= 1) {
+    if (securityTech && securityTech.level >= 1 && careerData?.group === "人类联盟") {
       const techLevel = securityTech.level - 1;
       const securityConfig = Spacestationtechnology.find((t) => t.techId === 4);
       const isEligibleForCareerBonus = securityConfig?.careerNames.includes(career);
       techBonusPercent = isEligibleForCareerBonus ? SECURITY_BONUS_MAPPING.career[techLevel] : SECURITY_BONUS_MAPPING.base[techLevel];
     }
-    const techMessage = techBonusPercent ? ` + ${techBonusPercent}% (${securityTech.level}级安防系统${career ? ` + ${career}职业加成` : ""})` : "";
     let careerMultiplier = 0;
     let careerMessage = "";
     let redcrystalMessage = "";

package/package.json

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