koishi-plugin-smmcat-gensokyo 0.0.3 → 0.0.4

package/lib/battle.d.ts

@@ -1,5 +1,6 @@
 import { Context, Session } from "koishi";
 import { Config } from ".";
+import { UserBaseAttribute } from "./users";
 declare module 'koishi' {
     interface Tables {
         smm_gensokyo_battle_history: BattleHistory;
@@ -87,6 +88,7 @@ type LastPlay = {
     [keys: string]: {
         self: BattleAttribute[];
         goal: BattleAttribute[];
+        isPK?: boolean;
     };
 };
 export declare const BattleData: {
@@ -98,22 +100,32 @@ export declare const BattleData: {
     init(config: Config, ctx: Context): void;
     /** 玩家是否正在战斗 */
     isBattle(session: Session): boolean;
+    /** 玩家是否正在战斗 */
+    isBattleByUserId(userId: string): boolean;
     /** 玩家是否在队伍中 */
     isTeam(session: Session): boolean;
+    isTeamByUserId(userId: string): boolean;
+    teamListByUser(userId: string): UserBaseAttribute[];
     /** 创建战斗-与怪物 */
     createBattleByMonster(session: Session, goal: {
         name: string;
         lv: number;
     }[]): Promise<void>;
+    /** 创建战斗-与玩家 */
+    createBattleByUser(session: Session, goal: {
+        userId: string;
+    }[]): Promise<void>;
     /** 文本化当前战况 */
     battleSituationTextFormat(team: {
         self: BattleAttribute[];
         goal: BattleAttribute[];
+        isPK?: boolean;
     }): string;
     /** 判断输赢 */
     playOver(team: {
         self: BattleAttribute[];
         goal: BattleAttribute[];
+        isPK?: boolean;
     }): {
         over: boolean;
         type: string;

package/lib/index.js

@@ -308,10 +308,24 @@ var GensokyoMap = {
     };
     fn && await fn(areaInfo);
     await delay(3e3);
-    GensokyoMap.setLocalStoragePoistionData(session.userId);
     userCurrentArea.moveing = false;
+    GensokyoMap.setLocalStoragePoistionData(session.userId);
     return;
   },
+  /** 查询附近玩家 */
+  nearbyPlayersByUserId(userId) {
+    const areaData = GensokyoMap.getUserCurrentArea(userId);
+    const liveUser = [];
+    Object.keys(GensokyoMap.userCurrentLoal).forEach((_userId) => {
+      const userItem = GensokyoMap.userCurrentLoal[_userId];
+      if (userItem.areaName == areaData.areaName && userItem.floor == areaData.floor) {
+        if (userId !== userItem.userId) {
+          liveUser.push({ userId: userItem.userId, playName: userItem.playName });
+        }
+      }
+    });
+    return liveUser;
+  },
   /** 区域信息格式化 */
   userAreaTextFormat(gameName, data) {
     const liveUser = [];
@@ -893,10 +907,27 @@ var BattleData = {
   isBattle(session) {
     return !!BattleData.lastPlay[session.userId];
   },
+  /** 玩家是否正在战斗 */
+  isBattleByUserId(userId) {
+    return !!BattleData.lastPlay[userId];
+  },
   /** 玩家是否在队伍中 */
   isTeam(session) {
     return !!BattleData.teamTemp[session.userId];
   },
+  isTeamByUserId(userId) {
+    return !!BattleData.teamTemp[userId];
+  },
+  // 返回队伍信息
+  teamListByUser(userId) {
+    const teamList = [];
+    Object.keys(BattleData.teamTemp).forEach((item) => {
+      if (BattleData.teamTemp[item].for == userId) {
+        teamList.push(User.getUserAttributeByUserId(item));
+      }
+    });
+    return teamList;
+  },
   /** 创建战斗-与怪物 */
   async createBattleByMonster(session, goal) {
     if (BattleData.isBattle(session)) {
@@ -923,14 +954,69 @@ var BattleData = {
     goal.forEach((item) => {
       battle_monsterList.push(initBattleAttribute(Monster.getMonsterAttributeData(item.name, item.lv)));
     });
+    const temp = {
+      self: battle_user.map((i) => ({ ...i, for: "self" })),
+      goal: battle_monsterList.map((i) => ({ ...i, for: "goal" }))
+    };
     playUser.forEach((userId) => {
-      BattleData.lastPlay[userId] = {
-        self: battle_user.map((i) => ({ ...i, for: "self" })),
-        goal: battle_monsterList.map((i) => ({ ...i, for: "goal" }))
-      };
+      BattleData.lastPlay[userId] = temp;
     });
     await session.send(`开始与 ${goal.map((i) => i.name).join("、")} 进行战斗`);
   },
+  /** 创建战斗-与玩家 */
+  async createBattleByUser(session, goal) {
+    if (BattleData.isBattle(session)) {
+      await session.send("当前正在战斗，还不能逃脱！");
+      return;
+    }
+    const battle_self = [];
+    const battle_goal = [];
+    const playUser = [];
+    const lostMsg = [];
+    goal = goal.filter((item) => {
+      const isBattle = BattleData.isBattleByUserId(item.userId);
+      const pyUser = User.userTempData[item.userId];
+      if (isBattle) {
+        lostMsg.push(`${pyUser.playName}正在参与着一场战斗，无法被PK选中。`);
+        return false;
+      }
+      return true;
+    });
+    if (lostMsg.length) {
+      await session.send(lostMsg.join("\n"));
+    }
+    if (!goal.length) {
+      lostMsg.push(`PK失败，无任何目标进行PK`);
+      return;
+    }
+    if (BattleData.isTeam(session) && BattleData.teamTemp[session.userId].identity == "队员") {
+      await session.send("你不是队伍的队长，无法主动操作战斗！");
+      return;
+    } else if (BattleData.isTeam(session)) {
+      Object.keys(BattleData.teamTemp).forEach((item) => {
+        if (BattleData.teamTemp[item].for == session.userId) {
+          playUser.push(item);
+          battle_self.push(initBattleAttribute(User.getUserAttributeByUserId(item)));
+        }
+      });
+    } else {
+      playUser.push(session.userId);
+      battle_self.push(initBattleAttribute(User.getUserAttributeByUserId(session.userId)));
+    }
+    goal.forEach((item) => {
+      playUser.push(item.userId);
+      battle_goal.push(initBattleAttribute(User.getUserAttributeByUserId(item.userId)));
+    });
+    const pkTemp = {
+      self: battle_self.map((i) => ({ ...i, for: "self" })),
+      goal: battle_goal.map((i) => ({ ...i, for: "goal" })),
+      isPK: true
+    };
+    playUser.forEach((userId) => {
+      BattleData.lastPlay[userId] = pkTemp;
+    });
+    await session.send(`开始与玩家 ${battle_goal.map((i) => i.name).join("、")} 进行PK战斗`);
+  },
   /** 文本化当前战况 */
   battleSituationTextFormat(team) {
     const selfTemp = [];
@@ -951,6 +1037,11 @@ ${generateHealthDisplay(item.hp, item.maxHp + item.gain.maxHp)}(${item.hp}/${ite
         goalTemp.push(`lv.${item.lv}[${item.name}]:已阵亡`);
       }
     });
+    if (team.isPK) {
+      return `[当前战况]
+攻击方：
+` + selfTemp.join("\n") + "\n\n防御方：\n" + goalTemp.join("\n");
+    }
     return `[当前战况]
 我方阵容：
 ` + selfTemp.join("\n") + "\n\n敌方阵容：\n" + goalTemp.join("\n");
@@ -962,19 +1053,20 @@ ${generateHealthDisplay(item.hp, item.maxHp + item.gain.maxHp)}(${item.hp}/${ite
     if (self && goal) {
       return { over: true, type: "平局" };
     } else if (self) {
-      return { over: true, type: "敌方赢" };
+      return { over: true, type: team.isPK ? "敌方赢" : "防御方赢" };
     } else if (goal) {
-      return { over: true, type: "我方赢" };
+      return { over: true, type: team.isPK ? "我方赢" : "攻击方赢" };
     }
     return { over: false, type: "未结束" };
   },
   /** 清理战场 */
   clearBattleData(session) {
     if (BattleData.isTeam(session)) {
-      const userId = BattleData.teamTemp[session.userId].for;
-      Object.keys(BattleData.teamTemp).forEach((item) => {
-        if (BattleData.teamTemp[item].for == userId) {
-          delete BattleData.lastPlay[item];
+      const currentBattle = BattleData.lastPlay[session.userId];
+      const allAgentList = [...currentBattle.goal, ...currentBattle.self].sort((a, b) => b.speed - a.speed);
+      allAgentList.forEach((item) => {
+        if (item.type == "玩家") {
+          delete BattleData.lastPlay[item.userId];
         }
       });
     } else {
@@ -1003,6 +1095,8 @@ ${generateHealthDisplay(item.hp, item.maxHp + item.gain.maxHp)}(${item.hp}/${ite
       if (agent.type == "玩家" && agent.userId == session.userId) {
         isMy = true;
         selectGoal = lifeGoalList.find((item) => item.name == select) || lifeGoalList[Math.floor(Math.random() * lifeGoalList.length)];
+      } else if (agent.type == "玩家") {
+        selectGoal = lifeGoalList[Math.floor(Math.random() * lifeGoalList.length)];
       } else {
         selectGoal = lifeGoalList[Math.floor(Math.random() * lifeGoalList.length)];
       }
@@ -1234,6 +1328,29 @@ function apply(ctx, config) {
     if (!userData) return;
     BattleData.play(session, "普攻", goal);
   });
+  ctx.command("打怪pk <goal>").action(async ({ session }, goal) => {
+    const userData = await User.getUserAttribute(session);
+    if (!userData) return;
+    GensokyoMap.initUserPoistion(session, userData);
+    if (!goal) {
+      await session.send("请选择PK目标！");
+      return;
+    }
+    const nearUserItem = GensokyoMap.nearbyPlayersByUserId(session.userId);
+    const exist = nearUserItem.find((item) => item.playName == goal.trim());
+    if (!exist) {
+      await session.send(`PK失败，当前区域未存在【${goal}】玩家`);
+      return;
+    }
+    if (BattleData.isTeamByUserId(exist.userId)) {
+      const teamItem = BattleData.teamListByUser(exist.userId);
+      await session.send(`对方有组队，您将扮演攻击方与对方队伍进行战斗。`);
+      await BattleData.createBattleByUser(session, teamItem.map((item) => ({ userId: item.userId })));
+    } else {
+      await session.send(`您将扮演攻击方与对方进行战斗。`);
+      await BattleData.createBattleByUser(session, [{ userId: exist.userId }]);
+    }
+  });
 }
 __name(apply, "apply");
 // Annotate the CommonJS export names for ESM import in node:

package/lib/map.d.ts

@@ -98,6 +98,11 @@ export declare const GensokyoMap: {
     setLocalStoragePoistionData(userId: string): Promise<void>;
     /** 用户移动 */
     move(session: Session, type: MoveType, fn?: (area: AreaCallbackData) => Promise<void>): Promise<void>;
+    /** 查询附近玩家 */
+    nearbyPlayersByUserId(userId: string): {
+        userId: string;
+        playName: string;
+    }[];
     /** 区域信息格式化 */
     userAreaTextFormat(gameName: string, data: AreaCallbackData): string;
 };

package/package.json

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