koishi-plugin-smmcat-gensokyo 0.0.40 → 0.0.42

package/lib/battle.d.ts

@@ -20,6 +20,7 @@ type BattleHistory = {
 type TeamData = {
     [keys: string]: {
         for: string;
+        duties: '前排' | '后排';
         identity: '队员' | '队长';
     };
 };
@@ -28,6 +29,7 @@ export type BattleAttribute = {
     id: number;
     /** 阵容 */
     for?: 'self' | 'goal';
+    duties?: '前排' | '后排';
     /** 等级 */
     lv: number;
     /** 单位名称 */
@@ -76,6 +78,8 @@ export type BattleAttribute = {
         name: string;
         prob: number;
     }[];
+    /** 被动技能 */
+    passiveList?: string[];
     /** 拓展数据 */
     expand: {
         [keys: string]: any;
@@ -143,7 +147,9 @@ export declare const BattleData: {
     isTeam(session: Session): boolean;
     /** 玩家是否在队伍中 通过UserId */
     isTeamByUserId(userId: string): boolean;
-    teamListByUser(userId: string): UserBaseAttribute[];
+    teamListByUser(userId: string): (UserBaseAttribute & {
+        duties: "\u524D\u6392" | "\u540E\u6392";
+    })[];
     /** 创建队伍 */
     creatTeam(session: Session): Promise<void>;
     /** 邀请加入队伍 */
@@ -154,6 +160,10 @@ export declare const BattleData: {
     exitTeam(session: Session): Promise<void>;
     /** 解散队伍 */
     dissolveTeam(session: Session): Promise<void>;
+    /** 查看职责 */
+    getTeamDuties(session: Session): Promise<void>;
+    /** 设置职责 */
+    settingTeamDuties(session: Session, playName: string, duties: "\u524D\u6392" | "\u540E\u6392"): Promise<void>;
     /** 创建战斗-与怪物 */
     createBattleByMonster(session: Session, goal: {
         name: string;

package/lib/damage.d.ts

@@ -16,6 +16,11 @@ export type DamageConfig = {
         self: BattleAttribute;
         goal: BattleAttribute;
     };
+    /** 浅拷贝数据 */
+    linkAgent: {
+        self: BattleAttribute;
+        goal: BattleAttribute;
+    };
     /** 实际伤害数据 */
     harm: number;
     /** 原始伤害数据 */
@@ -30,6 +35,8 @@ export type DamageConfig = {
     isBadDef: boolean;
     /** 减免伤害 */
     reductionVal: number;
+    /** 被动技能触发文本 */
+    passiveMsg: string[];
 };
 declare class Damage {
     config: DamageConfig;
@@ -61,7 +68,12 @@ declare class BuffDamage {
 /** 给予目标伤害 */
 declare function giveDamage(self: BattleAttribute, goal: BattleAttribute, damage: DamageConfig): number;
 /** 治疗目标 */
-declare function giveCure(goal: BattleAttribute, val: number): number;
+declare function giveCure(goal: BattleAttribute, val: number, fn?: (msg: string) => void): {
+    val: number;
+    buffMsg: string;
+};
 /** 伤害额外信息 */
-export declare function moreDamageInfo(damage: DamageConfig): string;
-export { Damage, BuffDamage, giveDamage, giveCure };
+declare function moreDamageInfo(damage: DamageConfig): string;
+/** 更多的伤害提示信息 */
+declare function baseMoreDamage(damageInfo: DamageConfig): string;
+export { Damage, BuffDamage, giveDamage, giveCure, moreDamageInfo, baseMoreDamage };

package/lib/data/PassiveFn.d.ts

@@ -1,12 +1,11 @@
-import { BattleAttribute } from "../battle";
+import { DamageConfig } from "../damage";
 export type PassiveDict = {
     [keys: string]: PassiveItem;
 };
 export type PassiveItem = {
     name: string;
     info: string;
-    damageFn: (agent: {
-        self: BattleAttribute;
-        goal: BattleAttribute;
-    }) => void;
+    type: 'atk' | 'hit';
+    damageFn: (config: DamageConfig) => string;
 };
+export declare const PassiveFn: PassiveDict;

package/lib/data/buffFn.d.ts

@@ -50,6 +50,9 @@ interface BuffConfig<T extends BuffType = BuffType> {
     fn(agent: BattleAttribute, cb?: (val: Extract<BuffItemParams, {
         type: T;
     }>) => void): void;
+    cureFn?(agent: BattleAttribute, cb?: (val: Extract<BuffItemParams, {
+        type: T;
+    }>) => void): string;
 }
 type BuffFnList = {
     [key: string]: BuffConfig;

package/lib/data/initMonster.d.ts

@@ -60,6 +60,8 @@ export type MonsterBaseAttribute = {
         /** 触发概率 */
         prob: number;
     }[];
+    /** 被动技能 */
+    passiveList?: string[];
 };
 export type MonsterTempData = {
     [keys: string]: MonsterBaseAttribute;

package/lib/index.js

@@ -136,7 +136,8 @@ var monsterData = {
     giveProps: [
       { name: "红药", val: 3, radomVal: 30 }
     ],
-    fn: [{ name: "垂死挣扎", prob: 1 }]
+    fn: [{ name: "垂死挣扎", prob: 1 }],
+    passiveList: []
   },
   "小蜘蛛": {
     name: "小蜘蛛",
@@ -159,7 +160,8 @@ var monsterData = {
     giveMonetary: 2,
     giveProps: [
       { name: "蓝药", val: 3, radomVal: 30 }
-    ]
+    ],
+    passiveList: []
   },
   "dora": {
     name: "dora",
@@ -184,7 +186,8 @@ var monsterData = {
       { name: "蓝药", val: 3, radomVal: 30 },
       { name: "初级万能药", val: 2, radomVal: 90, const: true, lv: 5 }
     ],
-    fn: [{ name: "治愈之光", prob: 1 }]
+    fn: [{ name: "治愈之光", prob: 1 }],
+    passiveList: []
   },
   "琪露诺": {
     name: "琪露诺",
@@ -205,6 +208,7 @@ var monsterData = {
     speed: 4,
     giveExp: 15,
     giveMonetary: 3,
+    passiveList: [],
     giveProps: [
       { name: "初级复活卷轴", val: 1, radomVal: 50 }
     ]
@@ -228,6 +232,7 @@ var monsterData = {
     speed: 5,
     giveExp: 15,
     giveMonetary: 3,
+    passiveList: [],
     giveProps: [
       { name: "初级复活卷轴", val: 1, radomVal: 50 }
     ]
@@ -251,6 +256,7 @@ var monsterData = {
     speed: 6,
     giveExp: 20,
     giveMonetary: 5,
+    passiveList: [],
     giveProps: [
       { name: "初级复活卷轴", val: 1, radomVal: 50 }
     ],
@@ -275,6 +281,7 @@ var monsterData = {
     speed: 5,
     giveExp: 16,
     giveMonetary: 5,
+    passiveList: [],
     giveProps: [
       { name: "初级复活卷轴", val: 1, radomVal: 50 }
     ],
@@ -299,6 +306,7 @@ var monsterData = {
     speed: 8,
     giveExp: 20,
     giveMonetary: 8,
+    passiveList: [],
     giveProps: [
       { name: "初级复活卷轴", val: 1, radomVal: 50 }
     ],
@@ -323,6 +331,7 @@ var monsterData = {
     speed: 8,
     giveExp: 20,
     giveMonetary: 8,
+    passiveList: ["反伤"],
     giveProps: [
       { name: "大红药", val: 2, radomVal: 50 }
     ],
@@ -423,7 +432,7 @@ var Monster = {
   },
   /** 格式化怪物属性数据 */
   monsterAttributeTextFormat(monster) {
-    const { name: name2, type, lv, hp, maxHp, mp, maxMp, atk, def, chr, evasion, hit, ghd, speed, info, pic, giveProps } = monster;
+    const { name: name2, type, lv, hp, maxHp, mp, maxMp, atk, def, chr, evasion, hit, ghd, speed, info, pic, giveProps, passiveList } = monster;
     const propsList = giveProps.filter((item) => item.lv ? lv >= item.lv : true).map((item) => item.name);
     const attributeText = (pic ? import_koishi.h.image(pic) + "\n" : "") + `Lv.${lv}【${name2}】
 
@@ -436,7 +445,8 @@ var Monster = {
 【速度值】${speed}
 【命中率】${(100 + (hit - 1e3) / 10).toFixed(1)}%
 【暴击率】${(chr / 10).toFixed(1)}%
-【爆伤倍率】${(ghd * 100).toFixed(0)}%` + (propsList?.length ? `
+【爆伤倍率】${(ghd * 100).toFixed(0)}%` + (passiveList.length ? `
+【被动技能】${passiveList.join("、")}` : "") + (propsList?.length ? `
 【概率掉落道具】` + propsList.join("、") : "") + (info ? "\n\n" + info : "");
     return attributeText;
   }
@@ -501,165 +511,6 @@ var AsyncOperationQueue = class {
   }
 };
 
-// src/damage.ts
-var Damage = class {
-  static {
-    __name(this, "Damage");
-  }
-  config;
-  constructor(agent, realHarm = false) {
-    this.config = {
-      agent: { self: { ...agent.self }, goal: { ...agent.goal } },
-      harm: 0,
-      default_harm: 0,
-      isRealHarm: realHarm,
-      isEvasion: false,
-      isCsp: false,
-      isBadDef: false,
-      reductionVal: 0
-    };
-  }
-  /** 伤害判定前 */
-  before(fn) {
-    this.config.default_harm = this.config.agent.self.atk + this.config.agent.self.gain.atk;
-    fn && fn(this.config);
-    return this;
-  }
-  /** 真实伤害判定 */
-  beforRealHarm(fn) {
-    fn && fn(this.config);
-    if (this.config.isRealHarm) {
-      this.config.harm = this.config.default_harm;
-    }
-    return this;
-  }
-  /** 是否闪避判定 */
-  evasion(fn) {
-    const { self, goal } = this.config.agent;
-    if (this.config.isRealHarm) return this;
-    const lvSup = /* @__PURE__ */ __name(() => Math.floor((goal.lv - self.lv) / 5) * 20, "lvSup");
-    const evaVal = Math.min(95, (goal.evasion + goal.gain.evasion - (self.hit - 1e3) + lvSup()) / 10);
-    if (random(0, 100) <= evaVal) {
-      this.config.isEvasion = true;
-      fn && fn(this.config);
-      return this;
-    }
-    fn && fn(this.config);
-    return this;
-  }
-  /** 是否暴击判定 */
-  csp(fn) {
-    const { self, goal } = this.config.agent;
-    if (this.config.isRealHarm) return this;
-    if (this.config.isEvasion) return this;
-    const cspVal = (self.chr + self.gain.chr - goal.csr) / 10;
-    if (random(0, 100) <= cspVal) {
-      this.config.isCsp = true;
-      this.config.harm = Math.floor(this.config.default_harm * (self.ghd + self.gain.ghd));
-      fn && fn(this.config);
-      return this;
-    }
-    this.config.harm = this.config.default_harm;
-    fn && fn(this.config);
-    return this;
-  }
-  /** 防御结算 */
-  beforDef(fn) {
-    const { goal } = this.config.agent;
-    if (this.config.isRealHarm) return this;
-    if (this.config.isEvasion) return this;
-    const dpVal = goal.def + goal.gain.def;
-    fn && fn(this.config);
-    if (this.config.harm - dpVal > 0) {
-      this.config.harm -= dpVal;
-    } else {
-      this.config.isBadDef = true;
-      this.config.harm = 1;
-    }
-    return this;
-  }
-  /** 最终结算 伤害减免 */
-  beforEnd(fn) {
-    if (!this.config.isRealHarm) {
-      this.config.reductionVal = Math.floor(this.config.agent.goal.gain.reduction * this.config.harm);
-      this.config.harm -= this.config.reductionVal;
-      if (this.config.harm < 0) {
-        this.config.harm = 0;
-      }
-    }
-    fn && fn(this.config);
-    return this;
-  }
-  result(fn) {
-    this.before((val) => {
-      fn?.before && fn.before(val);
-    }).beforRealHarm((val) => {
-      fn?.beforRealHarm && fn.beforRealHarm(val);
-    }).evasion((val) => {
-      fn?.evasion && fn.evasion(val);
-    }).csp((val) => {
-      fn?.csp && fn.csp(val);
-    }).beforDef((val) => {
-      fn?.beforDef && fn.beforDef(val);
-    }).beforEnd((val) => {
-      fn?.beforEnd && fn.beforEnd(val);
-    });
-    return this.config;
-  }
-};
-var BuffDamage = class {
-  static {
-    __name(this, "BuffDamage");
-  }
-  goal;
-  val;
-  isRealHarm;
-  constructor(val, goal, isRealHarm = false) {
-    this.goal = goal;
-    this.val = val;
-    this.isRealHarm = isRealHarm;
-  }
-  giveDamage() {
-    if (this.isRealHarm) {
-      const val = this.goal.hp - this.val > 0 ? this.val : this.goal.hp;
-      this.goal.hp -= val;
-      return val;
-    } else {
-      const def = this.goal.def + this.goal.gain.def;
-      const val = this.goal.hp + def - this.val > 0 ? this.val - def : this.goal.hp;
-      this.goal.hp -= val;
-      return val;
-    }
-  }
-};
-function giveDamage(self, goal, damage) {
-  if (goal.hp - damage.harm > 0) {
-    goal.hp -= damage.harm;
-    return damage.harm;
-  } else {
-    const lostHp = goal.hp;
-    goal.hp = 0;
-    return lostHp;
-  }
-}
-__name(giveDamage, "giveDamage");
-function giveCure(goal, val) {
-  const upVal = goal.hp + val;
-  if (upVal < goal.maxHp + goal.gain.maxHp) {
-    goal.hp = upVal;
-    return val;
-  } else {
-    const abHp = goal.maxHp + goal.gain.maxHp - goal.hp;
-    goal.hp += abHp;
-    return abHp;
-  }
-}
-__name(giveCure, "giveCure");
-function moreDamageInfo(damage) {
-  return (damage.isCsp ? `（暴击！）` : "") + (damage.isEvasion ? `（闪避成功！）` : "") + (damage.isBadDef ? `（未破防！）` : "");
-}
-__name(moreDamageInfo, "moreDamageInfo");
-
 // src/data/buffFn.ts
 var BuffFn = {
   "治愈": {
@@ -772,6 +623,14 @@ var BuffFn = {
       if (!agent.expand["curse-buff"]) agent.expand["curse-buff"] = { val: 0 };
       agent.expand["curse-buff"].val++;
     }, "initFn"),
+    cureFn: /* @__PURE__ */ __name(function(agent, fn) {
+      if (random(0, 1)) {
+        clearImprint(agent, { name: "咒" });
+        return ` 治疗状态下 ⌈咒⌋ 被成功驱散`;
+      } else {
+        return ``;
+      }
+    }, "cureFn"),
     fn: /* @__PURE__ */ __name(function(agent, fn) {
       fn && fn({
         type: "印记" /* 印记 */,
@@ -787,7 +646,7 @@ function giveBuff(agent, buff) {
   const buffInfo = BuffFn[buff.name] || null;
   if (!buffInfo) return;
   if (buffInfo.type == "印记" /* 印记 */) {
-    buffInfo?.initFn(agent);
+    buffInfo.initFn?.(agent);
   }
   let again = false;
   if (agent.buff[buff.name]) again = true;
@@ -833,8 +692,10 @@ function settlementBuff(agent) {
   agent.gain.maxMp = 0;
   agent.gain.speed = 0;
   agent.gain.reduction = 0;
+  agent.gain.TreatmentUp = 0;
   agent.gain.dizziness = false;
   agent.gain.chaos = false;
+  agent.gain.silence = false;
   const msgList = [];
   const gainDict = {
     atk: "攻击",
@@ -861,7 +722,7 @@ function settlementBuff(agent) {
       case "治疗" /* 治疗 */:
         buffInfo.fn(agent, (val) => {
           const value = giveCure(agent, val.val);
-          msgList.push(`${buffInfo.name}+${value}HP`);
+          msgList.push(`${buffInfo.name}+${value.val}HP。` + (value.buffMsg ? value.buffMsg : ""));
         });
         break;
       case "增益" /* 增益 */:
@@ -914,6 +775,279 @@ function settlementBuff(agent) {
 }
 __name(settlementBuff, "settlementBuff");
 
+// src/data/PassiveFn.ts
+var PassiveFn = {
+  "吸血": {
+    name: "吸血",
+    info: "造成伤害时，汲取10%该次伤害的值治疗自己",
+    type: "atk",
+    damageFn: /* @__PURE__ */ __name(function(config) {
+      const val = Math.floor(config.harm * 0.1);
+      if (val) {
+        const res = giveCure(config.linkAgent.self, val);
+        return `‣ ${getLineupName(config.linkAgent.self)}:[${this.name}] HP+${res.val}`;
+      }
+      return ``;
+    }, "damageFn")
+  },
+  "反伤": {
+    name: "反伤",
+    info: "有40%概率直接反弹本次伤害的20%（真实伤害）",
+    type: "hit",
+    damageFn: /* @__PURE__ */ __name(function(config) {
+      const val = Math.floor(config.harm * 0.2);
+      if (val && random(0, 10) <= 4) {
+        const value = new BuffDamage(val, config.linkAgent.self, true).giveDamage();
+        console.log(config.linkAgent.self);
+        return `‣ ${getLineupName(config.linkAgent.self)}:[${this.name}] HP-${value}`;
+      }
+      return ``;
+    }, "damageFn")
+  },
+  "破势": {
+    name: "破势",
+    info: "敌方血量大于70%时，造成的伤害提高30%",
+    type: "atk",
+    damageFn: /* @__PURE__ */ __name(function(config) {
+      if (config.linkAgent.goal.hp / config.linkAgent.goal.maxHp > 0.7) {
+        const upVal = Math.floor(config.harm * 0.3);
+        if (upVal) {
+          config.harm += Math.floor(config.harm * 0.3);
+          return `‣ ${getLineupName(config.linkAgent.self)}:[${this.name}] 伤害+${upVal}`;
+        }
+        return ``;
+      }
+      return ``;
+    }, "damageFn")
+  },
+  "心眼": {
+    name: "心眼",
+    info: "敌方血量小于40%时，造成的伤害提高30%",
+    type: "atk",
+    damageFn: /* @__PURE__ */ __name(function(config) {
+      if (config.linkAgent.goal.hp / config.linkAgent.goal.maxHp < 0.4) {
+        const upVal = Math.floor(config.harm * 0.3);
+        if (upVal) {
+          config.harm += Math.floor(config.harm * 0.3);
+          return `‣ ${getLineupName(config.linkAgent.self)}:[${this.name}] 伤害+${upVal}`;
+        }
+        return ``;
+      }
+      return ``;
+    }, "damageFn")
+  },
+  "针女": {
+    name: "针女",
+    info: "攻击时有40%概率额外造成敌方5%血量真实伤害（伤害最大不超过使用者攻击力的120%）",
+    type: "atk",
+    damageFn: /* @__PURE__ */ __name(function(config) {
+      if (random(0, 10) <= 4) {
+        const upVal = Math.min(
+          config.linkAgent.self.atk + config.linkAgent.self.gain.atk,
+          Math.floor(config.linkAgent.goal.maxHp * 0.05)
+        );
+        if (upVal) {
+          const value = new BuffDamage(upVal, config.linkAgent.goal, true).giveDamage();
+          return `‣ ${getLineupName(config.linkAgent.goal)}:[${this.name}] HP-${value}`;
+        }
+        return ``;
+      }
+      return ``;
+    }, "damageFn")
+  }
+};
+
+// src/damage.ts
+var Damage = class {
+  static {
+    __name(this, "Damage");
+  }
+  config;
+  constructor(agent, realHarm = false) {
+    this.config = {
+      agent: { self: { ...agent.self }, goal: { ...agent.goal } },
+      linkAgent: { self: agent.self, goal: agent.goal },
+      harm: 0,
+      default_harm: 0,
+      isRealHarm: realHarm,
+      isEvasion: false,
+      isCsp: false,
+      isBadDef: false,
+      reductionVal: 0,
+      passiveMsg: []
+    };
+  }
+  /** 伤害判定前 */
+  before(fn) {
+    this.config.default_harm = this.config.agent.self.atk + this.config.agent.self.gain.atk;
+    fn && fn(this.config);
+    return this;
+  }
+  /** 真实伤害判定 */
+  beforRealHarm(fn) {
+    fn && fn(this.config);
+    if (this.config.isRealHarm) {
+      this.config.harm = this.config.default_harm;
+    }
+    return this;
+  }
+  /** 是否闪避判定 */
+  evasion(fn) {
+    const { self, goal } = this.config.agent;
+    if (this.config.isRealHarm) return this;
+    const lvSup = /* @__PURE__ */ __name(() => Math.floor((goal.lv - self.lv) / 5) * 20, "lvSup");
+    const evaVal = Math.min(95, (goal.evasion + goal.gain.evasion - (self.hit - 1e3) + lvSup()) / 10);
+    if (random(0, 100) <= evaVal) {
+      this.config.isEvasion = true;
+      fn && fn(this.config);
+      return this;
+    }
+    fn && fn(this.config);
+    return this;
+  }
+  /** 是否暴击判定 */
+  csp(fn) {
+    const { self, goal } = this.config.agent;
+    if (this.config.isRealHarm) return this;
+    if (this.config.isEvasion) return this;
+    const cspVal = (self.chr + self.gain.chr - goal.csr) / 10;
+    if (random(0, 100) <= cspVal) {
+      this.config.isCsp = true;
+      this.config.harm = Math.floor(this.config.default_harm * (self.ghd + self.gain.ghd));
+      fn && fn(this.config);
+      return this;
+    }
+    this.config.harm = this.config.default_harm;
+    fn && fn(this.config);
+    return this;
+  }
+  /** 防御结算 */
+  beforDef(fn) {
+    const { goal } = this.config.agent;
+    if (this.config.isRealHarm) return this;
+    if (this.config.isEvasion) return this;
+    const dpVal = goal.def + goal.gain.def;
+    fn && fn(this.config);
+    if (this.config.harm - dpVal > 0) {
+      this.config.harm -= dpVal;
+    } else {
+      this.config.isBadDef = true;
+      this.config.harm = 1;
+    }
+    return this;
+  }
+  /** 最终结算 伤害减免 */
+  beforEnd(fn) {
+    if (!this.config.isRealHarm) {
+      this.config.reductionVal = Math.floor(this.config.agent.goal.gain.reduction * this.config.harm);
+      this.config.harm -= this.config.reductionVal;
+      if (this.config.harm < 0) {
+        this.config.harm = 0;
+      }
+    }
+    fn && fn(this.config);
+    if (this.config.linkAgent.self.passiveList?.length) {
+      this.config.linkAgent.self.passiveList.forEach((passiveName) => {
+        if (PassiveFn[passiveName].type == "atk") {
+          const msg = PassiveFn[passiveName].damageFn(this.config);
+          msg && this.config.passiveMsg.push(msg);
+        }
+      });
+    }
+    return this;
+  }
+  result(fn) {
+    this.before((val) => {
+      fn?.before && fn.before(val);
+    }).beforRealHarm((val) => {
+      fn?.beforRealHarm && fn.beforRealHarm(val);
+    }).evasion((val) => {
+      fn?.evasion && fn.evasion(val);
+    }).csp((val) => {
+      fn?.csp && fn.csp(val);
+    }).beforDef((val) => {
+      fn?.beforDef && fn.beforDef(val);
+    }).beforEnd((val) => {
+      fn?.beforEnd && fn.beforEnd(val);
+    });
+    return this.config;
+  }
+};
+var BuffDamage = class {
+  static {
+    __name(this, "BuffDamage");
+  }
+  goal;
+  val;
+  isRealHarm;
+  constructor(val, goal, isRealHarm = false) {
+    this.goal = goal;
+    this.val = val;
+    this.isRealHarm = isRealHarm;
+  }
+  giveDamage() {
+    if (this.isRealHarm) {
+      const val = this.goal.hp - this.val > 0 ? this.val : this.goal.hp;
+      this.goal.hp -= val;
+      return val;
+    } else {
+      const def = this.goal.def + this.goal.gain.def;
+      const val = this.goal.hp + def - this.val > 0 ? this.val - def : this.goal.hp;
+      this.goal.hp -= val;
+      return val;
+    }
+  }
+};
+function giveDamage(self, goal, damage) {
+  if (damage.linkAgent.goal.passiveList?.length) {
+    damage.linkAgent.goal.passiveList.forEach((passiveName) => {
+      if (PassiveFn[passiveName].type == "hit") {
+        const msg = PassiveFn[passiveName].damageFn(damage);
+        msg && damage.passiveMsg.push(msg);
+      }
+    });
+  }
+  if (goal.hp - damage.harm > 0) {
+    goal.hp -= damage.harm;
+    return damage.harm;
+  } else {
+    const lostHp = goal.hp;
+    goal.hp = 0;
+    return lostHp;
+  }
+}
+__name(giveDamage, "giveDamage");
+function giveCure(goal, val, fn) {
+  const buffMsg = [];
+  console.log(goal.buff);
+  Object.keys(goal.buff).forEach((buff) => {
+    if (BuffFn[buff]?.cureFn) {
+      const msg = BuffFn[buff].cureFn(goal);
+      msg && buffMsg.push(msg);
+    }
+  });
+  const upVal = goal.hp + val;
+  if (upVal < goal.maxHp + goal.gain.maxHp) {
+    goal.hp = upVal;
+    fn && fn(buffMsg.join("、"));
+    return { val, buffMsg: buffMsg.join("、") };
+  } else {
+    const abHp = goal.maxHp + goal.gain.maxHp - goal.hp;
+    goal.hp += abHp;
+    fn && fn(buffMsg.join("、"));
+    return { val: abHp, buffMsg: buffMsg.join("、") };
+  }
+}
+__name(giveCure, "giveCure");
+function moreDamageInfo(damage) {
+  return (damage.isCsp ? `（暴击！）` : "") + (damage.isEvasion ? `（闪避！）` : "") + (damage.isBadDef ? `（未破防！）` : "") + (damage.isRealHarm ? `(真实伤害)` : "");
+}
+__name(moreDamageInfo, "moreDamageInfo");
+function baseMoreDamage(damageInfo) {
+  return moreDamageInfo(damageInfo) + (damageInfo.passiveMsg.length ? "\n" + damageInfo.passiveMsg.join("‣") : "");
+}
+__name(baseMoreDamage, "baseMoreDamage");
+
 // src/data/skillFn.ts
 var skillFn = {
   "重砍": {
@@ -936,7 +1070,7 @@ var skillFn = {
         target: [agent.goal],
         isNext: false
       });
-      return `${getLineupName(agent.self)} 释放重砍，对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。` + moreDamageInfo(damageData);
+      return `${getLineupName(agent.self)} 释放重砍，对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。` + baseMoreDamage(damageData);
     }, "fn")
   },
   "突刺": {
@@ -959,7 +1093,7 @@ var skillFn = {
         target: [agent.goal],
         isNext: false
       });
-      return `${getLineupName(agent.self)} 释放突刺，对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。` + moreDamageInfo(damageData);
+      return `${getLineupName(agent.self)} 释放突刺，对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。` + baseMoreDamage(damageData);
     }, "fn")
   },
   "水炮": {
@@ -981,7 +1115,7 @@ var skillFn = {
         target: [agent.goal],
         isNext: false
       });
-      return `${getLineupName(agent.self)} 释放水炮，对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。` + moreDamageInfo(damageData);
+      return `${getLineupName(agent.self)} 释放水炮，对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。` + baseMoreDamage(damageData);
     }, "fn")
   },
   "濒死一击": {
@@ -1004,7 +1138,7 @@ var skillFn = {
           target: [agent.goal],
           isNext: false
         });
-        return `${getLineupName(agent.self)} 释放濒死一击，对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。` + moreDamageInfo(damageData);
+        return `${getLineupName(agent.self)} 释放濒死一击，对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。` + baseMoreDamage(damageData);
       } else {
         fn({
           type: "释放失败" /* 释放失败 */,
@@ -1053,7 +1187,7 @@ var skillFn = {
         target: [agent.goal],
         isNext: false
       });
-      return `${getLineupName(agent.self)} 进行垂死挣扎，对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。` + moreDamageInfo(damageData);
+      return `${getLineupName(agent.self)} 进行垂死挣扎，对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。` + baseMoreDamage(damageData);
     }, "fn")
   },
   "治愈之光": {
@@ -1099,7 +1233,7 @@ var skillFn = {
           isNext: false,
           target: [goal]
         });
-        msgList.push(`- 对 ${getLineupName(goal)} 造成 ${damageData.harm} 伤害。${useBuff ? "(中毒)" : ""}` + moreDamageInfo(damageData));
+        msgList.push(`- 对 ${getLineupName(goal)} 造成 ${damageData.harm} 伤害。${useBuff ? "(中毒)" : ""}` + baseMoreDamage(damageData));
       });
       return msgList.join("\n");
     }, "fn")
@@ -1129,7 +1263,7 @@ var skillFn = {
         isNext: false,
         target: [agent.goal]
       });
-      return `${getLineupName(agent.self)} 发动恐怖催眠术！对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。${useBuff ? "(晕眩)" : ""}` + moreDamageInfo(damageData);
+      return `${getLineupName(agent.self)} 发动恐怖催眠术！对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。${useBuff ? "(晕眩)" : ""}` + baseMoreDamage(damageData);
     }, "fn")
   },
   "恐怖的回忆": {
@@ -1183,7 +1317,7 @@ var skillFn = {
   "紧闭的恋之瞳": {
     name: "紧闭的恋之瞳",
     type: "减益技" /* 减益技 */,
-    info: "[减益技]怪物特有技能：为玩家目标添加5回合的⌈咒⌋印记，当对方持有3个⌈咒⌋印记，将直接死亡。",
+    info: "[减益技]怪物特有技能：为玩家目标添加5回合的⌈咒⌋印记，当对方持有3个⌈咒⌋印记，将直接死亡。⌈咒⌋可以有50%概率会被技能类型的治疗驱散",
     lv: 5,
     mp: 40,
     fn: /* @__PURE__ */ __name(function(agent, agentList, fn) {
@@ -1204,9 +1338,9 @@ var skillFn = {
       if (agent.goal.expand[key].val >= 3) {
         agent.goal.hp = 0;
         clearImprint(agent.goal, { name: "咒" });
-        return `${getLineupName(agent.self)}释放紧闭的恋之瞳，目标⌈咒⌋层达到3层，目标立即死亡`;
+        return `${getLineupName(agent.self)}释放紧闭的恋之瞳，${getLineupName(agent.goal)}⌈咒⌋层达到3层，立即死亡!`;
       }
-      return `${getLineupName(agent.self)}释放紧闭的恋之瞳，目标⌈咒⌋层数${agent.goal.expand[key].val}层`;
+      return `${getLineupName(agent.self)}释放紧闭的恋之瞳，${getLineupName(agent.goal)}⌈咒⌋层数${agent.goal.expand[key].val}层`;
     }, "fn")
   },
   "无意识行动": {
@@ -1242,7 +1376,7 @@ var skillFn = {
         isNext: false,
         target: [agent.goal]
       });
-      return `${getLineupName(agent.self)} 发动无意识行动！对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。${useBuff ? "(沉默)" : ""}` + moreDamageInfo(damageData);
+      return `${getLineupName(agent.self)} 发动无意识行动！对 ${getLineupName(agent.goal)} 造成 ${damageData.harm} 伤害。${useBuff ? "(沉默)" : ""}` + baseMoreDamage(damageData);
     }, "fn")
   }
 };
@@ -1284,7 +1418,7 @@ var BattleData = {
     const _userId = BattleData.teamTemp[userId].for;
     Object.keys(BattleData.teamTemp).forEach((item) => {
       if (BattleData.teamTemp[item].for == _userId) {
-        teamList.push(User.getUserAttributeByUserId(item));
+        teamList.push({ ...User.getUserAttributeByUserId(item), duties: BattleData.teamTemp[item].duties });
       }
     });
     return teamList;
@@ -1293,11 +1427,12 @@ var BattleData = {
   async creatTeam(session) {
     const { userId } = session;
     if (BattleData.isTeamByUserId(userId)) {
-      await session.send(`${User.getUserName(userId)}:你已经加入了${BattleData.teamTemp[userId].for}的队伍，需要退出才可以重新创建！`);
+      await session.send(`${User.getUserName(userId)}:你已经加入了${User.getUserName(BattleData.teamTemp[userId].for)}的队伍，需要退出才可以重新创建！`);
       return;
     }
     BattleData.teamTemp[userId] = {
       for: userId,
+      duties: "后排",
       identity: "队长"
     };
     await session.send("创建队伍成功！发送 /队伍邀请 昵称 \n可对周围对应昵称玩家进行组队邀请！");
@@ -1355,6 +1490,7 @@ var BattleData = {
     }
     BattleData.teamTemp[userId] = {
       for: invInfo.for,
+      duties: "后排",
       identity: "队员"
     };
     await session.send(`加入${invInfo.playName}的队伍成功！
@@ -1392,6 +1528,39 @@ var BattleData = {
     });
     await session.send("操作成功，已经解散你创建的小队。");
   },
+  /** 查看职责 */
+  async getTeamDuties(session) {
+    const { userId } = session;
+    if (!BattleData.isTeamByUserId(userId)) {
+      await session.send("你还没有加入任何队伍！");
+      return;
+    }
+    const team = BattleData.teamListByUser(userId);
+    await session.send(`当前队伍职责：
+` + team.map((agent) => {
+      return `Lv.${agent.lv} ` + agent.playName + ` [${agent.duties}]`;
+    }).join("\n"));
+  },
+  /** 设置职责 */
+  async settingTeamDuties(session, playName, duties) {
+    const { userId } = session;
+    if (!BattleData.isTeamByUserId(userId)) {
+      await session.send("你还没有加入任何队伍！");
+      return;
+    }
+    if (BattleData.teamTemp[userId].identity == "队员") {
+      await session.send("你不是小队队长，无法配置职责。");
+      return;
+    }
+    const isUpdate = Object.keys(BattleData.teamTemp).some((item) => {
+      if (BattleData.teamTemp[item].for == userId && item == User.getUserIdByPlayName(playName)) {
+        BattleData.teamTemp[item].duties = duties;
+        return true;
+      }
+      return false;
+    });
+    await session.send(isUpdate ? "修改成功！" : "修改失败，可能原因：小队中不存在此人！");
+  },
   /** 创建战斗-与怪物 */
   async createBattleByMonster(session, goal) {
     if (BattleData.isBattle(session)) {
@@ -1614,7 +1783,12 @@ MP:${item.mp}/${item.maxMp + item.gain.maxMp}`);
           } else if (agent.type == "玩家") {
             selectGoal = lifeGoalList[Math.floor(Math.random() * lifeGoalList.length)];
           } else {
-            selectGoal = lifeGoalList[Math.floor(Math.random() * lifeGoalList.length)];
+            const fistGoal = lifeGoalList.filter((item) => item.duties == "前排");
+            if (!fistGoal.length) {
+              selectGoal = lifeGoalList[Math.floor(Math.random() * lifeGoalList.length)];
+            } else {
+              selectGoal = fistGoal[Math.floor(Math.random() * fistGoal.length)];
+            }
             if (random(0, 10) < 4 && agent.fn?.length) {
               funType = getSkillFn(agent.fn);
             }
@@ -1628,7 +1802,7 @@ MP:${item.mp}/${item.maxMp + item.gain.maxMp}`);
           const damageInfo = new Damage({ self: agent, goal: selectGoal }).result();
           giveDamage(agent, selectGoal, damageInfo);
           msgList.push(
-            `${getLineupName(agent)} 使用普攻攻击了 ${getLineupName(selectGoal)}，造成了${damageInfo.harm}伤害。` + moreDamageInfo(damageInfo)
+            `${getLineupName(agent)} 使用普攻攻击了 ${getLineupName(selectGoal)}，造成了${damageInfo.harm}伤害。` + baseMoreDamage(damageInfo)
           );
         }, "noralAtk");
         if (funType == "普攻" || agent.gain.silence) {
@@ -1640,6 +1814,7 @@ MP:${item.mp}/${item.maxMp + item.gain.maxMp}`);
               _selectGoal = lifeSelfList.find((item) => item.name == select) || agent;
             }
             const selectFn = skillFn[funType];
+            let buffmsg = "";
             if (selectFn.mp == 0 || agent.mp - selectFn.mp >= 0) {
               agent.mp -= selectFn.mp;
               let isNext = false;
@@ -1656,7 +1831,11 @@ MP:${item.mp}/${item.maxMp + item.gain.maxMp}`);
                     case "治疗技" /* 治疗技 */:
                       val.target.map((goal) => {
                         val.value += val.value * (1 - agent.gain.TreatmentUp);
-                        giveCure(goal, val.value);
+                        giveCure(goal, val.value, (msg) => {
+                          if (msg) {
+                            buffmsg = "。" + msg;
+                          }
+                        });
                       });
                       break;
                     case "增益技" /* 增益技 */:
@@ -1673,7 +1852,7 @@ MP:${item.mp}/${item.maxMp + item.gain.maxMp}`);
                   isNext = val.isNext;
                 }
               );
-              fnMsg && msgList.push(fnMsg);
+              fnMsg && msgList.push(fnMsg + buffmsg);
               isNext && noralAtk();
             } else {
               isMy && await session.send(`MP不足，释放失败！`);
@@ -1809,6 +1988,7 @@ function initBattleAttribute(data) {
       id: Date.now(),
       userId: userData.userId,
       name: userData.playName,
+      duties: BattleData.isTeamByUserId(userData.userId) ? BattleData.teamTemp[userData.userId].duties : "前排",
       lv: userData.lv,
       type: "玩家",
       selfType: userData.type,
@@ -1842,6 +2022,7 @@ function initBattleAttribute(data) {
       },
       buff: {},
       fn: [],
+      passiveList: [],
       expand: {}
     };
     return temp;
@@ -1882,6 +2063,7 @@ function initBattleAttribute(data) {
         reduction: 0
       },
       buff: {},
+      passiveList: monsterData2.passiveList || [],
       fn: monsterData2.fn ? JSON.parse(JSON.stringify(monsterData2.fn)).filter((item) => {
         return skillFn[item.name] && monsterData2.lv >= skillFn[item.name].lv;
       }) : [],
@@ -2158,6 +2340,7 @@ var User = {
   config: {},
   ctx: {},
   userTempData: {},
+  userNameTemp: {},
   async init(config, ctx) {
     User.config = config;
     User.ctx = ctx;
@@ -2183,6 +2366,7 @@ var User = {
     const temp = {};
     userData.forEach((item) => {
       temp[item.userId] = item;
+      User.userNameTemp[item.playName] = item.userId;
     });
     User.userTempData = temp;
   },
@@ -2190,6 +2374,10 @@ var User = {
   getUserName(userId) {
     return User.userTempData[userId].playName || null;
   },
+  /** 获取玩家userId */
+  getUserIdByPlayName(playName) {
+    return User.userNameTemp[playName] || null;
+  },
   /** 获取角色基础属性 */
   async getUserAttribute(session) {
     if (!User.userTempData[session.userId]) {
@@ -2315,6 +2503,7 @@ ${Object.keys(UserOccDict).map((i) => `【${i}】:${UserOccDict[i].info}`).join(
     };
     User.ctx.database.create("smm_gensokyo_user_attribute", temp);
     User.userTempData[session.userId] = temp;
+    User.userNameTemp[temp.playName] = temp.userId;
     await Props.initUserPropsData(session.userId);
     await session.send("创建成功！\n" + User.userAttributeTextFormat(session.userId));
   },
@@ -3624,7 +3813,20 @@ function apply(ctx, config) {
     if (!goal) return `请输入技能名，例如 /技能查询 重砍`;
     if (!skillFn[goal]) return `没有存在 ${goal} 技能！`;
     return `[${goal}]信息如下：
-` + skillFn[goal].info;
+` + skillFn[goal].info + `
+消耗MP：${skillFn[goal].mp}`;
+  });
+  ctx.command("幻想乡/被动查询 <goal>").action(async ({ session }, goal) => {
+    if (!goal) return `请输入被动名，例如 /被动查询 吸血`;
+    if (!PassiveFn[goal]) return `没有存在 ${goal} 被动！`;
+    return `[${goal}]信息如下：
+` + PassiveFn[goal].info;
+  });
+  ctx.command("幻想乡/状态查询 <goal>").action(async ({ session }, goal) => {
+    if (!goal) return `请输入技能名，例如 /状态查询 治愈`;
+    if (!BuffFn[goal]) return `没有存在 ${goal} 状态！`;
+    return `[${goal}]信息如下：
+` + BuffFn[goal].info;
   });
   const temp = {};
   ctx.command("幻想乡/补给").action(async ({ session }) => {
@@ -3669,7 +3871,7 @@ function apply(ctx, config) {
     const team = BattleData.teamListByUser(session.userId);
     if (!team.length) return `你还没有队伍...`;
     return `当前队伍信息如下：
-` + team.map((item) => `lv.${item.lv} ${item.playName} [${BattleData.teamTemp[item.userId].identity}]`).join("\n");
+` + team.map((item) => `lv.${item.lv} ${item.playName} [${BattleData.teamTemp[item.userId].identity}] 【${item.duties}】`).join("\n");
   });
   ctx.command("队伍操作/队伍邀请 <playName>").action(async ({ session }, playName) => {
     const userData = await User.getUserAttribute(session);
@@ -3710,6 +3912,26 @@ function apply(ctx, config) {
     }
     await BattleData.dissolveTeam(session);
   });
+  ctx.command("队伍操作/队伍职责").action(async ({ session }) => {
+    const userData = await User.getUserAttribute(session);
+    if (!userData) return;
+    GensokyoMap.initUserPoistion(session, userData);
+    await BattleData.getTeamDuties(session);
+  });
+  ctx.command("队伍操作/队伍调整 <goal> <type>").action(async ({ session }, goal, type) => {
+    const userData = await User.getUserAttribute(session);
+    if (!userData) return;
+    GensokyoMap.initUserPoistion(session, userData);
+    if (!(goal && type)) {
+      return `请携带队伍中成员的名字和职责进行操作！
+例如 /队伍调整 张三 前排`;
+    }
+    if (!["前排", "后排"].includes(type)) {
+      return `设置失败，目前只有 前排 和 后排职责。`;
+    } else {
+      await BattleData.settingTeamDuties(session, goal, type);
+    }
+  });
   ctx.command("幻想乡/地图").action(async ({ session }) => {
     const userData = await User.getUserAttribute(session);
     if (!userData) return;

package/lib/users.d.ts

@@ -80,9 +80,14 @@ export declare const User: {
     config: Config;
     ctx: Context;
     userTempData: UserTempData;
+    userNameTemp: {
+        [keys: string]: string;
+    };
     init(config: Config, ctx: Context): Promise<void>;
     /** 获取玩家名字 */
     getUserName(userId: string): string;
+    /** 获取玩家userId */
+    getUserIdByPlayName(playName: string): string;
     /** 获取角色基础属性 */
     getUserAttribute(session: Session): Promise<UserBaseAttribute>;
     /** 获取角色实际等级属性数据 */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-smmcat-gensokyo",
   "description": "名为《幻想乡》的文字冒险游戏",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [