koishi-plugin-maple-warriors 0.0.2 → 0.1.0

package/lib/index.js

@@ -27,65 +27,231 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
-var using = ["database"];
 var name = "maple-warriors";
+var using = ["database"];
 var DEFAULT_PREY_DATA = [
-  "老鼠 5 1 1 1 1 1-20",
-  "野兔 1 3-5 2-4 2-4 1-3 5-50"
+  "老鼠 100 1 1-5 1 1 1-20",
+  "松鼠 20 1-5 1 1 1 5-50",
+  "野兔 10 3-5 2-4 2-4 1-3 5-50",
+  "獾 1 100 100 100 100 100"
 ];
 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("战斗消息发送间隔（秒）")
 });
+var INITIAL_ITEMS = [
+  {
+    name: "老鼠",
+    type: "猎物",
+    sellPrice: 1,
+    shopPrice: 5,
+    hpBonus: 1,
+    constitutionBonus: 0,
+    attackBonus: 0,
+    toughnessBonus: 0,
+    critBonus: 0,
+    agilityBonus: 0,
+    buff: null,
+    description: "随处可见的普通猎物"
+  },
+  {
+    name: "松鼠",
+    type: "猎物",
+    sellPrice: 2,
+    shopPrice: 10,
+    hpBonus: 2,
+    constitutionBonus: 0,
+    attackBonus: 0,
+    toughnessBonus: 0,
+    critBonus: 0,
+    agilityBonus: 0,
+    buff: null,
+    description: "上蹿下跳！"
+  },
+  {
+    name: "野兔",
+    type: "猎物",
+    sellPrice: 5,
+    shopPrice: 50,
+    hpBonus: 5,
+    constitutionBonus: 0,
+    attackBonus: 0,
+    toughnessBonus: 0,
+    critBonus: 0,
+    agilityBonus: 0,
+    buff: null,
+    description: "跑得很快的猎物"
+  },
+  {
+    name: "獾",
+    type: "猎物",
+    sellPrice: 50,
+    shopPrice: -1,
+    hpBonus: 10,
+    constitutionBonus: 0,
+    attackBonus: 0,
+    toughnessBonus: 0,
+    critBonus: 0,
+    agilityBonus: 0,
+    buff: null,
+    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 };
 }
 __name(calculateRates, "calculateRates");
