koishi-plugin-ggcevo-game 1.5.29 → 1.5.31

package/lib/database.d.ts

@@ -211,7 +211,6 @@ export interface PKProtection {
 export interface spaceship {
     handle: string;
     id: number;
-    status: string;
     createTime: Date;
 }
 export interface explore {

package/lib/index.js

@@ -7251,7 +7251,6 @@ function apply(ctx, config) {
   ctx.model.extend("ggcevo_spaceship", {
     handle: "string",
     id: "unsigned",
-    status: "string",
     createTime: "timestamp"
   }, {
     primary: "handle"
@@ -10960,23 +10959,23 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     }
     let halfHours = Math.floor(duration / 30);
     let base = halfHours * 4;
-    const maxHalfHours = career.group === "人类联盟" && techLevel === 5 ? 96 : 48;
+    const maxHalfHours = career?.group === "人类联盟" && techLevel === 5 ? 96 : 48;
     halfHours = Math.min(halfHours, maxHalfHours);
     base = Math.min(base, maxHalfHours * 4);
     let techBonusRate = 0;
     let careerBonusRate = 0;
     let shipBonusRate = 0;
     let minerBonusRate = 0;
-    if (career.group === "人类联盟") {
+    if (career?.group === "人类联盟") {
       const baseTechRates = [0, 0.1, 0.2, 0.3, 0.4, 0.5];
       techBonusRate = baseTechRates[Math.min(techLevel, 5)];
       const techCareers = ["深空矿工", "情报副官"];
-      if (techCareers.includes(career.career)) {
+      if (techCareers.includes(career?.career)) {
         const careerBonusRates = [0, 0.1, 0.2, 0.3, 0.4, 0.5];
         careerBonusRate = careerBonusRates[Math.min(techLevel, 5)];
       }
     }
-    if (career.career === "深空矿工") {
+    if (career?.career === "深空矿工") {
       minerBonusRate = 0.5;
     }
     let shipName = "";
@@ -11049,7 +11048,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       if (hasMinerBonus) {
         reportLines.push(`▸ ⛏️ 深空矿工专业加成：+${(minerBonusRate * 100).toFixed(0)}%金币`);
       }
-      if (techLevel === 5 && career.group === "人类联盟") {
+      if (techLevel === 5 && career?.group === "人类联盟") {
         reportLines.push(`▸ ⏱️ 单次挖矿时间上限增加至48小时`);
       }
     }
@@ -11141,7 +11140,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       const baseTotal = taskConfig.price * completableTimes;
       let baseBonus = 0;
       if (techLevel > 0) {
-        baseBonus = careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData?.career) ? [0, 20, 40, 60, 50, 100][techLevel] : [0, 10, 20, 30, 40, 50][techLevel];
+        baseBonus = careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData?.career) ? [0, 20, 40, 60, 80, 100][techLevel] : [0, 10, 20, 30, 40, 50][techLevel];
       }
       const captainBonus = careerData?.group === "人类联盟" && careerData.career === "舰长" ? 50 : 0;
       const totalBonus = baseBonus + captainBonus;
@@ -11420,10 +11419,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       return "⛔ 您已被列入黑名单。";
     }
     const [career] = await ctx.database.get("ggcevo_careers", { handle });
-    const allowedGroups = ["人类联盟", "辛迪加海盗"];
-    if (!allowedGroups.includes(career.group)) {
-    }
-    const careerName = career.career;
+    const careerName = career?.career;
     const careerCoinBonus = careerName === "总工程师" ? 50 : 0;
     const [shipRecord] = await ctx.database.get("ggcevo_spaceship", { handle });
     let shipBonus = 0;
@@ -11458,7 +11454,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     const techLevel = techReactor?.level || 0;
     let techBonusRate = 0;
     let careerBonusRate = 0;
-    if (career.group === "人类联盟" && techLevel > 0) {
+    if (career?.group === "人类联盟" && techLevel > 0) {
       const baseRates = [0, 0.1, 0.2, 0.3, 0.4, 0.5];
       techBonusRate = baseRates[techLevel];
       const specialCareers = ["总工程师", "情报副官"];
@@ -11481,8 +11477,8 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         const returnsIncrement = (record.returns || 0) + 1;
         const galaxyData2 = galaxy[record.galaxy];
         let successRate = galaxyData2.success;
-        if (career.group === "人类联盟" && record.galaxy === "联盟星系") successRate += 0.1;
-        else if (career.group === "辛迪加海盗" && record.galaxy === "辛迪加星系") successRate += 0.1;
+        if (career?.group === "人类联盟" && record.galaxy === "联盟星系") successRate += 0.1;
+        else if (career?.group === "辛迪加海盗" && record.galaxy === "辛迪加星系") successRate += 0.1;
         if (stealthShipEffectAdded) successRate += 0.2;
         successRate = Math.min(successRate, 1);
         let baseCoinReward = Math.floor(Math.random() * 51) + 50;
@@ -11579,53 +11575,53 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     const actualPlunderRate = basePlunderRate + plunderRateBonus / 100;
     const canPlunder = Math.random() < actualPlunderRate;
     if (canPlunder) {
-      let otherPlayers = await ctx.database.get("ggcevo_explore", {
+      const explorers = await ctx.database.get("ggcevo_explore", {
         galaxy: galaxyName,
         status: "探索中",
-        handle: { $ne: handle },
-        plunderbonus: { $gte: 0 }
+        handle: { $ne: handle }
       });
-      if (otherPlayers.length > 0) {
-        const nonStealthPlayers = [];
-        for (const player of otherPlayers) {
-          const [playerShip] = await ctx.database.get("ggcevo_spaceship", { handle: player.handle });
-          if (!playerShip || playerShip.id !== 2) {
-            nonStealthPlayers.push(player);
-          }
-        }
-        otherPlayers = nonStealthPlayers;
-      }
-      if (otherPlayers.length > 0) {
-        const target = otherPlayers[Math.floor(Math.random() * otherPlayers.length)];
-        await session.send(`❗ 您在探索过程中发现了【${target.name}】的飞船，是否掠夺？（30秒内输入"是"来进行掠夺）`);
-        const response = await session.prompt(3e4);
-        if (response === "是") {
-          let baseSuccessRate = 0.5;
-          if (isBehemoth) baseSuccessRate += 0.3;
-          if (shipRecord?.id === 3) baseSuccessRate += 0.1;
-          const success = Math.random() < baseSuccessRate;
-          let playerBonus, targetBonus;
-          if (success) {
-            playerBonus = 20;
-            targetBonus = -20;
-          } else {
-            playerBonus = -20;
-            targetBonus = 20;
+      if (explorers.length > 0) {
+        const shipHandles = explorers.map((e) => e.handle);
+        const ships = await ctx.database.get("ggcevo_spaceship", {
+          handle: { $in: shipHandles }
+        });
+        const shipMap = new Map(ships.map((ship) => [ship.handle, ship.id]));
+        const plunderTargets = explorers.filter((explorer) => {
+          const shipId = shipMap.get(explorer.handle);
+          return shipId !== 2;
+        });
+        if (plunderTargets.length > 0) {
+          const target = plunderTargets[Math.floor(Math.random() * plunderTargets.length)];
+          await session.send(`❗ 您在探索过程中发现了【${target.name}】的飞船，是否掠夺？（30秒内输入"是"来进行掠夺）`);
+          const response = await session.prompt(3e4);
+          if (response === "是") {
+            let baseSuccessRate = 0.5;
+            if (isBehemoth) baseSuccessRate += 0.3;
+            if (shipRecord?.id === 3) baseSuccessRate += 0.1;
+            const success = Math.random() < baseSuccessRate;
+            let playerBonus, targetBonus;
+            if (success) {
+              playerBonus = 20;
+              targetBonus = -20;
+            } else {
+              playerBonus = -20;
+              targetBonus = 20;
+            }
+            await ctx.database.upsert("ggcevo_explore", [{
+              handle,
+              name: name2,
+              startTime: /* @__PURE__ */ new Date(),
+              galaxy: galaxyName,
+              returns: record?.returns || 0,
+              plunderbonus: playerBonus,
+              status: "探索中"
+            }], ["handle"]);
+            const [targetRecord] = await ctx.database.get("ggcevo_explore", { handle: target.handle });
+            await ctx.database.set("ggcevo_explore", { handle: target.handle }, {
+              plunderbonus: (targetRecord.plunderbonus || 0) + targetBonus
+            });
+            return success ? `✅ 掠夺成功！您获得${playerBonus}%金币加成，${target.name}的金币收益被降低了20%。` : `❌ 掠夺失败！您的金币收益被降低20%，${target.name}获得了20%的金币收益加成。`;
           }
-          await ctx.database.upsert("ggcevo_explore", [{
-            handle,
-            name: name2,
-            startTime: /* @__PURE__ */ new Date(),
-            galaxy: galaxyName,
-            returns: record?.returns || 0,
-            plunderbonus: playerBonus,
-            status: "探索中"
-          }], ["handle"]);
-          const [targetRecord] = await ctx.database.get("ggcevo_explore", { handle: target.handle });
-          await ctx.database.set("ggcevo_explore", { handle: target.handle }, {
-            plunderbonus: (targetRecord.plunderbonus || 0) + targetBonus
-          });
-          return success ? `✅ 掠夺成功！您获得${playerBonus}%金币加成，${target.name}的金币收益被降低了20%。` : `❌ 掠夺失败！您的金币收益被降低20%，${target.name}获得了20%的金币收益加成。`;
         }
       }
     }
@@ -11640,8 +11636,8 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     }], ["handle"]);
     const galaxyData = galaxy[galaxyName];
     let estimatedRate = galaxyData.success;
-    if (career.group === "人类联盟" && galaxyName === "联盟星系") estimatedRate += 0.1;
-    if (career.group === "辛迪加海盗" && galaxyName === "辛迪加星系") estimatedRate += 0.1;
+    if (career?.group === "人类联盟" && galaxyName === "联盟星系") estimatedRate += 0.1;
+    if (career?.group === "辛迪加海盗" && galaxyName === "辛迪加星系") estimatedRate += 0.1;
     if (isStealthShip) estimatedRate += 0.2;
     estimatedRate = Math.min(estimatedRate, 1) * 100;
     return [
@@ -11700,10 +11696,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       `🔭 探索加成：+${ship.explorebonus}%金币`,
       `⛏️ 挖矿加成：+${ship.miningbonus}%金币`,
       `💡 特殊效果：${ship.effect || "无"}`,
-      `🛒 购买价格：${ship.price}金币`,
-      `📅 获得时间：${shipRecord.createTime.toLocaleString("zh-CN", { hour12: false })}`,
-      `🔋 状态：${shipRecord.status}`,
-      `💰 当前金币余额：${coins}`
+      `📅 获得时间：${shipRecord.createTime.toLocaleString("zh-CN", { hour12: false })}`
     ].join("\n");
   });
   ctx.command("ggcevo/购买飞船 [shipName]").action(async ({ session }, shipName) => {
@@ -11756,8 +11749,6 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       await ctx.database.create("ggcevo_spaceship", {
         handle,
         id: ship.id,
-        status: "空闲",
-        // 设置初始状态
         createTime: now
       });
     }
@@ -11807,7 +11798,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     if (career.career === "指挥官") {
       upgradeCost = Math.floor(upgradeCost * 0.5);
       discountNotice = `
-✨ 指挥官职业生效！实际消耗: ${upgradeCost} (原价${upgradeConfig.upgradeCostBase}的50%)`;
+✨ 指挥官职业生效！实际消耗: ${upgradeCost} (原价：${upgradeConfig.upgradeCostBase})`;
     }
     if (career.redcrystal < upgradeCost) {
       return `🚫 红晶不足！升级需要${upgradeCost}红晶，您当前有${career.redcrystal}红晶`;

package/package.json

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