nonebot-plugin-werewolf 1.1.9__py3-none-any.whl → 1.1.11__py3-none-any.whl

nonebot_plugin_werewolf/__init__.py

@@ -10,7 +10,7 @@ from . import matchers as matchers
 from . import players as players
 from .config import Config
 
-__version__ = "1.1.9"
+__version__ = "1.1.11"
 __plugin_meta__ = PluginMetadata(
     name="狼人杀",
     description="适用于 Nonebot2 的狼人杀插件",

nonebot_plugin_werewolf/config.py

@@ -1,6 +1,6 @@
 import json
 from pathlib import Path
-from typing import Any, ClassVar, Final
+from typing import Any, ClassVar, Final, Literal
 from typing_extensions import Self
 
 import nonebot
@@ -83,10 +83,26 @@ class GameBehavior(ConfigFile):
     timeout: Final[_Timeout] = _Timeout()
 
 
+class RequireAtConfig(BaseModel):
+    start: bool = True
+    terminate: bool = True
+
+
+class MatcherPriorityConfig(BaseModel):
+    start: int = 1
+    terminate: int = 1
+    preset: int = 1
+    behavior: int = 1
+    in_game: int = 10
+    stop: int = 10
+
+
 class PluginConfig(BaseModel):
     enable_poke: bool = True
     enable_button: bool = False
     stop_command: str | set[str] = "stop"
+    require_at: bool | RequireAtConfig = True
+    matcher_priority: MatcherPriorityConfig = MatcherPriorityConfig()
 
     def get_stop_command(self) -> list[str]:
         return (
@@ -95,6 +111,11 @@ class PluginConfig(BaseModel):
             else sorted(self.stop_command, key=len)
         )
 
+    def get_require_at(self, cmd: Literal["start", "terminate"]) -> bool:
+        if isinstance(self.require_at, bool):
+            return self.require_at
+        return getattr(self.require_at, cmd)
+
 
 class Config(BaseModel):
     werewolf: PluginConfig = PluginConfig()

nonebot_plugin_werewolf/constant.py

@@ -1,20 +1,18 @@
 import functools
 from typing import TYPE_CHECKING
 
-import nonebot
-
 from .models import GameStatus, KillReason, Role, RoleGroup
 
 STOP_COMMAND = "{{stop}}"
-COMMAND_START = next(
-    iter(sorted(nonebot.get_driver().config.command_start, key=len)), ""
-)
 
 
 def stop_command_prompt() -> str:
+    import nonebot
+
     from .config import config  # circular import
 
-    return COMMAND_START + config.get_stop_command()[0]
+    cmd_starts = sorted(nonebot.get_driver().config.command_start, key=len)
+    return next(iter(cmd_starts), "") + config.get_stop_command()[0]
 
 
 if not TYPE_CHECKING:

nonebot_plugin_werewolf/game.py

@@ -1,7 +1,7 @@
 import contextlib
 import functools
 import secrets
-from collections import defaultdict
+from collections import Counter
 from typing import NoReturn, final
 from typing_extensions import Self
 
@@ -10,8 +10,8 @@ import nonebot
 from nonebot.adapters import Bot
 from nonebot.utils import escape_tag
 from nonebot_plugin_alconna import At, Target, UniMessage
-from nonebot_plugin_alconna.uniseg.message import Receipt
-from nonebot_plugin_uninfo import Interface, SceneType
+from nonebot_plugin_alconna.uniseg.receipt import Receipt
+from nonebot_plugin_uninfo import Interface, Scene, SceneType
 
 from .config import GameBehavior, PresetData
 from .constant import GAME_STATUS_CONV, REPORT_TEXT, ROLE_EMOJI, ROLE_NAME_CONV
@@ -162,11 +162,10 @@ class Game:
         self.state = GameState(0)
         self.killed_players = []
         self._player_map: dict[str, Player] = {}
-        self._scene = None
-        self._finished = None
-        self._task_group = None
-        self._send_handler = _SendHandler()
-        self._send_handler.update(group, bot)
+        self._shuffled: list[Player] = []
+        self._scene: Scene | None = None
+        self._finished = self._task_group = None
+        self._send_handler = _SendHandler(group, bot)
 
     @final
     @classmethod
@@ -185,6 +184,7 @@ class Game:
 
         self.players = await init_players(bot, self, players, interface)
         self._player_map |= {p.user_id: p for p in self.players}
+        self._shuffled = self.players.shuffled
 
         return self
 
@@ -258,12 +258,9 @@ class Game:
         )
 
         if self.behavior.show_roles_list_on_start:
-            role_cnt: dict[Role, int] = defaultdict(lambda: 0)
-            for role in sorted((p.role for p in self.players), key=lambda r: r.value):
-                role_cnt[role] += 1
-
             msg.text("\n\n📚职业列表:\n")
-            for role, cnt in role_cnt.items():
+            counter = Counter(p.role for p in self.players)
+            for role, cnt in sorted(counter.items(), key=lambda x: x[0].value):
                 msg.text(f"- {ROLE_EMOJI[role]}{ROLE_NAME_CONV[role]}x{cnt}\n")
 
         async with anyio.create_task_group() as tg:
@@ -340,23 +337,24 @@ class Game:
         timeout = self.behavior.timeout
 
         if not self.behavior.speak_in_turn:
-            speak_timeout = timeout.group_speak
             await self.send(
                 f"💬接下来开始自由讨论\n{timeout.group_speak_timeout_prompt}",
                 stop_btn_label="结束发言",
             )
-            await self.wait_stop(*self.players.alive(), timeout_secs=speak_timeout)
+            await self.wait_stop(
+                *self.players.alive(),
+                timeout_secs=timeout.group_speak,
+            )
         else:
             await self.send("💬接下来开始轮流发言")
-            speak_timeout = timeout.speak
-            for player in self.players.alive().sorted:
+            for player in filter(lambda p: p.alive, self._shuffled):
                 await self.send(
                     UniMessage.text("💬")
                     .at(player.user_id)
                     .text(f"\n轮到你发言\n{timeout.speak_timeout_prompt}"),
                     stop_btn_label="结束发言",
                 )
