koishi-plugin-ggcevo-game 1.3.48 → 1.3.50

package/lib/index.js

@@ -991,7 +991,7 @@ function apply(ctx, config) {
     },
     {
       professionName: "辛迪加财务经理",
-      effect: "每日签到能额外获得红晶",
+      effect: "每日签到能额外获得红晶; 主动PK对战结果胜利时，额外奖励1红晶",
       requirements: "当月累计签到14天及以上",
       Jobtransfer: true,
       costcoins: 0,
@@ -999,11 +999,11 @@ function apply(ctx, config) {
     },
     {
       professionName: "计算机专家",
-      effect: "黑市订购设备工具类物品享有50%折扣",
+      effect: "黑市订购设备工具类物品享有50%折扣; 被动PK对战结果失败时，不会损失金币",
       requirements: "仓库中拥有一个黑市订购的设备工具类物品",
       Jobtransfer: true,
       costcoins: 0,
-      costredcrystal: 40
+      costredcrystal: 30
     },
     {
       professionName: "指挥官",
@@ -3057,7 +3057,48 @@ ${discountDetails.join("\n▸ ")}`;
   }
   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;
     let total = baseRank;
+    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;
+      }
+    }
     for (const { weaponId, level, installedMods } of weapons) {
       const weapon = weaponConfigById[weaponId];
       if (!weapon) continue;
@@ -4478,6 +4519,12 @@ ${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功能，无法发起挑战。";
       }
@@ -4523,16 +4570,20 @@ ${items.join("、")}
       if (initiatorGold < 100) return "发起者需要至少100金币才能发起挑战。";
       if (targetGold < 100) return "对方金币不足100，无法应战。";
       let hasMP3 = false;
-      const [mp3Item] = await ctx.database.get("ggcevo_warehouse", {
-        handle: initiatorHandle,
-        itemId: 5
-        // MP3播放器的物品ID
-      });
-      hasMP3 = mp3Item && mp3Item.quantity > 0;
+      if (initiatorCareer?.group === "辛迪加海盗") {
+        const [mp3Item] = await ctx.database.get("ggcevo_warehouse", {
+          handle: initiatorHandle,
+          itemId: 5
+          // MP3播放器ID
+        });
+        hasMP3 = mp3Item && mp3Item.quantity > 0;
+      }
       const powerDiff = initiatorPower - targetPower;
       let winRate = 50 + powerDiff / 50 * 0.1;
       winRate = Math.min(Math.max(winRate, 5), 95);
-      const isWin = Math.random() * 100 < winRate;
+      const randInt = Math.floor(Math.random() * 1e4);
+      const winRateInt = Math.floor(winRate * 100);
+      const isWin = randInt < winRateInt;
       let stealPercentage = getRandomInt(1, 5);
       let goldTransfer = Math.floor(
         (isWin ? targetGold : initiatorGold) * stealPercentage / 100
@@ -4543,8 +4594,10 @@ ${items.join("、")}
         mp3Effect = true;
         goldTransfer = reducedGold;
       }
-      if ((isWin ? targetGold : initiatorGold) < goldTransfer) {
-        return `${isWin ? "对方" : "你"}的金币不足以完成交易`;
+      let computerExpertProtection = false;
+      if (isWin && targetCareer?.career === "计算机专家") {
+        computerExpertProtection = true;
+        goldTransfer = 0;
       }
       await ctx.database.withTransaction(async () => {
         await ctx.database.upsert("ggcevo_pk", [
@@ -4583,38 +4636,67 @@ ${items.join("、")}
           target_handle: targetHandle,
           date: /* @__PURE__ */ new Date()
         });
-        if (isWin) {
-          await ctx.database.set("ggcevo_sign", targetHandle, { totalRewards: targetGold - goldTransfer });
-          await ctx.database.set("ggcevo_sign", initiatorHandle, { totalRewards: initiatorGold + goldTransfer });
-        } else {
-          await ctx.database.set("ggcevo_sign", initiatorHandle, { totalRewards: initiatorGold - goldTransfer });
-          await ctx.database.set("ggcevo_sign", targetHandle, { totalRewards: targetGold + goldTransfer });
+        let extraRedCrystal = 0;
+        if (isWin && initiatorCareer?.career === "辛迪加财务经理") {
+          extraRedCrystal = 1;
         }
-        const [initiatorCareer2] = await ctx.database.get("ggcevo_careers", {
-          handle: initiatorHandle
-        });
-        if (initiatorCareer2?.group === "辛迪加海盗") {
+        let redcrystalAdd = 0;
+        if (initiatorCareer?.group === "辛迪加海盗") {
+          redcrystalAdd += 1;
+        }
+        redcrystalAdd += extraRedCrystal;
+        if (redcrystalAdd > 0) {
           await ctx.database.upsert("ggcevo_careers", [{
             handle: initiatorHandle,
-            redcrystal: (initiatorCareer2.redcrystal || 0) + 1
+            redcrystal: (initiatorCareer?.redcrystal || 0) + redcrystalAdd
           }], ["handle"]);
         }
-      });
-      const [initiatorCareer] = await ctx.database.get("ggcevo_careers", {
-        handle: initiatorHandle
+        if (computerExpertProtection) {
+        } else {
+          if (isWin) {
+            await ctx.database.set("ggcevo_sign", targetHandle, {
+              totalRewards: targetGold - goldTransfer
+            });
+            await ctx.database.set("ggcevo_sign", initiatorHandle, {
+              totalRewards: initiatorGold + goldTransfer
+            });
+          } else {
+            await ctx.database.set("ggcevo_sign", initiatorHandle, {
+              totalRewards: initiatorGold - goldTransfer
+            });
+            await ctx.database.set("ggcevo_sign", targetHandle, {
+              totalRewards: targetGold + goldTransfer
+            });
+          }
+        }
       });
       const result = [
         `⚔️【对战结果】${isWin ? "胜利" : "失败"}${mp3Effect ? " (MP3减免)" : ""}`,
         `🏅 挑战者：${initiatorRankname}(战斗力 ${initiatorPower})`,
+        `  👨‍💼 职业：${initiatorCareer?.career || "无"}`,
+        // 显示职业
         `🛡️ 应战者：${targetRankname}(战斗力 ${targetPower})`,
-        `📊  胜率预测：${winRate.toFixed(1)}%`,
+        `  👨‍💼 职业：${targetCareer?.career || "无"}`,
+        // 显示职业
+        `📊 胜率预测：${winRate.toFixed(1)}%`,
         `🎰 金币变动：${stealPercentage}%`
       ];
-      isWin ? result.push(`💰 您从对方的口袋里抢夺了${goldTransfer}枚金币`) : result.push(`💸 您从口袋里拿出了${goldTransfer}枚金币上交给对方`);
+      if (computerExpertProtection) {
+        result.push(`💻 计算机专家职业加成：被动PK失败不损失金币`);
+      } else if (isWin) {
+        result.push(`💰 您从对方的口袋里抢夺了${goldTransfer}枚金币`);
+      } else {
+        result.push(`💸 您从口袋里拿出了${goldTransfer}枚金币上交给对方`);
+      }
       if (mp3Effect) {
-        result.push(`💿 MP3播放器生效：上缴金币减少50%`);
+        result.push(`💿 MP3播放器生效：失败上交的金币减少50%`);
+      }
+      if (initiatorCareer?.group === "辛迪加海盗") {
+        result.push(`🔴 辛迪加海盗阵营加成：获得1枚红晶`);
+      }
+      if (isWin && initiatorCareer?.career === "辛迪加财务经理") {
+        result.push(`💰 辛迪加财务经理职业加成：胜利额外获得1枚红晶`);
       }
-      initiatorCareer?.group === "辛迪加海盗" ? result.push(`🔴 辛迪加海盗阵营加成：获得1枚红晶`) : "";
       result.push(`📅 剩余挑战次数：${config.dailyPKLimit - (initiatorPK.todayCount + 1)}`);
       return result.join("\n");
     } catch (error) {
@@ -4968,7 +5050,7 @@ ${validTypes.join("、")}`;
       ].join("\n");
     }));
     return [
-      `🛡️ ${handle}拥有的武器`,
+      `🛡️ ${handle}的武器仓库`,
       '使用"装备 武器名称"来装备武器',
       "⚡表示当前装备武器",
       "──────────────",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo-game",
   "description": "《星际争霸2》咕咕虫-evolved地图的专属游戏助手插件，集成天梯排行、抽奖系统、签到福利、兑换商城等丰富功能。",
-  "version": "1.3.48",
+  "version": "1.3.50",
   "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.17"
+    "koishi-plugin-sc2arcade-search": "^1.1.18"
   },
   "koishi": {
     "service": {