koishi-plugin-ggcevo-game 1.3.46 → 1.3.48

package/lib/index.js

@@ -500,6 +500,14 @@ function apply(ctx, config) {
       price: 75,
       redCrystalCost: 0,
       effects: "对目标使用后，消耗其500点能量"
+    },
+    "MP3播放器": {
+      id: 5,
+      type: "设备工具",
+      description: "这是一款未来派音乐设备",
+      price: 0,
+      redCrystalCost: 10,
+      effects: "主动PK对战结果失败时上交给对方的金币-50%"
     }
   };
   const modConfig = {
@@ -991,11 +999,11 @@ function apply(ctx, config) {
     },
     {
       professionName: "计算机专家",
-      effect: "每日pk次数翻倍，pk的胜率提高10%",
-      requirements: "",
-      Jobtransfer: false,
-      costcoins: 2e3,
-      costredcrystal: 10
+      effect: "黑市订购设备工具类物品享有50%折扣",
+      requirements: "仓库中拥有一个黑市订购的设备工具类物品",
+      Jobtransfer: true,
+      costcoins: 0,
+      costredcrystal: 40
     },
     {
       professionName: "指挥官",
@@ -2731,6 +2739,17 @@ function apply(ctx, config) {
           success: signData?.monthlyDays >= 14,
           message: `需要当月累计签到14天及以上(当前${signData?.monthlyDays || 0}天)`
         };
+      case "计算机专家": {
+        const warehouseItems = await ctx2.database.get("ggcevo_warehouse", { handle });
+        const blackMarketDeviceTools = Object.values(SyndicatedItems).filter((item) => item.type === "设备工具" && item.redCrystalCost > 0).map((item) => item.id);
+        const hasDeviceTool = warehouseItems.some(
+          (item) => blackMarketDeviceTools.includes(item.itemId) && item.quantity > 0
+        );
+        return {
+          success: hasDeviceTool,
+          message: hasDeviceTool ? "" : "需要仓库中拥有一个从黑市订购的设备工具物品"
+        };
+      }
       default:
         return { success: false, message: "未知职业要求" };
     }
@@ -2803,10 +2822,10 @@ function apply(ctx, config) {
           message: `成功使用 ${itemName}，已重置 ${target} 的技能计数`
         };
       }
