koishi-plugin-maple-warriors 0.0.2 → 0.0.3

package/lib/index.js

@@ -34,13 +34,13 @@ var DEFAULT_PREY_DATA = [
   "野兔 1 3-5 2-4 2-4 1-3 5-50"
 ];
 var Config = import_koishi.Schema.object({
-  preyData: import_koishi.Schema.array(import_koishi.Schema.string()).role("table").default(DEFAULT_PREY_DATA).description("猎物数据，每行格式：猎物名 权重 体质 攻击 韧性 暴击 敏捷（权重是固定数值，属性可以是固定数值或范围，如1-10）"),
+  preyData: import_koishi.Schema.array(import_koishi.Schema.string()).role("table").default(DEFAULT_PREY_DATA).description("猎物数据，每行格式：猎物名 权重 体质 攻击 防御 暴击 敏捷（权重是固定数值，属性可以是固定数值或范围，如1-10）"),
   battleMessageInterval: import_koishi.Schema.number().min(1).max(5).default(2).description("战斗消息发送间隔（秒）")
 });
 function calculateRates(character) {
   const resistance = (character.toughness / (character.toughness + 90)).toFixed(4);
   const critRate = (character.crit / (character.crit + 90)).toFixed(4);
-  const chargeTime = (1 + 280 / (character.agility + 70)).toFixed(2);
+  const chargeTime = (1 + 720 / (character.agility + 80)).toFixed(2);
   const dodgeRate = (0.2 * character.agility / (character.agility + 90)).toFixed(4);
   return { resistance, critRate, chargeTime, dodgeRate };
 }
@@ -233,7 +233,7 @@ function apply(ctx, config) {
 等级: ${character.level}
 体质: ${character.constitution} (HP: ${character.currentHp}/${character.maxHp})
 攻击: ${character.attack}
-韧性: ${character.toughness} (抗性: ${(parseFloat(rates.resistance) * 100).toFixed(2)}%)
+防御: ${character.toughness} (韧性: ${(parseFloat(rates.resistance) * 100).toFixed(2)}%)
 暴击: ${character.crit} (暴击率: ${(parseFloat(rates.critRate) * 100).toFixed(2)}%)
 敏捷: ${character.agility} (蓄力: ${rates.chargeTime}s 闪避率: ${(parseFloat(rates.dodgeRate) * 100).toFixed(2)}%)
 状态: ${character.status}${character.statusEndTime ? " 剩余" + formatRemainingTime(character.statusEndTime) : ""}
@@ -300,7 +300,7 @@ ${itemsText || "空空如也"}`;
   }
   __name(checkCharacterStatus, "checkCharacterStatus");
   ctx.command("猫武士", "猫武士插件 - 帮助菜单");
-  ctx.command("猫武士/修改名字 <name>", "修改角色名字").example("修改名字 火焰猫").example("修改名字 闪电虎").action(async ({ session }, name2) => {
+  ctx.command("猫武士/修改名字 <name>", "修改角色名字").example("修改名字 火星").action(async ({ session }, name2) => {
     if (!name2 || name2.trim().length === 0) {
       return "格式错误！正确格式：修改名字 角色名";
     }
@@ -343,27 +343,26 @@ ${itemsText || "空空如也"}`;
     let character = await getOrCreateCharacter(userId);
     return await formatCharacterInfo(character);
   });