-                await self.wait_stop(player, timeout_secs=speak_timeout)
+                await self.wait_stop(player, timeout_secs=timeout.speak)
             await self.send("💬所有玩家发言结束")
 
     async def run_vote(self) -> None:

nonebot_plugin_werewolf/matchers/depends.py

@@ -1,7 +1,7 @@
 import itertools
 
 from nonebot.adapters import Bot, Event
-from nonebot_plugin_alconna import MsgTarget, UniMessage
+from nonebot_plugin_alconna import MsgTarget, get_target
 
 from ..game import Game, get_running_games
 
@@ -27,7 +27,7 @@ async def rule_in_game(bot: Bot, event: Event) -> bool:
         return False
 
     try:
-        target = UniMessage.get_target(event, bot)
+        target = get_target(event, bot)
     except NotImplementedError:
         return False
 

nonebot_plugin_werewolf/matchers/edit_behavior.py

@@ -15,7 +15,7 @@ from nonebot_plugin_alconna import (
     on_alconna,
 )
 
-from ..config import GameBehavior
+from ..config import GameBehavior, config
 
 GAME_BEHAVIOR_CACHE_KEY = "GAME_BEHAVIOR_CACHE_KEY"
 
@@ -118,7 +118,7 @@ alc = Alconna(
 edit_behavior = on_alconna(
     alc,
     permission=SUPERUSER,
-    use_cmd_start=True,
+    priority=config.matcher_priority.behavior,
 )
 
 
@@ -145,7 +145,10 @@ async def set_dead_chat(behavior: Behavior, limit: int) -> None:
 @edit_behavior.assign("werewolf_multi_select")
 async def set_werewolf_multi_select(behavior: Behavior, enabled: bool) -> None:
     behavior.werewolf_multi_select = enabled
-    await finish(f"已{'启用' if enabled else '禁用'}狼人多选")
+    await finish(
+        f"已{'启用' if enabled else '禁用'}狼人多选\n"
+        "注: 狼人意见未统一时随机选择已选玩家"
+    )
 
 
 @edit_behavior.assign("timeout.prepare")
@@ -205,13 +208,14 @@ async def handle_default(behavior: Behavior) -> None:
         f"游戏开始发送职业列表: {'是' if behavior.show_roles_list_on_start else '否'}",
         f"白天讨论按顺序发言: {'是' if behavior.speak_in_turn else '否'}",
         f"死亡玩家发言转发限制: {behavior.dead_channel_rate_limit} 次/分钟",
+        f"狼人多选(意见未统一时随机选择已选玩家): {'是' if behavior.werewolf_multi_select else '否'}",  # noqa: E501
         "",
         "超时时间设置:",
         f"准备阶段: {timeout.prepare} 秒",
         f"个人发言: {timeout.speak} 秒",
         f"集体发言: {timeout.group_speak} 秒",
-        f"交互阶段: {timeout.interact} 秒",
         f"投票阶段: {timeout.vote} 秒",
+        f"交互阶段: {timeout.interact} 秒",
         f"狼人交互: {timeout.werewolf} 秒",
     ]
     await finish("\n".join(lines))

nonebot_plugin_werewolf/matchers/edit_preset.py

@@ -1,6 +1,6 @@
 from typing import Any, NoReturn
 
-import nonebot_plugin_waiter as waiter
+import nonebot_plugin_waiter.unimsg as waiter
 from arclet.alconna import AllParam
 from nonebot.permission import SUPERUSER
 from nonebot.typing import T_State
@@ -14,7 +14,7 @@ from nonebot_plugin_alconna import (
     on_alconna,
 )
 
-from ..config import PresetData
+from ..config import PresetData, config
 from ..constant import ROLE_NAME_CONV
 from ..models import Role
 
@@ -48,8 +48,8 @@ alc = Alconna(
         help_text="设置神职优先级",
     ),
     Subcommand(
-        "joker",
-        Args["probability?#概率", float],
+        "jester",
+        Args["probability?#概率(百分比)", float],
         alias={"小丑"},
         help_text="设置小丑概率",
     ),
