koishi-plugin-smmcat-gensokyo 0.0.17 → 0.0.18

package/lib/data/initProps.d.ts

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

package/lib/index.js

@@ -451,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);
@@ -467,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);
@@ -483,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);
@@ -500,10 +500,10 @@ var propsData = {
     info: "复活玩家，复活时保留 20% 血量。(该道具使用完需要冷却 6 分钟)",
     price: 10,
     cooling: 3600,
-    fn: /* @__PURE__ */ __name(function(session) {
+    fn: /* @__PURE__ */ __name(async function(session) {
       if (!User.isDie(session.userId)) {
         session.send(`啊哈...你还没有阵亡，使用失败！`);
-        return;
+        return { err: true };
       }
       const { maxHp } = User.getUserAttributeByUserId(session.userId);
       User.giveLife(session.userId, Math.floor(maxHp * 0.2), async (val) => {
@@ -595,7 +595,12 @@ var Props = {
       if (propsData[propsName].cooling) {
         coolingTemp[userId];
       }
-      propsData[propsName].fn(session);
+      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 }]);
+        }
+      }
     });
   }
 };
@@ -1913,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) {
@@ -1955,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/package.json

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