koishi-plugin-smmcat-gensokyo 0.0.10 → 0.0.12

package/lib/data/initMonster.d.ts

@@ -7,6 +7,7 @@ export declare const monsterData: {
         name: string;
         type: MonsterOccupation;
         info: string;
+        pic: string;
         hp: number;
         maxHp: number;
         mp: number;
@@ -24,6 +25,7 @@ export declare const monsterData: {
         name: string;
         type: MonsterOccupation;
         info: string;
+        pic: string;
         hp: number;
         maxHp: number;
         mp: number;
@@ -41,6 +43,7 @@ export declare const monsterData: {
         name: string;
         type: MonsterOccupation;
         info: string;
+        pic: string;
         hp: number;
         maxHp: number;
         mp: number;

package/lib/index.js

@@ -26,7 +26,7 @@ __export(src_exports, {
   name: () => name
 });
 module.exports = __toCommonJS(src_exports);
-var import_koishi = require("koishi");
+var import_koishi2 = require("koishi");
 
 // src/map.ts
 var delay = /* @__PURE__ */ __name((ms) => new Promise((resolve) => setTimeout(resolve, ms)), "delay");
@@ -483,6 +483,7 @@ var User = {
       ...UserOccDict[UserDict.type].initStatus,
       lv: UserDict.lv,
       hp: UserDict.hp,
+      mp: UserDict.mp,
       exp: UserDict.exp,
       pp: UserDict.pp,
       playName: UserDict.playName,
@@ -496,9 +497,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
       },
@@ -508,9 +509,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
       },
@@ -520,9 +521,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
       }
@@ -657,12 +658,16 @@ ${Object.keys(UserOccDict).map((i) => `【${i}】:${UserOccDict[i].info}`).join(
   }
 };
 
+// src/monster.ts
+var import_koishi = require("koishi");
+
 // src/data/initMonster.ts
 var monsterData = {
   "小蜜蜂": {
     name: "小蜜蜂",
     type: "野怪" /* 野怪 */,
     info: "幻想乡一层常见的生物",
+    pic: "http://smmcat.cn/run/gensokyo/小蜜蜂.png",
     hp: 50,
     maxHp: 50,
     mp: 30,
@@ -680,6 +685,7 @@ var monsterData = {
     name: "小蜘蛛",
     type: "野怪" /* 野怪 */,
     info: "幻想乡一层常见的生物",
+    pic: "http://smmcat.cn/run/gensokyo/小蜘蛛.png",
     hp: 55,
     maxHp: 55,
     mp: 30,
@@ -687,7 +693,7 @@ var monsterData = {
     atk: 10,
     def: 3,
     chr: 50,
-    evasion: 200,
+    evasion: 150,
     hit: 1e3,
     ghd: 1.2,
     speed: 4,
@@ -697,6 +703,7 @@ var monsterData = {
     name: "dora",
     type: "野怪" /* 野怪 */,
     info: "偶尔出没在一层世界的奇怪生物",
+    pic: "http://smmcat.cn/run/gensokyo/dora.png",
     hp: 88,
     maxHp: 88,
     mp: 10,
@@ -704,7 +711,7 @@ var monsterData = {
     atk: 20,
     def: 5,
     chr: 200,
-    evasion: 300,
+    evasion: 200,
     hit: 1e3,
     ghd: 1.2,
     speed: 4,
@@ -771,8 +778,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
       },
@@ -783,9 +790,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
       },
@@ -817,8 +824,8 @@ var Monster = {
   },
   /** 格式化怪物属性数据 */
   monsterAttributeTextFormat(monster) {
-    const { name: name2, type, lv, hp, maxHp, mp, maxMp, atk, def, chr, evasion, hit, ghd, speed, info } = monster;
-    const attributeText = `Lv.${lv}【${name2}】
+    const { name: name2, type, lv, hp, maxHp, mp, maxMp, atk, def, chr, evasion, hit, ghd, speed, info, pic } = monster;
+    const attributeText = (pic ? import_koishi.h.image(pic) + "\n" : "") + `Lv.${lv}【${name2}】
 
 【怪物类型】${type}
 【生命值】${hp}/${maxHp}
@@ -1262,17 +1269,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)) {
@@ -1371,6 +1374,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) => {
@@ -1388,15 +1392,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 {
@@ -1405,13 +1413,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));
+        }
       }
     }
   }
@@ -1497,7 +1507,7 @@ var name = "smmcat-gensokyo";
 var inject = {
   required: ["monetary", "database"]
 };
-var Config = import_koishi.Schema.object({});
+var Config = import_koishi2.Schema.object({});
 function apply(ctx, config) {
   ctx.on("ready", () => {
     GensokyoMap.init(config, ctx);
@@ -1622,8 +1632,7 @@ function apply(ctx, config) {
     if (!lv) lv = 1;
     const result = Monster.getMonsterAttributeData(monster, lv);
     if (!result) return `没有找到该怪物信息...`;
-    return `查找成功！
-` + Monster.monsterAttributeTextFormat(result);
+    return Monster.monsterAttributeTextFormat(result);
   });
   ctx.command("幻想乡/打怪遇敌 <goal>").action(async ({ session }, goal) => {
     const userData = await User.getUserAttribute(session);
@@ -1699,12 +1708,14 @@ 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);
+    console.log(maxMp);
     User.userTempData[session.userId].hp = maxHp;
     User.userTempData[session.userId].mp = maxMp;
+    console.log(User.userTempData[session.userId]);
     await User.setDatabaseUserAttribute(session.userId);
     return playName + `通过补给，目前已恢复HP和MP`;
   });

package/lib/monster.d.ts

@@ -14,6 +14,8 @@ export type MonsterBaseAttribute = {
     name: string;
     /** 怪物说明 */
     info?: string;
+    /** 怪物配图 */
+    pic?: string;
     /** 类型 */
     type: MonsterOccupation;
     /** 血量 */

package/package.json

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