@@ -73,7 +73,7 @@ alc = Alconna(
 edit_preset = on_alconna(
     alc,
     permission=SUPERUSER,
-    use_cmd_start=True,
+    priority=config.matcher_priority.preset,
 )
 
 
@@ -82,8 +82,7 @@ async def finish(text: str) -> NoReturn:
 
 
 def display_roles(roles: list[Role]) -> str:
-    role_name = ROLE_NAME_CONV.__getitem__
-    return ", ".join(map(role_name, roles))
+    return ", ".join(map(ROLE_NAME_CONV.__getitem__, roles))
 
 
 @edit_preset.assign("role")
@@ -217,8 +216,8 @@ async def assign_priesthood(state: T_State) -> None:
     await finish("设置成功: " + display_roles(result))
 
 
-@edit_preset.assign("joker")
-async def assign_joker(probability: Match[float]) -> None:
+@edit_preset.assign("jester")
+async def assign_jester(probability: Match[float]) -> None:
     if not probability.available:
         result = await waiter.prompt_until(
             message="请发送小丑概率，范围 0-100\n发送 “取消” 取消操作",

nonebot_plugin_werewolf/matchers/message_in_game.py

@@ -7,7 +7,10 @@ from ..constant import STOP_COMMAND
 from ..utils import InputStore
 from .depends import rule_in_game
 
-message_in_game = on_message(rule=rule_in_game, priority=10)
+message_in_game = on_message(
+    rule=rule_in_game,
+    priority=config.matcher_priority.in_game,
+)
 
 
 @message_in_game.handle()
@@ -24,6 +27,7 @@ stopcmd = on_alconna(
     block=True,
     use_cmd_start=True,
     aliases=set(aliases) if (aliases := config.get_stop_command()[1:]) else None,
+    priority=config.matcher_priority.stop,
 )
 
 

nonebot_plugin_werewolf/matchers/poke/__init__.py

@@ -1,3 +1,4 @@
+from ...config import config
 from .chronocat_poke import chronocat_poke_enabled
 from .ob11_poke import ob11_poke_enabled
 
@@ -5,4 +6,4 @@ checks = [chronocat_poke_enabled, ob11_poke_enabled]
 
 
 def poke_enabled() -> bool:
-    return any(check() for check in checks)
+    return config.enable_poke and any(check() for check in checks)

nonebot_plugin_werewolf/matchers/poke/chronocat_poke.py

@@ -15,7 +15,10 @@ def chronocat_poke_enabled() -> bool:
     return False
 
 
-with contextlib.suppress(ImportError):
+with contextlib.suppress(ImportError, RuntimeError):
+    if not config.enable_poke:
+        raise RuntimeError  # skip matcher definition
+
     from nonebot.adapters.satori import Bot
     from nonebot.adapters.satori.event import (
         MessageCreatedEvent,
@@ -46,8 +49,6 @@ with contextlib.suppress(ImportError):
 
     # 游戏内戳一戳等效 "stop" 命令
     async def _rule_poke_stop(bot: Bot, event: MessageCreatedEvent) -> bool:
-        if not config.enable_poke:
-            return False
         return extract_poke_tome(event) is not None and (
             user_in_game(bot.self_id, *extract_user_group(event))
         )
@@ -66,9 +67,6 @@ with contextlib.suppress(ImportError):
         event: PublicMessageCreatedEvent,
         target: MsgTarget,
     ) -> bool:
-        if not config.enable_poke:
-            return False
-
         return (
             (user_id := extract_poke_tome(event)) is not None
             and not user_in_game(
@@ -110,9 +108,6 @@ with contextlib.suppress(ImportError):
             await UniMessage.at(user_id).text("\n✅成功加入游戏").send(target, bot)
 
     def chronocat_poke_enabled() -> bool:
-        if not config.enable_poke:
-            return False
-
         event = current_event.get()
         return (
             isinstance(event, MessageCreatedEvent)

nonebot_plugin_werewolf/matchers/poke/ob11_poke.py

@@ -15,15 +15,15 @@ def ob11_poke_enabled() -> bool:
     return False
 
 
-with contextlib.suppress(ImportError):
+with contextlib.suppress(ImportError, RuntimeError):
+    if not config.enable_poke:
+        raise RuntimeError  # skip matcher definition
+
     from nonebot.adapters.onebot.v11 import Bot
     from nonebot.adapters.onebot.v11.event import PokeNotifyEvent
 
     # 游戏内戳一戳等效 "stop" 命令
     async def _rule_poke_stop(bot: Bot, event: PokeNotifyEvent) -> bool:
-        if not config.enable_poke:
-            return False
-
         user_id = str(event.user_id)
         group_id = str(event.group_id) if event.group_id is not None else None
         return (event.target_id == event.self_id) and user_in_game(
@@ -42,7 +42,7 @@ with contextlib.suppress(ImportError):
     async def _rule_poke_join(
         bot: Bot, event: PokeNotifyEvent, target: MsgTarget
     ) -> bool:
-        if not config.enable_poke or event.group_id is None:
+        if event.group_id is None:
             return False
 
         user_id = str(event.user_id)
@@ -74,7 +74,4 @@ with contextlib.suppress(ImportError):
         await UniMessage.at(user_id).text("\n✅成功加入游戏").send(target, bot)
 
     def ob11_poke_enabled() -> bool:
-        if not config.enable_poke:
-            return False
-
         return isinstance(current_bot.get(), Bot)

nonebot_plugin_werewolf/matchers/start_game.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 
 import anyio
 import nonebot
-import nonebot_plugin_waiter as waiter
+import nonebot_plugin_waiter.unimsg as waiter
 from nonebot.adapters import Bot, Event
 from nonebot.internal.matcher import current_bot
 from nonebot.permission import SuperUser
@@ -21,12 +21,13 @@ from nonebot_plugin_alconna import (
     Target,
     UniMessage,
     UniMsg,
+    get_target,
     on_alconna,
 )
 from nonebot_plugin_localstore import get_plugin_data_file
 from nonebot_plugin_uninfo import QryItrface, Uninfo
 
-from ..config import GameBehavior, PresetData
+from ..config import GameBehavior, PresetData, config
 from ..constant import stop_command_prompt
 from ..game import Game, get_running_games, get_starting_games
 from ..utils import ObjectStream, SendHandler, extract_session_member_nick
@@ -41,9 +42,11 @@ start_game = on_alconna(
         "werewolf",
         Option("restart|-r|--restart|重开", dest="restart"),
     ),
-    rule=to_me() & rule_not_in_game,
+    rule=to_me() & rule_not_in_game
+    if config.get_require_at("start")
+    else rule_not_in_game,
     aliases={"狼人杀"},
-    use_cmd_start=True,
+    priority=config.matcher_priority.start,
 )
 player_data_file = get_plugin_data_file("players.json")
 if not player_data_file.exists():
@@ -112,7 +115,7 @@ class PrepareGame:
     def __init__(self, event: Event, players: dict[str, str]) -> None:
         self.event = event
         self.admin_id = event.get_user_id()
-        self.group = UniMessage.get_target(event)
+        self.group = get_target(event)
         self.stream = ObjectStream[tuple[Event, str, str]](16)
         self.players = players
         self.send_handler = self._SendHandler()

nonebot_plugin_werewolf/matchers/superuser_ops.py

@@ -1,24 +1,32 @@
+from typing import Annotated
+
+from nonebot.params import Depends
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
 from nonebot_plugin_alconna import Alconna, MsgTarget, UniMessage, on_alconna
 
-from ..game import get_running_games
-
-
-def rule_game_running(target: MsgTarget) -> bool:
-    return any(target.verify(g.group) for g in get_running_games())
-
+from ..config import config
+from ..game import Game, get_running_games
 
-force_stop = on_alconna(
+terminate = on_alconna(
     Alconna("中止游戏"),
-    rule=to_me() & rule_game_running,
+    rule=to_me() if config.get_require_at("terminate") else None,
     permission=SUPERUSER,
-    use_cmd_start=True,
+    priority=config.matcher_priority.terminate,
 )
 
 
-@force_stop.handle()
-async def _(target: MsgTarget) -> None:
-    game = next(g for g in get_running_games() if target.verify(g.group))
+async def running_game(target: MsgTarget) -> Game:
+    for game in get_running_games():
+        if target.verify(game.group):
+            return game
+    return terminate.skip()
+
+
+RunningGame = Annotated[Game, Depends(running_game)]
+
+
+@terminate.handle()
+async def _(game: RunningGame) -> None:
     game.terminate()
     await UniMessage.text("已中止当前群组的游戏进程").finish(reply_to=True)

nonebot_plugin_werewolf/player.py

@@ -129,8 +129,7 @@ class Player:
         self.bot = bot
         self.killed = anyio.Event()
         self._member = None
-        self._send_handler = _SendHandler()
-        self._send_handler.update(self.__user, bot)
+        self._send_handler = _SendHandler(self.__user, bot)
 
     @final
     @override

nonebot_plugin_werewolf/player_set.py

@@ -1,6 +1,7 @@
 import functools
 import random
 from collections.abc import Iterable
+from collections.abc import Set as AbstractSet
 from typing_extensions import Self
 
 import anyio
@@ -100,3 +101,12 @@ class PlayerSet(set[Player]):
 
     def __getitem__(self, index: int, /) -> Player:
         return self.sorted[index]
+
+    def __and__(self, other: AbstractSet[Player], /) -> Self:  # type: ignore[override]
+        return self.from_(super().__and__(other))
+
+    def __or__(self, other: AbstractSet[Player], /) -> Self:  # type: ignore[override]
+        return self.from_(super().__or__(other))
+
+    def __sub__(self, other: AbstractSet[Player], /) -> Self:  # type: ignore[override]
+        return self.from_(super().__sub__(other))

nonebot_plugin_werewolf/utils.py

@@ -190,11 +190,19 @@ def add_players_button(msg: str | UniMessage, players: "PlayerSet") -> UniMessag
 
 class SendHandler(abc.ABC, Generic[P]):
     bot: Bot
-    target: Event | Target
+    target: Event | Target | None
     reply_to: bool | None = None
     last_msg: UniMessage | None = None
     last_receipt: Receipt | None = None
 
+    def __init__(
+        self,
+        target: Event | Target | None = None,
+        bot: Bot | None = None,
+    ) -> None:
+        self.bot = bot or current_bot.get()
+        self.target = target
+
     def update(self, target: Event | Target, bot: Bot | None = None) -> None:
         self.bot = bot or current_bot.get()
         self.target = target
@@ -210,6 +218,9 @@ class SendHandler(abc.ABC, Generic[P]):
             await last.edit(self.last_msg.exclude(Keyboard))
 
     async def _send(self, message: UniMessage) -> None:
+        if self.target is None:
+            raise RuntimeError("Target cannot be None when sending a message.")
+
         if not config.enable_button:
             message = message.exclude(Keyboard)
         receipt = await message.send(

{nonebot_plugin_werewolf-1.1.9.dist-info → nonebot_plugin_werewolf-1.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-werewolf
-Version: 1.1.9
+Version: 1.1.11
 Summary: 适用于 Nonebot2 的狼人杀插件
 Author-email: wyf7685 <wyf7685@163.com>
 License: MIT
@@ -10,11 +10,11 @@ Project-URL: bug-tracker, https://github.com/wyf7685/nonebot-plugin-werewolf/iss
 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: nonebot2>=2.4.0
+Requires-Dist: nonebot-plugin-alconna>=0.57.0
 Requires-Dist: nonebot-plugin-localstore>=0.7.1
-Requires-Dist: nonebot-plugin-uninfo>=0.4.0
-Requires-Dist: nonebot-plugin-waiter>=0.7.1
+Requires-Dist: nonebot-plugin-uninfo>=0.7.3
+Requires-Dist: nonebot-plugin-waiter>=0.8.0
 Requires-Dist: anyio>=4.6.0
 Dynamic: license-file
 
@@ -39,7 +39,8 @@ _✨ 简单的狼人杀插件 ✨_
 [![pre-commit](https://results.pre-commit.ci/badge/github/wyf7685/nonebot-plugin-werewolf/master.svg)](https://results.pre-commit.ci/latest/github/wyf7685/nonebot-plugin-werewolf/master)
 [![lint](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/lint.yml/badge.svg?branch=master&event=push)](https://github.com/wyf7685/nonebot-plugin-werewolf/actions/workflows/lint.yml)
 
-<!-- https://github.com/lgc2333/nonebot-registry-badge -->
+<!-- ref: 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)
 
@@ -53,7 +54,7 @@ _✨ 简单的狼人杀插件 ✨_
 
 > [!note]
 >
-> 请确保 NoneBot2 使用的 Python 解释器版本 >=3.10
+> 请确保 [NoneBot2](https://nonebot.dev/) 使用的 Python 解释器版本 >=3.10
 
 <details open>
 <summary>使用 nb-cli 安装</summary>
@@ -65,12 +66,14 @@ _✨ 简单的狼人杀插件 ✨_
 
 <details>
 <summary>使用包管理器安装</summary>
+<!-- 会用包管理器的用户真的需要这节吗 -->
+
 在 nonebot2 项目的插件目录下, 打开命令行, 根据你使用的包管理器, 输入相应的安装命令
 
-<details>
-<summary>pip</summary>
+<details open>
+<summary>uv</summary>
 
-    pip install nonebot-plugin-werewolf
+    uv add nonebot-plugin-werewolf
 
 </details>
 <details>
@@ -90,6 +93,12 @@ _✨ 简单的狼人杀插件 ✨_
 
     conda install nonebot-plugin-werewolf
 
+</details>
+<details>
+<summary>pip</summary>
+
+    pip install nonebot-plugin-werewolf
+
 </details>
 
 打开 nonebot2 项目根目录下的 `pyproject.toml` 文件, 在 `[tool.nonebot]` 部分追加写入
@@ -102,16 +111,39 @@ _✨ 简单的狼人杀插件 ✨_
 
 在 nonebot2 项目的 `.env` 文件中添加如下配置:
 
-|          配置项           | 必填  | 默认值  |             说明             |
-| :-----------------------: | :---: | :-----: | :--------------------------: |
-|  `werewolf__enable_poke`  |  否   | `True`  |  是否使用戳一戳简化操作流程  |
-| `werewolf__enable_button` |  否   | `False` |     是否在交互中添加按钮     |
-| `werewolf__stop_command`  |  否   | `stop`  | 修改游戏进程中的 `stop` 命令 |
+|            配置项            | 必填 | 默认值  |           类型            |              说明              |
+| :--------------------------: | :--: | :-----: | :-----------------------: | :----------------------------: |
+|   `werewolf__enable_poke`    |  否  | `True`  |          `bool`           |   是否使用戳一戳简化操作流程   |
+|  `werewolf__enable_button`   |  否  | `False` |          `bool`           |      是否在交互中添加按钮      |
+|   `werewolf__stop_command`   |  否  | `stop`  |     `str \| set[str]`     |  修改游戏进程中的 `stop` 命令  |
+|    `werewolf__require_at`    |  否  | `True`  | `bool \| RequireAtConfig` | 部分命令是否需要 at 机器人触发 |
+| `werewolf__matcher_priority` |  否  |    -    |  `MatcherPriorityConfig`  | 配置插件 matcher 注册的优先级  |
 
 `werewolf__enable_poke` 仅在 `OneBot V11` 适配器 / `Satori/chronocat` 下生效
 
 `werewolf__enable_button` 仅在 `Telegram` 适配器下通过测试，不保证在其他适配器的可用性。如有疑问欢迎提出。
 
+<details>
+<summary> werewolf__require_at 示例 </summary>
+
+```ini
+# 所有命令均需 at 触发
+werewolf__require_at=true
+
+# 所有命令均不需 at 触发
+werewolf__require_at=false
+
+# 狼人杀命令需要 at, 中止游戏命令不需要 at
+werewolf__require_at='{"start": true, "terminate": false}'
+```
+</details>
+<br/>
+
+`werewolf__matcher_priority` 的 matcher 优先级参考 [官方文档](https://nonebot.dev/docs/advanced/matcher#%E5%93%8D%E5%BA%94%E4%BC%98%E5%85%88%E7%BA%A7)
+  - 一般情况下不需要修改此配置, 插件的默认优先级可以参考 [这里](./nonebot_plugin_werewolf/config.py) 的 `MatcherPriorityConfig`
+  - 如果遇到与其他插件的命令冲突, 可考虑修改此处的优先级配置
+  - 配置应填入 JSON 对象, 可用键: `start` `terminate` `preset` `behavior` `in_game` `stop`
+
 ## 🎉 使用
 
 > [!note]
@@ -135,28 +167,29 @@ _✨ 简单的狼人杀插件 ✨_
 
 ### 指令表
 
-|        指令         |        权限         | 需要@ | 范围  |                   说明                    |
-| :-----------------: | :-----------------: | :---: | :---: | :---------------------------------------: |
-| `werewolf`/`狼人杀` |        群员         |  是   | 群聊  |          发起游戏 (进入准备阶段)          |
-|     `开始游戏`      |     游戏发起者      |  否   | 群聊  |      _[准备阶段]_ 游戏发起者开始游戏      |
-|     `结束游戏`      | 游戏发起者/超级用户 |  否   | 群聊  | _[准备阶段]_ 游戏发起者/超级用户 结束游戏 |
-|     `当前玩家`      |        群员         |  否   | 群聊  |    _[准备阶段]_ 列出参与游戏的玩家列表    |
-|     `加入游戏`      |        群员         |  否   | 群聊  |         _[准备阶段]_ 玩家加入游戏         |
-|     `退出游戏`      |        群员         |  否   | 群聊  |         _[准备阶段]_ 玩家退出游戏         |
-|     `中止游戏`      |      超级用户       |  是   | 群聊  |      _[游戏内]_ 超级用户强制中止游戏      |
-|    `狼人杀预设`     |      超级用户       |  否   | 任意  |      _[游戏外]_ 超级用户编辑游戏预设      |
-|    `狼人杀配置`     |      超级用户       |  否   | 任意  |      _[游戏外]_ 超级用户编辑游戏配置      |
+|        指令         |        权限         | 需要@ | 范围 |                   说明                    |
+| :-----------------: | :-----------------: | :---: | :--: | :---------------------------------------: |
+| `werewolf`/`狼人杀` |        群员         |  是   | 群聊 |          发起游戏 (进入准备阶段)          |
+|     `开始游戏`      |     游戏发起者      |  否   | 群聊 |      _[准备阶段]_ 游戏发起者开始游戏      |
+|     `结束游戏`      | 游戏发起者/超级用户 |  否   | 群聊 | _[准备阶段]_ 游戏发起者/超级用户 结束游戏 |
+|     `当前玩家`      |        群员         |  否   | 群聊 |    _[准备阶段]_ 列出参与游戏的玩家列表    |
+|     `加入游戏`      |        群员         |  否   | 群聊 |         _[准备阶段]_ 玩家加入游戏         |
+|     `退出游戏`      |        群员         |  否   | 群聊 |         _[准备阶段]_ 玩家退出游戏         |
+|     `中止游戏`      |      超级用户       |  是   | 群聊 |      _[游戏内]_ 超级用户强制中止游戏      |
+|    `狼人杀预设`     |      超级用户       |  否   | 任意 |      _[游戏外]_ 超级用户编辑游戏预设      |
+|    `狼人杀配置`     |      超级用户       |  否   | 任意 |      _[游戏外]_ 超级用户编辑游戏配置      |
 
- - 发起游戏时添加 `restart`/`重开`, 可加载上一次游戏的玩家列表, 快速发起游戏。例: `werewolf restart`/`狼人杀 重开`
+- `超级用户` 为 nonebot2 配置项中的 `SUPERUSERS`, 配置说明参考 [官方文档](https://nonebot.dev/docs/appendices/config#superusers)
 
- - `狼人杀预设` 命令用法可通过 `狼人杀预设 --help` 获取，或参考 [游戏内容](#游戏内容) 部分的介绍
+- 发起游戏时添加 `restart`/`重开`, 可加载上一次游戏的玩家列表, 快速发起游戏。例: `werewolf restart`/`狼人杀 重开`
 
- - `狼人杀配置` 命令用法可通过 `狼人杀预设 --help` 获取
+- `狼人杀预设` 命令用法可通过 `狼人杀预设 --help` 获取，或参考 [游戏内容](#游戏内容) 部分的介绍
 
- - 对于 `OneBot V11` 适配器和 `Satori` 适配器的 `chronocat`, 启用配置项 `werewolf__enable_poke` 后, 可以使用戳一戳代替 _准备阶段_ 的 `加入游戏` 操作 和 游戏内的 `stop` 命令
+- `狼人杀配置` 命令用法可通过 `狼人杀预设 --help` 获取
 
- - _其他交互参考游戏内提示_
+- 对于 `OneBot V11` 适配器和 `Satori` 适配器的 `chronocat`, 启用配置项 `werewolf__enable_poke` 后, 可以使用戳一戳代替 _准备阶段_ 的 `加入游戏` 操作 和 游戏内的 `stop` 命令
 
+- _其他交互参考游戏内提示_
 
 ### 游戏内容
 
@@ -183,9 +216,9 @@ _✨ 简单的狼人杀插件 ✨_
 <details>
 <summary>示例</summary>
 
- - 命令: `狼人杀预设 职业 6 1 3 2`
+- 命令: `狼人杀预设 职业 6 1 3 2`
 
- - 上述命令指定当总人数为 6 时，狼人、神职、平民的数量分别为 1、3、2
+- 上述命令指定当总人数为 6 时，狼人、神职、平民的数量分别为 1、3、2
 
 </details>
 <br/>
@@ -202,19 +235,19 @@ _✨ 简单的狼人杀插件 ✨_
 
 #### 命令 `狼人杀预设 狼人`
 
- - 命令: `狼人杀预设 狼人 狼 狼王 狼 狼`
+- 命令: `狼人杀预设 狼人 狼 狼王 狼 狼`
 
- - 上述命令指定狼人的职业优先级为 `狼人`, `狼王`, `狼人`, `狼人`
+- 上述命令指定狼人的职业优先级为 `狼人`, `狼王`, `狼人`, `狼人`
 
 #### 命令 `狼人杀预设 神职`
 
- - 命令: `狼人杀预设 神职 预言家 女巫 猎人 守卫 白痴`
+- 命令: `狼人杀预设 神职 预言家 女巫 猎人 守卫 白痴`
 
- - 上述命令指定狼人的职业优先级为 `预言家`, `女巫`, `猎人`, `守卫`, `白痴`
+- 上述命令指定神职的职业优先级为 `预言家`, `女巫`, `猎人`, `守卫`, `白痴`
 
 > [!note]
 >
-> 以上两条命令均支持交互式输入
+> 以上两条命令均支持交互式输入 ~~waiter 真好用~~
 >
 > 例：向机器人发送命令 `狼人杀预设 狼人`，在接下来的一条消息中发送 `狼人 狼王 狼人 狼人`
 >
@@ -223,7 +256,7 @@ _✨ 简单的狼人杀插件 ✨_
 </details>
 <br/>
 
-对于 `小丑` 职业，当预设中的平民数量大于或等于 2 时，将有 *一定概率* 将其中一个平民替换为小丑。
+对于 `小丑` 职业，当预设中的平民数量大于或等于 2 时，将有 _一定概率_ 将其中一个平民替换为小丑。
 
 小丑属于第三方阵营，胜利条件为在投票阶段被票出，在预言家查验及游戏进程判断时视作平民。
 
@@ -231,8 +264,13 @@ _✨ 简单的狼人杀插件 ✨_
 
 ### 已知问题
 
+<details>
+    <summary>已知问题</summary>
+
 - 截止 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>
+
 ## 📝 更新日志
 
 <details>
@@ -240,11 +278,21 @@ _✨ 简单的狼人杀插件 ✨_
 
 <!-- CHANGELOG -->
 
+- 2025.04.20 v1.1.11
+
+  - 添加配置项 `werewolf__require_at`, 用于配置命令是否需要 at 机器人触发
+  - 添加配置项 `werewolf__matcher_priority`, 用于配置插件 matcher 注册优先级
+
+- 2025.04.17 v1.1.10
+
+  - 添加狼人多选目标配置项显示
+  - 在游戏开始时打乱并固定轮流发言模式的发言顺序 (#20)
+
 - 2025.04.15 v1.1.9
 
   - 添加游戏行为配置 `werewolf_multi_select`
   - 重构玩家类
-  - 添加轮流发言模式缺失的 at 消息段
+  - 添加轮流发言模式缺失的 at 消息段 (#19)
 
 - 2025.02.13 v1.1.8
 
@@ -254,7 +302,7 @@ _✨ 简单的狼人杀插件 ✨_
 
 - 2024.10.31 v1.1.7
 
-  - *Bug fix*
+  - _Bug fix_
 
 - 2024.10.31 v1.1.6
 

nonebot_plugin_werewolf-1.1.11.dist-info/RECORD

@@ -0,0 +1,35 @@
+nonebot_plugin_werewolf/__init__.py,sha256=9e9JlBvTP1rx6o5CSsFQo5w_cr8-0_xWg2YUsNEJ_WE,932
+nonebot_plugin_werewolf/config.py,sha256=ncIqL9StQ_Q0osqt2iyGlxZxgdqo9QPDQDhFDZMnk-g,3739
+nonebot_plugin_werewolf/constant.py,sha256=oBA6RWhJr7sDp-p3EbveMZfMP144TTGqYQGLUU7ionQ,2049
+nonebot_plugin_werewolf/exception.py,sha256=SP9RdzsREB6PtpRfhZjxqybtvO0aw48hpN9QMU9jDZY,366
+nonebot_plugin_werewolf/game.py,sha256=bq8w28jU7soBP7_UjsL3iCv4JfG-VOlbXfHheH3KLIQ,19378
+nonebot_plugin_werewolf/models.py,sha256=PiQ-5_R-cUlHKWDa5G0bFnz7jv20200_kr449G9Jgjg,2300
+nonebot_plugin_werewolf/player.py,sha256=1FPsvNkt9d5D2EH7vXCXmDabdcOOAGFcI4Ky9rUe99s,11223
+nonebot_plugin_werewolf/player_set.py,sha256=S2To4-YW-Geh-Jrol6IsqIvJmf5a7lNGMl4rlngD3Gc,3375
+nonebot_plugin_werewolf/utils.py,sha256=gV01cdGJXdbnxDcm6PWEbFYcgL1sF4rA-y5XzrYwzvU,7122
+nonebot_plugin_werewolf/matchers/__init__.py,sha256=lQ9AZDEWgtbP-W8KWvjkEYc_UfTHSUwjaGdZ7PT3z0E,219
+nonebot_plugin_werewolf/matchers/depends.py,sha256=FMlKxDyFjQUXmi6UekhmG1zDdO8xVOhPNoRKbBlg3Nw,1332
+nonebot_plugin_werewolf/matchers/edit_behavior.py,sha256=8gTSnvJNqKGjmOts_5zYR4f5Qn-NxUlAvUsOCk6LYDw,7262
+nonebot_plugin_werewolf/matchers/edit_preset.py,sha256=2PLo-7f2XdZxQ71hZBZ7r-wVj5fNlE13A2wnathhofw,8113
+nonebot_plugin_werewolf/matchers/message_in_game.py,sha256=xpnUanxa-reVlaXnwBTwfoDWQc-MhsMq03tHFKjeEkQ,1052
+nonebot_plugin_werewolf/matchers/start_game.py,sha256=yLYXxzK_NUz8FreAZMB894wFaMpTmR2lNxMrkwQRzIg,12060
+nonebot_plugin_werewolf/matchers/superuser_ops.py,sha256=_Bt_UbEZzeaPMBzwICvWRWoGgV_YnKauBy8dw7uBiUA,889
+nonebot_plugin_werewolf/matchers/poke/__init__.py,sha256=LhWYvAYZsmJbnYMFj7Q032pvq5_P6FYRCzvnwuBvsb0,272
+nonebot_plugin_werewolf/matchers/poke/chronocat_poke.py,sha256=i_9eJXR2FTHhSM_jveeza6A2jkVGl0lncqs6u_rJ4yk,3931
+nonebot_plugin_werewolf/matchers/poke/ob11_poke.py,sha256=k-huQnnblojsQpDYVM_RnhWvmEWc--1usn_0sN-lzxo,2539
+nonebot_plugin_werewolf/players/__init__.py,sha256=lDHCYkk6h_1Bl9DKIqF6vPAcLXNhCGlxBFQzPH4NvUQ,345
+nonebot_plugin_werewolf/players/civilian.py,sha256=Y6A5yB74Ckn_U0vAOoRJhpwhm3MyG6m47TalQ2mjhtw,151
+nonebot_plugin_werewolf/players/guard.py,sha256=2HE3MRG92Ujc4JUHEB86EwNB-l7PgdpNUFxCU8cDBKQ,1354
+nonebot_plugin_werewolf/players/hunter.py,sha256=iYeM2srPaoncBrft2LRuyNVUeGyeBF-rs0BAHl7RP7s,228
+nonebot_plugin_werewolf/players/idiot.py,sha256=OfbLuSLhXNJueB9IYheNT7OpenqaFQjKaAKBlOH3hE0,1659
+nonebot_plugin_werewolf/players/jester.py,sha256=aErVfQS30hS0t2KiQSNFfTHmC2_hqtaHdQvQ4U1Ts_Y,1016
+nonebot_plugin_werewolf/players/prophet.py,sha256=OlMYIdSlZppbHVpfpeO60nFwdh1YtxMVCWEuapFZSyA,1084
+nonebot_plugin_werewolf/players/shooter.py,sha256=1bWkqcSFX6Crynh3IrlI-2RGrNiP6d4XJAc8_FAF2JU,1946
+nonebot_plugin_werewolf/players/werewolf.py,sha256=7lAJT7FjEt42J04RNAXkfDDIN-1mQOej0NaIo0dEWMQ,5347
+nonebot_plugin_werewolf/players/witch.py,sha256=flugzsDkpYiMW-BQGvvqwcXHX_UGcsryAnyYKmh07l4,3049
+nonebot_plugin_werewolf/players/wolfking.py,sha256=CMZ5Tq74wupcRPjAzXHEF2Gts4z3thsD57q64uGp_-c,628
+nonebot_plugin_werewolf-1.1.11.dist-info/licenses/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
+nonebot_plugin_werewolf-1.1.11.dist-info/METADATA,sha256=mU_NX1jnmiEtiMkwJ_sRkmfDjwGKDrSr8sFS8OD_tBI,13897
+nonebot_plugin_werewolf-1.1.11.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+nonebot_plugin_werewolf-1.1.11.dist-info/top_level.txt,sha256=wLTfg8sTKbH9lLT9LtU118C9cTspEBJareLsrYM52YA,24
+nonebot_plugin_werewolf-1.1.11.dist-info/RECORD,,

{nonebot_plugin_werewolf-1.1.9.dist-info → nonebot_plugin_werewolf-1.1.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (78.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

nonebot_plugin_werewolf-1.1.9.dist-info/RECORD

@@ -1,35 +0,0 @@
-nonebot_plugin_werewolf/__init__.py,sha256=lDOYm3Z6UA_fFXiKT9cGweOiND3X-Y3RAiKB5iqpTVc,931
-nonebot_plugin_werewolf/config.py,sha256=Dlng9cRvTf8dEPFngOobeV3S-TnrVrjs9Eqje8dH1wQ,3160
-nonebot_plugin_werewolf/constant.py,sha256=NVKMx4CI64hgftJJySa6VnK2K8ZBmGtrAyMxel3HS2o,2053
-nonebot_plugin_werewolf/exception.py,sha256=SP9RdzsREB6PtpRfhZjxqybtvO0aw48hpN9QMU9jDZY,366
-nonebot_plugin_werewolf/game.py,sha256=UL68ftCEgV9h34Xgw1sZPAUbyjIhFhGAdc70w8huWuQ,19438
-nonebot_plugin_werewolf/models.py,sha256=PiQ-5_R-cUlHKWDa5G0bFnz7jv20200_kr449G9Jgjg,2300
-nonebot_plugin_werewolf/player.py,sha256=EzV_In8KmlZAx0GGV-Cj9qIJjIefIf7CXzlchCTJvFo,11259
-nonebot_plugin_werewolf/player_set.py,sha256=RF3aQXLZyUBPa0_G-Q48NUARictMRp6IV2WD-BKtNTQ,2913
-nonebot_plugin_werewolf/utils.py,sha256=bwbBLApPWis15_perT89Mmy33gAdaHR8fKJWVnDGh9E,6803
-nonebot_plugin_werewolf/matchers/__init__.py,sha256=lQ9AZDEWgtbP-W8KWvjkEYc_UfTHSUwjaGdZ7PT3z0E,219
-nonebot_plugin_werewolf/matchers/depends.py,sha256=TITA2brcyHSavFA3K_HgqkoQtkwxdM8miyEKafcfZz4,1343
-nonebot_plugin_werewolf/matchers/edit_behavior.py,sha256=DaxMS9wcSyYpdhnHHXb0GqRgRNm6LNr5W1vbk-B63n4,7014
-nonebot_plugin_werewolf/matchers/edit_preset.py,sha256=PXABbjhQM0DiKfEqjOMKtSrJs2fKoVh91iTJlVD3hKA,8089
-nonebot_plugin_werewolf/matchers/message_in_game.py,sha256=Lm9VqZcnAU023SJ6R8LH-3-tSp8KRtmOJ4x4dTZGb1o,969
-nonebot_plugin_werewolf/matchers/start_game.py,sha256=cFa9KzZ3zEri5Ras1ccFyZQWK8HPcs6KRNZr2ArsdsA,11956
-nonebot_plugin_werewolf/matchers/superuser_ops.py,sha256=oz-znCaraxCJS08Ox1xcbhC0X-Uy-WXeNYTH1LgT2zU,700
-nonebot_plugin_werewolf/matchers/poke/__init__.py,sha256=gYysvGjztN3iDQpX6v5nkPT195FXnk7fqP9kzByTES0,220
-nonebot_plugin_werewolf/matchers/poke/chronocat_poke.py,sha256=kYJfhOGbZkYWmti0S7b82yYxcoEO9baMHORCXA19cpY,4013
-nonebot_plugin_werewolf/matchers/poke/ob11_poke.py,sha256=XYkEYoYqaViLp5pzRBZqyjBqanJp-sZL4595-fhfrys,2587
-nonebot_plugin_werewolf/players/__init__.py,sha256=lDHCYkk6h_1Bl9DKIqF6vPAcLXNhCGlxBFQzPH4NvUQ,345
-nonebot_plugin_werewolf/players/civilian.py,sha256=Y6A5yB74Ckn_U0vAOoRJhpwhm3MyG6m47TalQ2mjhtw,151
-nonebot_plugin_werewolf/players/guard.py,sha256=2HE3MRG92Ujc4JUHEB86EwNB-l7PgdpNUFxCU8cDBKQ,1354
-nonebot_plugin_werewolf/players/hunter.py,sha256=iYeM2srPaoncBrft2LRuyNVUeGyeBF-rs0BAHl7RP7s,228
-nonebot_plugin_werewolf/players/idiot.py,sha256=OfbLuSLhXNJueB9IYheNT7OpenqaFQjKaAKBlOH3hE0,1659
-nonebot_plugin_werewolf/players/jester.py,sha256=aErVfQS30hS0t2KiQSNFfTHmC2_hqtaHdQvQ4U1Ts_Y,1016
-nonebot_plugin_werewolf/players/prophet.py,sha256=OlMYIdSlZppbHVpfpeO60nFwdh1YtxMVCWEuapFZSyA,1084
-nonebot_plugin_werewolf/players/shooter.py,sha256=1bWkqcSFX6Crynh3IrlI-2RGrNiP6d4XJAc8_FAF2JU,1946
-nonebot_plugin_werewolf/players/werewolf.py,sha256=7lAJT7FjEt42J04RNAXkfDDIN-1mQOej0NaIo0dEWMQ,5347
-nonebot_plugin_werewolf/players/witch.py,sha256=flugzsDkpYiMW-BQGvvqwcXHX_UGcsryAnyYKmh07l4,3049
-nonebot_plugin_werewolf/players/wolfking.py,sha256=CMZ5Tq74wupcRPjAzXHEF2Gts4z3thsD57q64uGp_-c,628
-nonebot_plugin_werewolf-1.1.9.dist-info/licenses/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
-nonebot_plugin_werewolf-1.1.9.dist-info/METADATA,sha256=ZL27XQ01QhEddypOZDVFVr5cRfB9WO5MUE19o7GA-jQ,11912
-nonebot_plugin_werewolf-1.1.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nonebot_plugin_werewolf-1.1.9.dist-info/top_level.txt,sha256=wLTfg8sTKbH9lLT9LtU118C9cTspEBJareLsrYM52YA,24
-nonebot_plugin_werewolf-1.1.9.dist-info/RECORD,,