koishi-plugin-ggcevo-game 1.6.59 → 1.6.61

package/lib/index.js

@@ -1482,7 +1482,7 @@ var bossPool = [
     main: {
       name: "空间站感染虫",
       type: "主宰",
-      maxHP: 15e3,
+      maxHP: 2e4,
       maxShield: 0,
       maxEnergy: 0,
       armor: 5,
@@ -1507,7 +1507,7 @@ var bossPool = [
       {
         name: "空间站哨枪塔",
         type: "子代",
-        maxHP: 2e4,
+        maxHP: 3e4,
         maxShield: 0,
         maxEnergy: 0,
         armor: 6.5,
@@ -1709,7 +1709,7 @@ var bossPool = [
     main: {
       name: "虫群女王",
       type: "主宰",
-      maxHP: 1e4,
+      maxHP: 2e4,
       maxShield: 0,
       maxEnergy: 0,
       armor: 5,
@@ -5515,6 +5515,21 @@ var ggcevoUpdates = [
 - 修改铝热炸弹的机制，现在无法直接击杀异形
 - 削弱了燃烧机制，现在每一层额外造成1点伤害（上限依旧是100点）
     `.trim()
+  },
+  {
+    version: "1.6.60",
+    time: "2025-08-4",
+    content: `
+- 新增兑换资源，1张兑换券可以兑换20张资源兑换券
+    `.trim()
+  },
+  {
+    version: "1.6.61",
+    time: "2025-08-5",
+    content: `
+- 优化探索掠夺机制，现在相同名称的飞船互相掠夺成功率固定为50%
+- 修改TX-12S隐形巡洋舰的机制，现在只有当掠夺金币加成≤0时，探索才不会被掠夺
+    `.trim()
   }
 ];
 function compareVersions(a, b) {
@@ -7322,7 +7337,7 @@ var spaceship = {
     description: "TX-12S是标准星际巡洋舰的改型",
     miningbonus: 10,
     explorebonus: 5,
-    effect: "探索的成功率提高10%；探索时不会被掠夺",
+    effect: "探索的成功率提高10%；当掠夺金币加成≤0时，探索不会被掠夺",
     price: 1500
   },
   "TX-12A突击巡洋舰": {
@@ -12012,6 +12027,15 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       return "🛠️ 系统维护中，请稍后再试";
     }
   });
+  function getSpaceshipNameById(spaceshipId) {
+    for (const [name2, data] of Object.entries(spaceship)) {
+      if (data.id === spaceshipId) {
+        return name2;
+      }
+    }
+    return "未知飞船型号";
+  }
+  __name(getSpaceshipNameById, "getSpaceshipNameById");
   ctx.command("ggcevo/探索 [galaxyName]").action(async ({ session }, galaxyName) => {
     const Curfew = fixedCurfewCheck(session, config);
     if (!Curfew) return "⛔ 宵禁时段 (18:00-24:00) 禁止在群聊中使用咕咕之战指令。\n请添加C.O.R.E为好友使用私聊指令，好友验证信息为【咕咕之战】。";
@@ -12118,10 +12142,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
           bonusEffects.push(`▸ 🌌 ${record.galaxy}：金币+${galaxyBonusPercent.toFixed(0)}%`);
         }
         if (shipBonus || shipSuccessBonus) {
-          let shipType = "";
-          if (shipRecord.id === 2) shipType = "TX-12S隐形巡洋舰";
-          else if (shipRecord.id === 3) shipType = "TX-12A突击巡洋舰";
-          else if (shipRecord.id === 4) shipType = "庞兽号歼星舰";
+          let shipType = shipRecord ? getSpaceshipNameById(shipRecord.id) : "未知飞船";
           if (shipBonus) bonusEffects.push(`▸ 🚀 ${shipType}：金币+${shipBonus}%`);
           if (shipSuccessBonus) bonusEffects.push(`▸ 🛸 ${shipType}：成功率+${Math.round(shipSuccessBonus * 100)}%`);
         }
@@ -12228,7 +12249,6 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         });
         const isRewardModified = finalCoin !== baseCoinReward;
         const coinDisplay = isRewardModified ? `💰 金币 +${finalCoin}（基础值 ${baseCoinReward}）` : `💰 金币 +${finalCoin}`;
-        const availableItemsDisplay = galaxyData2.available.join("、") || "无";
         const resultMessage = [
           isSuccess ? "🎉 探索成功！" : "⚠️ 探索失败！",
           `🌌 星系：${record.galaxy}`,
@@ -12277,8 +12297,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       const explorers = await ctx.database.get("ggcevo_explore", {
         galaxy: galaxyName,
         status: "探索中",
-        handle: { $ne: handle },
-        plunderbonus: { $gte: 0 }
+        handle: { $ne: handle }
       });
       if (explorers.length > 0) {
         const shipHandles = explorers.map((e) => e.handle);
@@ -12288,26 +12307,37 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         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;
+          return !(shipId === 2 && explorer.plunderbonus <= 0);
         });
         if (plunderTargets.length > 0) {
           const target = plunderTargets[Math.floor(Math.random() * plunderTargets.length)];
+          const targetShipId = shipMap.get(target.handle) || 0;
+          const targetShipType = getSpaceshipNameById(targetShipId);
+          const playerShipType = shipRecord ? getSpaceshipNameById(shipRecord.id) : "未知型号";
           let isTargetBehemoth = false;
           let defenseNote = "";
-          const [targetShip] = await ctx.database.get("ggcevo_spaceship", { handle: target.handle });
-          if (targetShip && targetShip.id === 4) {
-            isTargetBehemoth = true;
-          }
-          let baseSuccessRate = 50;
-          if (isBehemoth) baseSuccessRate += 30;
-          if (shipRecord?.id === 3) baseSuccessRate += 10;
-          if (isTargetBehemoth && !isBehemoth) {
+          if (targetShipId === 4) isTargetBehemoth = true;
+          const sameShipType = shipRecord?.id === targetShipId;
+          let baseSuccessRate = sameShipType ? 50 : (
+            // 修改2：相同型号固定50%
+            isBehemoth ? 80 : (
+              // 庞兽号基础成功率
+              shipRecord?.id === 3 ? 60 : (
+                // 突击巡洋舰
+                50
+              )
+            )
+          );
+          if (isTargetBehemoth && !isBehemoth && !sameShipType) {
             baseSuccessRate -= 30;
             defenseNote = "⚠️ 目标飞船为庞兽号歼星舰，掠夺成功率降低30%！";
           }
-          baseSuccessRate = Math.max(0, Math.min(baseSuccessRate, 100));
+          if (sameShipType) {
+            defenseNote = `⚠️ 检测到相同型号飞船「${playerShipType}」，掠夺成功率固定为50%！`;
+          }
           await session.send([
-            `❗ 您在探索过程中发现了【${target.name}】的飞船，是否掠夺？`,
+            `❗ 您在探索过程中发现了【${target.name}】的飞船`,
+            `🚀 对方飞船：${targetShipType}`,
             defenseNote,
             `🎯 掠夺成功率：${baseSuccessRate}%`,
             `⏱️ （30秒内输入"是"来进行掠夺）`
@@ -12315,7 +12345,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
           try {
             const response = await session.prompt(3e4);
             if (response === "是") {
-              let success = Math.random() < baseSuccessRate / 100;
+              const success = Math.random() < baseSuccessRate / 100;
               let playerBonus, targetBonus;
               if (success) {
                 playerBonus = 20;
@@ -12324,13 +12354,15 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
                 playerBonus = -20;
                 targetBonus = 20;
               }
+              const [currentRecord] = await ctx.database.get("ggcevo_explore", { handle });
               await ctx.database.upsert("ggcevo_explore", [{
                 handle,
                 name: name2,
                 startTime: /* @__PURE__ */ new Date(),
                 galaxy: galaxyName,
-                returns: record?.returns || 0,
-                plunderbonus: playerBonus,
+                returns: currentRecord?.returns || 0,
+                plunderbonus: (currentRecord?.plunderbonus || 0) + playerBonus,
+                // 累加加成值
                 status: "探索中"
               }], ["handle"]);
               const [targetRecord] = await ctx.database.get("ggcevo_explore", { handle: target.handle });
@@ -12718,7 +12750,7 @@ ${validBossNames.join("、")}`;
       return "⚠️ 竞猜提交失败，请重试";
     }
   });
-  ctx.command("ggcevo/兑换资源 [name] [amount]").usage('输入"兑换资源"查看可兑换资源列表\n输入"兑换资源 物品名称 [数量]"进行兑换').action(async ({ session }, name2, amount) => {
+  ctx.command("ggcevo/兑换资源 [name] [amount]").alias("兑换").usage('输入"兑换资源"查看可兑换物品列表\n输入"兑换资源 物品名称 [数量]"进行兑换').action(async ({ session }, name2, amount) => {
     const Curfew = fixedCurfewCheck(session, config);
     if (!Curfew) return "⛔ 宵禁时段 (18:00-24:00) 禁止在群聊中使用咕咕之战指令。\n请添加C.O.R.E为好友使用私聊指令，好友验证信息为【咕咕之战】。";
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
@@ -12727,71 +12759,154 @@ ${validBossNames.join("、")}`;
     if ((await ctx.database.get("ggcevo_blacklist", { handle })).length) {
       return "⛔ 您已被列入黑名单。";
     }
-    const resourceItems = {
-      "金币": { valuePerCoupon: 100, currencyField: "totalRewards", table: "ggcevo_sign" },
-      "红晶": { valuePerCoupon: 1, currencyField: "redcrystal", table: "ggcevo_careers" }
+    const exchangeItems = {
+      // === 特殊资源兑换 ===
+      "金币": {
+        type: "resource",
+        costItemId: 8,
+        costAmount: 1,
+        valuePerCoupon: 100,
+        currencyField: "totalRewards",
+        table: "ggcevo_sign",
+        display: "1张资源兑换券 → 100金币"
+      },
+      "红晶": {
+        type: "resource",
+        costItemId: 8,
+        costAmount: 1,
+        valuePerCoupon: 1,
+        currencyField: "redcrystal",
+        table: "ggcevo_careers",
+        display: "1张资源兑换券 → 1红晶",
+        preCheck: /* @__PURE__ */ __name(async () => {
+          const [career] = await ctx.database.get("ggcevo_careers", { handle });
+          if (!career || career.group !== "辛迪加海盗") {
+            return `⚠️ 兑换失败：仅限【辛迪加海盗】组织成员兑换，您当前属于【${career?.group || "无"}】`;
+          }
+          return null;
+        }, "preCheck")
+      },
+      // === 物品兑换 ===
+      "资源兑换券": {
+        type: "item",
+        costItemId: 2,
+        // 消耗：ItemID=2 (兑换券)
+        costAmount: 1,
+        // 每张兑换券消耗数量
+        gainItemId: 8,
+        // 获得：ItemID=8 (资源兑换券)
+        gainAmount: 20,
+        // 获得数量
+        display: "1张兑换券 → 20张资源兑换券"
+      }
+      // 可在此继续添加其他物品兑换...
     };
     if (!name2) {
-      const [coupon] = await ctx.database.get("ggcevo_backpack", {
-        handle,
-        itemId: 8
-      });
+      const [resourceCoupon] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 8 });
+      const [exchangeCoupon] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 2 });
       return [
-        "💰 资源兑换商店 💰",
+        "🛒 资源兑换商店 🛒",
         '使用 "兑换资源 物品名称 数量" 进行兑换',
-        `您当前持有: ${coupon?.quantity || 0}张资源兑换券`,
         "====================",
-        ...Object.entries(resourceItems).map(([itemName, config2]) => `▸ ${itemName}：1张券兑换${config2.valuePerCoupon}${itemName === "金币" ? "金币" : "红晶"}`),
+        `🪙 资源兑换券: ${resourceCoupon?.quantity || 0}张`,
+        `🎟️ 兑换券: ${exchangeCoupon?.quantity || 0}张`,
+        "====================",
+        ...Object.entries(exchangeItems).map(([itemName, config2]) => {
+          return `▸ ${itemName}: ${config2.display}`;
+        }),
         "====================",
-        '输入示例："兑换资源 金币 5"（兑换500金币）'
+        "输入示例：",
+        '"兑换资源 金币 5" → 兑换500金币（消耗5张资源券）',
+        '"兑换资源 资源兑换券 2" → 兑换40张资源券（消耗2张兑换券）'
       ].join("\n");
     }
-    const itemconfig = resourceItems[name2];
-    if (!itemconfig) return `⚠️ 无效物品名称，可用选项：${Object.keys(resourceItems).join("、")}`;
-    if (name2 === "红晶") {
-      const [career] = await ctx.database.get("ggcevo_careers", { handle });
-      if (!career || career.group !== "辛迪加海盗") {
-        return `⚠️ 兑换红晶失败：仅限【辛迪加海盗】组织成员兑换，您当前属于【${career?.group || "无"}】`;
-      }
-    }
-    const exchangeAmount = parseInt(amount) || 1;
-    if (exchangeAmount <= 0 || exchangeAmount > 100) return "⚠️ 兑换数量需在1-100之间";
-    const [couponItem] = await ctx.database.get("ggcevo_backpack", {
-      handle,
-      itemId: 8
-    });
-    const couponCount = couponItem?.quantity || 0;
-    if (couponCount < exchangeAmount) {
-      return `⚠️ 兑换券不足，需要${exchangeAmount}张，当前持有：${couponCount}张`;
-    }
-    const gainAmount = itemconfig.valuePerCoupon * exchangeAmount;
+    const itemConfig2 = exchangeItems[name2];
+    if (!itemConfig2) return `⚠️ 无效物品名称，可用选项：${Object.keys(exchangeItems).join("、")}`;
+    let exchangeCount = parseInt(amount) || 1;
+    if (exchangeCount <= 0) return "⚠️ 兑换数量必须大于0";
+    if (exchangeCount > 100) return "⚠️ 单次最多兑换100次";
     try {
-      await ctx.database.withTransaction(async () => {
-        await ctx.database.set(
-          "ggcevo_backpack",
-          { handle, itemId: 8 },
-          { quantity: couponCount - exchangeAmount }
-        );
-        const [record] = await ctx.database.get(itemconfig.table, { handle });
-        if (record) {
+      if (itemConfig2.type === "resource") {
+        if (itemConfig2.preCheck) {
+          const checkResult = await itemConfig2.preCheck();
+          if (checkResult) return checkResult;
+        }
+        const [costItem] = await ctx.database.get("ggcevo_backpack", {
+          handle,
+          itemId: itemConfig2.costItemId
+        });
+        const requiredCoupons = exchangeCount * itemConfig2.costAmount;
+        const heldCoupons = costItem?.quantity || 0;
+        if (heldCoupons < requiredCoupons) {
+          return `⚠️ ${name2}不足，需要${requiredCoupons}张资源兑换券，当前持有：${heldCoupons}张`;
+        }
+        const gainAmount = itemConfig2.valuePerCoupon * exchangeCount;
+        await ctx.database.withTransaction(async () => {
           await ctx.database.set(
-            itemconfig.table,
-            { handle },
-            { [itemconfig.currencyField]: record[itemconfig.currencyField] + gainAmount }
+            "ggcevo_backpack",
+            { handle, itemId: itemConfig2.costItemId },
+            { quantity: heldCoupons - requiredCoupons }
           );
-        } else {
-          await ctx.database.create(itemconfig.table, {
+          const [record] = await ctx.database.get(itemConfig2.table, { handle });
+          if (record) {
+            await ctx.database.set(
+              itemConfig2.table,
+              { handle },
+              { [itemConfig2.currencyField]: record[itemConfig2.currencyField] + gainAmount }
+            );
+          } else {
+            await ctx.database.create(itemConfig2.table, {
+              handle,
+              userId: session.userId,
+              [itemConfig2.currencyField]: gainAmount,
+              ...itemConfig2.table === "ggcevo_sign" ? { lastSign: /* @__PURE__ */ new Date() } : {}
+            });
+          }
+        });
+        return `🎉 兑换成功！使用${requiredCoupons}张资源券兑换了${gainAmount}${name2}`;
+      } else if (itemConfig2.type === "item") {
+        const [costItem] = await ctx.database.get("ggcevo_backpack", {
+          handle,
+          itemId: itemConfig2.costItemId
+        });
+        const requiredQuantity = exchangeCount * itemConfig2.costAmount;
+        const heldQuantity = costItem?.quantity || 0;
+        if (heldQuantity < requiredQuantity) {
+          const requiredName = itemConfig2.costItemId === 2 ? "兑换券" : "物品";
+          return `⚠️ ${name2}不足，需要${requiredQuantity}张${requiredName}，当前持有：${heldQuantity}张`;
+        }
+        const gainQuantity = exchangeCount * itemConfig2.gainAmount;
+        await ctx.database.withTransaction(async () => {
+          await ctx.database.set(
+            "ggcevo_backpack",
+            { handle, itemId: itemConfig2.costItemId },
+            { quantity: heldQuantity - requiredQuantity }
+          );
+          const [targetItem] = await ctx.database.get("ggcevo_backpack", {
             handle,
-            userId: session.userId,
-            [itemconfig.currencyField]: gainAmount,
-            ...itemconfig.table === "ggcevo_sign" ? { lastSign: /* @__PURE__ */ new Date() } : {}
+            itemId: itemConfig2.gainItemId
           });
-        }
-      });
-      return `🎉 兑换成功！使用${exchangeAmount}张资源券兑换了${gainAmount}${name2 === "金币" ? "金币" : "红晶"}`;
+          if (targetItem) {
+            await ctx.database.set(
+              "ggcevo_backpack",
+              { handle, itemId: itemConfig2.gainItemId },
+              { quantity: targetItem.quantity + gainQuantity }
+            );
+          } else {
+            await ctx.database.create("ggcevo_backpack", {
+              handle,
+              itemId: itemConfig2.gainItemId,
+              quantity: gainQuantity
+            });
+          }
+        });
+        const costName = itemConfig2.costItemId === 2 ? "兑换券" : "物品";
+        return `🔄 兑换成功！使用${requiredQuantity}张${costName}兑换了${gainQuantity}张${name2}`;
+      }
+      return "⚠️ 未知的兑换类型";
     } catch (error) {
-      console.error("资源兑换失败:", error);
-      return "⚠️ 兑换失败，请稍后再试";
+      console.error("兑换失败:", error);
+      return "⚠️ 兑换过程中出错，请稍后再试";
     }
   });
   ctx.command("ggcevo/签到奖励").action(({}) => {

package/package.json

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