Update version to v0.1.2

修改为以群为单位答题，答对后出下一题，增加答题计时
支持更多中文符号

build.gradle.kts

@@ -1,13 +1,13 @@
 plugins {
-    val kotlinVersion = "1.6.10"
+    val kotlinVersion = "1.7.0"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 
-    id("net.mamoe.mirai-console") version "2.11.1"
+    id("net.mamoe.mirai-console") version "2.12.0"
 }
 
 group = "top.jie65535"
-version = "0.1.0"
+version = "0.1.2"
 
 repositories {
     maven("https://maven.aliyun.com/repository/public") // 阿里云国内代理仓库

src/main/kotlin/PluginCommand.kt

@@ -0,0 +1,30 @@
+package top.jie65535.j24
+
+import net.mamoe.mirai.console.command.CommandSender
+import net.mamoe.mirai.console.command.CompositeCommand
+import net.mamoe.mirai.console.command.getGroupOrNull
+import net.mamoe.mirai.contact.Group
+
+object PluginCommand : CompositeCommand(
+    PluginMain, "j24"
+) {
+    @SubCommand
+    suspend fun CommandSender.enable(group: Group? = getGroupOrNull()) {
+        if (group == null) {
+            sendMessage("必须指定群")
+            return
+        }
+        PluginConfig.enabledGroups.add(group.id)
+        sendMessage("OK")
+    }
+
+    @SubCommand
+    suspend fun CommandSender.disable(group: Group? = getGroupOrNull()) {
+        if (group == null) {
+            sendMessage("必须指定群")
+            return
+        }
+        PluginConfig.enabledGroups.remove(group.id)
+        sendMessage("OK")
+    }
+}

src/main/kotlin/PluginConfig.kt

@@ -0,0 +1,8 @@
+package top.jie65535.j24
+
+import net.mamoe.mirai.console.data.AutoSavePluginConfig
+import net.mamoe.mirai.console.data.value
+
+object PluginConfig : AutoSavePluginConfig("config") {
+    val enabledGroups: MutableSet<Long> by value()
+}

src/main/kotlin/PluginMain.kt

@@ -1,16 +1,20 @@
 package top.jie65535.j24
 
+import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register
 import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescription
 import net.mamoe.mirai.console.plugin.jvm.KotlinPlugin
 import net.mamoe.mirai.event.GlobalEventChannel
-import net.mamoe.mirai.event.subscribeMessages
+import net.mamoe.mirai.event.events.GroupMessageEvent
+import net.mamoe.mirai.event.subscribeGroupMessages
 import net.mamoe.mirai.utils.info
+import java.time.Duration
+import java.time.LocalDateTime
 
 object PluginMain : KotlinPlugin(
     JvmPluginDescription(
         id = "top.jie65535.j24",
         name = "J 24点游戏",
-        version = "0.1.0"
+        version = "0.1.2"
     ) {
         author("jie65535")
         info("24点游戏")
@@ -18,34 +22,42 @@ object PluginMain : KotlinPlugin(
 ) {
     private val games: MutableMap<Long, Point24> = mutableMapOf()
 
+    private const val prefix = "="
+
     override fun onEnable() {
         logger.info { "Plugin loaded" }
-        //配置文件目录 "${dataFolder.absolutePath}/"
+        PluginCommand.register()
+        PluginConfig.reload()
+
         val eventChannel = GlobalEventChannel.parentScope(this)
-        eventChannel.subscribeMessages {
-            contains("24点") quoteReply {
-                val game = Point24()
-                games[this.sender.id] = game
-                "你抽到了 [${game.points[0]}] [${game.points[1]}] [${game.points[2]}] [${game.points[3]}]\n" +
-                    "请用以上四组数字组合成结果为24的算式，以“答”开头验证"
+        eventChannel.filter { it is GroupMessageEvent && PluginConfig.enabledGroups.contains(it.group.id) }.subscribeGroupMessages {
+            startsWith("24点") reply {
+                var game = games[group.id]
+                if (game == null || game.time.plusMinutes(1) < LocalDateTime.now()) {
+                    game = Point24()
+                    games[group.id] = game
+                    "请用 $game 组成结果为24的算式，以'$prefix'开头验证"
+                } else Unit
             }
-            startsWith("答") quoteReply {
-                val game = games[sender.id]
-                if (game == null) {
-                    "你还没有抽数字哦，说“24点”来开始游戏吧"
-                } else {
+
+            startsWith(prefix) quoteReply {
+                val game = games[group.id]
+                if (game != null) {
                     try {
-                        val result = game.evaluate(message.contentToString().removePrefix("答").trim())
+                        val result = game.evaluate(message.contentToString().removePrefix(prefix).trim())
                         if (result == 24.0) {
-                            games.remove(sender.id)
-                            "恭喜你，答对了！"
+                            val newGame = Point24()
+                            games[group.id] = newGame
+                            val duration = Duration.between(game.time, LocalDateTime.now())
+                            "答对了！ ${duration.toMinutes()}:${duration.toSecondsPart()}\n下一题：$newGame"
                         } else {
                             "答错了，计算结果为 $result"
                         }
                     } catch (e: Throwable) {
+//                        logger.error(e)
                         "错误：${e.message}"
                     }
-                }
+                } else Unit
             }
         }
     }

src/main/kotlin/Point24.kt

@@ -1,18 +1,63 @@
 package top.jie65535.j24
 
 import net.objecthunter.exp4j.ExpressionBuilder
+import net.objecthunter.exp4j.operator.Operator
 import net.objecthunter.exp4j.shuntingyard.ShuntingYard
 import net.objecthunter.exp4j.tokenizer.NumberToken
 import net.objecthunter.exp4j.tokenizer.Token
+import java.time.LocalDateTime
 import kotlin.random.Random
 
 class Point24 {
-    var points = genPoints()
-
-    fun regenPoints() {
-        points = genPoints()
+    companion object {
+        val myOperators = listOf(
+            object : Operator(">>", 2, true, Operator.PRECEDENCE_ADDITION - 1) {
+                override fun apply(vararg args: Double): Double {
+                    return (args[0].toInt() shr args[1].toInt()).toDouble()
+                }
+            },
+            object : Operator("<<", 2, true, Operator.PRECEDENCE_ADDITION - 1) {
+                override fun apply(vararg args: Double): Double {
+                    return (args[0].toInt() shl args[1].toInt()).toDouble()
+                }
+            },
+            object : Operator("&", 2, true, Operator.PRECEDENCE_ADDITION - 2) {
+                override fun apply(vararg args: Double): Double {
+                    return (args[0].toInt() and args[1].toInt()).toDouble()
+                }
+            },
+            object : Operator("^", 2, true, Operator.PRECEDENCE_ADDITION - 3) {
+                override fun apply(vararg args: Double): Double {
+                    return (args[0].toInt() xor args[1].toInt()).toDouble()
+                }
+            },
+            object : Operator("|", 2, true, Operator.PRECEDENCE_ADDITION - 4) {
+                override fun apply(vararg args: Double): Double {
+                    return (args[0].toInt() or args[1].toInt()).toDouble()
+                }
+            },
+            // 阶乘禁用，因为这会让游戏从24点变成4点
+//            object : Operator("!", 1, true, Operator.PRECEDENCE_POWER) {
+//                override fun apply(vararg args: Double): Double {
+//                    var sum = 1
+//                    for (i in 2..args[0].toInt())
+//                        sum *= i
+//                    return sum.toDouble()
+//                }
+//            },
+        )
+        private val myOperatorMap: Map<String, Operator>
+        init {
+            val m = mutableMapOf<String, Operator>()
+            for (opt in myOperators)
+                m[opt.symbol] = opt
+            myOperatorMap = m
+        }
     }
 
+    var points = genPoints()
+    var time: LocalDateTime = LocalDateTime.now()
+
     private fun genPoints() = arrayOf(
         Random.nextInt(1, 14),
         Random.nextInt(1, 14),
@@ -20,17 +65,34 @@ class Point24 {
         Random.nextInt(1, 14)
     )
 
+    override fun toString() = "[${points[0]}] [${points[1]}] [${points[2]}] [${points[3]}]"
+
     fun evaluate(expression: String): Double {
-        val expr = expression.replace('（', '(').replace('）', ')')
+        val expr = expression
+            .replace('（', '(')
+            .replace('）', ')')
+            .replace('x', '*')
+            .replace('×', '*')
+            .replace('÷', '/')
+            .replace('－', '-')
+            .replace('＋', '+')
+            .replace('！', '!')
+            .replace('＜', '<')
+            .replace('＞', '>')
+
+
+        if (expr.contains('%'))
+            throw IllegalArgumentException("禁止使用%运算符")
 
         val tokens = ShuntingYard.convertToRPN(
             expr,
             null,
-            mapOf(),
+            myOperatorMap,
             null,
             false
         )
 
+        var usedAll = true
         val nums = points.toMutableList()
         for (token in tokens) {
             if (token.type == Token.TOKEN_NUMBER.toInt()) {
@@ -43,17 +105,24 @@ class Point24 {
                 if (i < nums.size)
                     nums.removeAt(i)
                 else
-                    throw IllegalArgumentException("不能使用未得到的数值")
+                    usedAll = false
+//                throw IllegalArgumentException("不能使用未得到的数值")
             } else if (token.type == Token.TOKEN_FUNCTION.toInt()) {
                 throw IllegalArgumentException("禁止使用函数哦")
             }
         }
         if (nums.isNotEmpty())
-            throw IllegalArgumentException("必须使用所有数值")
+            usedAll = false
+//            throw IllegalArgumentException("必须使用所有数值")
 
-        return ExpressionBuilder(expr)
+        val result = ExpressionBuilder(expr)
+            .operator(myOperators)
             .implicitMultiplication(false)
             .build()
             .evaluate()
+        if (usedAll)
+            return result
+        else
+            throw IllegalArgumentException("结果为$result，请使用系统生成的数值！")
     }
 }