:sparkles: 完善Result基类

2 files changed, 19 insertions, 2 deletions

diff --git a/src/hydrorollcore/__init__.py b/src/hydrorollcore/__init__.py
index f0a096fd..7a2bba77 100644
--- a/src/hydrorollcore/__init__.py
+++ b/src/hydrorollcore/__init__.py
@@ -1,6 +1,6 @@
 from HydroRollCore.cli import Cli
 from HydroRollCore.config import Config
-from HydroRollCore.rule import Rule
+from HydroRollCore.rule import Rule, Result, Dice
 from HydroRollCore.core import Core
 
-__all__ = ["Core", "Rule", "Config", "Cli"]
+__all__ = ["Core", "Rule", "Config", "Cli", "Result", "Dice"]
diff --git a/src/hydrorollcore/rule.py b/src/hydrorollcore/rule.py
index 7dd24836..d2ea4a19 100644
--- a/src/hydrorollcore/rule.py
+++ b/src/hydrorollcore/rule.py
@@ -1,5 +1,6 @@
 from abc import ABCMeta, abstractmethod
 from enum import Enum
+from .exceptions import HydroError
 
 __all__ = ["RuleLoadType", "Rule"]
 
@@ -17,6 +18,17 @@ class Result(metaclass=ABCMeta):
     """规则检定结果基类"""
 
     event: str
+    status: bool
+    exception: HydroError | None = None
+
+    def __init__(self, event: str, status: bool, exception: HydroError | None) -> None:
+        self.event = event
+        self.status = status
+        self.exception = exception
+
+    def ok(self):
+        """规则执行期间是否产生异常"""
+        return isinstance(self.exception, HydroError)
 
 
 class Dice(metaclass=ABCMeta):
@@ -32,12 +44,17 @@ class Dice(metaclass=ABCMeta):
     def __str__(self) -> str:
         return self.db.upper()
 
+    def __int__(self) -> int:
+        return self.outcome
+
     @abstractmethod
     def parse(self) -> "Dice":
+        """解析传入的掷骰字符串`roll_string`，返回一个`Dice`对象"""
         raise NotImplementedError
 
     @abstractmethod
     def roll(self) -> int:
+        """掷骰方法，返回掷骰结果"""
         raise NotImplementedError