koishi-plugin-smmcat-gensokyo 0.0.9 → 0.0.11

package/lib/index.js

@@ -267,50 +267,57 @@ var GensokyoMap = {
   },
   /** 用户移动 */
   async move(session, type, fn) {
-    const userCurrentArea = GensokyoMap.userCurrentLoal[session.userId] || {};
-    const { floor, areaName, moveing } = userCurrentArea;
-    if (moveing) {
-      await session.send("当前移动冷却中，请稍等...");
-      return;
-    }
-    if (!(floor && areaName)) {
-      await session.send("您当前位置有误，请使用(还没写好的指令)脱离卡死...");
-      return;
-    }
-    userCurrentArea.moveing = true;
-    const nowPosition = GensokyoMap.mapLocalData[floor][areaName];
-    if (!nowPosition[type]) {
-      await session.send("抱歉，此路不通！");
-      userCurrentArea.moveing = false;
-      return;
-    }
-    const newArea = GensokyoMap.mapLocalData[floor][nowPosition[type]];
-    if (!newArea) {
-      await session.send("进入失败，地图中不存在 " + nowPosition[type] + " 这个区域。");
-      userCurrentArea.moveing = false;
-      return;
-    }
-    if (newArea.type == "禁用" /* 禁用 */) {
-      await session.send(`该区域暂时未开放...`);
-      userCurrentArea.moveing = false;
-      return;
-    }
-    if (newArea.needLv > 1) {
-      await session.send(`当前区域由于您的等级未达到最低要求，暂时无法进入。
+    try {
+      const userCurrentArea = GensokyoMap.userCurrentLoal[session.userId] || {};
+      const { floor, areaName, moveing } = userCurrentArea;
+      if (moveing) {
+        await session.send("当前移动冷却中，请稍等...");
+        return;
+      }
+      if (!(floor && areaName)) {
+        await session.send("您当前位置有误，请使用(还没写好的指令)脱离卡死...");
+        return;
+      }
+      userCurrentArea.moveing = true;
+      const nowPosition = GensokyoMap.mapLocalData[floor][areaName];
+      if (!nowPosition[type]) {
+        await session.send("抱歉，此路不通！");
+        userCurrentArea.moveing = false;
+        return;
+      }
+      const newArea = GensokyoMap.mapLocalData[floor][nowPosition[type]];
+      if (!newArea) {
+        await session.send("进入失败，地图中不存在 " + nowPosition[type] + " 这个区域。");
+        userCurrentArea.moveing = false;
+        return;
+      }
+      if (newArea.type == "禁用" /* 禁用 */) {
+        await session.send(`该区域暂时未开放...`);
+        userCurrentArea.moveing = false;
+        return;
+      }
+      if (newArea.needLv > 1) {
+        await session.send(`当前区域由于您的等级未达到最低要求，暂时无法进入。
 需要等级：${newArea.needLv}级`);
+        userCurrentArea.moveing = false;
+        return;
+      }
+      userCurrentArea.areaName = newArea.areaName;
+      const areaInfo = {
+        user: { ...userCurrentArea },
+        map: { ...newArea }
+      };
+      fn && await fn(areaInfo);
+      await delay(3e3);
       userCurrentArea.moveing = false;
+      GensokyoMap.setLocalStoragePoistionData(session.userId);
       return;
+    } catch (error) {
+      console.log(error);
+      if (GensokyoMap.userCurrentLoal?.[session.userId]) {
+        GensokyoMap.userCurrentLoal[session.userId].moveing = false;
+      }
     }
-    userCurrentArea.areaName = newArea.areaName;
-    const areaInfo = {
-      user: { ...userCurrentArea },
-      map: { ...newArea }
-    };
-    fn && await fn(areaInfo);
-    await delay(3e3);
-    userCurrentArea.moveing = false;
-    GensokyoMap.setLocalStoragePoistionData(session.userId);
-    return;
   },
   /** 查询附近玩家 */
   nearbyPlayersByUserId(userId) {
@@ -489,9 +496,9 @@ var User = {
         maxMp: 1.1,
         atk: 1.12,
         def: 1.1,
-        chr: 1.1,
-        evasion: 1.1,
-        hit: 1.1,
+        chr: 1.08,
+        evasion: 1.08,
+        hit: 1.08,
         ghd: 1,
         speed: 1.05
       },
@@ -501,9 +508,9 @@ var User = {
         maxMp: 1.1,
         atk: 1.1,
         def: 1.1,
-        chr: 1.1,
-        evasion: 1.1,
-        hit: 1.08,
+        chr: 1.04,
+        evasion: 1.04,
+        hit: 1.04,
         ghd: 1,
         speed: 1.05
       },
@@ -513,9 +520,9 @@ var User = {
         maxMp: 1.05,
         atk: 1.1,
         def: 1.05,
-        chr: 1.05,
-        evasion: 1.05,
-        hit: 1.05,
+        chr: 1.03,
+        evasion: 1.03,
+        hit: 1.03,
         ghd: 1.05,
         speed: 1.05
       }
@@ -643,6 +650,10 @@ ${Object.keys(UserOccDict).map((i) => `【${i}】:${UserOccDict[i].info}`).join(
       fn && await fn(upTemp);
     }
     await User.setDatabaseUserAttribute(userId);
+  },
+  /** 目标是否死亡 */
+  isDie(userId) {
+    return User.userTempData[userId]?.hp <= 0;
   }
 };
 
@@ -760,8 +771,8 @@ var Monster = {
         atk: 1.2,
         def: 1.1,
         chr: 1.1,
-        evasion: 1.2,
-        hit: 1.2,
+        evasion: 1.1,
+        hit: 1.1,
         ghd: 1,
         speed: 1.05
       },
@@ -772,9 +783,9 @@ var Monster = {
         maxMp: 1.1,
         atk: 1.1,
         def: 1.1,
-        chr: 1.1,
-        evasion: 1.1,
-        hit: 1.1,
+        chr: 1.08,
+        evasion: 1.08,
+        hit: 1.08,
         ghd: 1,
         speed: 1.05
       },
@@ -1251,17 +1262,13 @@ MP:${item.mp}/${item.maxMp + item.gain.maxMp}`);
   },
   /** 清理战场 */
   clearBattleData(session) {
-    if (BattleData.isTeam(session)) {
-      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 {
-      delete BattleData.lastPlay[session.userId];
-    }
+    const currentBattle = BattleData.lastPlay[session.userId];
+    const allAgentList = [...currentBattle.goal, ...currentBattle.self];
+    allAgentList.forEach((item) => {
+      if (item.type == "玩家") {
+        delete BattleData.lastPlay[item.userId];
+      }
+    });
   },
   async play(session, atkType, select) {
     if (!BattleData.isBattle(session)) {
@@ -1360,6 +1367,7 @@ MP:${item.mp}/${item.maxMp + item.gain.maxMp}`);
   },
   /** 结算奖励 */
   async settlement(tempData, overInfo, session) {
+    const allList = [...tempData.self, ...tempData.goal].filter((item) => item.type == "玩家");
     const selfList = tempData.self.filter((item) => item.type == "玩家");
     const goalList = tempData.goal.filter((item) => item.type == "玩家");
     const msg = /* @__PURE__ */ __name(async (val) => {
@@ -1377,15 +1385,19 @@ MP:${item.mp}/${item.maxMp + item.gain.maxMp}`);
     if (tempData.isPK) {
       if (overInfo.win == "self") {
         await session.send("攻击方获得20EXP");
-        for (const agent of selfList) {
+        for (const agent of allList) {
           aynchronize(agent);
-          await User.giveExp(agent.userId, 20, async (val) => await msg(val));
+          if (agent.for == "self") {
+            await User.giveExp(agent.userId, 20, async (val) => await msg(val));
+          }
         }
       } else if (overInfo.win == "goal") {
         await session.send("防御方获得20EXP");
-        for (const agent of goalList) {
+        for (const agent of allList) {
           aynchronize(agent);
-          await User.giveExp(agent.userId, 20, async (val) => await msg(val));
+          if (agent.for == "goal") {
+            await User.giveExp(agent.userId, 20, async (val) => await msg(val));
+          }
         }
       }
     } else {
@@ -1394,13 +1406,15 @@ MP:${item.mp}/${item.maxMp + item.gain.maxMp}`);
       monsterName.forEach((item) => {
         const monster = Monster.monsterTempData[item.name];
         if (monster) {
-          val += monster.giveExp + monster.giveExp * (item.lv - 1) * 0.2;
+          val += Math.floor(monster.giveExp + monster.giveExp * (item.lv - 1) * 0.2);
         }
       });
       for (const agent of selfList) {
         aynchronize(agent);
-        await session.send(`小队获得${val}EXP`);
-        await User.giveExp(agent.userId, val, async (val2) => await msg(val2));
+        if (overInfo.win == "self") {
+          await session.send(`小队获得${val}EXP`);
+          await User.giveExp(agent.userId, val, async (val2) => await msg(val2));
+        }
       }
     }
   }
@@ -1503,6 +1517,9 @@ function apply(ctx, config) {
       await session.send("您正在战斗中，无法移动！");
       return;
     }
+    if (User.isDie(session.userId)) {
+      return `你已经阵亡，请发送 /补给 进行治疗。`;
+    }
     GensokyoMap.move(session, "top" /* 上 */, async (val) => {
       await session.send(GensokyoMap.userAreaTextFormat(userData.playName, val));
       if (val.map.type == "冒险区" /* 冒险区 */ && val.map.monster?.length) {
@@ -1523,6 +1540,9 @@ function apply(ctx, config) {
       await session.send("您正在战斗中，无法移动！");
       return;
     }
+    if (User.isDie(session.userId)) {
+      return `你已经阵亡，请发送 /补给 进行治疗。`;
+    }
     GensokyoMap.move(session, "down" /* 下 */, async (val) => {
       await session.send(GensokyoMap.userAreaTextFormat(userData.playName, val));
       if (val.map.type == "冒险区" /* 冒险区 */ && val.map.monster?.length) {
@@ -1543,6 +1563,9 @@ function apply(ctx, config) {
       await session.send("您正在战斗中，无法移动！");
       return;
     }
+    if (User.isDie(session.userId)) {
+      return `你已经阵亡，请发送 /补给 进行治疗。`;
+    }
     GensokyoMap.move(session, "left" /* 左 */, async (val) => {
       await session.send(GensokyoMap.userAreaTextFormat(userData.playName, val));
       if (val.map.type == "冒险区" /* 冒险区 */ && val.map.monster?.length) {
@@ -1563,6 +1586,9 @@ function apply(ctx, config) {
       await session.send("您正在战斗中，无法移动！");
       return;
     }
+    if (User.isDie(session.userId)) {
+      return `你已经阵亡，请发送 /补给 进行治疗。`;
+    }
     GensokyoMap.move(session, "right" /* 右 */, async (val) => {
       await session.send(GensokyoMap.userAreaTextFormat(userData.playName, val));
       if (val.map.type == "冒险区" /* 冒险区 */ && val.map.monster?.length) {
@@ -1606,6 +1632,9 @@ function apply(ctx, config) {
     const userData = await User.getUserAttribute(session);
     if (!userData) return;
     GensokyoMap.initUserPoistion(session, userData);
+    if (User.isDie(session.userId)) {
+      return `你已经阵亡，请发送 /补给 进行治疗。`;
+    }
     const areaInfo = GensokyoMap.getUserCurrentArea(session.userId);
     if (goal) {
       if (!areaInfo.monster?.map((i) => i.name).includes(goal)) {
@@ -1632,6 +1661,9 @@ function apply(ctx, config) {
     const userData = await User.getUserAttribute(session);
     if (!userData) return;
     GensokyoMap.initUserPoistion(session, userData);
+    if (User.isDie(session.userId)) {
+      return `你已经阵亡，请发送 /补给 进行治疗。`;
+    }
     if (!goal) {
       await session.send("请选择PK目标！");
       return;
@@ -1642,6 +1674,9 @@ function apply(ctx, config) {
       await session.send(`PK失败，当前区域未存在【${goal}】玩家`);
       return;
     }
+    if (User.isDie(exist.userId)) {
+      return `目标已经阵亡，请更换PK目标对象...`;
+    }
     if (BattleData.isTeamByUserId(exist.userId)) {
       const teamItem = BattleData.teamListByUser(exist.userId);
       await session.send(`对方有组队，您将扮演攻击方与对方队伍进行战斗。`);
@@ -1667,7 +1702,7 @@ function apply(ctx, config) {
     }
     const useTime = Date.now() - temp[session.userId];
     if (useTime < 36e4) {
-      return `请等待下一个补给时间！剩余${Math.floor(useTime / 6e4)}分钟。`;
+      return `请等待下一个补给时间！剩余${Math.floor(36e4 - useTime / 6e4)}分钟。`;
     }
     temp[session.userId] = Date.now();
     const { maxHp, maxMp, playName } = User.getUserAttributeByUserId(session.userId);

package/lib/users.d.ts

@@ -126,5 +126,7 @@ export declare const User: {
         lv: number;
         name: string;
     }) => Promise<void>): Promise<void>;
+    /** 目标是否死亡 */
+    isDie(userId: string): boolean;
 };
 export {};

package/package.json

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