koishi-plugin-toram 1.0.0-bata-2 → 1.0.0-bata-3

package/lib/aoandou.js

@@ -22,22 +22,18 @@ async function apply(ctx, config) {
     ctx.middleware(async (session, next) => {
         logger.info(session);
         const qq = session.userId;
-        switch (session.event.platform) {
-            case 'qqguild':
-                let user = await (0, functions_1.getUser)(ctx, session);
-                // 赋予初始属性
-                if (user === undefined) {
-                    user = new classes_1.User(qq, session.username);
-                    await ctx.database.create('toramUser', user);
-                }
-                // 判断是否今日首次发言
-                if ((0, functions_1.isToday)(user.lastChatTime)) {
-                    user.magic += 10;
-                    await ctx.database.set('toramUser', { qq: qq }, { magic: user.magic });
-                }
-                await ctx.database.set('toramUser', { qq: qq }, { lastChatTime: new Date().getTime() });
-                break;
+        let user = await (0, functions_1.getUser)(ctx, session);
+        // 赋予初始属性
+        if (user === undefined) {
+            user = new classes_1.User(qq, session.username);
+            await ctx.database.create('toramUser', user);
+        }
+        // 判断是否今日首次发言
+        if ((0, functions_1.isToday)(user.lastChatTime)) {
+            user.magic += config.magic_dailyGet;
+            await ctx.database.set('toramUser', { qq: qq }, { magic: user.magic });
         }
+        await ctx.database.set('toramUser', { qq: qq }, { lastChatTime: new Date().getTime() });
         return next();
     });
     // 注册

package/lib/functions.js

@@ -22,10 +22,10 @@ exports.isToday = isToday;
 // 消耗魔能
 async function magicUse(ctx, session, use) {
     const qq = session.userId;
-    const users = await ctx.database.get('toramUser', { qq: qq });
-    const residue = users[0].magic - use;
+    const user = await getUser(ctx, session);
+    const residue = user.magic - use;
     if (residue >= 0) {
-        await ctx.database.set('toramUser', { qq: qq }, { magic: users[0].magic - use });
+        await ctx.database.set('toramUser', { qq: qq }, { magic: residue });
         return true;
     }
     else {

package/lib/index.d.ts

@@ -13,10 +13,14 @@ export interface Config {
     dishes_return: number;
     levelUP_pet_fixedBossReturn: number;
     levelUP_player_fixedBossReturn: number;
+    levelUP_player_wildBossReturn: number;
     magic_dailyGet: number;
+    magic_dishes: number;
+    magic_levelUP: number;
+    magic_levelUP_pet: number;
+    magic_update: number;
     maxLevel: number;
     update_return: number;
-    levelUP_player_wildBossReturn: number;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): Promise<void>;

package/lib/index.js

@@ -31,7 +31,7 @@ exports.name = 'toram';
 exports.Config = koishi_1.Schema.intersect([
     koishi_1.Schema.object({
         account_qq: koishi_1.Schema.string().description('机器人使用的QQ号'),
-        account_qq_guild: koishi_1.Schema.string().description('机器人在频道的QQ号【通过在频道发送 account_qq 获得'),
+        account_qq_guild: koishi_1.Schema.string().description('机器人在频道的QQ号【通过在频道发送 account_qq 获得】'),
         aoandou: koishi_1.Schema.boolean().default(false).description('开启高级魔导书'),
     }).description('机器人'),
     koishi_1.Schema.object({
@@ -48,6 +48,10 @@ exports.Config = koishi_1.Schema.intersect([
         koishi_1.Schema.object({
             aoandou: koishi_1.Schema.const(true).required(),
             magic_dailyGet: koishi_1.Schema.number().min(0).default(10).description('每日发言奖励的魔能'),
+            magic_dishes: koishi_1.Schema.number().min(0).default(1).description('料理指令消耗魔能'),
+            magic_levelUP: koishi_1.Schema.number().min(0).default(1).description('升级指令消耗魔能'),
+            magic_levelUP_pet: koishi_1.Schema.number().min(0).default(1).description('练宠指令消耗魔能'),
+            magic_update: koishi_1.Schema.number().min(0).default(1).description('更新指令消耗魔能'),
         })
     ])
 ]);
@@ -70,7 +74,7 @@ async function apply(ctx, config) {
     }, {
         primary: 'id'
     });
-    const pluginVersion = '1.0.0-bata-2'; // 插件当前版本
+    const pluginVersion = '1.0.0-bata-3'; // 插件当前版本
     // 更新数据库指令
     ctx.command('updateDatabase').action(async ({ session }) => {
         let version = await ctx.database.get('toram', { database: 'data_version' });
@@ -120,19 +124,19 @@ async function apply(ctx, config) {
     });
     // 料理指令
     ctx.command('料理 <料理种类> <料理等级>').action(async ({ session }, ...args) => {
-        await (0, functions_1.useCommand)('dishes', ctx, session, logger, config, 1, args);
+        await (0, functions_1.useCommand)('dishes', ctx, session, logger, config, config.magic_dishes, args);
     });
     // 升级指令
     ctx.command('升级 <等级数>').action(async ({ session }, ...args) => {
-        await (0, functions_1.useCommand)('levelUP', ctx, session, logger, config, 1, args);
+        await (0, functions_1.useCommand)('levelUP', ctx, session, logger, config, config.magic_levelUP, args);
     });
     // 更新指令
     ctx.command('更新').action(async ({ session }) => {
-        await (0, functions_1.useCommand)('update', ctx, session, logger, config, 1);
+        await (0, functions_1.useCommand)('update', ctx, session, logger, config, config.magic_update);
     });
     // 练宠指令
     ctx.command('练宠 <等级数>').action(async ({ session }, ...args) => {
-        await (0, functions_1.useCommand)('levelUP_pet', ctx, session, logger, config, 1, args);
+        await (0, functions_1.useCommand)('levelUP_pet', ctx, session, logger, config, config.magic_levelUP_pet, args);
     });
 }
 exports.apply = apply;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-toram",
   "description": "托拉姆物语小工具",
-  "version": "1.0.0-bata-2",
+  "version": "1.0.0-bata-3",
   "contributors": [
     "青灯 <1874053520@qq.com>"
   ],