nonebot-plugin-werewolf 1.1.2__tar.gz → 1.1.5__tar.gz

{nonebot_plugin_werewolf-1.1.2/nonebot_plugin_werewolf.egg-info → nonebot_plugin_werewolf-1.1.5}/PKG-INFO

@@ -1,16 +1,20 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-werewolf
-Version: 1.1.2
+Version: 1.1.5
 Summary: 适用于 Nonebot2 的狼人杀插件
 Author-email: wyf7685 <wyf7685@163.com>
 License: MIT
+Project-URL: homepage, https://github.com/wyf7685/nonebot-plugin-werewolf
+Project-URL: repository, https://github.com/wyf7685/nonebot-plugin-werewolf
+Project-URL: bug-tracker, https://github.com/wyf7685/nonebot-plugin-werewolf/issues
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: nonebot2>=2.3.3
 Requires-Dist: nonebot-plugin-alconna>=0.52.1
-Requires-Dist: nonebot-plugin-userinfo>=0.2.6
+Requires-Dist: nonebot-plugin-uninfo>=0.4.0
 Requires-Dist: nonebot-plugin-waiter>=0.7.1
+Requires-Dist: anyio>=4.6.0
 
 <div align="center">
   <a href="https://v2.nonebot.dev/store">
@@ -39,6 +43,7 @@ _✨ 简单的狼人杀插件 ✨_
 [![pyright](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/pyright.yml/badge.svg?branch=master&event=push)](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/pyright.yml)
 [![publish](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/pypi-publish.yml/badge.svg)](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/pypi-publish.yml)
 