-      if (itemConfig2.id === 3) {
+      if (itemConfig2.id === 3 || itemConfig2.id === 5) {
         return {
           success: false,
-          message: `此物品无需使用，存放于仓库即刻生效。`
+          message: `此物品无法使用，存放于仓库即刻生效。`
         };
       }
       if (itemConfig2.id === 4) {
@@ -4503,14 +4522,27 @@ ${items.join("、")}
       const targetGold = targetSign[0]?.totalRewards || 0;
       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;
       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 stealPercentage = getRandomInt(1, 5);
-      const goldTransfer = Math.floor(
+      let stealPercentage = getRandomInt(1, 5);
+      let goldTransfer = Math.floor(
         (isWin ? targetGold : initiatorGold) * stealPercentage / 100
       );
+      let mp3Effect = false;
+      if (!isWin && hasMP3) {
+        const reducedGold = Math.floor(goldTransfer * 0.5);
+        mp3Effect = true;
+        goldTransfer = reducedGold;
+      }
       if ((isWin ? targetGold : initiatorGold) < goldTransfer) {
         return `${isWin ? "对方" : "你"}的金币不足以完成交易`;
       }
@@ -4572,13 +4604,16 @@ ${items.join("、")}
         handle: initiatorHandle
       });
       const result = [
-        `⚔️【对战结果】${isWin ? "胜利" : "失败"}`,
+        `⚔️【对战结果】${isWin ? "胜利" : "失败"}${mp3Effect ? " (MP3减免)" : ""}`,
         `🏅 挑战者：${initiatorRankname}(战斗力 ${initiatorPower})`,
         `🛡️ 应战者：${targetRankname}(战斗力 ${targetPower})`,
         `📊  胜率预测：${winRate.toFixed(1)}%`,
         `🎰 金币变动：${stealPercentage}%`
       ];
       isWin ? result.push(`💰 您从对方的口袋里抢夺了${goldTransfer}枚金币`) : result.push(`💸 您从口袋里拿出了${goldTransfer}枚金币上交给对方`);
+      if (mp3Effect) {
+        result.push(`💿 MP3播放器生效：上缴金币减少50%`);
+      }
       initiatorCareer?.group === "辛迪加海盗" ? result.push(`🔴 辛迪加海盗阵营加成：获得1枚红晶`) : "";
       result.push(`📅 剩余挑战次数：${config.dailyPKLimit - (initiatorPK.todayCount + 1)}`);
       return result.join("\n");
@@ -4727,10 +4762,10 @@ ${Object.keys(typeStats).join("、")}`;
         `类型：${config2.type}`,
         `基础伤害：${config2.damage}`,
         `价格：${actualPrice}金币${totalDiscount > 0 ? ` (原价${config2.price})` : ""}`,
-        "特性：",
-        tagEffectsDesc,
         specialEffect,
         // 新增特殊效果显示
+        "特性：",
+        tagEffectsDesc,
         `描述：${config2.description}`
       ].filter(Boolean).join("\n");
     });
@@ -5559,10 +5594,14 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
     if (bossGroup.main.energy > 0) {
       result.push(`⚡ 能量：${mainBoss.energy}/1000`);
     }
-    result.push(
-      `🏷️ 标签：${mainBoss.tags?.join("、") || "无"}`,
-      `✨ 被动：`
-    );
+    result.push(`🏷️ 标签：${mainBoss.tags?.join("、") || "无"}`);
+    if (mainBoss.Vulnerability > 0) {
+      result.push(`☢️ 辐射：${mainBoss.Vulnerability}层`);
+    }
+    if (mainBoss.freezing > 0) {
+      result.push(`❄️ 寒冷：${mainBoss.freezing}层`);
+    }
+    result.push(`✨ 被动：`);
     if (mainBoss.skills.length > 0) {
       result.push(...mainBoss.skills.map((p) => `➤ ${p}：${passiveConfig[p]?.description}`));
     } else {
@@ -5585,10 +5624,14 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
         if (minionConfig && minionConfig.energy > 0) {
           minionInfo.push(`⚡ 能量：${minion.energy}/1000`);
         }
-        minionInfo.push(
-          `🏷️ 标签：${minion.tags?.join("、") || "无"}`,
-          `✨ 被动：`
-        );
+        minionInfo.push(`🏷️ 标签：${minion.tags?.join("、") || "无"}`);
+        if (minion.Vulnerability > 0) {
+          minionInfo.push(`☢️ 辐射：${minion.Vulnerability}层`);
+        }
+        if (minion.freezing > 0) {
+          minionInfo.push(`❄️ 寒冷：${minion.freezing}层`);
+        }
+        minionInfo.push(`✨ 被动：`);
         if (minion.skills.length > 0) {
           minionInfo.push(...minion.skills.map((p) => `➤ ${p}：${passiveConfig[p]?.description}`));
         } else {
@@ -5996,6 +6039,7 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
     if (!careerData || careerData.group !== "辛迪加海盗") {
       return "🚫 该功能需要【辛迪加海盗】阵营权限";
     }
+    const isComputerExpert = careerData.career === "计算机专家";
     const typeStats = {};
     Object.values(weaponConfig).filter((config2) => config2.redCrystalCost > 0).forEach((weapon) => {
       typeStats[weapon.type] = (typeStats[weapon.type] || 0) + 1;
@@ -6009,7 +6053,9 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
         '使用 "黑市 类型名称" 查看详细信息',
         "====================",
         ...Object.entries(typeStats).map(([typeName, count]) => `▸ ${typeName} (${count}种)`),
-        "===================="
+        "====================",
+        // 添加计算机专家提示
+        isComputerExpert ? "💳 计算机专家可享受设备工具类物品50%折扣！" : ""
       ].join("\n");
     }
     const normalizedType = Object.keys(typeStats).find((t) => t === type);
@@ -6021,10 +6067,11 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
         const infoBlocks = [
           `【${name2}】`,
           `类型：${config2.type}`,
-          ...config2.damage ? [`基础伤害：${config2.damage}`] : [],
           `订购价：${config2.redCrystalCost}红晶`
-          // 只显示红晶价格
         ];
+        if (config2.specialeffect) {
+          infoBlocks.push(`特殊效果：${config2.specialeffect}`);
+        }
         if (Object.keys(config2.tagEffects).length > 0) {
           const tagEffectsDesc = Object.entries(config2.tagEffects).map(([tag, mul]) => `▸ 对${tag}目标造成${(mul * 100).toFixed(0)}%伤害`).join("\n");
           infoBlocks.push("特性：", tagEffectsDesc);
@@ -6038,24 +6085,36 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
       ...Object.entries(SyndicatedItems).filter(
         ([_, item]) => item.type === normalizedType && item.redCrystalCost > 0
       ).map(([name2, item]) => {
+        const finalPrice = isComputerExpert && normalizedType === "设备工具" ? Math.floor(item.redCrystalCost * 0.5) : item.redCrystalCost;
         const infoBlocks = [
           `【${name2}】`,
-          `类型：${item.type}`,
-          `订购价：${item.redCrystalCost}红晶`,
-          // 只显示红晶价格
-          `效果：${item.effects}`,
+          `类型：${item.type}`
+        ];
+        if (isComputerExpert && normalizedType === "设备工具") {
+          infoBlocks.push(
+            `订购价：${finalPrice}红晶 (原价${item.redCrystalCost})`
+          );
+        } else {
+          infoBlocks.push(
+            `订购价：${item.redCrystalCost}红晶`
+          );
+        }
+        infoBlocks.push(
+          `特殊效果：${item.effects}`,
           `描述：${item.description}`,
           "──────────────"
-        ];
+        );
         return infoBlocks.join("\n");
       })
     ];
     return [
       `🏴☠️ 辛迪加黑市 - ${normalizedType} 🏴☠️`,
       "使用“订购 物品名称”进行购买(仅消耗红晶)",
+      // 计算机专家专属提示
+      isComputerExpert && normalizedType === "设备工具" ? "💳 计算机专家可享受50%折扣！" : "",
       "====================",
       ...items
-    ].join("\n\n");
+    ].filter(Boolean).join("\n\n");
   });
   ctx.command("ggcevo/订购 <item>").action(async ({ session }, item) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
@@ -6074,6 +6133,19 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
     if (!isWeapon && !isSyndicatedItem) return "❌ 无效物品名称";
     const itemConfig2 = isWeapon ? weaponConfig[item] : SyndicatedItems[item];
     if (!itemConfig2.redCrystalCost) return "⛔ 该物品不可订购";
+    let isComputerExpertDiscount = false;
+    let originalPrice = itemConfig2.redCrystalCost;
+    let finalCost = originalPrice;
+    let discountApplied = false;
+    if (!isWeapon && itemConfig2.type === "设备工具" && careerData.career === "计算机专家") {
+      finalCost = Math.floor(originalPrice * 0.5);
+      isComputerExpertDiscount = true;
+      discountApplied = true;
+    }
+    if ((careerData.redcrystal || 0) < finalCost) {
+      const discountMessage = isComputerExpertDiscount ? `(原价${originalPrice})` : "";
+      return `❌ 红晶不足！需要：${finalCost}${discountMessage} 当前拥有红晶：${careerData.redcrystal}`;
+    }
     if (isWeapon) {
       const existing = await ctx.database.get("ggcevo_equipment", {
         handle,
@@ -6081,13 +6153,9 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
       });
       if (existing.length) return "您已经拥有该武器。";
     }
-    const requiredRed = itemConfig2.redCrystalCost;
-    if ((careerData.redcrystal || 0) < requiredRed) {
-      return `❌ 红晶不足！需要：${requiredRed} 当前：${careerData.redcrystal}`;
-    }
     await ctx.database.withTransaction(async () => {
       await ctx.database.set("ggcevo_careers", { handle }, {
-        redcrystal: careerData.redcrystal - requiredRed
+        redcrystal: careerData.redcrystal - finalCost
       });
       if (isWeapon) {
         await ctx.database.create("ggcevo_equipment", {
@@ -6118,6 +6186,11 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
         }], ["handle", "itemId"]);
       }
     });
+    let discountInfo = "";
+    if (discountApplied) {
+      discountInfo = `
+💳 计算机专家职业加成：设备工具类物品50%折扣`;
+    }
     if (isWeapon) {
       const equippedStatus = await ctx.database.get("ggcevo_equipment", {
         handle,
@@ -6125,7 +6198,7 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
       }).then((r) => r[0]?.equipped ? "已自动装备武器" : "需手动装备武器");
       return [
         `✅ 成功订购【${item}】！`,
-        `消耗红晶：${requiredRed}`,
+        `消耗红晶：${finalCost}${discountInfo}`,
         `装备状态：${equippedStatus}`,
         '输入 "武器仓库" 管理武器'
       ].join("\n");
@@ -6134,9 +6207,14 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
         handle,
         itemId: itemConfig2.id
       }).then((r) => r[0]?.quantity || 1);
+      let priceInfo = `消耗红晶：${finalCost}`;
+      if (isComputerExpertDiscount) {
+        priceInfo += `(原价${originalPrice})`;
+      }
+      priceInfo += discountInfo;
       return [
         `✅ 成功订购【${item}】x1！`,
-        `消耗红晶：${requiredRed}`,
+        priceInfo,
         `当前库存：${currentStock}件`,
         '输入 "仓库" 查看所有物品'
       ].join("\n");

package/package.json

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