koishi-plugin-ggcevo-game 1.3.53 → 1.3.55

package/lib/index.js

@@ -193,7 +193,7 @@ function apply(ctx, config) {
     lastPK: "timestamp",
     enable: {
       type: "boolean",
-      initial: true
+      initial: false
       // 默认开启
     },
     lastToggle: "timestamp"
@@ -3075,56 +3075,39 @@ ${discountDetails.join("\n▸ ")}`;
   for (const key in weaponConfig) {
     weaponConfigById[weaponConfig[key].id] = weaponConfig[key];
   }
-  async function calculateTotalPower(handle, baseRank) {
-    const weapons = await ctx.database.get("ggcevo_equipment", { handle });
-    const careers = await ctx.database.get("ggcevo_careers", { handle });
-    const career = careers.length ? careers[0].career : null;
+  async function calculateTotalPower(handle) {
+    const [rankData] = await ctx.database.get("ggcevo_rank", {
+      handle,
+      rankseason: config.rankseason
+    });
+    const baseRank = rankData?.rank || 0;
     let total = baseRank;
+    const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
+    const career = careerData?.career;
     if (career) {
-      if (career === "联盟新兵") {
-        total += 1e3;
-      } else if (career === "辛迪加炮灰新兵") {
-        total += 2e3;
-      } else if ([
-        "深空矿工",
-        "医疗专家",
-        "情报副官",
-        "总工程师",
-        "舰长",
-        "机械化专家"
-      ].includes(career)) {
-        total += 2500;
-      } else if ([
-        "清洁工",
-        "辛迪加财务经理",
-        "计算机专家",
-        "指挥官",
-        "装甲兵",
-        "破坏者",
-        "征募官"
-      ].includes(career)) {
-        total += 3e3;
-      } else if ([
-        "警卫员下士",
-        "警卫长",
-        "武器中士"
-      ].includes(career)) {
-        total += 3500;
-      } else if ([
-        "能量武器专家",
-        "枪手",
-        "猩红杀手",
-        "纵火狂"
-      ].includes(career)) {
-        total += 4e3;
-      }
+      if (career === "联盟新兵") total += 1e3;
+      else if (career === "辛迪加炮灰新兵") total += 2e3;
+      else if (["深空矿工", "医疗专家", "情报副官", "总工程师", "舰长", "机械化专家"].includes(career)) total += 2500;
+      else if (["清洁工", "辛迪加财务经理", "计算机专家", "指挥官", "装甲兵", "破坏者", "征募官"].includes(career)) total += 3e3;
+      else if (["警卫员下士", "警卫长", "武器中士"].includes(career)) total += 3500;
+      else if (["能量武器专家", "枪手", "猩红杀手", "纵火狂"].includes(career)) total += 4e3;
     }
+    const weapons = await ctx.database.get("ggcevo_equipment", { handle });
     for (const { weaponId, level, installedMods } of weapons) {
       const weapon = weaponConfigById[weaponId];
       if (!weapon) continue;
       total += weapon.damage * 100;
-      total += level * 1e3;
-      total += (installedMods?.length || 0) * 2e3;
+      total += level * (level + 1) / 2 * 1e3;
+      for (const modName of installedMods || []) {
+        const mod = modConfig[modName];
+        if (mod) {
+          if (mod.isExclusive) {
+            total += 4e3;
+          } else {
+            total += 2e3;
+          }
+        }
+      }
     }
     return total;
   }
@@ -4510,12 +4493,42 @@ ${items.join("、")}
         ctx.database.get("ggcevo_rank", { handle: initiatorHandle, rankseason: config.rankseason }),
         ctx.database.get("ggcevo_rank", { handle: targetHandle, rankseason: config.rankseason })
       ]);
-      const initiatorRank = initiatorData[0]?.rank || 0;
-      const targetRank = targetData[0]?.rank || 0;
-      const initiatorPower = await calculateTotalPower(initiatorHandle, initiatorRank);
-      const targetPower = await calculateTotalPower(targetHandle, targetRank);
+      const initiatorPower = await calculateTotalPower(initiatorHandle);
+      const targetPower = await calculateTotalPower(targetHandle);
       const initiatorRankname = initiatorData[0]?.name || session.username;
       const targetRankname = targetData[0]?.name || (targetUsername.name || targetUsername.user.name);
+      const [initiatorCareer] = await ctx.database.get("ggcevo_careers", {
+        handle: initiatorHandle
+      });
+      const [targetCareer] = await ctx.database.get("ggcevo_careers", {
+        handle: targetHandle
+      });
+      const validGroups = /* @__PURE__ */ new Set(["人类联盟", "辛迪加海盗"]);
+      if (!initiatorCareer?.group || !validGroups.has(initiatorCareer.group)) {
+        return "❌ 您尚未加入人类联盟或辛迪加海盗，不能参与PK";
+      }
+      if (!targetCareer?.group || !validGroups.has(targetCareer.group)) {
+        return "❌ 对方尚未加入人类联盟或辛迪加海盗，不能参与PK";
+      }
+      if (targetCareer.group === "人类联盟") {
+        let joinDate;
+        if (typeof targetCareer.date === "string") {
+          joinDate = convertUTCtoChinaTime(new Date(targetCareer.date));
+        } else if (typeof targetCareer.date === "number") {
+          joinDate = convertUTCtoChinaTime(new Date(targetCareer.date));
+        } else {
+          joinDate = convertUTCtoChinaTime(targetCareer.date);
+        }
+        if (isNaN(joinDate.getTime())) {
+          return "❌ 对方阵营加入阵营日期无效";
+        }
+        const now2 = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
+        const timeDiff = now2.getTime() - joinDate.getTime();
+        const diffInDays = Math.floor(timeDiff / (1e3 * 60 * 60 * 24));
+        if (diffInDays < 30) {
+          return `🛡️ 该玩家是人类联盟成员，尚在30天保护期内（剩余${30 - diffInDays}天），无法挑战`;
+        }
+      }
       let initiatorPK = {
         handle: initiatorHandle,
         name: initiatorRankname,
@@ -4524,7 +4537,7 @@ ${items.join("、")}
         todayCount: 0,
         lastPK: /* @__PURE__ */ new Date(0),
         // 明确初始化 lastPK
-        enable: true,
+        enable: false,
         // 新增默认值
         lastToggle: /* @__PURE__ */ new Date(0)
         // 新增默认值
@@ -4536,7 +4549,7 @@ ${items.join("、")}
         wins: 0,
         todayCount: 0,
         lastPK: /* @__PURE__ */ new Date(0),
-        enable: true,
+        enable: false,
         // 新增默认值
         lastToggle: /* @__PURE__ */ new Date(0)
         // 新增默认值
@@ -4547,17 +4560,28 @@ ${items.join("、")}
         const [dbTarget] = await ctx.database.get("ggcevo_pk", { handle: targetHandle });
         if (dbTarget) Object.assign(targetPK, dbTarget);
       });
-      const [initiatorCareer] = await ctx.database.get("ggcevo_careers", {
-        handle: initiatorHandle
-      });
-      const [targetCareer] = await ctx.database.get("ggcevo_careers", {
-        handle: targetHandle
-      });
-      if (!initiatorPK.enable) {
-        return "您已关闭PK功能，无法发起挑战。";
-      }
-      if (!targetPK.enable) {
-        return "对方已关闭PK功能，无法接受挑战。";
+      if (initiatorCareer.group === "人类联盟" && !initiatorPK.enable) {
+        let joinDate;
+        if (typeof initiatorCareer.date === "string") joinDate = convertUTCtoChinaTime(new Date(initiatorCareer.date));
+        else if (typeof initiatorCareer.date === "number") joinDate = convertUTCtoChinaTime(new Date(initiatorCareer.date));
+        else joinDate = convertUTCtoChinaTime(initiatorCareer.date);
+        if (!isNaN(joinDate.getTime())) {
+          const now2 = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
+          const timeDiff = now2.getTime() - joinDate.getTime();
+          const remainingDays = 30 - Math.floor(timeDiff / (1e3 * 60 * 60 * 24));
+          if (remainingDays > 0) {
+            await session.send(`⚠️ 您的人类联盟保护期剩余 ${remainingDays} 天，发起PK将永久失去保护期！请确认是否继续？
+回复"是"继续PK，或"取消"退出`);
+            const confirm = await session.prompt(3e4);
+            if (confirm !== "是") return "已取消PK操作，保护期仍有效";
+          }
+        }
+        initiatorPK.enable = true;
+        initiatorPK.lastToggle = /* @__PURE__ */ new Date();
+        await ctx.database.set("ggcevo_pk", initiatorHandle, {
+          enable: true,
+          lastToggle: /* @__PURE__ */ new Date()
+        });
       }
       const now = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
       if (!isSameDate(convertUTCtoChinaTime(initiatorPK.lastPK), now)) {
@@ -4607,12 +4631,15 @@ ${items.join("、")}
         hasMP3 = mp3Item && mp3Item.quantity > 0;
       }
       const powerDiff = initiatorPower - targetPower;
-      let winRate = 50 + powerDiff / 50 * 0.1;
+      let winRate = 50 + powerDiff / 100 * 0.1;
       winRate = Math.min(Math.max(winRate, 5), 95);
       const randInt = Math.floor(Math.random() * 1e4);
       const winRateInt = Math.floor(winRate * 100);
       const isWin = randInt < winRateInt;
       let stealPercentage = getRandomInt(1, 5);
+      if (targetCareer.group === "人类联盟" && isWin) {
+        stealPercentage = 1;
+      }
       let goldTransfer = Math.floor(
         (isWin ? targetGold : initiatorGold) * stealPercentage / 100
       );
@@ -4636,11 +4663,7 @@ ${items.join("、")}
             total: initiatorPK.total + 1,
             wins: isWin ? initiatorPK.wins + 1 : initiatorPK.wins,
             todayCount: initiatorPK.todayCount + 1,
-            lastPK: /* @__PURE__ */ new Date(),
-            enable: initiatorPK.enable,
-            // 包含新字段
-            lastToggle: initiatorPK.lastToggle
-            // 包含新字段
+            lastPK: /* @__PURE__ */ new Date()
           },
           // 应战者记录（新增部分）
           {
@@ -4651,12 +4674,8 @@ ${items.join("、")}
             // 应战者胜利时增加
             todayCount: targetPK.todayCount,
             // 不消耗应战者次数
-            lastPK: targetPK.lastPK,
+            lastPK: targetPK.lastPK
             // 保留原有时间不更新
-            enable: targetPK.enable,
-            // 包含新字段
-            lastToggle: targetPK.lastToggle
-            // 包含新字段
           }
         ]);
         await ctx.database.create("ggcevo_pk_logs", {
@@ -4699,7 +4718,7 @@ ${items.join("、")}
         }
       });
       const result = [
-        `⚔️【对战结果】${isWin ? "胜利" : "失败"}${mp3Effect ? " (MP3减免)" : ""}`,
+        `⚔️【对战结果】${isWin ? "胜利" : "失败"}`,
         `🏅 挑战者：${initiatorRankname}(战斗力 ${initiatorPower})`,
         `  👨‍💼 职业：${initiatorCareer?.career || "无"}`,
         // 显示职业
@@ -4709,6 +4728,9 @@ ${items.join("、")}
         `📊 胜率预测：${winRate.toFixed(1)}%`,
         `🎰 金币变动：${stealPercentage}%`
       ];
+      if (targetCareer.group === "人类联盟" && isWin) {
+        result.push(`🛡️ 人类联盟保护：应战者失败仅损失1%金币`);
+      }
       if (computerExpertProtection) {
         result.push(`💻 计算机专家职业加成：被动PK失败不损失金币`);
       } else if (isWin) {
@@ -4739,10 +4761,10 @@ ${items.join("、")}
     if (pageNum < 1) return "请输入有效的页码。";
     const offset = (pageNum - 1) * 10;
     const [records, total] = await Promise.all([
-      // 获取当前页记录（仅显示启用PK功能的用户）
-      ctx.database.select("ggcevo_pk").where({ enable: true }).orderBy("wins", "desc").limit(10).offset(offset).execute(),
+      // 获取当前页记录
+      ctx.database.select("ggcevo_pk").orderBy("wins", "desc").limit(10).offset(offset).execute(),
       // 获取总记录数（启用PK的用户总数）
-      ctx.database.select("ggcevo_pk").where({ enable: true }).execute((row) => import_koishi.$.count(row.handle))
+      ctx.database.select("ggcevo_pk").execute((row) => import_koishi.$.count(row.handle))
     ]);
     const totalPages = Math.ceil(total / 10);
     if (pageNum > totalPages) return `查询失败，最多有 ${totalPages} 页`;
@@ -4757,7 +4779,7 @@ ${items.join("、")}
       ].join(" | ");
     }).join("\n");
     return [
-      "🏆 PK排行榜(已启用PK功能的玩家)",
+      "🏆 PK排行榜 🏆",
       "──────────────",
       rankingText,
       "──────────────",
@@ -4765,54 +4787,6 @@ ${items.join("、")}
       pageNum < totalPages ? `输入 pk榜 ${pageNum + 1} 查看下一页` : "已是最后一页"
     ].join("\n");
   });
-  ctx.command("ggcevo/切换pk", "切换玩家对战状态").alias("切换pk状态").action(async ({ session }) => {
-    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
-    const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
-    const [pkRecord] = await ctx.database.get("ggcevo_pk", { handle }) || [null];
-    const currentState = pkRecord?.enable ?? true;
-    const lastToggle = pkRecord?.lastToggle ?? /* @__PURE__ */ new Date(0);
-    if (!pkRecord) {
-      await ctx.database.create("ggcevo_pk", {
-        handle,
-        total: 0,
-        wins: 0,
-        todayCount: 0,
-        lastPK: /* @__PURE__ */ new Date(0),
-        enable: true,
-        // 默认初始状态为开启
-        lastToggle: /* @__PURE__ */ new Date(0)
-      });
-    }
-    const now = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
-    const lastToggleTime = convertUTCtoChinaTime(lastToggle);
-    const diffDays = Math.floor((now.getTime() - lastToggleTime.getTime()) / (1e3 * 3600 * 24));
-    const [careers] = await ctx.database.get("ggcevo_careers", { handle });
-    if (careers?.group === "辛迪加海盗") return "您已经加入了辛迪加海盗阵营，无法切换PK状态！";
-    if (diffDays < 3 && lastToggleTime.getTime() !== 0) {
-      const remaining = 3 - diffDays;
-      return `状态切换冷却中，${remaining}天后再试(下次可切换时间：${new Date(lastToggle.getTime() + 3 * 864e5).toLocaleDateString("zh-CN")})。`;
-    }
-    const action = currentState ? "关闭" : "开启";
-    await session.send(`您当前的PK状态为【${currentState ? "开启" : "关闭"}】，确认要${action}吗？(请在30秒内回复“是”确认)`);
-    const confirm = await session.prompt(3e4);
-    if (confirm !== "是") return "已取消操作。";
-    await ctx.database.upsert("ggcevo_pk", [{
-      handle,
-      enable: !currentState,
-      lastToggle: /* @__PURE__ */ new Date(),
-      // 保持其他字段不变
-      total: pkRecord?.total || 0,
-      wins: pkRecord?.wins || 0,
-      todayCount: pkRecord?.todayCount || 0,
-      lastPK: pkRecord?.lastPK || /* @__PURE__ */ new Date(0)
-    }], ["handle"]);
-    return `PK状态已${!currentState ? "开启" : "关闭"}，下次可切换时间：${new Date(Date.now() + 3 * 864e5).toLocaleDateString("zh-CN", {
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit"
-    })}`;
-  });
   ctx.command("ggcevo/武器库 [type]").usage("输入“武器库”查看类型，或“武器库 类型”查看详细武器信息").action(async ({ session }, type) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "⚠️ 需要先绑定游戏句柄";
@@ -5153,11 +5127,19 @@ ${validTypes.join("、")}`;
     const processModInstallation = /* @__PURE__ */ __name(async () => {
       const modInfo = modConfig[mod];
       if (!modInfo) return "无效模块名称。";
+      if (!weapon || !weaponConfig[weapon]?.id) {
+        const validWeapons = Object.keys(weaponConfig).filter((k) => weaponConfig[k].id);
+        return `❌ 无效武器名称。可选武器：${validWeapons.join("、")}`;
+      }
+      const weaponId = weaponConfig[weapon].id;
       const [equipment] = await ctx.database.get("ggcevo_equipment", {
         handle,
-        weaponId: weaponConfig[weapon].id
+        weaponId
+        // 使用已验证的weaponId
       });
-      if (!equipment) return "您尚未获得该武器。";
+      if (!equipment) {
+        return `❌ 尚未获得【${weapon}】或武器名称错误`;
+      }
       if (modInfo.isExclusive) {
         if (modInfo.exclusiveTo !== weapon) return `❌ 该模块只能安装在${modInfo.exclusiveTo}上。`;
         const hasExclusive = equipment.installedMods.some((m) => modConfig[m]?.isExclusive);
@@ -5971,9 +5953,9 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
     try {
       if (faction === "人类联盟") {
         if (userCoins < 1e3) {
-          return `加入人类联盟需要1000金币，你当前拥有${userCoins}金币`;
+          return `加入人类联盟需要1000金币，您当前拥有${userCoins}金币`;
         }
-        await session.send(`请问你确定要缴纳1000金币加入人类联盟吗？(请在30秒内输入“是”确定加入)`);
+        await session.send(`请问您确定要缴纳1000金币加入人类联盟吗？(请在30秒内输入“是”确定加入)`);
         const cost = await session.prompt(3e4);
         if (cost !== "是") return "已取消加入。";
         await ctx.database.upsert("ggcevo_sign", [{
@@ -5990,12 +5972,9 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
       } else if (faction === "辛迪加海盗") {
         const [pkData] = await ctx.database.get("ggcevo_pk", { handle });
         if (userCoins < 2e3) {
-          return `加入辛迪加海盗需要缴纳2000金币并且永久开启PK功能，你当前拥有${userCoins}金币`;
-        }
-        if (pkData && !pkData?.enable) {
-          return "当前PK功能未开启，无法加入辛迪加海盗。";
+          return `加入辛迪加海盗需要缴纳2000金币，您当前拥有${userCoins}金币`;
         }
-        await session.send(`请问你确定要缴纳2000金币并且永久开启PK功能加入辛迪加海盗吗？(请在30秒内输入“是”确定加入)`);
+        await session.send(`请问您确定要缴纳2000金币加入辛迪加海盗吗？(请在30秒内输入“是”确定加入)`);
         const cost = await session.prompt(3e4);
         if (cost !== "是") return "已取消加入。";
         await ctx.database.upsert("ggcevo_sign", [{
@@ -6089,8 +6068,7 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
       }
       await ctx.database.upsert("ggcevo_careers", [{
         handle,
-        career: profession,
-        date: /* @__PURE__ */ new Date()
+        career: profession
       }], ["handle"]);
       return `${careerData.group === "辛迪加海盗" ? `花费${targetProfession.costredcrystal}红晶` : `花费${targetProfession.costcoins}金币`}转职成功！当前职业：${profession}`;
     } catch (err) {
@@ -6110,14 +6088,17 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
       const config2 = careerData.group === "辛迪加海盗" ? syndicatePirateConfig : spaceStationCrewConfig;
       const profession = config2.find((p) => p.professionName === careerData.career);
       const effectDisplay = profession?.effect || "暂无特殊效果";
-      const joinDate = new Date(careerData.date);
+      const joinDate = convertUTCtoChinaTime(new Date(careerData.date));
       const formattedDate = `${joinDate.getFullYear()}年${joinDate.getMonth() + 1}月${joinDate.getDate()}日`;
+      const powerValue = await calculateTotalPower(handle);
       const infoCard = [
         `🎮 游戏句柄：${handle}`,
+        `⚔️ 当前战力：${powerValue}`,
+        // 新增战力显示行
         `🎯 当前阵营：${careerData.group}`,
         `👔 当前职业：${careerData.career}`,
         `✨ 职业效果：${effectDisplay}`,
-        `🗓️ 就职时间：${formattedDate}`
+        `🗓️ 加入时间：${formattedDate}`
       ];
       if (careerData.group === "人类联盟") {
         const techEntries = await ctx.database.get("ggcevo_tech", { handle });

package/package.json

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