10 files changed, 77 insertions, 9 deletions

diff --git a/HydroRoll/Hydro/roll.py b/HydroRoll/Hydro/roll.py
index 8ccf0cd..c08bce9 100644
--- a/HydroRoll/Hydro/roll.py
+++ b/HydroRoll/Hydro/roll.py
@@ -7,5 +7,6 @@ class Roll(Plugin):
     async def rule(self) -> bool:

         return(

             self.event.adapter.name == "cqhttp" and

+            self.event.type == "message" and

             self.event.get_plain_text() == "1"

         )
\ No newline at end of file
diff --git a/HydroRoll/__init__.py b/HydroRoll/__init__.py
index c290288..d73cd0c 100644
--- a/HydroRoll/__init__.py
+++ b/HydroRoll/__init__.py
@@ -1,6 +1 @@
-from iamai import Bot

-from .Hydro import Dice

-bot = Bot(hot_reload=True)

-

-if __name__ == "__main__":

-    bot.run()

+name = "HydroRoll"
\ No newline at end of file
diff --git a/HydroRoll/main.py b/HydroRoll/main.py
new file mode 100644
index 0000000..793bbb7
--- /dev/null
+++ b/HydroRoll/main.py
@@ -0,0 +1,7 @@
+from iamai import Bot
+
+
+bot = Bot(hot_reload=True)
+
+if __name__ == "__main__":
+    bot.run()
diff --git a/HydroRoll/plugins/Hydro.py b/HydroRoll/plugins/Hydro.py
deleted file mode 100644
index 52895ea..0000000
--- a/HydroRoll/plugins/Hydro.py
+++ /dev/null
@@ -1 +0,0 @@
-from .. import Hydro
\ No newline at end of file
diff --git a/HydroRoll/plugins/__init__.py b/HydroRoll/plugins/__init__.py
new file mode 100644
index 0000000..6cccc74
--- /dev/null
+++ b/HydroRoll/plugins/__init__.py
@@ -0,0 +1 @@
+from Hydro import Dice
\ No newline at end of file
diff --git a/HydroRoll/plugins/iamai_plugin_base/__init__.py b/HydroRoll/plugins/iamai_plugin_base/__init__.py
index fe0cd32..8fe559b 100644
--- a/HydroRoll/plugins/iamai_plugin_base/__init__.py
+++ b/HydroRoll/plugins/iamai_plugin_base/__init__.py
@@ -30,7 +30,7 @@ class BasePlugin(
     async def rule(self) -> bool:
         if self.event.adapter.name != "cqhttp":
             return False
-        if self.event.type != "message":
+        if self.event.type != "message_sent":
             return False
         if self.config.handle_all_message:
             return self.str_match(self.event.message.get_plain_text())
diff --git a/HydroRoll/plugins/iamai_plugin_base/config.py b/HydroRoll/plugins/iamai_plugin_base/config.py
index c36d03e..04924e0 100644
--- a/HydroRoll/plugins/iamai_plugin_base/config.py
+++ b/HydroRoll/plugins/iamai_plugin_base/config.py
@@ -22,7 +22,7 @@ class RegexPluginConfig(BasePluginConfig):
 
 
 class CommandPluginConfig(RegexPluginConfig):
-    command_prefix: Set[str] = {".", "。","!"}
+    command_prefix: Set[str] = {".", "。","!",":"}
     """命令前缀。"""
     command: Set[str] = {}
     """命令文本。"""
diff --git a/HydroRoll/plugins/iamai_plugin_dice/__init__.py b/HydroRoll/plugins/iamai_plugin_dice/__init__.py
new file mode 100644
index 0000000..396278a
--- /dev/null
+++ b/HydroRoll/plugins/iamai_plugin_dice/__init__.py
@@ -0,0 +1,51 @@
+import re
+import random
+
+from iamai.log import logger
+
+from plugins.iamai_plugin_base import CommandPluginBase
+
+from .config import Config
+
+__all__ = ["Dice"]
+
+class Dice(CommandPluginBase[None, Config]):
+    Config = Config
+
+    def __post_init__(self):
+        self.re_pattern = re.compile(
+            r"\s*(?P<dice_times>\d+)d(?P<dice_faces>\d+)([*x](?P<dice_multiply>\d+))?",
+            flags=re.I,
+        )
+
+    async def handle(self) -> None:
+        dice_times = int(self.msg_match.group("dice_times"))
+        dice_faces = int(self.msg_match.group("dice_faces"))
+        if self.msg_match.group("dice_multiply") is None:
+            dice_multiply = None
+        else:
+            dice_multiply = int(self.msg_match.group("dice_multiply"))
+
+        if dice_times > self.config.max_dice_times:
+            await self.event.reply(
+                self.format_str(self.config.exceed_max_dice_times_str)
+            )
+            return
+
+        dice = [random.randint(1, dice_faces) for _ in range(dice_times)]
+        dice_sum = sum(dice)
+        if dice_multiply is None:
+            result_str = f"{dice_times}D{dice_faces}="
+            if dice_times != 1:
+                result_str += f"{'+'.join(map(lambda x: str(x), dice))}="
+            result_str += str(dice_sum)
+        else:
+            result_str = f"{dice_times}D{dice_faces}x{dice_multiply}="
+            if dice_times != 1:
+                result_str += (
+                    f"({'+'.join(map(lambda x: str(x), dice))})x{dice_multiply}="
+                )
+            result_str += f"{dice_sum}x{dice_multiply}={dice_sum * dice_multiply}"
+
+        logger.info(f"Dice Plugin: {result_str}")
+        await self.event.reply(self.format_str(self.config.message_str, result_str))
diff --git a/HydroRoll/plugins/iamai_plugin_dice/config.py b/HydroRoll/plugins/iamai_plugin_dice/config.py
new file mode 100644
index 0000000..a8c6700
--- /dev/null
+++ b/HydroRoll/plugins/iamai_plugin_dice/config.py
@@ -0,0 +1,13 @@
+from typing import Set
+
+from plugins.iamai_plugin_base import CommandPluginConfig
+
+
+class Config(CommandPluginConfig):
+    __config_name__ = "plugin_dice"
+    command: Set[str] = {"r", "roll", "dice"}
+    """命令文本。"""
+    max_dice_times: int = 1000
+    """最大单次投掷次数。"""
+    exceed_max_dice_times_str: str = "错误：超过最大投掷次数。"
+    """超过最大单次投掷次数时的提示语。"""
diff --git a/HydroRoll/plugins/plugin.py b/HydroRoll/plugins/plugin.py
new file mode 100644
index 0000000..6cccc74
--- /dev/null
+++ b/HydroRoll/plugins/plugin.py
@@ -0,0 +1 @@
+from Hydro import Dice
\ No newline at end of file