15 files changed, 18 insertions, 74 deletions

diff --git a/hydroroll/plugins/HydroRoll_plugin_dice/__init__.py b/hydroroll/plugins/HydroRoll_plugin_dice/__init__.py
deleted file mode 100644
index 2c9d2b4..0000000
--- a/hydroroll/plugins/HydroRoll_plugin_dice/__init__.py
+++ /dev/null
@@ -1,51 +0,0 @@
-import re
-import random
-
-from iamai.log import logger
-
-from plugins.hydroroll_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/HydroRoll_plugin_dice/config.py b/hydroroll/plugins/HydroRoll_plugin_dice/config.py
deleted file mode 100644
index 4846409..0000000
--- a/hydroroll/plugins/HydroRoll_plugin_dice/config.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from typing import Set
-
-from plugins.hydroroll_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/HydroRoll_plugin_base/__init__.py b/hydroroll/plugins/plugin_base/__init__.py
index a050ae1..a050ae1 100644
--- a/hydroroll/plugins/HydroRoll_plugin_base/__init__.py
+++ b/hydroroll/plugins/plugin_base/__init__.py
diff --git a/hydroroll/plugins/HydroRoll_plugin_base/config.py b/hydroroll/plugins/plugin_base/config.py
index 311874c..311874c 100644
--- a/hydroroll/plugins/HydroRoll_plugin_base/config.py
+++ b/hydroroll/plugins/plugin_base/config.py
diff --git a/hydroroll/plugins/HydroRoll_plugin_bot/__init__.py b/hydroroll/plugins/plugin_bot/__init__.py
index 2b3eec8..89ba17b 100644
--- a/hydroroll/plugins/HydroRoll_plugin_bot/__init__.py
+++ b/hydroroll/plugins/plugin_bot/__init__.py
@@ -1,6 +1,6 @@
 import re
 from importlib.metadata import version
-from plugins.hydroroll_plugin_base import CommandPluginBase
+from plugins.plugin_base import CommandPluginBase
 from hydroroll.config import GlobalConfig
 
 from .config import Config
diff --git a/hydroroll/plugins/HydroRoll_plugin_bot/config.py b/hydroroll/plugins/plugin_bot/config.py
index 717b7b2..640f23a 100644
--- a/hydroroll/plugins/HydroRoll_plugin_bot/config.py
+++ b/hydroroll/plugins/plugin_bot/config.py
@@ -1,6 +1,6 @@
 from typing import Set
 
-from plugins.hydroroll_plugin_base import CommandPluginConfig
+from plugins.plugin_base import CommandPluginConfig
 
 
 class Config(CommandPluginConfig):
diff --git a/hydroroll/plugins/HydroRoll_plugin_echo/__init__.py b/hydroroll/plugins/plugin_echo/__init__.py
index e800384..faa47df 100644
--- a/hydroroll/plugins/HydroRoll_plugin_echo/__init__.py
+++ b/hydroroll/plugins/plugin_echo/__init__.py
@@ -1,6 +1,6 @@
 import re
 
-from plugins.hydroroll_plugin_base import CommandPluginBase
+from plugins.plugin_base import CommandPluginBase
 
 from .config import Config
 
diff --git a/hydroroll/plugins/HydroRoll_plugin_echo/config.py b/hydroroll/plugins/plugin_echo/config.py
index 030bbec..c047134 100644
--- a/hydroroll/plugins/HydroRoll_plugin_echo/config.py
+++ b/hydroroll/plugins/plugin_echo/config.py
@@ -1,6 +1,6 @@
 from typing import Set
 
-from plugins.hydroroll_plugin_base import CommandPluginConfig
+from plugins.plugin_base import CommandPluginConfig
 
 
 class Config(CommandPluginConfig):
diff --git a/hydroroll/plugins/HydroRoll_plugin_luck/__init__.py b/hydroroll/plugins/plugin_luck/__init__.py
index a30c964..7967a0b 100644
--- a/hydroroll/plugins/HydroRoll_plugin_luck/__init__.py
+++ b/hydroroll/plugins/plugin_luck/__init__.py
@@ -2,7 +2,7 @@ import re
 import time
 import random
 
-from plugins.hydroroll_plugin_base import CommandPluginBase
+from plugins.plugin_base import CommandPluginBase
 
 from .config import Config
 
diff --git a/hydroroll/plugins/HydroRoll_plugin_luck/config.py b/hydroroll/plugins/plugin_luck/config.py
index eeef14b..6190531 100644
--- a/hydroroll/plugins/HydroRoll_plugin_luck/config.py
+++ b/hydroroll/plugins/plugin_luck/config.py
@@ -1,6 +1,6 @@
 from typing import Set
 
-from plugins.hydroroll_plugin_base import CommandPluginConfig
+from plugins.plugin_base import CommandPluginConfig
 
 
 class Config(CommandPluginConfig):
diff --git a/hydroroll/plugins/HydroRoll_plugin_send/__init__.py b/hydroroll/plugins/plugin_send/__init__.py
index 234e5b3..2468189 100644
--- a/hydroroll/plugins/HydroRoll_plugin_send/__init__.py
+++ b/hydroroll/plugins/plugin_send/__init__.py
@@ -1,6 +1,6 @@
 import re
 
-from plugins.hydroroll_plugin_base import CommandPluginBase
+from plugins.plugin_base import CommandPluginBase
 
 from .config import Config
 
diff --git a/hydroroll/plugins/HydroRoll_plugin_send/config.py b/hydroroll/plugins/plugin_send/config.py
index 6903c0f..5b7fe7b 100644
--- a/hydroroll/plugins/HydroRoll_plugin_send/config.py
+++ b/hydroroll/plugins/plugin_send/config.py
@@ -1,6 +1,6 @@
 from typing import Set, Optional
 
-from plugins.hydroroll_plugin_base import CommandPluginConfig
+from plugins.plugin_base import CommandPluginConfig
 
 
 class Config(CommandPluginConfig):
diff --git a/hydroroll/plugins/HydroRoll_plugin_system/__init__.py b/hydroroll/plugins/plugin_system/__init__.py
index 6e4f232..ea797d3 100644
--- a/hydroroll/plugins/HydroRoll_plugin_system/__init__.py
+++ b/hydroroll/plugins/plugin_system/__init__.py
@@ -1,5 +1,5 @@
 import re
-from plugins.hydroroll_plugin_base import CommandPluginBase
+from plugins.plugin_base import CommandPluginBase
 from .config import Config
 import psutil
 import time
diff --git a/hydroroll/plugins/HydroRoll_plugin_system/config.py b/hydroroll/plugins/plugin_system/config.py
index 416fcbe..aa5f51b 100644
--- a/hydroroll/plugins/HydroRoll_plugin_system/config.py
+++ b/hydroroll/plugins/plugin_system/config.py
@@ -1,6 +1,6 @@
 from typing import Set
 
-from plugins.hydroroll_plugin_base import CommandPluginConfig
+from plugins.plugin_base import CommandPluginConfig
 
 
 class Config(CommandPluginConfig):
diff --git a/hydroroll/plugins/test.py b/hydroroll/plugins/test.py
new file mode 100644
index 0000000..01d0615
--- /dev/null
+++ b/hydroroll/plugins/test.py
@@ -0,0 +1,8 @@
+from iamai import Plugin

+

+class Test(Plugin):

+    async def handle(self) -> None:

+        ...

+        

+    async def rule(self) -> None:

+        ...
\ No newline at end of file