-  ctx.command("猫武士/训练 <attrs>", "训练提升属性").example("训练 体质 体质 攻击").example("训练 体质").example("训练 随机").action(async ({ session }, attrs) => {
+  ctx.command("猫武士/训练 <...args>", "训练提升属性").example("训练 体质 体质 攻击").example("训练 体质").example("训练 随机").action(async ({ session }, ...args) => {
     const userId = session.userId;
     let character = await getOrCreateCharacter(userId);
-    const statusCheck = checkCharacterStatus(character);
-    if (!statusCheck.canAct) {
-      return statusCheck.message;
-    }
     const today = getTodayDateString();
     if (character.lastTrainDate && isSameDay(character.lastTrainDate, today)) {
       return "今天已经训练过了，要注意劳逸结合哦！";
     }
-    if (!attrs) {
+    const statusCheck = checkCharacterStatus(character);
+    if (!statusCheck.canAct) {
+      return statusCheck.message;
+    }
+    if (args.length === 0) {
       return "格式错误！正确格式：训练 属性1 属性2 属性3（可重复，若只指定一项，则其余两项随机提升）或 训练 随机";
     }
-    const attrList = attrs.trim().split(/\s+/);
-    if (attrList.length === 1 && attrList[0] === "随机") {
-      const validAttrs2 = ["体质", "攻击", "韧性", "暴击", "敏捷"];
+    if (args.length === 1 && args[0] === "随机") {
+      const validAttrs2 = ["体质", "攻击", "防御", "暴击", "敏捷"];
       const attrMap2 = {
         "体质": "constitution",
         "攻击": "attack",
-        "韧性": "toughness",
+        "防御": "toughness",
         "暴击": "crit",
         "敏捷": "agility"
       };
@@ -385,30 +384,30 @@ ${itemsText || "空空如也"}`;
       return `训练成功！你好像领悟了什么……
 ${changes2.join(" ")}`;
     }
-    if (attrList.length > 3) {
+    if (args.length > 3) {
       return "只能指定3个属性（可以重复），不要太贪心哦！";
     }
-    const validAttrs = ["体质", "攻击", "韧性", "暴击", "敏捷"];
+    const validAttrs = ["体质", "攻击", "防御", "暴击", "敏捷"];
     const attrMap = {
       "体质": "constitution",
       "攻击": "attack",
-      "韧性": "toughness",
+      "防御": "toughness",
       "暴击": "crit",
       "敏捷": "agility"
     };
-    for (const attr of attrList) {
+    for (const attr of args) {
       if (!validAttrs.includes(attr)) {
         return `属性名错误！有效的属性有：${validAttrs.join("、")}`;
       }
     }
     const updates = {};
     const attributeCounts = {};
-    for (const attr of attrList) {
+    for (const attr of args) {
       const field = attrMap[attr];
       updates[field] = (updates[field] || character[field] || 0) + 1;
       attributeCounts[attr] = (attributeCounts[attr] || 0) + 1;
     }
-    for (let i = 0; i < 3 - attrList.length; i++) {
+    for (let i = 0; i < 3 - args.length; i++) {
       const randomAttr = validAttrs[Math.floor(Math.random() * validAttrs.length)];
       const field = attrMap[randomAttr];
       updates[field] = (updates[field] || character[field] || 0) + 1;
@@ -450,7 +449,7 @@ ${changes.join(" ")}`;
     const crit = parseAttributeRange(selectedPrey.crit);
     const agility = parseAttributeRange(selectedPrey.agility);
     const preyHp = constitution * 5;
-    const chargeTime = parseFloat((1 + 280 / (agility + 70)).toFixed(2));
+    const chargeTime = parseFloat((1 + 720 / (agility + 80)).toFixed(2));
     const prey = {
       name: selectedPrey.name,
       constitution,
@@ -474,7 +473,7 @@ ${changes.join(" ")}`;
     await session.send(`发现猎物: ${prey.name}
 体质: ${prey.constitution} (HP: ${prey.hp})
 攻击: ${prey.attack}
-韧性: ${prey.toughness} (抗性: ${(parseFloat(preyRates.resistance) * 100).toFixed(2)}%)
+防御: ${prey.toughness} (韧性: ${(parseFloat(preyRates.resistance) * 100).toFixed(2)}%)
 暴击: ${prey.crit} (暴击率: ${(parseFloat(preyRates.critRate) * 100).toFixed(2)}%)
 敏捷: ${prey.agility} (蓄力: ${preyRates.chargeTime}s 闪避率: ${(parseFloat(preyRates.dodgeRate) * 100).toFixed(2)}%)`);
     await new Promise((resolve) => setTimeout(resolve, 2e3));
@@ -489,7 +488,7 @@ ${changes.join(" ")}`;
         agility: character.agility,
         hp: character.currentHp,
         maxHp: character.maxHp,
-        chargeTime: parseFloat((1 + 280 / (character.agility + 70)).toFixed(2)),
+        chargeTime: parseFloat((1 + 720 / (character.agility + 80)).toFixed(2)),
         nextAttackTime: 0
       };
       await executeBattle(
@@ -517,6 +516,7 @@ ${changes.join(" ")}`;
           const items = parseItemsString(character.items);
           items[selectedPrey.name] = (items[selectedPrey.name] || 0) + 1;
           updates.items = serializeItems(items);
+          await session.send(`捕猎成功！获得物品 ${selectedPrey.name}*1`);
         }
       }
       await ctx.database.set("maple_warriors", { userId }, updates);
@@ -593,7 +593,7 @@ ${changes.join(" ")}`;
       }
       if (item.toughnessBonus) {
         updates.toughness = character.toughness + item.toughnessBonus * count;
-        changes.push(`韧性+${item.toughnessBonus * count}`);
+        changes.push(`防御+${item.toughnessBonus * count}`);
       }
       if (item.critBonus) {
         updates.crit = character.crit + item.critBonus * count;
@@ -663,6 +663,7 @@ ${changes.join(" ")}`;
             });
           }
           battleManager.endBattle(channelId);
+          return;
         } else {
           return "当前没有正在进行的战斗。";
         }
@@ -697,7 +698,7 @@ ${changes.join(" ")}`;
     if (item.hpBonus) bonuses.push(`HP+${item.hpBonus}`);
     if (item.constitutionBonus) bonuses.push(`体质+${item.constitutionBonus}`);
     if (item.attackBonus) bonuses.push(`攻击+${item.attackBonus}`);
-    if (item.toughnessBonus) bonuses.push(`韧性+${item.toughnessBonus}`);
+    if (item.toughnessBonus) bonuses.push(`防御+${item.toughnessBonus}`);
     if (item.critBonus) bonuses.push(`暴击+${item.critBonus}`);
     if (item.agilityBonus) bonuses.push(`敏捷+${item.agilityBonus}`);
     let result = `物品: ${item.name}
@@ -710,7 +711,7 @@ ${changes.join(" ")}`;
     }
     return result.trim();
   });
-  ctx.command("猫武士/添加物品 <...args>", "添加或修改物品").example("添加物品 老鼠 体质 1 很常见的老鼠").example("添加物品 治疗药水 hp 10 恢复生命值").action(async ({ session }, ...args) => {
+  ctx.command("猫武士/添加物品 <...args>", "添加或修改物品").example("添加物品 老鼠 hp 1 很常见的老鼠").example("添加物品 治疗药水 hp 10 恢复生命值").action(async ({ session }, ...args) => {
     if (args.length < 1) {
       return "格式错误！正确格式：添加物品 物品名 [属性 增加数 ...] [介绍]";
     }
@@ -725,13 +726,13 @@ ${changes.join(" ")}`;
       agilityBonus: 0
     };
     let i = 1;
-    const validAttrs = ["HP", "hp", "体质", "攻击", "韧性", "暴击", "敏捷"];
+    const validAttrs = ["HP", "hp", "体质", "攻击", "防御", "暴击", "敏捷"];
     const attrMap = {
       "HP": "hpBonus",
       "hp": "hpBonus",
       "体质": "constitutionBonus",
       "攻击": "attackBonus",
-      "韧性": "toughnessBonus",
+      "防御": "toughnessBonus",
       "暴击": "critBonus",
       "敏捷": "agilityBonus"
     };
@@ -760,7 +761,7 @@ ${changes.join(" ")}`;
       if (fieldName) {
         updates[fieldName] = value;
       } else {
-        return `属性名错误！有效的属性有：${["HP", "体质", "攻击", "韧性", "暴击", "敏捷"].join("、")}`;
+        return `属性名错误！有效的属性有：${["HP", "体质", "攻击", "防御", "暴击", "敏捷"].join("、")}`;
       }
       i += 2;
     }
@@ -771,7 +772,7 @@ ${changes.join(" ")}`;
         description,
         createdAt: /* @__PURE__ */ new Date()
       });
-      return `修改${itemName}成功！`;
+      return `修改物品成功！`;
     } else {
       await ctx.database.create("maple_warriors_items", {
         name: itemName,
@@ -779,7 +780,7 @@ ${changes.join(" ")}`;
         description,
         createdAt: /* @__PURE__ */ new Date()
       });
-      return `添加${itemName}成功！`;
+      return `添加物品成功！`;
     }
   });
   ctx.command("猫武士/物品列表 [page]", "查看物品列表").example("物品列表").example("物品列表 2").action(async ({ session }, page = "1") => {
@@ -819,13 +820,18 @@ ${changes.join(" ")}`;
   ctx.command("猫武士/战斗训练 <target:user>", "与指定用户的角色进行训练战斗（不消耗HP）").example("战斗训练 @火星").action(async ({ session }, target) => {
     const channelId = session.channelId;
     const userId = session.userId;
+    let targetUserId = target;
+    if (target.includes(":")) {
+      const parts = target.split(":");
+      targetUserId = parts[parts.length - 1];
+    }
     if (battleManager.isBattling(channelId)) {
       return "请等待当前战斗结束！";
     }
-    if (!target) {
+    if (!targetUserId) {
       return "请指定训练对手！正确格式：战斗训练 @用户名";
     }
-    if (target === userId) {
+    if (targetUserId === userId) {
       return "不能和自己进行战斗训练哦！";
     }
     let player1 = await getOrCreateCharacter(userId);
@@ -833,7 +839,11 @@ ${changes.join(" ")}`;
     if (!statusCheck.canAct) {
       return statusCheck.message;
     }
-    let player2 = await getOrCreateCharacter(target);
+    let player2Characters = await ctx.database.get("maple_warriors", { userId: targetUserId });
+    if (player2Characters.length === 0) {
+      return "战斗失败！对方尚未生成角色";
+    }
+    let player2 = player2Characters[0];
     const opponentStatusCheck = checkCharacterStatus(player2);
     if (!opponentStatusCheck.canAct) {
       return `对手目前状态不佳，无法进行战斗训练：${opponentStatusCheck.message}`;
@@ -851,7 +861,7 @@ ${changes.join(" ")}`;
       hp: player1.currentHp,
       // 使用当前HP
       maxHp: player1.maxHp,
-      chargeTime: parseFloat((1 + 280 / (player1.agility + 70)).toFixed(2)),
+      chargeTime: parseFloat((1 + 720 / (player1.agility + 80)).toFixed(2)),
       nextAttackTime: 0
     };
     const player2Char = {
@@ -864,7 +874,7 @@ ${changes.join(" ")}`;
       hp: player2.currentHp,
       // 使用当前HP
       maxHp: player2.maxHp,
-      chargeTime: parseFloat((1 + 280 / (player2.agility + 70)).toFixed(2)),
+      chargeTime: parseFloat((1 + 720 / (player2.agility + 80)).toFixed(2)),
       nextAttackTime: 0
     };
     const abortController = battleManager.getAbortController(channelId);
@@ -911,8 +921,8 @@ ${changes.join(" ")}`;
 }
 __name(apply, "apply");
 async function executeBattle(session, player1, player2, battleMessageInterval, isTraining = false, abortController) {
-  const originalHp1 = player1.hp;
-  const originalHp2 = player2.hp;
+  const initialHp1 = player1.hp;
+  const initialHp2 = player2.hp;
   const rates1 = calculateRates({
     toughness: player1.toughness,
     crit: player1.crit,
@@ -966,21 +976,18 @@ async function executeBattle(session, player1, player2, battleMessageInterval, i
       }
       const baseDamage = attacker.attack * (0.5 + Math.random());
       let initialDamage = Math.ceil(baseDamage);
-      let totalDamage = initialDamage;
       const attackerCritRate = attacker === player1 ? critRate1 : critRate2;
       let isCritical = false;
       if (Math.random() < attackerCritRate) {
-        totalDamage *= 2;
+        initialDamage *= 2;
         isCritical = true;
         battleMessage += ` 暴击！`;
       }
+      battleMessage += ` 造成了${initialDamage}点伤害。`;
       const reduceAmount = defender.toughness * Math.random();
-      const reducedDamage = Math.min(Math.ceil(reduceAmount), totalDamage);
-      const finalDamage = totalDamage - reducedDamage;
+      const reducedDamage = Math.min(Math.ceil(reduceAmount), initialDamage);
+      const finalDamage = initialDamage - reducedDamage;
       if (finalDamage <= 0) {
-        if (isCritical) {
-          battleMessage += ` 造成了${totalDamage}点伤害。`;
-        }
         battleMessage += ` 被${defender.name}抵挡住了！`;
         await session.send(battleMessage);
         currentTime = attackTime;
@@ -988,11 +995,6 @@ async function executeBattle(session, player1, player2, battleMessageInterval, i
       }
       defender.hp -= finalDamage;
       if (defender.hp < 0) defender.hp = 0;
-      if (isCritical) {
-        battleMessage += ` 造成了${totalDamage}点伤害。`;
-      } else {
-        battleMessage += ` 造成了${initialDamage}点伤害。`;
-      }
       battleMessage += ` ${defender.name}抵挡了${reducedDamage}点伤害，实际造成${finalDamage}点伤害。${defender.name} HP: ${defender.hp}`;
       await session.send(battleMessage);
       if (defender.hp <= 0) {
@@ -1002,10 +1004,12 @@ async function executeBattle(session, player1, player2, battleMessageInterval, i
       currentTime = attackTime;
     }
     if (currentTime > maxBattleTime && player1.hp > 0 && player2.hp > 0) {
-      if (player1.hp > player2.hp) {
-        await session.send(`战斗超时！${player1.name} 剩余HP更高，获得胜利！`);
+      const player1Loss = initialHp1 - player1.hp;
+      const player2Loss = initialHp2 - player2.hp;
+      if (player1Loss < player2Loss) {
+        await session.send(`战斗超时！${player1.name} 损失HP较少，获得胜利！`);
       } else if (player2.hp > player1.hp) {
-        await session.send(`战斗超时！${player2.name} 剩余HP更高，获得胜利！`);
+        await session.send(`战斗超时！${player2.name} 损失HP较少，获得胜利！`);
       } else {
         await session.send(`战斗超时！双方平局！`);
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-maple-warriors",
   "description": "-",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [