nonebot-plugin-werewolf 1.1.2__py3-none-any.whl → 1.1.5__py3-none-any.whl

nonebot_plugin_werewolf/__init__.py

@@ -2,13 +2,14 @@ from nonebot import require
 from nonebot.plugin import PluginMetadata, inherit_supported_adapters
 
 require("nonebot_plugin_alconna")
-require("nonebot_plugin_userinfo")
+require("nonebot_plugin_uninfo")
 require("nonebot_plugin_waiter")
 
 from . import matchers as matchers
+from . import players as players
 from .config import Config
 
-__version__ = "1.1.2"
+__version__ = "1.1.5"
 __plugin_meta__ = PluginMetadata(
     name="狼人杀",
     description="适用于 Nonebot2 的狼人杀插件",
@@ -18,8 +19,12 @@ __plugin_meta__ = PluginMetadata(
     config=Config,
     supported_adapters=inherit_supported_adapters(
         "nonebot_plugin_alconna",
-        "nonebot_plugin_userinfo",
+        "nonebot_plugin_uninfo",
         "nonebot_plugin_waiter",
     ),
-    extra={"author": "wyf7685"},
+    extra={
+        "Author": "wyf7685",
+        "Version": __version__,
+        "Bug Tracker": "https://github.com/wyf7685/nonebot-plugin-werewolf/issues",
+    },
 )

nonebot_plugin_werewolf/config.py

@@ -1,4 +1,4 @@
-from typing import Literal, overload
+from typing import Any, Literal, overload
 
 from nonebot import get_plugin_config, logger
 from nonebot.compat import PYDANTIC_V2
@@ -7,6 +7,8 @@ from typing_extensions import Self
 
 from .constant import (
     Role,
+    RolePresetConfig,
+    RolePresetDict,
     default_priesthood_proirity,
     default_role_preset,
     default_werewolf_priority,
@@ -18,12 +20,12 @@ else:
     from pydantic import root_validator
 
     @overload
-    def model_validator(*, mode: Literal["before"]): ...  # noqa: ANN201
+    def model_validator(*, mode: Literal["before"]) -> Any: ...  # noqa: ANN401
 
     @overload
-    def model_validator(*, mode: Literal["after"]): ...  # noqa: ANN201
+    def model_validator(*, mode: Literal["after"]) -> Any: ...  # noqa: ANN401
 
-    def model_validator(*, mode: Literal["before", "after"]):
+    def model_validator(*, mode: Literal["before", "after"]) -> Any:
         return root_validator(
             pre=mode == "before",  # pyright: ignore[reportArgumentType]
             allow_reuse=True,
@@ -31,16 +33,10 @@ else:
 
 
 class PluginConfig(BaseModel):
-    enable_poke: bool = Field(default=True)
-    role_preset: list[tuple[int, int, int, int]] | dict[int, tuple[int, int, int]] = (
-        Field(default_factory=default_role_preset.copy)
-    )
-    werewolf_priority: list[Role] = Field(
-        default_factory=default_werewolf_priority.copy
-    )
-    priesthood_proirity: list[Role] = Field(
-        default_factory=default_priesthood_proirity.copy
-    )
+    enable_poke: bool = True
+    role_preset: RolePresetConfig = default_role_preset.copy()
+    werewolf_priority: list[Role] = default_werewolf_priority.copy()
+    priesthood_proirity: list[Role] = default_priesthood_proirity.copy()
     joker_probability: float = Field(default=0.0, ge=0.0, le=1.0)
 
     @model_validator(mode="after")
@@ -72,7 +68,7 @@ class PluginConfig(BaseModel):
 
         return self
 
-    def get_role_preset(self) -> dict[int, tuple[int, int, int]]:
+    def get_role_preset(self) -> RolePresetDict:
         if isinstance(self.role_preset, list):
             self.role_preset = {i[0]: i[1:] for i in self.role_preset}
         return self.role_preset

nonebot_plugin_werewolf/constant.py

@@ -4,8 +4,17 @@ import dataclasses
 from enum import Enum, auto
 from typing import TYPE_CHECKING
 
+import nonebot
+
 if TYPE_CHECKING:
-    from .player import Player
+    from .players import Player
+
+
+COMMAND_START = next(
+    iter(sorted(nonebot.get_driver().config.command_start, key=len)), ""
+)
+STOP_COMMAND_PROMPT = f"{COMMAND_START}stop"
+STOP_COMMAND = "{{stop}}"
 
 
 class Role(Enum):
@@ -49,11 +58,24 @@ class GameStatus(Enum):
 @dataclasses.dataclass
 class GameState:
     day: int
+    """当前天数记录, 不会被 `reset()` 重置"""
     killed: Player | None = None
-    shoot: tuple[Player, Player] | tuple[None, None] = (None, None)
+    """当晚狼人击杀目标, `None` 则为空刀"""
+    shoot: Player | None = None
+    """当前执行射杀操作的玩家"""
     antidote: set[Player] = dataclasses.field(default_factory=set)
+    """当晚女巫使用解药的目标"""
     poison: set[Player] = dataclasses.field(default_factory=set)
+    """当晚使用了毒药的女巫"""
     protected: set[Player] = dataclasses.field(default_factory=set)
+    """当晚守卫保护的目标"""
+
+    def reset(self) -> None:
+        self.killed = None
+        self.shoot = None
+        self.antidote = set()
+        self.poison = set()
+        self.protected = set()
 
 
 role_name_conv: dict[Role | RoleGroup, str] = {
@@ -71,7 +93,22 @@ role_name_conv: dict[Role | RoleGroup, str] = {
     RoleGroup.Others: "其他",
 }
 
-default_role_preset: dict[int, tuple[int, int, int]] = {
+role_emoji: dict[Role, str] = {
+    Role.Werewolf: "🐺",
+    Role.WolfKing: "🐺👑",
+    Role.Prophet: "🔮",
+    Role.Witch: "🧙‍♀️",
+    Role.Hunter: "🕵️",
+    Role.Guard: "🛡️",
+    Role.Idiot: "👨🏻‍🦲",
+    Role.Joker: "🤡",
+    Role.Civilian: "👨🏻‍🌾",
+}
+
+RolePresetDict = dict[int, tuple[int, int, int]]
+RolePresetConfig = RolePresetDict | list[tuple[int, int, int, int]]
+
+default_role_preset: RolePresetDict = {
     # 总人数: (狼, 神, 民)
     6: (1, 2, 3),
     7: (2, 2, 3),