From 0553f6a5848b902743d56f22316dff55b85a26e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E5=82=91?= <840465812@qq.com> Date: Fri, 14 Jan 2022 21:20:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E8=83=9C=E5=88=A9?= =?UTF-8?q?=E8=AF=8D=E5=AE=9A=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/JHRPluginConfig.kt | 11 +++++++++++ src/main/kotlin/JHorseRacing.kt | 23 ++++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/JHRPluginConfig.kt b/src/main/kotlin/JHRPluginConfig.kt index f224de2..fe1a4f2 100644 --- a/src/main/kotlin/JHRPluginConfig.kt +++ b/src/main/kotlin/JHRPluginConfig.kt @@ -63,6 +63,17 @@ object JHRPluginConfig : AutoSavePluginConfig("HorseRacingPluginConfig") { ) ) + @ValueDescription("胜利消息 ?为占位符") + val winnerMessage: MutableList by value( + mutableListOf( + "马?获得胜利,但在庆祝时被口水呛死了", + "马?获得了胜利,但发现奖牌是镀金的", + "马?到达终点,但是马?变得(", + "马?获得了胜利,跳起了失传已久的hop", + "马?获得了胜利,但随后,梦醒了", + ) + ) + /** * 自动开始时间(s) */ diff --git a/src/main/kotlin/JHorseRacing.kt b/src/main/kotlin/JHorseRacing.kt index 9a82ded..4ea96fc 100644 --- a/src/main/kotlin/JHorseRacing.kt +++ b/src/main/kotlin/JHorseRacing.kt @@ -15,7 +15,6 @@ import net.mamoe.mirai.event.events.MessageEvent import net.mamoe.mirai.message.data.At import net.mamoe.mirai.message.data.MessageChainBuilder import net.mamoe.mirai.message.data.MessageSource.Key.quote -import net.mamoe.mirai.message.data.PlainText import net.mamoe.mirai.utils.info import top.jie65535.jhr.game.Bet import top.jie65535.jhr.game.Horse @@ -144,11 +143,14 @@ object JHorseRacing : KotlinPlugin( delay(Random.nextLong(1000) + 3000) } val mb = MessageChainBuilder() - if (winners.size == 1) { - mb.add("${winners[0]} 最终赢得了胜利,让我们为它鼓掌") - } else { - mb.add("${winners.joinToString()} 一起赢得了胜利,让我们为它们鼓掌") + for (winner in winners) { + mb.add(JHRPluginConfig.winnerMessage[Random.nextInt(JHRPluginConfig.winnerMessage.size)].replace(",", winner.toString())) } +// if (winners.size == 1) { +// mb.add("${winners[0]} 最终赢得了胜利,让我们为它鼓掌") +// } else { +// mb.add("${winners.joinToString()} 一起赢得了胜利,让我们为它们鼓掌") +// } ranks.remove(subject.id) val pool = pools.remove(subject.id) if (pool != null && pool.size > 0) { @@ -306,6 +308,17 @@ object JHorseRacing : KotlinPlugin( } subject.sendMessage("OK") } + msg.startsWith("增加胜利词") -> { + val event = msg.removePrefix("增加胜利词").trim() + if (event.isBlank()) { + return@subscribeAlways + } + if (JHRPluginConfig.winnerMessage.indexOf(event) == -1) { + JHRPluginConfig.winnerMessage.add(event) + logger.info("已增加胜利词'$event'") + } + subject.sendMessage("OK") + } } }