-var BattleManager = class {
-  static {
-    __name(this, "BattleManager");
+function parseBuffs(buffsStr) {
+  if (!buffsStr) return [];
+  try {
+    return JSON.parse(buffsStr);
+  } catch {
+    return [];
   }
-  battles = /* @__PURE__ */ new Map();
-  startBattle(channelId, playerHp, preyName) {
-    if (this.isBattling(channelId)) {
-      return false;
-    }
-    this.battles.set(channelId, {
-      isBattling: true,
-      abortController: new AbortController(),
-      playerHp,
-      preyName
-    });
-    return true;
+}
+__name(parseBuffs, "parseBuffs");
+function serializeBuffs(buffs) {
+  return JSON.stringify(buffs);
+}
+__name(serializeBuffs, "serializeBuffs");
+function parseItemBuff(buffStr) {
+  if (!buffStr) return null;
+  try {
+    return JSON.parse(buffStr);
+  } catch {
+    return null;
   }
-  endBattle(channelId, finalPlayerHp) {
-    const battle = this.battles.get(channelId);
-    if (battle && battle.isBattling) {
-      if (battle.abortController) {
-        battle.abortController.abort();
-      }
-      if (finalPlayerHp !== void 0) {
-        battle.playerHp = finalPlayerHp;
-      }
-      this.battles.delete(channelId);
-      return true;
+}
+__name(parseItemBuff, "parseItemBuff");
+function calculateCharacterAttributes(character) {
+  const buffs = parseBuffs(character.buffs);
+  const now = /* @__PURE__ */ new Date();
+  const activeBuffs = buffs.filter((buff) => {
+    return new Date(buff.endTime) > now;
+  });
+  const baseAttributes = {
+    constitution: character.constitution,
+    attack: character.attack,
+    toughness: character.toughness,
+    crit: character.crit,
+    agility: character.agility
+  };
+  let constitutionBonus = 0;
+  let attackBonus = 0;
+  let toughnessBonus = 0;
+  let critBonus = 0;
+  let agilityBonus = 0;
+  activeBuffs.forEach((buff) => {
+    if (buff.effects) {
+      buff.effects.forEach((effect) => {
+        const percentage = effect.percentage || 0;
+        const max = effect.max || 0;
+        let bonus = 0;
+        switch (effect.attribute) {
+          case "体质":
+            bonus = Math.min(Math.floor(character.constitution * percentage / 100), max);
+            constitutionBonus += bonus;
+            break;
+          case "攻击":
+            bonus = Math.min(Math.floor(character.attack * percentage / 100), max);
+            attackBonus += bonus;
+            break;
+          case "防御":
+            bonus = Math.min(Math.floor(character.toughness * percentage / 100), max);
+            toughnessBonus += bonus;
+            break;
+          case "暴击":
+            bonus = Math.min(Math.floor(character.crit * percentage / 100), max);
+            critBonus += bonus;
+            break;
+          case "敏捷":
+            bonus = Math.min(Math.floor(character.agility * percentage / 100), max);
+            agilityBonus += bonus;
+            break;
+        }
+      });
+    }
+  });
+  const buffBonuses = {
+    constitution: constitutionBonus,
+    attack: attackBonus,
+    toughness: toughnessBonus,
+    crit: critBonus,
+    agility: agilityBonus
+  };
+  const totalAttributes = {
+    constitution: character.constitution + constitutionBonus,
+    attack: character.attack + attackBonus,
+    toughness: character.toughness + toughnessBonus,
+    crit: character.crit + critBonus,
+    agility: character.agility + agilityBonus
+  };
+  const rates = calculateRates(totalAttributes);
+  const maxHp = totalAttributes.constitution * 5;
+  return {
+    base: baseAttributes,
+    buffs: buffBonuses,
+    total: totalAttributes,
+    rates,
+    maxHp
+  };
+}
+__name(calculateCharacterAttributes, "calculateCharacterAttributes");
+function getBattleCharacter(character) {
+  const attrs = calculateCharacterAttributes(character);
+  return {
+    name: character.name,
+    constitution: attrs.total.constitution,
+    attack: attrs.total.attack,
+    toughness: attrs.total.toughness,
+    crit: attrs.total.crit,
+    agility: attrs.total.agility,
+    hp: Math.min(character.currentHp, attrs.maxHp),
+    // 确保当前HP不超过最大HP
+    maxHp: attrs.maxHp,
+    chargeTime: parseFloat(attrs.rates.chargeTime),
+    nextAttackTime: 0
+  };
+}
+__name(getBattleCharacter, "getBattleCharacter");
+function parseTimeString(timeStr) {
+  let totalSeconds = 0;
+  const timeRegex = /(\d+)([hms])/g;
+  let match;
+  while ((match = timeRegex.exec(timeStr)) !== null) {
+    const value = parseInt(match[1]);
+    const unit = match[2];
+    switch (unit) {
+      case "h":
+        totalSeconds += value * 3600;
+        break;
+      case "m":
+        totalSeconds += value * 60;
+        break;
+      case "s":
+        totalSeconds += value;
+        break;
     }
-    return false;
-  }
-  isBattling(channelId) {
-    return this.battles.has(channelId) && this.battles.get(channelId).isBattling;
-  }
-  getAbortController(channelId) {
-    return this.battles.get(channelId)?.abortController;
-  }
-  getBattleData(channelId) {
-    return this.battles.get(channelId);
   }
-};
+  return totalSeconds;
+}
+__name(parseTimeString, "parseTimeString");
+function formatTimeRemaining(seconds) {
+  if (seconds <= 0) return "0s";
+  const hours = Math.floor(seconds / 3600);
+  const minutes = Math.floor(seconds % 3600 / 60);
+  const secs = seconds % 60;
+  const parts = [];
+  if (hours > 0) parts.push(`${hours}h`);
+  if (minutes > 0) parts.push(`${minutes}m`);
+  if (secs > 0 || parts.length === 0) parts.push(`${secs}s`);
+  return parts.join("");
+}
+__name(formatTimeRemaining, "formatTimeRemaining");
 function parseAttributeRange(value) {
   if (value.includes("-")) {
     const [min, max] = value.split("-").map((v) => parseInt(v.trim()));
@@ -121,6 +287,10 @@ function formatRemainingTime(endTime) {
   return parts.join("");
 }
 __name(formatRemainingTime, "formatRemainingTime");
+function formatGold(amount) {
+  return amount.toLocaleString("en-US");
+}
+__name(formatGold, "formatGold");
 function getTodayDateString() {
   const now = /* @__PURE__ */ new Date();
   return now.toISOString().split("T")[0];
@@ -180,6 +350,47 @@ function selectRandomPrey(preyList) {
   return preyList[0];
 }
 __name(selectRandomPrey, "selectRandomPrey");
+var BattleManager = class {
+  static {
+    __name(this, "BattleManager");
+  }
+  battles = /* @__PURE__ */ new Map();
+  startBattle(channelId, playerHp, preyName) {
+    if (this.isBattling(channelId)) {
+      return false;
+    }
+    this.battles.set(channelId, {
+      isBattling: true,
+      abortController: new AbortController(),
+      playerHp,
+      preyName
+    });
+    return true;
+  }
+  endBattle(channelId, finalPlayerHp) {
+    const battle = this.battles.get(channelId);
+    if (battle && battle.isBattling) {
+      if (battle.abortController) {
+        battle.abortController.abort();
+      }
+      if (finalPlayerHp !== void 0) {
+        battle.playerHp = finalPlayerHp;
+      }
+      this.battles.delete(channelId);
+      return true;
+    }
+    return false;
+  }
+  isBattling(channelId) {
+    return this.battles.has(channelId) && this.battles.get(channelId).isBattling;
+  }
+  getAbortController(channelId) {
+    return this.battles.get(channelId)?.abortController;
+  }
+  getBattleData(channelId) {
+    return this.battles.get(channelId);
+  }
+};
 function apply(ctx, config) {
   const battleManager = new BattleManager();
   ctx.model.extend("maple_warriors", {
@@ -187,16 +398,19 @@ function apply(ctx, config) {
     userId: "string",
     name: "string",
     level: "unsigned",
+    gold: "unsigned",
+    // 新增：金币
     constitution: "unsigned",
     attack: "unsigned",
     toughness: "unsigned",
     crit: "unsigned",
     agility: "unsigned",
     currentHp: "unsigned",
-    maxHp: "unsigned",
     status: "string",
     previousStatus: "string",
     statusEndTime: "timestamp",
+    buffs: "text",
+    // 新增：当前生效的buff（JSON格式）
     items: "text",
     lastTrainDate: "string",
     lastHuntDate: "string",
@@ -208,6 +422,14 @@ function apply(ctx, config) {
   ctx.model.extend("maple_warriors_items", {
     id: "unsigned",
     name: "string",
+    type: "string",
+    // 新增：物品类型
+    sellPrice: "integer",
+    // 新增：出售价
+    shopPrice: "integer",
+    // 新增：商店价
+    buff: "text",
+    // 新增：buff效果（JSON格式）
     hpBonus: "integer",
     constitutionBonus: "integer",
     attackBonus: "integer",
@@ -221,22 +443,55 @@ function apply(ctx, config) {
     autoInc: true,
     unique: ["name"]
   });
+  ctx.on("ready", async () => {
+    try {
+      const existingItems = await ctx.database.get("maple_warriors_items", {});
+      if (existingItems.length === 0) {
+        for (const itemData of INITIAL_ITEMS) {
+          await ctx.database.create("maple_warriors_items", {
+            ...itemData,
+            createdAt: /* @__PURE__ */ new Date()
+          });
+        }
+        const logger = ctx.logger("maple-warriors");
+        logger.info(`检测到物品表为空，已自动初始化 ${INITIAL_ITEMS.length} 个物品到物品表`);
+      }
+    } catch (error) {
+      const logger = ctx.logger("maple-warriors");
+      logger.error("初始化物品表失败:", error);
+    }
+  });
   async function formatCharacterInfo(character) {
-    const rates = calculateRates({
-      toughness: character.toughness,
-      crit: character.crit,
-      agility: character.agility
-    });
+    const attrs = calculateCharacterAttributes(character);
     const items = parseItemsString(character.items);
     const itemsText = Object.entries(items).map(([name2, count]) => `${name2}*${count}`).join("\n");
+    const buffs = parseBuffs(character.buffs);
+    const now = /* @__PURE__ */ new Date();
+    const activeBuffs = buffs.filter((buff) => new Date(buff.endTime) > now);
+    let buffsText = "无";
+    if (activeBuffs.length > 0) {
+      buffsText = activeBuffs.map((buff) => {
+        const endTime = new Date(buff.endTime);
+        const remainingSeconds = Math.max(0, (endTime.getTime() - now.getTime()) / 1e3);
+        return `${buff.name}(${formatTimeRemaining(Math.floor(remainingSeconds))})`;
+      }).join(" ");
+    }
+    const constitutionDisplay = attrs.buffs.constitution > 0 ? `${attrs.base.constitution}(+${attrs.buffs.constitution})` : attrs.base.constitution.toString();
+    const attackDisplay = attrs.buffs.attack > 0 ? `${attrs.base.attack}(+${attrs.buffs.attack})` : attrs.base.attack.toString();
+    const toughnessDisplay = attrs.buffs.toughness > 0 ? `${attrs.base.toughness}(+${attrs.buffs.toughness})` : attrs.base.toughness.toString();
+    const critDisplay = attrs.buffs.crit > 0 ? `${attrs.base.crit}(+${attrs.buffs.crit})` : attrs.base.crit.toString();
+    const agilityDisplay = attrs.buffs.agility > 0 ? `${attrs.base.agility}(+${attrs.buffs.agility})` : attrs.base.agility.toString();
+    const currentHp = Math.min(character.currentHp, attrs.maxHp);
     return `名字: ${character.name}
 等级: ${character.level}
-体质: ${character.constitution} (HP: ${character.currentHp}/${character.maxHp})
-攻击: ${character.attack}
-韧性: ${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)}%)
+金币: ${formatGold(character.gold)}
+体质: ${constitutionDisplay} (HP: ${currentHp}/${attrs.maxHp})
+攻击: ${attackDisplay}
+防御: ${toughnessDisplay} (韧性: ${(parseFloat(attrs.rates.resistance) * 100).toFixed(2)}%)
+暴击: ${critDisplay} (暴击率: ${(parseFloat(attrs.rates.critRate) * 100).toFixed(2)}%)
+敏捷: ${agilityDisplay} (蓄力: ${attrs.rates.chargeTime}s 闪避率: ${(parseFloat(attrs.rates.dodgeRate) * 100).toFixed(2)}%)
 状态: ${character.status}${character.statusEndTime ? " 剩余" + formatRemainingTime(character.statusEndTime) : ""}
+buff: ${buffsText}
 ──────────
 物品栏:
 ${itemsText || "空空如也"}`;
@@ -251,16 +506,19 @@ ${itemsText || "空空如也"}`;
         userId,
         name: name2 || '请输入"修改名字 角色名"修改',
         level: 1,
+        gold: 0,
+        // 新增：初始化金币为0
         constitution: attributes.constitution,
         attack: attributes.attack,
         toughness: attributes.toughness,
         crit: attributes.crit,
         agility: attributes.agility,
         currentHp: maxHp,
-        maxHp,
         status: "无",
         previousStatus: "无",
         statusEndTime: null,
+        buffs: "[]",
+        // 初始化 buffs 为空数组
         items: "{}",
         lastTrainDate: "",
         lastHuntDate: "",
@@ -272,7 +530,38 @@ ${itemsText || "空空如也"}`;
     return characters[0];
   }
   __name(getOrCreateCharacter, "getOrCreateCharacter");
-  function checkCharacterStatus(character) {
+  const statusRules = {
+    // 状态列表: 
+    // 无，受伤，睡眠，治疗
+    // 受影响的指令列表（角色操作指令）: 
+    // 训练，捕猎，睡眠，治疗，战斗训练，使用物品
+    "受伤": {
+      // 可以使用物品，治疗
+      "训练": { message: '你受伤了，快输入"治疗"吧！' },
+      "捕猎": { message: '你受伤了，快输入"治疗"吧！' },
+      "睡眠": { message: '你受伤了，快输入"治疗"吧！' },
+      "战斗训练": { message: '你受伤了，快输入"治疗"吧！' }
+    },
+    "睡眠": {
+      // 都不行
+      "训练": { message: "你想在梦里训练吗？" },
+      "捕猎": { message: "你想在梦里捕猎吗？" },
+      "治疗": { message: "你想在梦里治疗吗？" },
+      "使用物品": { message: "你想在梦里使用物品吗？" },
+      "战斗训练": { message: "你想在梦里战斗训练吗？" },
+      "睡眠": { message: "已经处于睡眠中！" }
+    },
+    "治疗": {
+      // 都不行
+      "训练": { message: "正在治疗中，请好好养伤！" },
+      "捕猎": { message: "正在治疗中，请好好养伤！" },
+      "睡眠": { message: "正在治疗中，请好好养伤！" },
+      "使用物品": { message: "正在治疗中，请好好养伤！" },
+      "战斗训练": { message: "正在治疗中，请好好养伤！" },
+      "治疗": { message: "已经处于治疗中！" }
+    }
+  };
+  function checkInstructionStatus(character, instruction) {
     const now = /* @__PURE__ */ new Date();
     if (character.statusEndTime && now >= character.statusEndTime) {
       const updates = {
@@ -282,25 +571,29 @@ ${itemsText || "空空如也"}`;
         updatedAt: /* @__PURE__ */ new Date()
       };
       if (character.status === "睡眠" || character.status === "治疗") {
-        updates.currentHp = character.maxHp;
+        const attrs = calculateCharacterAttributes(character);
+        updates.currentHp = attrs.maxHp;
       }
       ctx.database.set("maple_warriors", { id: character.id }, updates);
       return { canAct: true, message: "" };
     }
-    if (character.status === "受伤") {
-      return { canAct: false, message: '你受伤了，快输入"治疗"吧！' };
+    const status = character.status;
+    if (status === "无") {
+      return { canAct: true, message: "" };
     }
-    if (character.status === "睡眠") {
-      return { canAct: false, message: "你想在梦里做这个吗？" };
+    const statusRule = statusRules[status];
+    if (!statusRule) {
+      return { canAct: true, message: "" };
     }
-    if (character.status === "治疗") {
-      return { canAct: false, message: "正在治疗中，请好好养伤！" };
+    const instructionRule = statusRule[instruction];
+    if (!instructionRule) {
+      return { canAct: true, message: "" };
     }
-    return { canAct: true, message: "" };
+    return { canAct: false, message: instructionRule.message };
   }
-  __name(checkCharacterStatus, "checkCharacterStatus");
+  __name(checkInstructionStatus, "checkInstructionStatus");
   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 "格式错误！正确格式：修改名字 角色名";
     }
@@ -314,13 +607,14 @@ ${itemsText || "空空如也"}`;
         userId,
         name: trimmedName,
         level: 1,
+        gold: 0,
+        // 新增：初始化金币为0
         constitution: attributes.constitution,
         attack: attributes.attack,
         toughness: attributes.toughness,
         crit: attributes.crit,
         agility: attributes.agility,
         currentHp: maxHp,
-        maxHp,
         status: "无",
         previousStatus: "无",
         statusEndTime: null,
@@ -341,79 +635,135 @@ ${itemsText || "空空如也"}`;
   ctx.command("猫武士/我的角色", "查看我的角色信息").example("我的角色").action(async ({ session }) => {
     const userId = session.userId;
     let character = await getOrCreateCharacter(userId);
-    return await formatCharacterInfo(character);
+    const attrs = calculateCharacterAttributes(character);
+    const items = parseItemsString(character.items);
+    const itemsText = Object.entries(items).map(([name2, count]) => `${name2}*${count}`).join("\n");
+    const buffs = parseBuffs(character.buffs);
+    const now = /* @__PURE__ */ new Date();
+    const activeBuffs = buffs.filter((buff) => new Date(buff.endTime) > now);
+    let buffsText = "无";
+    if (activeBuffs.length > 0) {
+      buffsText = activeBuffs.map((buff) => {
+        const endTime = new Date(buff.endTime);
+        const remainingSeconds = Math.max(0, (endTime.getTime() - now.getTime()) / 1e3);
+        return `${buff.name}(${formatTimeRemaining(Math.floor(remainingSeconds))})`;
+      }).join(" ");
+    }
+    const constitutionDisplay = attrs.buffs.constitution > 0 ? `${attrs.total.constitution}(+${attrs.buffs.constitution})` : attrs.total.constitution.toString();
+    const attackDisplay = attrs.buffs.attack > 0 ? `${attrs.total.attack}(+${attrs.buffs.attack})` : attrs.total.attack.toString();
+    const toughnessDisplay = attrs.buffs.toughness > 0 ? `${attrs.total.toughness}(+${attrs.buffs.toughness})` : attrs.total.toughness.toString();
+    const critDisplay = attrs.buffs.crit > 0 ? `${attrs.total.crit}(+${attrs.buffs.crit})` : attrs.total.crit.toString();
+    const agilityDisplay = attrs.buffs.agility > 0 ? `${attrs.total.agility}(+${attrs.buffs.agility})` : attrs.total.agility.toString();
+    const currentHp = Math.min(character.currentHp, attrs.maxHp);
+    return `名字: ${character.name}
+等级: ${character.level}
+体质: ${constitutionDisplay} (HP: ${currentHp}/${attrs.maxHp})
+攻击: ${attackDisplay}
+防御: ${toughnessDisplay} (韧性: ${(parseFloat(attrs.rates.resistance) * 100).toFixed(2)}%)
+暴击: ${critDisplay} (暴击率: ${(parseFloat(attrs.rates.critRate) * 100).toFixed(2)}%)
+敏捷: ${agilityDisplay} (蓄力: ${attrs.rates.chargeTime}s 闪避率: ${(parseFloat(attrs.rates.dodgeRate) * 100).toFixed(2)}%)
+状态: ${character.status}${character.statusEndTime ? " 剩余" + formatRemainingTime(character.statusEndTime) : ""}
+buff: ${buffsText}
+──────────
+物品栏:
+${itemsText || "空空如也"}`;
   });
-  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 = checkInstructionStatus(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"
       };
       const updates2 = {};
       const attributeCounts2 = {};
+      for (const key of Object.keys(attrMap2)) {
+        const field = attrMap2[key];
+        updates2[field] = character[field] || 0;
+      }
       for (let i = 0; i < 3; i++) {
         const randomAttr = validAttrs2[Math.floor(Math.random() * validAttrs2.length)];
         const field = attrMap2[randomAttr];
-        updates2[field] = (updates2[field] || character[field] || 0) + 1;
+        updates2[field] = updates2[field] + 1;
         attributeCounts2[randomAttr] = (attributeCounts2[randomAttr] || 0) + 1;
       }
       const changes2 = [];
       for (const [attr, count] of Object.entries(attributeCounts2)) {
         changes2.push(`${attr}+${count}`);
       }
+      if (attributeCounts2["体质"]) {
+        const constitutionIncrease = attributeCounts2["体质"];
+        let newHp = character.currentHp + constitutionIncrease * 5;
+        const currentAttrs = calculateCharacterAttributes(character);
+        const newMaxHp = currentAttrs.maxHp + constitutionIncrease * 5;
+        if (newHp > newMaxHp) newHp = newMaxHp;
+        if (newHp < 0) newHp = 0;
+        updates2.currentHp = newHp;
+      }
       updates2.lastTrainDate = today;
       updates2.updatedAt = /* @__PURE__ */ new Date();
       await ctx.database.set("maple_warriors", { userId }, updates2);
       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 key of Object.keys(attrMap)) {
+      const field = attrMap[key];
+      updates[field] = character[field] || 0;
+    }
+    for (const attr of args) {
       const field = attrMap[attr];
-      updates[field] = (updates[field] || character[field] || 0) + 1;
+      updates[field] = updates[field] + 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;
+      updates[field] = updates[field] + 1;
       attributeCounts[randomAttr] = (attributeCounts[randomAttr] || 0) + 1;
     }
+    if (attributeCounts["体质"]) {
+      const constitutionIncrease = attributeCounts["体质"];
+      let newHp = character.currentHp + constitutionIncrease * 5;
+      const currentAttrs = calculateCharacterAttributes(character);
+      const newMaxHp = currentAttrs.maxHp + constitutionIncrease * 5;
+      if (newHp > newMaxHp) newHp = newMaxHp;
+      if (newHp < 0) newHp = 0;
+      updates.currentHp = newHp;
+    }
     const changes = [];
     for (const [attr, count] of Object.entries(attributeCounts)) {
       changes.push(`${attr}+${count}`);
@@ -431,14 +781,10 @@ ${changes.join(" ")}`;
       return "请等待当前战斗结束！";
     }
     let character = await getOrCreateCharacter(userId);
-    const statusCheck = checkCharacterStatus(character);
+    const statusCheck = checkInstructionStatus(character, "捕猎");
     if (!statusCheck.canAct) {
       return statusCheck.message;
     }
-    const today = getTodayDateString();
-    if (character.lastHuntDate && isSameDay(character.lastHuntDate, today)) {
-      return "今天已经捕猎过了，要注意劳逸结合哦！";
-    }
     const preyList = parsePreyData(config.preyData);
     if (preyList.length === 0) {
       return "未找到猎物数据，请在控制台配置猎物数据。";
@@ -450,7 +796,12 @@ ${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 preyRates = calculateRates({
+      toughness,
+      crit,
+      agility
+    });
+    const player = getBattleCharacter(character);
     const prey = {
       name: selectedPrey.name,
       constitution,
@@ -460,38 +811,21 @@ ${changes.join(" ")}`;
       agility,
       hp: preyHp,
       maxHp: preyHp,
-      chargeTime,
-      nextAttackTime: chargeTime
+      chargeTime: parseFloat(preyRates.chargeTime),
+      nextAttackTime: 0
     };
-    if (!battleManager.startBattle(channelId, character.currentHp, selectedPrey.name)) {
+    if (!battleManager.startBattle(channelId, player.hp, selectedPrey.name)) {
       return "战斗开始失败，请重试！";
     }
-    const preyRates = calculateRates({
-      toughness: prey.toughness,
-      crit: prey.crit,
-      agility: prey.agility
-    });
     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));
     const abortController = battleManager.getAbortController(channelId);
     try {
-      const player = {
-        name: character.name,
-        constitution: character.constitution,
-        attack: character.attack,
-        toughness: character.toughness,
-        crit: character.crit,
-        agility: character.agility,
-        hp: character.currentHp,
-        maxHp: character.maxHp,
-        chargeTime: parseFloat((1 + 280 / (character.agility + 70)).toFixed(2)),
-        nextAttackTime: 0
-      };
       await executeBattle(
         session,
         player,
@@ -501,9 +835,9 @@ ${changes.join(" ")}`;
         // 不是训练模式
         abortController
       );
-      const today2 = getTodayDateString();
+      const today = getTodayDateString();
       const updates = {
-        lastHuntDate: today2,
+        lastHuntDate: today,
         updatedAt: /* @__PURE__ */ new Date()
       };
       if (player.hp <= 0) {
@@ -517,14 +851,15 @@ ${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);
     } catch (error) {
       if (error.name === "AbortError") {
-        const today2 = getTodayDateString();
+        const today = getTodayDateString();
         await ctx.database.set("maple_warriors", { userId }, {
-          lastHuntDate: today2,
+          lastHuntDate: today,
           updatedAt: /* @__PURE__ */ new Date()
         });
       } else {
@@ -534,31 +869,23 @@ ${changes.join(" ")}`;
       battleManager.endBattle(channelId);
     }
   });
-  ctx.command("猫武士/使用物品 <itemInput>", "使用物品栏中的物品").example("使用物品 老鼠").example("使用物品 老鼠 2").example("使用物品 老鼠*2").action(async ({ session }, itemInput) => {
-    if (!itemInput) {
-      return "格式错误！正确格式：使用物品 物品名 数量 或 使用物品 物品名*数量";
+  ctx.command("猫武士/使用物品 <itemName> [count]", "使用物品栏中的物品").example("使用物品 老鼠").example("使用物品 老鼠 2").action(async ({ session }, itemName, countStr) => {
+    if (!itemName) {
+      return "格式错误！正确格式：使用物品 物品名 [数量]";
     }
     const userId = session.userId;
     let character = await getOrCreateCharacter(userId);
-    const statusCheck = checkCharacterStatus(character);
+    const statusCheck = checkInstructionStatus(character, "使用物品");
     if (!statusCheck.canAct) {
       return statusCheck.message;
     }
-    let itemName = "";
     let count = 1;
-    if (itemInput.includes("*")) {
-      const parts = itemInput.split("*");
-      itemName = parts[0].trim();
-      count = parseInt(parts[1]) || 1;
-    } else {
-      const parts = itemInput.trim().split(/\s+/);
-      itemName = parts[0];
-      if (parts[1]) {
-        count = parseInt(parts[1]) || 1;
+    if (countStr) {
+      const parsedCount = parseInt(countStr);
+      if (isNaN(parsedCount) || parsedCount <= 0) {
+        return "数量必须是正整数";
       }
-    }
-    if (!itemName) {
-      return "格式错误！正确格式：使用物品 物品名 数量 或 使用物品 物品名*数量";
+      count = parsedCount;
     }
     const items = parseItemsString(character.items);
     if (!items[itemName] || items[itemName] < count) {
@@ -575,46 +902,85 @@ ${changes.join(" ")}`;
       updatedAt: /* @__PURE__ */ new Date()
     };
     const changes = [];
+    const currentAttrs = calculateCharacterAttributes(character);
     if (item) {
-      if (item.hpBonus) {
+      if (item.hpBonus && item.hpBonus !== 0) {
         let newHp = character.currentHp + item.hpBonus * count;
-        if (newHp > character.maxHp) newHp = character.maxHp;
+        const maxHp = currentAttrs.maxHp;
+        if (newHp > maxHp) newHp = maxHp;
         if (newHp < 0) newHp = 0;
         updates.currentHp = newHp;
         changes.push(`HP+${item.hpBonus * count}`);
       }
-      if (item.constitutionBonus) {
-        updates.constitution = character.constitution + item.constitutionBonus * count;
+      if (item.constitutionBonus && item.constitutionBonus !== 0) {
+        const oldConstitution = character.constitution;
+        updates.constitution = oldConstitution + item.constitutionBonus * count;
+        const constitutionChange = item.constitutionBonus * count;
+        let newHp = character.currentHp + constitutionChange * 5;
+        const newMaxHp = updates.constitution * 5;
+        if (newHp > newMaxHp) newHp = newMaxHp;
+        if (newHp < 0) newHp = 0;
+        updates.currentHp = newHp;
         changes.push(`体质+${item.constitutionBonus * count}`);
       }
-      if (item.attackBonus) {
+      if (item.attackBonus && item.attackBonus !== 0) {
         updates.attack = character.attack + item.attackBonus * count;
         changes.push(`攻击+${item.attackBonus * count}`);
       }
-      if (item.toughnessBonus) {
+      if (item.toughnessBonus && item.toughnessBonus !== 0) {
         updates.toughness = character.toughness + item.toughnessBonus * count;
-        changes.push(`韧性+${item.toughnessBonus * count}`);
+        changes.push(`防御+${item.toughnessBonus * count}`);
       }
-      if (item.critBonus) {
+      if (item.critBonus && item.critBonus !== 0) {
         updates.crit = character.crit + item.critBonus * count;
         changes.push(`暴击+${item.critBonus * count}`);
       }
-      if (item.agilityBonus) {
+      if (item.agilityBonus && item.agilityBonus !== 0) {
         updates.agility = character.agility + item.agilityBonus * count;
         changes.push(`敏捷+${item.agilityBonus * count}`);
       }
-      if (updates.constitution) {
-        updates.maxHp = updates.constitution * 5;
+      const buffs = parseBuffs(character.buffs);
+      const now = /* @__PURE__ */ new Date();
+      if (item.buff && item.type) {
+        const itemBuff = parseItemBuff(item.buff);
+        if (itemBuff && itemBuff.duration && itemBuff.effects) {
+          const endTime = new Date(now.getTime() + itemBuff.duration * 1e3);
+          const newBuff = {
+            name: itemName,
+            type: item.type,
+            endTime: endTime.toISOString(),
+            effects: itemBuff.effects
+          };
+          const filteredBuffs = buffs.filter((b) => b.type !== item.type);
+          filteredBuffs.push(newBuff);
+          updates.buffs = serializeBuffs(filteredBuffs);
+          changes.push(`获得${itemName}的buff效果`);
+        }
       }
     }
     await ctx.database.set("maple_warriors", { userId }, updates);
     const changesText = changes.length > 0 ? "\n" + changes.join(" ") : "";
-    return `使用成功！消耗了${itemName}*${count}${changesText}`;
+    let buffInfo = "";
+    if (item && item.buff) {
+      try {
+        const buff = JSON.parse(item.buff);
+        if (buff.effects && buff.effects.length > 0) {
+          const buffEffects = buff.effects.map((effect) => {
+            return `${effect.attribute}+${effect.percentage}%(最大${effect.max})`;
+          }).join(" ");
+          const duration = formatTimeRemaining(buff.duration);
+          buffInfo = `
+buff: ${buffEffects} 持续${duration}`;
+        }
+      } catch (e) {
+      }
+    }
+    return `使用成功！消耗了${itemName}*${count}${changesText}${buffInfo}`;
   });
-  ctx.command("猫武士/睡眠", "让角色进入睡眠状态").example("睡眠").action(async ({ session }) => {
+  ctx.command("猫武士/睡眠", "进入睡眠状态（时间结束后回满HP）").example("睡眠").action(async ({ session }) => {
     const userId = session.userId;
     let character = await getOrCreateCharacter(userId);
-    const statusCheck = checkCharacterStatus(character);
+    const statusCheck = checkInstructionStatus(character, "睡眠");
     if (!statusCheck.canAct) {
       return statusCheck.message;
     }
@@ -627,11 +993,15 @@ ${changes.join(" ")}`;
       statusEndTime: endTime,
       updatedAt: /* @__PURE__ */ new Date()
     });
-    return `进入睡眠状态，剩余4h0m0s`;
+    return `进入睡眠状态，剩余4h`;
   });
-  ctx.command("猫武士/治疗", "治疗受伤的角色").example("治疗").action(async ({ session }) => {
+  ctx.command("猫武士/治疗", "治疗受伤的角色（时间结束后回满HP）").example("治疗").action(async ({ session }) => {
     const userId = session.userId;
     let character = await getOrCreateCharacter(userId);
+    const statusCheck = checkInstructionStatus(character, "治疗");
+    if (!statusCheck.canAct) {
+      return statusCheck.message;
+    }
     if (character.currentHp > 0 && character.status !== "受伤") {
       return "你的状态良好，无需治疗。";
     }
@@ -644,7 +1014,7 @@ ${changes.join(" ")}`;
       statusEndTime: endTime,
       updatedAt: /* @__PURE__ */ new Date()
     });
-    return `进入治疗状态，剩余4h0m0s`;
+    return `进入治疗状态，剩余4h`;
   });
   ctx.command("猫武士/结束 <action>", "结束当前状态").example("结束 战斗").example("结束 睡眠").example("结束 治疗").action(async ({ session }, action) => {
     if (!action) {
@@ -663,6 +1033,7 @@ ${changes.join(" ")}`;
             });
           }
           battleManager.endBattle(channelId);
+          return;
         } else {
           return "当前没有正在进行的战斗。";
         }
@@ -676,7 +1047,7 @@ ${changes.join(" ")}`;
             statusEndTime: null,
             updatedAt: /* @__PURE__ */ new Date()
           });
-          return `结束了当前的${action}`;
+          return `${action}被强制结束！`;
         } else {
           return `当前没有处于${action}状态。`;
         }
@@ -697,176 +1068,339 @@ ${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}
+    let result = `物品: ${item.name} [${item.type || "无类型"}] ${item.sellPrice || 0}/${item.shopPrice >= 0 ? item.shopPrice : "-"}
 `;
     if (bonuses.length > 0) {
       result += bonuses.join(" ") + "\n";
     }
+    if (item.buff) {
+      try {
+        const buff = JSON.parse(item.buff);
+        if (buff.effects && buff.effects.length > 0) {
+          const buffEffects = buff.effects.map((effect) => {
+            return `${effect.attribute}+${effect.percentage}%(最大${effect.max})`;
+          }).join(" ");
+          const duration = formatTimeRemaining(buff.duration);
+          result += `buff: ${buffEffects} 持续${duration}
+`;
+        }
+      } catch (e) {
+      }
+    }
     if (item.description) {
       result += `"${item.description}"`;
     }
     return result.trim();
   });
-  ctx.command("猫武士/添加物品 <...args>", "添加或修改物品").example("添加物品 老鼠 体质 1 很常见的老鼠").example("添加物品 治疗药水 hp 10 恢复生命值").action(async ({ session }, ...args) => {
-    if (args.length < 1) {
-      return "格式错误！正确格式：添加物品 物品名 [属性 增加数 ...] [介绍]";
+  ctx.command("猫武士/添加物品 <itemName>", "添加或修改物品").option("type", "-t <type:string> 物品类型").option("money", "-m <money:number> 出售价格").option("shop", "-s <shop:number> 商店价格").option("desc", "-d <desc:string> 物品介绍").option("characteristics", "-c <chars:string> 属性提升，格式：属性名，数值，属性名，数值，...").option("buff", "-b <buff:string> buff效果，格式：时间，属性名，百分比，上限，属性名，百分比，上限,...").example('添加物品 老鼠 -t 猎物 -m 1 -s 5 -c "HP,1"').example('添加物品 药水 -t 药品 -b "2m,体质,10%,5"').action(async ({ session, options }, itemName) => {
+    if (!itemName) {
+      return "格式错误！正确格式：添加物品 物品名 [选项]";
     }
-    let itemName = args[0];
-    let description = "";
-    const updates = {
-      hpBonus: 0,
-      constitutionBonus: 0,
-      attackBonus: 0,
-      toughnessBonus: 0,
-      critBonus: 0,
-      agilityBonus: 0
-    };
-    let i = 1;
-    const validAttrs = ["HP", "hp", "体质", "攻击", "韧性", "暴击", "敏捷"];
-    const attrMap = {
-      "HP": "hpBonus",
-      "hp": "hpBonus",
-      "体质": "constitutionBonus",
-      "攻击": "attackBonus",
-      "韧性": "toughnessBonus",
-      "暴击": "critBonus",
-      "敏捷": "agilityBonus"
-    };
-    while (i < args.length) {
-      const arg = args[i];
-      const normalizedAttr = arg.toLowerCase() === "hp" ? "HP" : arg;
-      if (!validAttrs.includes(normalizedAttr)) {
-        description = args.slice(i).join(" ");
-        break;
-      }
-      if (i + 1 >= args.length) {
-        return `格式错误！属性"${arg}"缺少数值`;
+    const existingItems = await ctx.database.get("maple_warriors_items", { name: itemName });
+    const existingItem = existingItems.length > 0 ? existingItems[0] : null;
+    if (existingItem) {
+      const updates = {};
+      if (options.type !== void 0) updates.type = options.type;
+      if (options.money !== void 0) updates.sellPrice = options.money;
+      if (options.shop !== void 0) updates.shopPrice = options.shop;
+      if (options.desc !== void 0) updates.description = options.desc;
+      const numericFields = ["hpBonus", "constitutionBonus", "attackBonus", "toughnessBonus", "critBonus", "agilityBonus"];
+      const attrMap = {
+        "HP": "hpBonus",
+        "hp": "hpBonus",
+        "体质": "constitutionBonus",
+        "攻击": "attackBonus",
+        "防御": "toughnessBonus",
+        "暴击": "critBonus",
+        "敏捷": "agilityBonus"
+      };
+      if (options.characteristics !== void 0) {
+        numericFields.forEach((field) => {
+          updates[field] = 0;
+        });
+        if (options.characteristics.trim() !== "") {
+          const params = options.characteristics.split(/[,，]/).map((s) => s.trim()).filter((s) => s);
+          if (params.length % 2 !== 0) {
+            return "属性提升格式错误！格式应为：属性名,数值,属性名,数值,...";
+          }
+          for (let i = 0; i < params.length; i += 2) {
+            const attrName = params[i];
+            const attrValue = params[i + 1];
+            const normalizedAttr = attrName.toLowerCase() === "hp" ? "HP" : attrName;
+            const fieldName = attrMap[normalizedAttr];
+            if (!fieldName) {
+              return `属性名错误！有效的属性有：${Object.keys(attrMap).join("、")}`;
+            }
+            const value = parseInt(attrValue);
+            if (isNaN(value)) {
+              return `属性"${attrName}"的数值必须是数字`;
+            }
+            updates[fieldName] = value;
+          }
+        }
       }
-      const nextArg = args[i + 1];
-      const value = parseInt(nextArg);
-      if (isNaN(value)) {
-        const nextNormalized = nextArg.toLowerCase() === "hp" ? "HP" : nextArg;
-        if (validAttrs.includes(nextNormalized)) {
-          return `格式错误！属性"${arg}"缺少数值`;
+      if (options.buff !== void 0) {
+        if (options.buff.trim() === "") {
+          updates.buff = null;
         } else {
-          description = args.slice(i + 1).join(" ");
-          break;
+          const params = options.buff.split(/[,，]/).map((s) => s.trim()).filter((s) => s);
+          if (params.length < 4 || (params.length - 1) % 3 !== 0) {
+            return "buff效果格式错误！格式应为：时间,属性名,百分比,上限,属性名,百分比,上限,...";
+          }
+          const durationStr = params[0];
+          const durationSeconds = parseTimeString(durationStr);
+          if (durationSeconds <= 0) {
+            return "有效时间格式错误！请使用如2m、1h30m、1h等格式";
+          }
+          const effects = [];
+          const validAttrs = ["体质", "攻击", "防御", "暴击", "敏捷"];
+          for (let i = 1; i < params.length; i += 3) {
+            const attribute = params[i];
+            if (!validAttrs.includes(attribute)) {
+              return `buff属性名错误！有效的属性有：${validAttrs.join("、")}`;
+            }
+            const percentageStr = params[i + 1];
+            if (!percentageStr.endsWith("%")) {
+              return `buff属性"${attribute}"的百分比必须以%结尾`;
+            }
+            const percentage = parseInt(percentageStr.slice(0, -1));
+            if (isNaN(percentage) || percentage <= 0) {
+              return `buff属性"${attribute}"的百分比必须是正整数`;
+            }
+            const max = parseInt(params[i + 2]);
+            if (isNaN(max) || max <= 0) {
+              return `buff属性"${attribute}"的最大上限必须是正整数`;
+            }
+            effects.push({
+              attribute,
+              percentage,
+              max
+            });
+          }
+          if (effects.length > 0) {
+            const buff = {
+              duration: durationSeconds,
+              effects
+            };
+            updates.buff = JSON.stringify(buff);
+          } else {
+            updates.buff = null;
+          }
         }
       }
-      const fieldName = attrMap[normalizedAttr];
-      if (fieldName) {
-        updates[fieldName] = value;
-      } else {
-        return `属性名错误！有效的属性有：${["HP", "体质", "攻击", "韧性", "暴击", "敏捷"].join("、")}`;
-      }
-      i += 2;
-    }
-    const existingItems = await ctx.database.get("maple_warriors_items", { name: itemName });
-    if (existingItems.length > 0) {
-      await ctx.database.set("maple_warriors_items", { name: itemName }, {
-        ...updates,
-        description,
-        createdAt: /* @__PURE__ */ new Date()
-      });
-      return `修改${itemName}成功！`;
+      updates.createdAt = /* @__PURE__ */ new Date();
+      await ctx.database.set("maple_warriors_items", { name: itemName }, updates);
+      return `修改物品"${itemName}"成功！`;
     } else {
-      await ctx.database.create("maple_warriors_items", {
+      const newItem = {
         name: itemName,
-        ...updates,
-        description,
+        type: options.type || "其他",
+        sellPrice: options.money !== void 0 ? options.money : 0,
+        shopPrice: options.shop !== void 0 ? options.shop : -1,
+        description: options.desc || "",
         createdAt: /* @__PURE__ */ new Date()
+      };
+      const numericFields = ["hpBonus", "constitutionBonus", "attackBonus", "toughnessBonus", "critBonus", "agilityBonus"];
+      numericFields.forEach((field) => {
+        newItem[field] = 0;
       });
-      return `添加${itemName}成功！`;
+      const attrMap = {
+        "HP": "hpBonus",
+        "hp": "hpBonus",
+        "体质": "constitutionBonus",
+        "攻击": "attackBonus",
+        "防御": "toughnessBonus",
+        "暴击": "critBonus",
+        "敏捷": "agilityBonus"
+      };
+      if (options.characteristics !== void 0 && options.characteristics.trim() !== "") {
+        const params = options.characteristics.split(/[,，]/).map((s) => s.trim()).filter((s) => s);
+        if (params.length % 2 !== 0) {
+          return "属性提升格式错误！格式应为：属性名，数值，属性名，数值，...";
+        }
+        for (let i = 0; i < params.length; i += 2) {
+          const attrName = params[i];
+          const attrValue = params[i + 1];
+          const normalizedAttr = attrName.toLowerCase() === "hp" ? "HP" : attrName;
+          const fieldName = attrMap[normalizedAttr];
+          if (!fieldName) {
+            return `属性名错误！有效的属性有：${Object.keys(attrMap).join("、")}`;
+          }
+          const value = parseInt(attrValue);
+          if (isNaN(value)) {
+            return `属性"${attrName}"的数值必须是数字`;
+          }
+          newItem[fieldName] = value;
+        }
+      }
+      if (options.buff !== void 0 && options.buff.trim() !== "") {
+        const params = options.buff.split(/[,，]/).map((s) => s.trim()).filter((s) => s);
+        if (params.length < 4 || (params.length - 1) % 3 !== 0) {
+          return "buff效果格式错误！格式应为：时间，属性名，百分比，上限，属性名，百分比，上限，...";
+        }
+        const durationStr = params[0];
+        const durationSeconds = parseTimeString(durationStr);
+        if (durationSeconds <= 0) {
+          return "有效时间格式错误！请使用如2m、1h30m、1h等格式";
+        }
+        const effects = [];
+        const validAttrs = ["体质", "攻击", "防御", "暴击", "敏捷"];
+        for (let i = 1; i < params.length; i += 3) {
+          const attribute = params[i];
+          if (!validAttrs.includes(attribute)) {
+            return `buff属性名错误！有效的属性有：${validAttrs.join("、")}`;
+          }
+          const percentageStr = params[i + 1];
+          if (!percentageStr.endsWith("%")) {
+            return `buff属性"${attribute}"的百分比必须以%结尾`;
+          }
+          const percentage = parseInt(percentageStr.slice(0, -1));
+          if (isNaN(percentage) || percentage <= 0) {
+            return `buff属性"${attribute}"的百分比必须是正整数`;
+          }
+          const max = parseInt(params[i + 2]);
+          if (isNaN(max) || max <= 0) {
+            return `buff属性"${attribute}"的最大上限必须是正整数`;
+          }
+          effects.push({
+            attribute,
+            percentage,
+            max
+          });
+        }
+        if (effects.length > 0) {
+          const buff = {
+            duration: durationSeconds,
+            effects
+          };
+          newItem.buff = JSON.stringify(buff);
+        }
+      } else {
+        newItem.buff = null;
+      }
+      await ctx.database.create("maple_warriors_items", newItem);
+      return `添加物品"${itemName}"成功！`;
     }
   });
-  ctx.command("猫武士/物品列表 [page]", "查看物品列表").example("物品列表").example("物品列表 2").action(async ({ session }, page = "1") => {
-    const pageNum = parseInt(page) || 1;
+  ctx.command("猫武士/物品列表 [typeOrPage] [page]", "查看物品列表").example("物品列表").example("物品列表 2").example("物品列表 药品").example("物品列表 药品 2").action(async ({ session }, typeOrPage, page) => {
+    let typeFilter = "";
+    let pageNum = 1;
+    if (typeOrPage) {
+      const parsedPage = parseInt(typeOrPage);
+      if (!isNaN(parsedPage)) {
+        pageNum = parsedPage;
+      } else {
+        typeFilter = typeOrPage;
+        if (page) {
+          const parsedPage2 = parseInt(page);
+          if (!isNaN(parsedPage2)) {
+            pageNum = parsedPage2;
+          }
+        }
+      }
+    }
     if (pageNum < 1) {
       return "页码必须大于0！";
     }
     const allItems = await ctx.database.get("maple_warriors_items", {});
-    allItems.sort((a, b) => a.name.localeCompare(b.name));
+    let filteredItems = allItems;
+    if (typeFilter) {
+      filteredItems = allItems.filter((item) => item.type === typeFilter);
+      if (filteredItems.length === 0) {
+        return `没有找到类型为"${typeFilter}"的物品！`;
+      }
+    }
+    filteredItems.sort((a, b) => a.name.localeCompare(b.name));
     const pageSize = 10;
-    const totalPages = Math.ceil(allItems.length / pageSize);
+    const totalPages = Math.ceil(filteredItems.length / pageSize);
     if (pageNum > totalPages && totalPages > 0) {
       return `页码超出范围！总页数：${totalPages}`;
     }
     const startIndex = (pageNum - 1) * pageSize;
-    const pageItems = allItems.slice(startIndex, startIndex + pageSize);
-    let output = `物品列表 第 ${pageNum}/${totalPages} 页（共 ${allItems.length} 个物品）
+    const pageItems = filteredItems.slice(startIndex, startIndex + pageSize);
+    let output = `物品列表`;
+    if (typeFilter) {
+      output += ` [类型: ${typeFilter}]`;
+    }
+    output += ` 第 ${pageNum}/${totalPages} 页（共 ${filteredItems.length} 个物品）
 
 `;
     pageItems.forEach((item, index) => {
       const displayIndex = startIndex + index + 1;
-      output += `${displayIndex}. ${item.name}
+      const sellPrice = item.sellPrice || 0;
+      const shopPrice = item.shopPrice >= 0 ? item.shopPrice : "-";
+      output += `${displayIndex}. ${item.name} [${item.type || "无类型"}] ${sellPrice}/${shopPrice}
 `;
     });
     output += "\n──────────\n";
     if (pageNum > 1) {
-      output += `输入"物品列表 ${pageNum - 1}"查看上一页
+      output += `输入"物品列表${typeFilter ? " " + typeFilter : ""} ${pageNum - 1}"查看上一页
 `;
     }
     if (pageNum < totalPages) {
-      output += `输入"物品列表 ${pageNum + 1}"查看下一页
+      output += `输入"物品列表${typeFilter ? " " + typeFilter : ""} ${pageNum + 1}"查看下一页
 `;
     }
     output += `输入"查询物品 物品名"查看物品详情`;
     return output.trim();
   });
+  ctx.command("猫武士/set <itemName> [count]", "直接获取指定数量的物品").option("user", "-u <userId:string> 指定用户ID").example("set 老鼠 5").example("set 1级敏捷药水 3").action(async ({ session, options }, itemName, countStr) => {
+    if (!itemName) {
+      return "格式错误！正确格式：set 物品名 [数量]";
+    }
+    const targetUserId = options.user ? options.user : session.userId;
+    const count = countStr ? parseInt(countStr) : 1;
+    if (isNaN(count) || count <= 0) {
+      return "数量必须是正整数";
+    }
+    let character = await getOrCreateCharacter(targetUserId);
+    const items = parseItemsString(character.items);
+    items[itemName] = (items[itemName] || 0) + count;
+    await ctx.database.set("maple_warriors", { userId: targetUserId }, {
+      items: serializeItems(items),
+      updatedAt: /* @__PURE__ */ new Date()
+    });
+    return `成功获得${itemName}*${count}`;
+  });
   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) {
-      return "不能和自己进行战斗训练哦！";
+    if (targetUserId === userId) {
+      return "不能和自己进行战斗训练！";
     }
     let player1 = await getOrCreateCharacter(userId);
-    const statusCheck = checkCharacterStatus(player1);
+    const statusCheck = checkInstructionStatus(player1, "战斗训练");
     if (!statusCheck.canAct) {
       return statusCheck.message;
     }
-    let player2 = await getOrCreateCharacter(target);
-    const opponentStatusCheck = checkCharacterStatus(player2);
+    let player2Characters = await ctx.database.get("maple_warriors", { userId: targetUserId });
+    if (player2Characters.length === 0) {
+      return "战斗失败！对方尚未生成角色";
+    }
+    let player2 = player2Characters[0];
+    const opponentStatusCheck = checkInstructionStatus(player2, "战斗训练");
     if (!opponentStatusCheck.canAct) {
-      return `对手目前状态不佳，无法进行战斗训练：${opponentStatusCheck.message}`;
+      return `对方${player2.status}中，无法进行战斗训练！`;
     }
     if (!battleManager.startBattle(channelId, player1.currentHp, void 0)) {
       return "战斗开始失败，请重试！";
     }
-    const player1Char = {
-      name: player1.name,
-      constitution: player1.constitution,
-      attack: player1.attack,
-      toughness: player1.toughness,
-      crit: player1.crit,
-      agility: player1.agility,
-      hp: player1.currentHp,
-      // 使用当前HP
-      maxHp: player1.maxHp,
-      chargeTime: parseFloat((1 + 280 / (player1.agility + 70)).toFixed(2)),
-      nextAttackTime: 0
-    };
-    const player2Char = {
-      name: player2.name,
-      constitution: player2.constitution,
-      attack: player2.attack,
-      toughness: player2.toughness,
-      crit: player2.crit,
-      agility: player2.agility,
-      hp: player2.currentHp,
-      // 使用当前HP
-      maxHp: player2.maxHp,
-      chargeTime: parseFloat((1 + 280 / (player2.agility + 70)).toFixed(2)),
-      nextAttackTime: 0
-    };
+    const player1Char = getBattleCharacter(player1);
+    const player2Char = getBattleCharacter(player2);
     const abortController = battleManager.getAbortController(channelId);
     try {
       await executeBattle(
@@ -886,6 +1420,126 @@ ${changes.join(" ")}`;
       battleManager.endBattle(channelId);
     }
   });
+  ctx.command("猫武士/删除角色", "删除角色").option("user", "-u <userId:string> 指定要删除角色的用户ID").example("删除角色").action(async ({ session, options }) => {
+    const userId = options.user ? options.user : session.userId;
+    const characters = await ctx.database.get("maple_warriors", { userId });
+    if (characters.length === 0) {
+      return "删除失败！找不到用户的角色";
+    }
+    const character = characters[0];
+    await session.send(`确定删除角色【${character.name}】吗？回复"确认"进行删除`);
+    try {
+      const confirm = await session.prompt(3e4);
+      if (confirm === "确认") {
+        await ctx.database.remove("maple_warriors", { userId });
+        return `删除【${character.name}】成功。输入"我的角色"将新建一个角色`;
+      } else {
+        return "删除失败！无法识别文本";
+      }
+    } catch (error) {
+      return "删除失败！回复超时";
+    }
+  });
+  ctx.command("猫武士/出售 <itemName> [count]", "出售物品").example("出售 老鼠").example("出售 老鼠 2").example("出售 老鼠 全部").action(async ({ session }, itemName, countStr) => {
+    if (!itemName) {
+      return "格式错误！正确格式：出售 物品名 [数量|全部]";
+    }
+    const userId = session.userId;
+    let character = await getOrCreateCharacter(userId);
+    const items = parseItemsString(character.items);
+    if (!items[itemName]) {
+      return `物品栏中没有${itemName}！`;
+    }
+    let count = 1;
+    let sellAll = false;
+    if (countStr === "全部") {
+      count = items[itemName];
+      sellAll = true;
+    } else if (countStr) {
+      const parsedCount = parseInt(countStr);
+      if (isNaN(parsedCount) || parsedCount <= 0) {
+        return '数量必须是正整数或"全部"';
+      }
+      count = Math.min(parsedCount, items[itemName]);
+    } else {
+      count = 1;
+    }
+    if (count > items[itemName]) {
+      return `物品栏中没有那么多${itemName}！`;
+    }
+    const itemInfo = await ctx.database.get("maple_warriors_items", { name: itemName });
+    const item = itemInfo.length > 0 ? itemInfo[0] : null;
+    const sellPrice = item?.sellPrice || 0;
+    const totalGold = sellPrice * count;
+    await session.send(`出售${itemName}*${count}将获得${formatGold(totalGold)}金币，回复"确认"进行出售！`);
+    try {
+      const confirm = await session.prompt(3e4);
+      if (confirm !== "确认") {
+        return "回复错误，出售失败！";
+      }
+      items[itemName] -= count;
+      if (items[itemName] <= 0) {
+        delete items[itemName];
+      }
+      const newGold = character.gold + totalGold;
+      await ctx.database.set("maple_warriors", { userId }, {
+        items: serializeItems(items),
+        gold: newGold,
+        updatedAt: /* @__PURE__ */ new Date()
+      });
+      return `出售了${itemName}*${count}，获得${formatGold(totalGold)}金币`;
+    } catch (error) {
+      return "回复错误，出售失败！";
+    }
+  });
+  ctx.command("猫武士/金币排行", "查看金币排行榜").example("金币排行").action(async ({ session }) => {
+    const allCharacters = await ctx.database.get("maple_warriors", {});
+    const sortedCharacters = allCharacters.sort((a, b) => b.gold - a.gold);
+    const topCharacters = sortedCharacters.slice(0, 5);
+    let output = "【金币排行】\n";
+    topCharacters.forEach((character, index) => {
+      const rank = index + 1;
+      output += `${rank}. ${character.name} 金币: ${formatGold(character.gold)}
+`;
+    });
+    return output.trim();
+  });
+  ctx.command("猫武士/购买物品 <itemName> [count]", "从商店购买物品").example("购买物品 老鼠").example("购买物品 老鼠 2").action(async ({ session }, itemName, countStr) => {
+    if (!itemName) {
+      return "格式错误！正确格式：购买物品 物品名 [数量]";
+    }
+    const userId = session.userId;
+    let character = await getOrCreateCharacter(userId);
+    const itemInfo = await ctx.database.get("maple_warriors_items", { name: itemName });
+    if (itemInfo.length === 0) {
+      return `购买失败！商店中没有${itemName}！`;
+    }
+    const item = itemInfo[0];
+    if (item.shopPrice < 0) {
+      return `购买失败！商店中没有${itemName}！`;
+    }
+    let count = 1;
+    if (countStr) {
+      const parsedCount = parseInt(countStr);
+      if (isNaN(parsedCount) || parsedCount <= 0) {
+        return "数量必须是正整数";
+      }
+      count = parsedCount;
+    }
+    const requiredGold = item.shopPrice * count;
+    if (character.gold < requiredGold) {
+      return `购买失败！需要${formatGold(requiredGold)}金币，金币不足！`;
+    }
+    const items = parseItemsString(character.items);
+    items[itemName] = (items[itemName] || 0) + count;
+    const newGold = character.gold - requiredGold;
+    await ctx.database.set("maple_warriors", { userId }, {
+      items: serializeItems(items),
+      gold: newGold,
+      updatedAt: /* @__PURE__ */ new Date()
+    });
+    return `购买成功！消耗${formatGold(requiredGold)}金币，获得了${itemName}*${count}`;
+  });
   setInterval(async () => {
     try {
       const now = /* @__PURE__ */ new Date();
@@ -899,20 +1553,42 @@ ${changes.join(" ")}`;
             updatedAt: /* @__PURE__ */ new Date()
           };
           if (character.status === "睡眠" || character.status === "治疗") {
-            updates.currentHp = character.maxHp;
+            const attrs = calculateCharacterAttributes(character);
+            updates.currentHp = attrs.maxHp;
           }
           await ctx.database.set("maple_warriors", { id: character.id }, updates);
         }
       }
+      for (const character of characters) {
+        const buffs = parseBuffs(character.buffs);
+        if (buffs.length === 0) continue;
+        const activeBuffs = buffs.filter((buff) => {
+          return new Date(buff.endTime) > now;
+        });
+        if (activeBuffs.length !== buffs.length) {
+          await ctx.database.set("maple_warriors", { id: character.id }, {
+            buffs: serializeBuffs(activeBuffs),
+            updatedAt: /* @__PURE__ */ new Date()
+          });
+        }
+      }
     } catch (error) {
-      console.error("状态检查错误:", error);
+      console.error("定时器错误:", error);
     }
   }, 6e4);
 }
 __name(apply, "apply");
 async function executeBattle(session, player1, player2, battleMessageInterval, isTraining = false, abortController) {
-  const originalHp1 = player1.hp;
-  const originalHp2 = player2.hp;
+  if (player1.hp <= 0) {
+    await session.send(`战斗失败！${player1.name}的HP为0！`);
+    return;
+  }
+  if (player2.hp <= 0) {
+    await session.send(`战斗失败！${player2.name}的HP为0！`);
+    return;
+  }
+  const initialHp1 = player1.hp;
+  const initialHp2 = player2.hp;
   const rates1 = calculateRates({
     toughness: player1.toughness,
     crit: player1.crit,
@@ -966,21 +1642,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 +1661,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 +1670,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(`战斗超时！双方平局！`);
       }