koishi-plugin-ggcevo-game 1.4.77 → 1.4.79

package/lib/index.js

@@ -715,7 +715,7 @@ var syndicatePirateConfig = [
     effect: "武器等级上限为7级; 升级武器享有10%的折扣; 购买M4AE脉冲步枪(传奇)享有50%的折扣",
     requirements: "至少拥有一把6级及以上等级的武器",
     Jobtransfer: true,
-    costredcrystal: 35
+    costredcrystal: 40
   },
   {
     professionName: "猩红杀手",
@@ -740,31 +740,31 @@ var syndicatePirateConfig = [
   },
   {
     professionName: "计算机专家",
-    effect: "黑市订购设备工具类物品享有50%折扣; 被动应战的PK对战结果为失败时，不会损失金币",
+    effect: "黑市订购设备工具类享有50%折扣; 被动应战的PK对战结果为失败时，不会损失金币；购买DG-3电弧步枪（传奇）享有50%的折扣",
     requirements: "仓库中至少拥有一个黑市订购的设备工具类物品",
     Jobtransfer: true,
     costredcrystal: 30
   },
   {
     professionName: "指挥官",
-    effect: "可以使用红晶升级独特的辛迪加空间站科技",
+    effect: "可以使用红晶升级独特的辛迪加空间站科技；购买光剑（传奇）享有50%的折扣",
     requirements: "",
     Jobtransfer: false,
     costredcrystal: 10
   },
   {
     professionName: "装甲兵",
-    effect: "",
-    requirements: "",
-    Jobtransfer: false,
-    costredcrystal: 10
+    effect: "所有武器额外拥有一个改装槽；武器改装任意模块享有10%的折扣；购买外星电浆（传奇）享有50%的折扣",
+    requirements: "至少拥有一把改装3个模块的武器",
+    Jobtransfer: true,
+    costredcrystal: 40
   },
   {
     professionName: "破坏者",
-    effect: "黑市订购爆破物类物品享有50%折扣",
+    effect: "黑市订购爆破物类享有50%折扣；购买核聚变重炮（传奇）享有50%的折扣",
     requirements: "仓库中至少拥有一个黑市订购的爆破物类物品",
     Jobtransfer: true,
-    costredcrystal: 25
+    costredcrystal: 30
   },
   {
     professionName: "征募官",
@@ -888,6 +888,18 @@ async function checkTransferRequirements(ctx, handle, profession) {
         success: hasExplosive,
         message: hasExplosive ? "" : "需要仓库中拥有一个从黑市订购的爆破物类物品"
       };
+    case "装甲兵": {
+      const userWeapons = await ctx.database.get("ggcevo_weapons", {
+        handle
+      });
+      const hasModifiedWeapon = userWeapons.some(
+        (weapon) => weapon.installedMods && weapon.installedMods.length >= 3
+      );
+      return {
+        success: hasModifiedWeapon,
+        message: hasModifiedWeapon ? "" : "需要至少拥有一把改装了3个模块的武器"
+      };
+    }
     case "清洁工":
       if (!mainBoss) return { success: false, message: "当前暂无伤害榜。" };
       const cleanTop20 = await ctx.database.select("ggcevo_boss_damage").where({ bossGroupId: mainBoss.groupId }).orderBy("totalDamage", "desc").limit(20).execute();
@@ -3041,6 +3053,7 @@ var BattleEffectProcessor = {
     const currentLayers = targetBoss.radiationLayers || 0;
     const armorReduction = currentLayers * 0.05;
     if (currentLayers > 0) {
+      messages.push(`☢️ 【辐射】：当前${currentLayers}层，护甲值减少${armorReduction.toFixed(2)}`);
     }
     let targetUpdates = null;
     if (weaponName === "伽马枪" && // 使用伽马枪
@@ -3049,10 +3062,8 @@ var BattleEffectProcessor = {
       targetUpdates = {
         name: targetBoss.name,
         updates: {
-          radiationLayersChange: 1,
+          radiationLayersChange: 1
           // 辐射层数增加1
-          armorChange: -0.05
-          // 同时削减0.05护甲值（永久生效）
         }
       };
       const newLayers = currentLayers + 1;
@@ -3919,7 +3930,7 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
   if (careerData?.career === "猩红杀手" && weaponName === "侦察步枪") {
     armorDamageReduction = 1;
   }
-  armor = targetBoss.armor;
+  armor = targetBoss.armor - targetBoss.radiationLayers;
   if (targetBoss.name === "测试假人") {
     armor = targetBoss.armor;
   }
@@ -4255,7 +4266,7 @@ var passiveConfig = {
   },
   "治愈虫群": {
     type: "",
-    description: "血量低于30%时，立即回复自身40%点生命值，同时回复所有存活异形10%点生命值（生效后移除）"
+    description: "血量低于30%时，立即回复自身40%点生命值，同时回复所有其他存活异形10%点生命值（生效后移除）"
   },
   "释放信息素": {
     type: "",
@@ -4987,9 +4998,13 @@ function formatTime(date) {
 __name(formatTime, "formatTime");
 var legendaryDiscounts = {
   "MK-4激光步枪": ["能量武器专家"],
+  "M4AE脉冲步枪": ["枪手"],
   "DSR-55反器材步枪": ["猩红杀手"],
   "龙息霰弹枪": ["纵火狂"],
-  "M4AE脉冲步枪": ["枪手"]
+  "DG-3电弧步枪": ["计算机专家"],
+  "光剑": ["指挥官"],
+  "外星电浆": ["装甲兵"],
+  "核聚变重炮": ["破坏者"]
 };
 
 // src/boss/damagecalculation.ts
@@ -5814,6 +5829,7 @@ async function createNestlingBosses(ctx, nestlingNames) {
       tags: foundMinion.tags,
       skills: [...foundMinion.passive],
       energy: foundMinion.maxEnergy,
+      armor: foundMinion.armor,
       groupId,
       isActive: true,
       respawnTime: /* @__PURE__ */ new Date()
@@ -8205,22 +8221,24 @@ ${validTypes.join("、")}`;
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     const techLevel = techData?.level || 0;
     const isCareerMatch = ["武器中士", "情报副官"].includes(careerData?.career);
+    const isArmoredPirate = careerData?.career === "装甲兵" && careerData?.group === "辛迪加海盗";
     const calculateDiscountRate = /* @__PURE__ */ __name((isExclusive) => {
-      if (isExclusive) {
-        if (techLevel >= 2) {
-          const baseDiscount = 5;
-          const careerDiscount = isCareerMatch ? 10 : 0;
-          return Math.max(baseDiscount, careerDiscount);
-        }
-        return 0;
-      } else {
-        if (techLevel >= 1) {
-          const baseDiscount = 5;
-          const careerDiscount = isCareerMatch ? 10 : 0;
-          return Math.max(baseDiscount, careerDiscount);
+      let discount = 0;
+      if (careerData?.group === "人类联盟") {
+        if (isExclusive) {
+          if (techLevel >= 2) {
+            discount = Math.max(5, isCareerMatch ? 10 : 0);
+          }
+        } else {
+          if (techLevel >= 1) {
+            discount = Math.max(5, isCareerMatch ? 10 : 0);
+          }
         }
-        return 0;
       }
+      if (isArmoredPirate) {
+        discount += 10;
+      }
+      return Math.min(discount, 100);
     }, "calculateDiscountRate");
     const processModInstallation = /* @__PURE__ */ __name(async () => {
       const modInfo = modConfig[mod];
@@ -8239,8 +8257,9 @@ ${validTypes.join("、")}`;
         const hasExclusive = equipment.installedMods.some((m) => modConfig[m]?.isExclusive);
         if (hasExclusive) return "❌ 每个武器只能安装一个专属模块。";
       }
-      if (equipment.installedMods.length >= equipment.modificationSlots) {
-        return "❌ 当前可用改装槽已满(武器升级至3/6级会额外获得一个改装槽)。";
+      const actualSlots = equipment.modificationSlots + (isArmoredPirate ? 1 : 0);
+      if (equipment.installedMods.length >= actualSlots) {
+        return `❌ 当前可用改装槽已满(武器升级至3/6级会额外获得一个改装槽${isArmoredPirate ? "，装甲兵职业额外获得一个改装槽" : ""})。`;
       }
       if (equipment.installedMods.includes(mod)) {
         return "❌ 已安装相同模块。";
@@ -8259,11 +8278,25 @@ ${validTypes.join("、")}`;
       await ctx.database.set("ggcevo_sign", { handle }, {
         totalRewards: signInfo.totalRewards - actualCost
       });
+      const discountMessages = [];
+      if (discountRate > 0) {
+        discountMessages.push(`💰 折扣明细：`);
+        if (careerData?.group === "人类联盟") {
+          if (modInfo.isExclusive && techLevel >= 2) {
+            discountMessages.push(`▸ ⚙️ 武器升级平台Lv.${techLevel}：${isCareerMatch ? 10 : 5}%折扣`);
+          } else if (!modInfo.isExclusive && techLevel >= 1) {
+            discountMessages.push(`▸ ⚙️ 武器升级平台Lv.${techLevel}：${isCareerMatch ? 10 : 5}%折扣`);
+          }
+        }
+        if (isArmoredPirate) {
+          discountMessages.push("▸ 🔰 装甲兵职业：10%折扣");
+        }
+      }
       return [
         `✅ ${weapon} 成功安装 ${mod}！`,
         `花费金币：${actualCost}${discountRate > 0 ? ` (原价${modInfo.cost})` : ""}`,
-        discountRate > 0 && `💰 折扣明细：${discountRate}% (⚙️ Lv.${techLevel})`,
-        `改装槽：${equipment.installedMods.length + 1}/${equipment.modificationSlots}`
+        discountMessages.length > 0 && discountMessages.join("\n"),
+        `改装槽：${equipment.installedMods.length + 1}/${actualSlots} ${isArmoredPirate ? "(装甲兵职业额外获得一个改装槽)" : ""}`
       ].filter(Boolean).join("\n");
     }, "processModInstallation");
     const showModList = /* @__PURE__ */ __name(async () => {
@@ -8297,22 +8330,30 @@ ${validTypes.join("、")}`;
             "------------------"
           ].join("\n");
         }).join("\n") : "❌ 该武器没有可用的专属模块";
+        const armorMessage = isArmoredPirate ? "🔰 装甲兵职业：\n▸ 武器改装槽+1" : "";
         return [
           `🛠️ ${weapon} 专属模块 🛠️`,
           "使用「改装 武器名称 模块名称」安装",
           "※ 每个武器只能安装一个专属模块",
-          exclusiveDiscountRate > 0 && `💰 当前专属模块折扣：
-▸ ⚙️ 武器升级平台Lv.${techLevel}：${exclusiveDiscountRate}%折扣`,
+          armorMessage,
+          // 新增装甲兵提示
+          exclusiveDiscountRate > 0 && `💰 当前专属模块折扣：`,
+          exclusiveDiscountRate > 0 && careerData?.group === "人类联盟" && techLevel >= 2 && `▸ ⚙️ 武器升级平台Lv.${techLevel}：${exclusiveDiscountRate}%折扣`,
+          exclusiveDiscountRate > 0 && isArmoredPirate && "▸ 🔰 装甲兵职业：10%折扣",
           "====================",
           exclusiveList
         ].filter(Boolean).join("\n");
       } else {
+        const armorMessage = isArmoredPirate ? "🔰 装甲兵职业：\n▸ 武器改装槽+1" : "";
         return [
           "🛠️ 通用武器模块 🛠️",
           "使用「改装 武器名称 模块名称」安装通用模块",
           "※ 使用「改装 武器名称」查询武器专属模块",
-          universalDiscountRate > 0 && `💰 当前通用模块折扣：
-▸ ⚙️ 武器升级平台Lv.${techLevel}：${universalDiscountRate}%折扣`,
+          armorMessage,
+          // 新增装甲兵提示
+          universalDiscountRate > 0 && `💰 当前通用模块折扣：`,
+          universalDiscountRate > 0 && careerData?.group === "人类联盟" && techLevel >= 1 && `▸ ⚙️ 武器升级平台Lv.${techLevel}：${universalDiscountRate}%折扣`,
+          universalDiscountRate > 0 && isArmoredPirate && "▸ 🔰 装甲兵职业：10%折扣",
           "====================",
           buildModList(false)
         ].filter(Boolean).join("\n");
@@ -9270,21 +9311,6 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
       return "🚫 该功能需要【辛迪加海盗】阵营权限";
     }
     const currentCareer = careerData.career;
-    const discountProfessions = {
-      "计算机专家": ["设备工具"],
-      "破坏者": ["爆破物"]
-    };
-    Object.keys(legendaryDiscounts).forEach((item) => {
-      if (legendaryDiscounts[item].includes(currentCareer)) {
-        const category2 = weaponConfig[item]?.category;
-        if (category2 && !discountProfessions[currentCareer]?.includes(category2)) {
-          discountProfessions[currentCareer] = [
-            ...discountProfessions[currentCareer] || [],
-            category2
-          ];
-        }
-      }
-    });
     const categoryStats = {};
     Object.values(weaponConfig).filter((config2) => config2.redCrystalCost > 0).forEach((weapon) => {
       categoryStats[weapon.category] = (categoryStats[weapon.category] || 0) + 1;
@@ -9294,16 +9320,23 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
     });
     if (!category) {
       const discountLines = [];
-      Object.entries(discountProfessions).forEach(([profession, categories]) => {
-        categories.forEach((cat) => {
-          discountLines.push(`▸ ${profession}：${cat}类50%折扣`);
-        });
+      if (currentCareer === "破坏者") {
+        discountLines.push(`▸ 破坏者职业：爆破物类50%折扣`);
+      }
+      if (currentCareer === "计算机专家") {
+        discountLines.push(`▸ 计算机专家职业：设备工具类50%折扣`);
+      }
+      Object.entries(legendaryDiscounts).forEach(([item, professions]) => {
+        if (professions.includes(currentCareer)) {
+          const category2 = weaponConfig[item]?.category;
+          discountLines.push(`▸ ${currentCareer}职业：${item}（传奇）50%折扣`);
+        }
       });
       return [
         "🏴 辛迪加黑市 🏴",
         '使用 "黑市 分类名称" 查看详细信息',
         discountLines.length ? [
-          "💰 专属折扣职业：",
+          "💰 折扣明细：",
           ...discountLines
         ].join("\n") : "",
         "====================",
@@ -9311,40 +9344,42 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
         "===================="
       ].join("\n");
     }
-    const normalizedCategory = Object.keys(categoryStats).find((c) => c === category);
-    if (!normalizedCategory) return `无效分类，可用：${Object.keys(categoryStats).join("、")}`;
+    if (!Object.keys(categoryStats).includes(category)) {
+      return `无效黑市分类，可用分类：
+${Object.keys(categoryStats).join("、")}`;
+    }
+    const discountDetails = [];
+    if (currentCareer === "破坏者" && category === "爆破物") {
+      discountDetails.push(`▸ 破坏者职业：爆破物类50%折扣`);
+    }
+    if (currentCareer === "计算机专家" && category === "设备工具") {
+      discountDetails.push(`▸ 计算机专家职业：设备工具类50%折扣`);
+    }
+    Object.entries(legendaryDiscounts).forEach(([weapon, professions]) => {
+      if (professions.includes(currentCareer) && weaponConfig[weapon]?.category === category) {
+        discountDetails.push(`▸ ${currentCareer}职业：${weapon}（传奇）50%折扣`);
+      }
+    });
     const items = [
       ...Object.entries(weaponConfig).filter(
-        ([_, config2]) => config2.category === normalizedCategory && config2.redCrystalCost > 0
+        ([_, config2]) => config2.category === category && config2.redCrystalCost > 0
       ).map(([name2, config2]) => {
-        let discountPrice = null;
-        let discountProfession = null;
-        if (legendaryDiscounts[name2]?.includes(currentCareer)) {
-          discountPrice = Math.floor(config2.redCrystalCost * 0.5);
-          discountProfession = currentCareer;
-        }
-        const armorDamageDesc = (() => {
-          if (config2.armorDamageReduction === 0) {
-            return `护甲减伤：0`;
-          } else if (config2.armorDamageReduction > 0) {
-            return `护甲减伤：${config2.armorDamageReduction}（每点护甲扣除${config2.armorDamageReduction}点伤害）`;
-          } else {
-            return `护甲减伤：${config2.armorDamageReduction}（每点护甲增加${Math.abs(config2.armorDamageReduction)}点伤害）`;
-          }
-        })();
+        const isDiscount = legendaryDiscounts[name2]?.includes(currentCareer);
+        const originalPrice = config2.redCrystalCost;
+        const discountPrice = isDiscount ? Math.floor(originalPrice * 0.5) : originalPrice;
+        const armorDamageDesc = config2.armorDamageReduction === 0 ? `护甲减伤：0` : `护甲减伤：${config2.armorDamageReduction}`;
         const infoBlocks = [
           `【${name2}】`,
-          `武器类型：${config2.type}`,
+          `类型：${config2.type}`,
           `基础伤害：${config2.damage}`,
           armorDamageDesc
         ];
-        if (discountPrice) {
+        if (isDiscount) {
           infoBlocks.push(
-            `订购价：${discountPrice}红晶 (原价${config2.redCrystalCost})`,
-            `折扣：${discountProfession}专属50%折扣`
+            `订购价：${discountPrice}红晶 (原价${originalPrice})`
           );
         } else {
-          infoBlocks.push(`订购价：${config2.redCrystalCost}红晶`);
+          infoBlocks.push(`订购价：${discountPrice}红晶`);
         }
         if (config2.specialeffect) {
           infoBlocks.push(`特殊效果：${config2.specialeffect}`);
@@ -9361,30 +9396,22 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
         return infoBlocks.join("\n");
       }),
       ...Object.entries(SyndicatedItems).filter(
-        ([_, item]) => item.type === normalizedCategory && item.redCrystalCost > 0
+        ([_, item]) => item.type === category && item.redCrystalCost > 0
       ).map(([name2, item]) => {
-        let discountPrice = null;
-        let discountReason = null;
-        if (currentCareer === "破坏者" && normalizedCategory === "爆破物") {
-          discountPrice = Math.floor(item.redCrystalCost * 0.5);
-          discountReason = "破坏者";
-        } else if (currentCareer === "计算机专家" && normalizedCategory === "设备工具") {
-          discountPrice = Math.floor(item.redCrystalCost * 0.5);
-          discountReason = "计算机专家";
-        }
+        const isDiscount = currentCareer === "破坏者" && category === "爆破物" || currentCareer === "计算机专家" && category === "设备工具";
+        const originalPrice = item.redCrystalCost;
+        const discountPrice = isDiscount ? Math.floor(originalPrice * 0.5) : originalPrice;
+        const discountReason = isDiscount ? currentCareer : null;
         const infoBlocks = [
           `【${name2}】`,
-          `物品类型：${item.type}`
+          `类型：${item.type}`
         ];
-        if (discountPrice) {
+        if (isDiscount) {
           infoBlocks.push(
-            `订购价：${discountPrice}红晶 (原价${item.redCrystalCost})`,
-            `折扣：${discountReason}专属50%折扣`
+            `订购价：${discountPrice}红晶 (原价${originalPrice})`
           );
         } else {
-          infoBlocks.push(
-            `订购价：${item.redCrystalCost}红晶`
-          );
+          infoBlocks.push(`订购价：${discountPrice}红晶`);
         }
         infoBlocks.push(
           `条件：${item.condition}`,
@@ -9395,32 +9422,14 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
         return infoBlocks.join("\n");
       })
     ];
-    const discountInfo = [];
-    if (normalizedCategory === "传奇武器") {
-      const availableDiscounts = [];
-      Object.entries(legendaryDiscounts).forEach(([weapon, professions]) => {
-        if (professions.includes(currentCareer)) {
-          availableDiscounts.push(`${weapon}(${currentCareer}专属50%折扣)`);
-        }
-      });
-      if (availableDiscounts.length) {
-        discountInfo.push(
-          "💰 传奇武器职业折扣：",
-          `▸ ${availableDiscounts.join("\n▸ ")}`
-        );
-      }
-    } else if (currentCareer === "破坏者" && normalizedCategory === "爆破物" || currentCareer === "计算机专家" && normalizedCategory === "设备工具") {
-      discountInfo.push(
-        "💰 折扣明细：",
-        `▸ ${currentCareer}职业：${normalizedCategory}类50%折扣`
-      );
-    }
     return [
-      `🏴 辛迪加黑市 - ${normalizedCategory} 🏴`,
+      `🏴 辛迪加黑市 - ${category} 🏴`,
       '使用"订购 物品名称"进行购买(仅消耗红晶)',
-      ...discountInfo,
+      discountDetails.length > 0 ? `💰 折扣明细：
+${discountDetails.join("\n")}` : "",
       "====================",
-      ...items
+      ...items,
+      items.length === 0 ? "⚠️ 该分类下暂无可用商品" : ""
     ].filter(Boolean).join("\n");
   });
   ctx.command("ggcevo/订购 <item>").action(async ({ session }, item) => {
@@ -9515,7 +9524,8 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
         return [
           `✅ 成功订购【${item}】！`,
           ...priceInfo,
-          discountApplied ? `💰 折扣明细：${discountReason}` : "",
+          discountApplied ? `💰 折扣明细：
+${discountReason}` : "",
           `装备状态：${equippedStatus}`,
           '输入 "武器仓库" 管理武器'
         ].filter(Boolean).join("\n");

package/lib/utils.d.ts

@@ -25,7 +25,11 @@ export declare function isWithinProtection(protections: PKProtection[]): boolean
 export declare function formatTime(date: Date): string;
 export declare const legendaryDiscounts: {
     'MK-4\u6FC0\u5149\u6B65\u67AA': string[];
+    M4AE脉冲步枪: string[];
     'DSR-55\u53CD\u5668\u6750\u6B65\u67AA': string[];
     龙息霰弹枪: string[];
-    M4AE脉冲步枪: string[];
+    'DG-3\u7535\u5F27\u6B65\u67AA': string[];
+    光剑: string[];
+    外星电浆: string[];
+    核聚变重炮: string[];
 };

package/package.json

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