koishi-plugin-smmcat-gensokyo 0.0.16 → 0.0.18

package/lib/data/initProps.d.ts

@@ -10,7 +10,10 @@ export type propsTemplateData = {
         type: PropType;
         info: string;
         price: number;
-        fn: (session: Session) => void;
+        cooling?: number;
+        fn: (session: Session) => Promise<void | {
+            err: boolean;
+        }>;
     };
 };
 export declare const propsData: propsTemplateData;

package/lib/index.js

@@ -202,7 +202,8 @@ var GensokyoMap = {
           type: "冒险区" /* 冒险区 */,
           needLv: 1,
           top: "绿野平原一",
-          down: "野猪巢穴"
+          down: "野猪巢穴",
+          monster: [{ name: "琪露诺", lv: 10 }]
         },
         "绿野平原六": {
           floor: 1,
@@ -450,7 +451,7 @@ var propsData = {
     type: "消耗类" /* 消耗类 */,
     info: "回复自身20HP",
     price: 10,
-    fn: /* @__PURE__ */ __name(function(session) {
+    fn: /* @__PURE__ */ __name(async function(session) {
       User.giveHPMP(session.userId, { hp: 20 }, async (val) => {
         if (val.err) {
           await session.send(val.err);
@@ -466,7 +467,7 @@ var propsData = {
     type: "消耗类" /* 消耗类 */,
     info: "回复自身20MP",
     price: 10,
-    fn: /* @__PURE__ */ __name(function(session) {
+    fn: /* @__PURE__ */ __name(async function(session) {
       User.giveHPMP(session.userId, { mp: 20 }, async (val) => {
         if (val.err) {
           await session.send(val.err);
@@ -482,7 +483,7 @@ var propsData = {
     type: "消耗类" /* 消耗类 */,
     info: "回复自身20MP和20HP",
     price: 20,
-    fn: /* @__PURE__ */ __name(function(session) {
+    fn: /* @__PURE__ */ __name(async function(session) {
       User.giveHPMP(session.userId, { hp: 20, mp: 20 }, async (val) => {
         if (val.err) {
           await session.send(val.err);
@@ -492,6 +493,23 @@ var propsData = {
         await session.send(msg);
       });
     }, "fn")
+  },
+  "初级复活卷轴": {
+    name: "初级复活卷轴",
+    type: "消耗类" /* 消耗类 */,
+    info: "复活玩家，复活时保留 20% 血量。(该道具使用完需要冷却 6 分钟)",
+    price: 10,
+    cooling: 3600,
+    fn: /* @__PURE__ */ __name(async function(session) {
+      if (!User.isDie(session.userId)) {
+        session.send(`啊哈...你还没有阵亡，使用失败！`);
+        return { err: true };
+      }
+      const { maxHp } = User.getUserAttributeByUserId(session.userId);
+      User.giveLife(session.userId, Math.floor(maxHp * 0.2), async (val) => {
+        await session.send(`复活成功，当前血量：${val.currentHP}`);
+      });
+    }, "fn")
   }
 };
 
@@ -549,22 +567,44 @@ var Props = {
       await Props.ctx.database.set("smm_gensokyo_user_props", { userId }, temp);
     }
   },
+  /** 使用指定道具 */
   async userProps(session, propsName) {
-    const userPropsData = Props.userPorpsTemp[session.userId];
+    const userId = session.userId;
+    const userPropsData = Props.userPorpsTemp[userId];
     if (!userPropsData) return;
     if (!userPropsData[propsName]) {
       await session.send(`您似乎没有${propsName}这个道具...`);
       return;
     }
-    User.loseProps(session.userId, { name: propsName, val: 1 }, async (val) => {
+    if (propsData[propsName].cooling) {
+      if (!coolingTemp[userId]) coolingTemp[userId] = {};
+      if (!coolingTemp[userId][propsName]) coolingTemp[userId][propsName] = 0;
+      const gapTime = Date.now() - coolingTemp[userId][propsName];
+      if (gapTime < propsData[propsName].cooling) {
+        await session.send(`该道具冷却还未结束，请等待${Math.ceil((coolingTemp[userId][propsName] - gapTime) / 60)}秒！`);
+        return;
+      } else {
+        coolingTemp[userId][propsName] = Date.now();
+      }
+    }
+    User.loseProps(userId, { name: propsName, val: 1 }, async (val) => {
       if (val.err) {
         await session.send(val.err);
         return;
       }
-      propsData[propsName].fn(session);
+      if (propsData[propsName].cooling) {
+        coolingTemp[userId];
+      }
+      const result = await propsData[propsName].fn(session);
+      if (result && typeof result === "object" && "err" in result) {
+        if (result.err) {
+          await User.giveProps(userId, [{ name: propsName, val: 1 }]);
+        }
+      }
     });
   }
 };
+var coolingTemp = {};
 
 // src/monster.ts
 var import_koishi = require("koishi");
@@ -585,7 +625,7 @@ var monsterData = {
     chr: 50,
     csr: 0,
     evasion: 100,
-    hit: 1e3,
+    hit: 0,
     ghd: 1.2,
     speed: 4,
     giveExp: 10,
@@ -608,7 +648,7 @@ var monsterData = {
     chr: 50,
     csr: 0,
     evasion: 150,
-    hit: 1e3,
+    hit: 0,
     ghd: 1.2,
     speed: 4,
     giveExp: 12,
@@ -631,7 +671,7 @@ var monsterData = {
     chr: 200,
     csr: 0,
     evasion: 200,
-    hit: 1e3,
+    hit: 0,
     ghd: 1.2,
     speed: 4,
     giveExp: 15,
@@ -640,6 +680,29 @@ var monsterData = {
       { name: "蓝药", val: 3, radomVal: 30 },
       { name: "初级万能药", val: 2, radomVal: 90, const: true, lv: 5 }
     ]
+  },
+  "琪露诺": {
+    name: "琪露诺",
+    type: "野怪" /* 野怪 */,
+    info: "常常被称呼笨蛋的冰之妖精，有时也被叫⑨",
+    pic: "http://smmcat.cn/run/gensokyo/琪露诺.png",
+    hp: 100,
+    maxHp: 100,
+    mp: 40,
+    maxMp: 40,
+    atk: 22,
+    def: 5,
+    chr: 100,
+    csr: 0,
+    evasion: 100,
+    hit: -800,
+    ghd: 1.2,
+    speed: 4,
+    giveExp: 15,
+    giveMonetary: 3,
+    giveProps: [
+      { name: "初级复活卷轴", val: 1, radomVal: 50 }
+    ]
   }
 };
 
@@ -700,7 +763,18 @@ var Monster = {
     Object.keys(monster).forEach((i) => {
       temp[i] = monster[i];
       if (useBenchmark[i]) {
-        temp[i] += Math.floor(temp[i] * (useBenchmark[i] - 1) * (lv - 1));
+        const upVal = Math.floor(temp[i] * (useBenchmark[i] - 1) * (lv - 1));
+        if (upVal > 0) {
+          temp[i] += upVal;
+        } else {
+          switch (i) {
+            case "hit":
+              temp[i] += 20 * (lv - 1);
+              break;
+            default:
+              break;
+          }
+        }
       }
     });
     return temp;
@@ -717,8 +791,8 @@ var Monster = {
 【攻击力】${atk}
 【防御力】${def}
 【闪避值】${evasion}
-【命中值】${hit}
 【速度值】${speed}
+【命中率】${(hit / 10 + 100).toFixed(1)}%
 【暴击率】${(chr / 10).toFixed(1)}%
 【爆伤倍率】${(ghd * 100).toFixed(0)}%` + (propsList?.length ? `
 【概率掉落道具】` + propsList.join("、") : "") + (info ? "\n\n" + info : "");
@@ -1335,7 +1409,7 @@ MP:${item.mp}/${item.maxMp + item.gain.maxMp}`);
           props.length && await User.giveProps(agent.userId, props, async (val2) => {
             const propsDict = {};
             val2.currentProps.forEach((item) => {
-              if (!propsDict[item.name]) propsDict[item.name] = 1;
+              if (!propsDict[item.name]) propsDict[item.name] = 0;
               propsDict[item.name]++;
             });
             const msg2 = Object.keys(propsDict).map((item) => {
@@ -1692,7 +1766,7 @@ ${Object.keys(UserOccDict).map((i) => `【${i}】:${UserOccDict[i].info}`).join(
     await User.setDatabaseUserAttribute(userId);
   },
   /** 给予玩家复活 */
-  async giveLife(userId, val) {
+  async giveLife(userId, val, fn) {
     const userInfo = User.userTempData[userId];
     if (!val) {
       const { maxHp } = User.getUserAttributeByUserId(userId);
@@ -1701,6 +1775,7 @@ ${Object.keys(UserOccDict).map((i) => `【${i}】:${UserOccDict[i].info}`).join(
       userInfo.hp = val;
     }
     await User.setDatabaseUserAttribute(userId);
+    fn && await fn({ currentHP: userInfo.hp });
   },
   /** 给予玩家血量或者蓝量 */
   async giveHPMP(userId, value, fn) {
@@ -1843,19 +1918,21 @@ ${Object.keys(UserOccDict).map((i) => `【${i}】:${UserOccDict[i].info}`).join(
     const upProps = [];
     for (const item of props) {
       const propsItem = propsData[item.name];
-      if (!propsItem) continue;
-      userProps[item.name] = {
-        name: propsItem.name,
-        type: propsItem.type,
-        value: 0
-      };
+      if (!propsData[item.name]) continue;
+      if (!userProps[item.name]) {
+        userProps[item.name] = {
+          name: propsItem.name,
+          type: propsItem.type,
+          value: 0
+        };
+      }
       userProps[item.name].value += item.val || 1;
       upProps.push({ name: item.name, val: userProps[item.name].value });
     }
+    await Props.setDatabasePropsData(userId);
     fn && await fn({
       currentProps: upProps
     });
-    await Props.setDatabasePropsData(userId);
   },
   /** 去除玩家指定道具 */
   async loseProps(userId, props, fn) {
@@ -1885,10 +1962,10 @@ ${Object.keys(UserOccDict).map((i) => `【${i}】:${UserOccDict[i].info}`).join(
     }
     userProps[props.name].value -= props.val || 1;
     if (userProps[props.name].value == 0) delete userProps[props.name];
+    await Props.setDatabasePropsData(userId);
     fn && await fn({
       currentProps: { name: props.name, val: userProps[props.name]?.value || 0 }
     });
-    await Props.setDatabasePropsData(userId);
   },
   /** 目标是否死亡 */
   isDie(userId) {

package/lib/props.d.ts

@@ -33,5 +33,6 @@ export declare const Props: {
     getPropsDataByUserId(userId: string): Promise<string>;
     /** 更新本地数据库对应数据 */
     setDatabasePropsData(userId: string): Promise<void>;
+    /** 使用指定道具 */
     userProps(session: Session, propsName: string): Promise<void>;
 };

package/lib/users.d.ts

@@ -105,7 +105,9 @@ export declare const User: {
     /** 给予玩家死亡 */
     giveDie(userId: string): Promise<void>;
     /** 给予玩家复活 */
-    giveLife(userId: string, val?: number): Promise<void>;
+    giveLife(userId: string, val?: number, fn?: (updata: {
+        currentHP: number;
+    }) => Promise<void>): Promise<void>;
     /** 给予玩家血量或者蓝量 */
     giveHPMP(userId: string, value: {
         hp?: number;

package/package.json

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