+<!-- https://github.com/lgc2333/nonebot-registry-badge -->
 [![NoneBot Registry](https://img.shields.io/endpoint?url=https%3A%2F%2Fnbbdg.lgc2333.top%2Fplugin%2Fnonebot-plugin-werewolf)](https://registry.nonebot.dev/plugin/nonebot-plugin-werewolf:nonebot_plugin_werewolf)
 [![Supported Adapters](https://img.shields.io/endpoint?url=https%3A%2F%2Fnbbdg.lgc2333.top%2Fplugin-adapters%2Fnonebot-plugin-werewolf)](https://registry.nonebot.dev/plugin/nonebot-plugin-werewolf:nonebot_plugin_werewolf)
 
@@ -145,7 +150,7 @@ _✨ 简单的狼人杀插件 ✨_
 
 _其他交互参考游戏内提示_
 
-对于 `OneBot V11` 适配器, 启用配置项 `werewolf__enable_poke` 后, 可以使用戳一戳代替 _准备阶段_ 的 `加入游戏` 操作 和 游戏内的 `/stop` 命令
+对于 `OneBot V11` 适配器和 `Satori` 适配器的 `chronocat`, 启用配置项 `werewolf__enable_poke` 后, 可以使用戳一戳代替 _准备阶段_ 的 `加入游戏` 操作 和 游戏内的 `stop` 命令
 
 ### 游戏内容
 
@@ -233,6 +238,10 @@ werewolf__priesthood_proirity=[11, 12, 13, 14, 15]
 
 </details>
 
+### 已知问题
+
+- 截止 chronocat v0.2.19, 调用 [`guild.member.get`](https://github.com/chrononeko/chronocat/blob/8558ad9ff4319395d86abbfda22136939bf66780/packages/engine-chronocat-api/src/api/guild/member/get.ts) / [`user.get`](https://github.com/chrononeko/chronocat/blob/8558ad9ff4319395d86abbfda22136939bf66780/packages/engine-chronocat-api/src/api/user/get.ts) 均无法获取用户名，这将导致在交互过程中的玩家名显示为用户ID
+
 ## 📝 更新日志
 
 <details>
@@ -240,6 +249,17 @@ werewolf__priesthood_proirity=[11, 12, 13, 14, 15]
 
 <!-- CHANGELOG -->
 
+- 2024.10.23 v1.1.5
+
+  - 添加对 chronocat:poke 的支持
+  - 游戏内 stop 命令使用 COMMAND_START
+  - 使用 `anyio` 重写并发逻辑
+
+- 2024.10.06 v1.1.3
+
+  - 使用 `RF-Tar-Railt/nonebot-plugin-uninfo` 获取用户数据
+  - 优化交互文本
+
 - 2024.09.18 v1.1.2
 
   - 修改 Python 需求为 `>=3.10`
@@ -284,6 +304,6 @@ werewolf__priesthood_proirity=[11, 12, 13, 14, 15]
 
 - [`nonebot/nonebot2`](https://github.com/nonebot/nonebot2): 跨平台 Python 异步机器人框架
 - [`nonebot/plugin-alconna`](https://github.com/nonebot/plugin-alconna): 跨平台的消息处理接口
-- [`noneplugin/nonebot-plugin-userinfo`](https://github.com/noneplugin/nonebot-plugin-userinfo): 用户信息获取
+- [`RF-Tar-Railt/nonebot-plugin-uninfo`](https://github.com/RF-Tar-Railt/nonebot-plugin-uninfo): 用户信息获取
 - [`RF-Tar-Railt/nonebot-plugin-waiter`](https://github.com/RF-Tar-Railt/nonebot-plugin-waiter): 灵活获取用户输入
 - `热心群友`: 协助测试插件

nonebot_plugin_werewolf-1.1.2/PKG-INFO → nonebot_plugin_werewolf-1.1.5/README.md

@@ -1,17 +1,3 @@
-Metadata-Version: 2.1
-Name: nonebot-plugin-werewolf
-Version: 1.1.2
-Summary: 适用于 Nonebot2 的狼人杀插件
-Author-email: wyf7685 <wyf7685@163.com>
-License: MIT
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: nonebot2>=2.3.3
-Requires-Dist: nonebot-plugin-alconna>=0.52.1
-Requires-Dist: nonebot-plugin-userinfo>=0.2.6
-Requires-Dist: nonebot-plugin-waiter>=0.7.1
-
 <div align="center">
   <a href="https://v2.nonebot.dev/store">
     <img src="https://raw.githubusercontent.com/wyf7685/wyf7685/main/assets/NoneBotPlugin.svg" width="300" alt="logo">
@@ -39,6 +25,7 @@ _✨ 简单的狼人杀插件 ✨_
 [![pyright](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/pyright.yml/badge.svg?branch=master&event=push)](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/pyright.yml)
 [![publish](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/pypi-publish.yml/badge.svg)](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/pypi-publish.yml)
 
+<!-- https://github.com/lgc2333/nonebot-registry-badge -->
 [![NoneBot Registry](https://img.shields.io/endpoint?url=https%3A%2F%2Fnbbdg.lgc2333.top%2Fplugin%2Fnonebot-plugin-werewolf)](https://registry.nonebot.dev/plugin/nonebot-plugin-werewolf:nonebot_plugin_werewolf)
 [![Supported Adapters](https://img.shields.io/endpoint?url=https%3A%2F%2Fnbbdg.lgc2333.top%2Fplugin-adapters%2Fnonebot-plugin-werewolf)](https://registry.nonebot.dev/plugin/nonebot-plugin-werewolf:nonebot_plugin_werewolf)
 
@@ -145,7 +132,7 @@ _✨ 简单的狼人杀插件 ✨_
 
 _其他交互参考游戏内提示_
 
-对于 `OneBot V11` 适配器, 启用配置项 `werewolf__enable_poke` 后, 可以使用戳一戳代替 _准备阶段_ 的 `加入游戏` 操作 和 游戏内的 `/stop` 命令
+对于 `OneBot V11` 适配器和 `Satori` 适配器的 `chronocat`, 启用配置项 `werewolf__enable_poke` 后, 可以使用戳一戳代替 _准备阶段_ 的 `加入游戏` 操作 和 游戏内的 `stop` 命令
 
 ### 游戏内容
 
@@ -233,6 +220,10 @@ werewolf__priesthood_proirity=[11, 12, 13, 14, 15]
 
 </details>
 
+### 已知问题
+
+- 截止 chronocat v0.2.19, 调用 [`guild.member.get`](https://github.com/chrononeko/chronocat/blob/8558ad9ff4319395d86abbfda22136939bf66780/packages/engine-chronocat-api/src/api/guild/member/get.ts) / [`user.get`](https://github.com/chrononeko/chronocat/blob/8558ad9ff4319395d86abbfda22136939bf66780/packages/engine-chronocat-api/src/api/user/get.ts) 均无法获取用户名，这将导致在交互过程中的玩家名显示为用户ID
+
 ## 📝 更新日志
 
 <details>
@@ -240,6 +231,17 @@ werewolf__priesthood_proirity=[11, 12, 13, 14, 15]
 
 <!-- CHANGELOG -->
 
+- 2024.10.23 v1.1.5
+
+  - 添加对 chronocat:poke 的支持
+  - 游戏内 stop 命令使用 COMMAND_START
+  - 使用 `anyio` 重写并发逻辑
+
+- 2024.10.06 v1.1.3
+
+  - 使用 `RF-Tar-Railt/nonebot-plugin-uninfo` 获取用户数据
+  - 优化交互文本
+
 - 2024.09.18 v1.1.2
 
   - 修改 Python 需求为 `>=3.10`
@@ -284,6 +286,6 @@ werewolf__priesthood_proirity=[11, 12, 13, 14, 15]
 
 - [`nonebot/nonebot2`](https://github.com/nonebot/nonebot2): 跨平台 Python 异步机器人框架
 - [`nonebot/plugin-alconna`](https://github.com/nonebot/plugin-alconna): 跨平台的消息处理接口
-- [`noneplugin/nonebot-plugin-userinfo`](https://github.com/noneplugin/nonebot-plugin-userinfo): 用户信息获取
+- [`RF-Tar-Railt/nonebot-plugin-uninfo`](https://github.com/RF-Tar-Railt/nonebot-plugin-uninfo): 用户信息获取
 - [`RF-Tar-Railt/nonebot-plugin-waiter`](https://github.com/RF-Tar-Railt/nonebot-plugin-waiter): 灵活获取用户输入
 - `热心群友`: 协助测试插件

{nonebot_plugin_werewolf-1.1.2 → nonebot_plugin_werewolf-1.1.5}/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-1.1.2 → nonebot_plugin_werewolf-1.1.5}/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-1.1.2 → nonebot_plugin_werewolf-1.1.5}/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),