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

nonebot_plugin_werewolf/players/can_shoot.py

@@ -1,7 +1,8 @@
 from nonebot_plugin_alconna.uniseg import UniMessage
 from typing_extensions import override
 
-from ..constant import STOP_COMMAND_PROMPT, KillReason
+from ..constant import STOP_COMMAND_PROMPT
+from ..models import KillReason
 from .player import Player
 
 
@@ -13,9 +14,9 @@ class CanShoot(Player):
             return await super().post_kill()
 
         await self.game.send(
-            UniMessage.text(f"🕵️{self.role_name} ")
+            UniMessage.text("🕵️玩家 ")
             .at(self.user_id)
-            .text(f" 死了\n请{self.role_name}决定击杀目标...")
+            .text(" 死了\n请在私聊决定射杀目标...")
         )
 
         self.game.state.shoot = None

nonebot_plugin_werewolf/players/civilian.py

@@ -1,4 +1,4 @@
-from ..constant import Role, RoleGroup
+from ..models import Role, RoleGroup
 from .player import Player
 
 

nonebot_plugin_werewolf/players/guard.py

@@ -1,7 +1,8 @@
 from nonebot_plugin_alconna.uniseg import UniMessage
 from typing_extensions import override
 
-from ..constant import STOP_COMMAND_PROMPT, Role, RoleGroup
+from ..constant import STOP_COMMAND_PROMPT
+from ..models import Role, RoleGroup
 from .player import Player
 
 

nonebot_plugin_werewolf/players/hunter.py

@@ -1,4 +1,4 @@
-from ..constant import Role, RoleGroup
+from ..models import Role, RoleGroup
 from .can_shoot import CanShoot
 from .player import Player
 

nonebot_plugin_werewolf/players/idiot.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 from nonebot_plugin_alconna.uniseg import UniMessage
 from typing_extensions import override
 
-from ..constant import KillReason, Role, RoleGroup
+from ..models import KillReason, Role, RoleGroup
 from .player import Player
 
 if TYPE_CHECKING:

nonebot_plugin_werewolf/players/joker.py

@@ -1,7 +1,9 @@
+from typing import TYPE_CHECKING
+
 from typing_extensions import override
 
-from ..constant import GameStatus, KillReason, Role, RoleGroup
 from ..exception import GameFinished
+from ..models import GameStatus, KillReason, Role, RoleGroup
 from .player import Player
 
 
@@ -16,6 +18,8 @@ class Joker(Player):
     async def kill(self, reason: KillReason, *killers: Player) -> bool:
         await super().kill(reason, *killers)
         if reason == KillReason.Vote:
-            self.game.killed_players.append(self)
+            if TYPE_CHECKING:
+                assert self.kill_info is not None
+            self.game.killed_players.append((self.name, self.kill_info))
             raise GameFinished(GameStatus.Joker)
         return True

nonebot_plugin_werewolf/players/player.py

@@ -1,26 +1,18 @@
 import functools
 import weakref
 from collections.abc import Callable
-from dataclasses import dataclass
 from typing import TYPE_CHECKING, ClassVar, Final, TypeVar, final
 
 import anyio
+import nonebot
 from nonebot.adapters import Bot
-from nonebot.log import logger
 from nonebot.utils import escape_tag
 from nonebot_plugin_alconna.uniseg import Receipt, Target, UniMessage
 from nonebot_plugin_uninfo import SceneType
 
-from ..constant import (
-    STOP_COMMAND,
-    STOP_COMMAND_PROMPT,
-    KillReason,
-    Role,
-    RoleGroup,
-    role_emoji,
-    role_name_conv,
-)
-from ..utils import InputStore, as_player_set, check_index, link
+from ..constant import STOP_COMMAND, STOP_COMMAND_PROMPT, role_emoji, role_name_conv
+from ..models import KillInfo, KillReason, Role, RoleGroup
+from ..utils import InputStore, check_index, link
 
 if TYPE_CHECKING:
     from ..game import Game
@@ -29,11 +21,7 @@ if TYPE_CHECKING:
 
 _P = TypeVar("_P", bound=type["Player"])
 
-
-@dataclass
-class KillInfo:
-    reason: KillReason
-    killers: "PlayerSet"
+logger = nonebot.logger.opt(colors=True)
 
 
 class Player:
@@ -140,9 +128,9 @@ class Player:
         return name
 
     @final
-    async def _log(self, text: str) -> None:
+    def _log(self, text: str) -> None:
         text = text.replace("\n", "\\n")
-        logger.opt(colors=True).info(
+        logger.info(
             f"{self.game.colored_name} | "
             f"[<b><m>{self.role_name}</m></b>] "
             f"{self.colored_name} | {text}",
@@ -153,7 +141,7 @@ class Player:
         if isinstance(message, str):
             message = UniMessage.text(message)
 
-        await self._log(f"<g>Send</g> | {escape_tag(str(message))}")
+        self._log(f"<g>Send</g> | {escape_tag(str(message))}")
         return await message.send(target=self.__user, bot=self.bot)
 
     @final
@@ -162,7 +150,7 @@ class Player:
             await self.send(prompt)
 
         result = await InputStore.fetch(self.user_id)
-        await self._log(f"<y>Recv</y> | {escape_tag(str(result))}")
+        self._log(f"<y>Recv</y> | {escape_tag(str(result))}")
         return result
 
     @final
@@ -177,8 +165,9 @@ class Player:
         await self.send(f"⚙️你的身份: {role_emoji[self.role]}{self.role_name}")
 
     async def kill(self, reason: KillReason, *killers: "Player") -> bool:
-        self.alive = False
-        self.kill_info = KillInfo(reason=reason, killers=as_player_set(*killers))
+        if self.alive:
+            self.alive = False
+            self.kill_info = KillInfo(reason=reason, killers=[p.name for p in killers])
         return True
 
     async def post_kill(self) -> None:
@@ -213,9 +202,13 @@ class Player:
         self,
         players: "PlayerSet",
         *,
-        on_stop: str | None = "ℹ️你选择了取消，回合结束",
-        on_index_error: str = f"⚠️输入错误: 请发送玩家编号或 “{STOP_COMMAND_PROMPT}”",
+        on_stop: str | None = None,
+        on_index_error: str | None = None,
     ) -> "Player | None":
+        on_stop = on_stop or "ℹ️你选择了取消，回合结束"
+        on_index_error = (
+            on_index_error or f"⚠️输入错误: 请发送玩家编号或 “{STOP_COMMAND_PROMPT}”"
+        )
         selected = None
 
         while selected is None:

nonebot_plugin_werewolf/players/prophet.py

@@ -1,7 +1,8 @@
 from nonebot_plugin_alconna.uniseg import UniMessage
 from typing_extensions import override
 
-from ..constant import STOP_COMMAND_PROMPT, Role, RoleGroup
+from ..constant import STOP_COMMAND_PROMPT
+from ..models import Role, RoleGroup
 from .player import Player
 
 

nonebot_plugin_werewolf/players/werewolf.py

@@ -1,12 +1,12 @@
 from typing import TYPE_CHECKING
 
 import anyio
-from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from nonebot_plugin_alconna.uniseg import UniMessage
 from typing_extensions import override
 
-from ..constant import STOP_COMMAND, STOP_COMMAND_PROMPT, Role, RoleGroup
-from ..utils import check_index
+from ..constant import STOP_COMMAND, STOP_COMMAND_PROMPT
+from ..models import Role, RoleGroup
+from ..utils import ObjectStream, check_index
 from .player import Player
 
 if TYPE_CHECKING:
@@ -15,6 +15,8 @@ if TYPE_CHECKING:
 
 @Player.register_role(Role.Werewolf, RoleGroup.Werewolf)
 class Werewolf(Player):
+    stream: ObjectStream[str | UniMessage]
+
     @override
     async def notify_role(self) -> None:
         await super().notify_role()
@@ -25,12 +27,7 @@ class Werewolf(Player):
                 + "\n".join(f"  {p.role_name}: {p.name}" for p in partners)
             )
 
-    async def _handle_interact(
-        self,
-        players: "PlayerSet",
-        stream: MemoryObjectSendStream[str | UniMessage],
-        finished: anyio.Event,
-    ) -> None:
+    async def _handle_interact(self, players: "PlayerSet") -> None:
         self.selected = None
 
         while True:
@@ -41,25 +38,25 @@ class Werewolf(Player):
                 self.selected = players[index - 1]
                 msg = f"当前选择玩家: {self.selected.name}"
                 await self.send(f"🎯{msg}\n发送 “{STOP_COMMAND_PROMPT}” 结束回合")
-                await stream.send(f"📝队友 {self.name} {msg}")
+                await self.stream.send(f"📝队友 {self.name} {msg}")
             if text == STOP_COMMAND:
                 if self.selected is not None:
                     await self.send("✅你已结束当前回合")
-                    await stream.send(f"📝队友 {self.name} 结束当前回合")
-                    finished.set()
+                    await self.stream.send(f"📝队友 {self.name} 结束当前回合")
+                    self.stream.close()
                     return
                 await self.send("⚠️当前未选择玩家，无法结束回合")
             else:
-                await stream.send(UniMessage.text(f"💬队友 {self.name}:\n") + input_msg)
+                await self.stream.send(UniMessage(f"💬队友 {self.name}:\n") + input_msg)
+
+    async def _handle_broadcast(self, partners: "PlayerSet") -> None:
+        while not self.stream.closed:
+            try:
+                message = await self.stream.recv()
+            except anyio.EndOfStream:
+                return
 
-    async def _handle_broadcast(
-        self,
-        partners: "PlayerSet",
-        stream: MemoryObjectReceiveStream[str | UniMessage],
-        finished: anyio.Event,
-    ) -> None:
-        while not finished.is_set() or stream.statistics().tasks_waiting_receive:
-            await partners.broadcast(await stream.receive())
+            await partners.broadcast(message)
 
     @override
     async def interact(self) -> None:
@@ -81,9 +78,11 @@ class Werewolf(Player):
             .text("\n\n⚠️意见未统一将空刀")
         )
 
-        send, recv = anyio.create_memory_object_stream[str | UniMessage]()
-        finished = anyio.Event()
+        self.stream = ObjectStream[str | UniMessage](8)
 
-        async with anyio.create_task_group() as tg:
-            tg.start_soon(self._handle_interact, players, send, finished)
-            tg.start_soon(self._handle_broadcast, partners, recv, finished)
+        try:
+            async with anyio.create_task_group() as tg:
+                tg.start_soon(self._handle_interact, players)
+                tg.start_soon(self._handle_broadcast, partners)
+        finally:
+            del self.stream

nonebot_plugin_werewolf/players/witch.py

@@ -1,7 +1,8 @@
 from nonebot_plugin_alconna.uniseg import UniMessage
 from typing_extensions import override
 
-from ..constant import STOP_COMMAND_PROMPT, Role, RoleGroup
+from ..constant import STOP_COMMAND_PROMPT
+from ..models import Role, RoleGroup
 from ..utils import as_player_set
 from .player import Player
 

nonebot_plugin_werewolf/players/wolfking.py

@@ -1,6 +1,6 @@
 from typing_extensions import override
 
-from ..constant import Role, RoleGroup
+from ..models import Role, RoleGroup
 from .can_shoot import CanShoot
 from .player import Player
 from .werewolf import Werewolf

nonebot_plugin_werewolf/utils.py

@@ -1,11 +1,15 @@
 import functools
+import itertools
 from collections import defaultdict
-from typing import TYPE_CHECKING, Any, ClassVar, TypeVar
+from typing import TYPE_CHECKING, Any, ClassVar, Generic, TypeVar
 
 import anyio
+import anyio.streams.memory
 from nonebot_plugin_alconna import UniMessage
 from nonebot_plugin_uninfo import Session
 
+from .constant import STOP_COMMAND
+
 if TYPE_CHECKING:
     from .player_set import PlayerSet
     from .players import Player
@@ -53,22 +57,37 @@ class InputStore:
     locks: ClassVar[dict[str, anyio.Lock]] = defaultdict(anyio.Lock)
     tasks: ClassVar[dict[str, _InputTask]] = {}
 
+    @staticmethod
+    def _key(user_id: str, group_id: str | None) -> str:
+        return f"{group_id}_{user_id}"
+
     @classmethod
     async def fetch(cls, user_id: str, group_id: str | None = None) -> UniMessage[Any]:
-        key = f"{group_id}_{user_id}"
+        key = cls._key(user_id, group_id)
         async with cls.locks[key]:
             cls.tasks[key] = task = _InputTask()
-            return await task.wait()
+            try:
+                return await task.wait()
+            finally:
+                cls.tasks.pop(key, None)
+
+    @classmethod
+    async def fetch_until_stop(cls, user_id: str, group_id: str | None = None) -> None:
+        while True:
+            msg = await cls.fetch(user_id, group_id)
+            if msg.extract_plain_text().strip() == STOP_COMMAND:
+                return
 
     @classmethod
     def put(cls, msg: UniMessage, user_id: str, group_id: str | None = None) -> None:
-        key = f"{group_id}_{user_id}"
+        key = cls._key(user_id, group_id)
         if task := cls.tasks.pop(key, None):
             task.set(msg)
 
     @classmethod
     def cleanup(cls, players: list[str], group_id: str) -> None:
-        for key in (f"{g}_{p}" for p in players for g in (group_id, None)):
+        for p, g in itertools.product(players, (group_id, None)):
+            key = cls._key(p, g)
             if key in cls.locks:
                 del cls.locks[key]
             if key in cls.tasks:
@@ -84,3 +103,48 @@ def cached_player_set() -> type["PlayerSet"]:
 
 def as_player_set(*player: "Player") -> "PlayerSet":
     return cached_player_set()(player)
+
+
+class ObjectStream(Generic[T]):
+    __unset: Any = object()
+    _send: anyio.streams.memory.MemoryObjectSendStream[T]
+    _recv: anyio.streams.memory.MemoryObjectReceiveStream[T]
+    _closed: anyio.Event
+
+    def __init__(self, max_buffer_size: float = 0) -> None:
+        self._send, self._recv = anyio.create_memory_object_stream(max_buffer_size)
+        self._closed = anyio.Event()
+
+    async def send(self, obj: T) -> None:
+        await self._send.send(obj)
+
+    async def recv(self) -> T:
+        result = self.__unset
+
+        async def _recv() -> None:
+            nonlocal result
+            result = await self._recv.receive()
+            tg.cancel_scope.cancel()
+
+        async def _cancel() -> None:
+            await self._closed.wait()
+            tg.cancel_scope.cancel()
+
+        async with anyio.create_task_group() as tg:
+            tg.start_soon(_recv)
+            tg.start_soon(_cancel)
+
+        if result is self.__unset:
+            raise anyio.EndOfStream
+
+        return result
+
+    def close(self) -> None:
+        self._closed.set()
+
+    @property
+    def closed(self) -> bool:
+        return self._closed.is_set()
+
+    async def wait_closed(self) -> None:
+        await self._closed.wait()

{nonebot_plugin_werewolf-1.1.5.dist-info → nonebot_plugin_werewolf-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-werewolf
-Version: 1.1.5
+Version: 1.1.7
 Summary: 适用于 Nonebot2 的狼人杀插件
 Author-email: wyf7685 <wyf7685@163.com>
 License: MIT
@@ -12,6 +12,7 @@ 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-localstore >=0.7.1
 Requires-Dist: nonebot-plugin-uninfo >=0.4.0
 Requires-Dist: nonebot-plugin-waiter >=0.7.1
 Requires-Dist: anyio >=4.6.0
@@ -44,6 +45,7 @@ _✨ 简单的狼人杀插件 ✨_
 [![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)
 
@@ -56,7 +58,7 @@ _✨ 简单的狼人杀插件 ✨_
 ## 💿 安装
 
 > [!note]
-> 
+>
 > 请确保 NoneBot2 使用的 Python 解释器版本 >=3.10
 
 <details open>
@@ -104,17 +106,16 @@ _✨ 简单的狼人杀插件 ✨_
 
 ## ⚙️ 配置
 
-在 nonebot2 项目的 `.env` 文件中添加如下配置
+在 nonebot2 项目的 `.env` 文件中添加如下配置:
+
+|          配置项           | 必填  | 默认值  |            说明            |
+| :-----------------------: | :---: | :-----: | :------------------------: |
+|  `werewolf__enable_poke`  |  否   | `True`  | 是否使用戳一戳简化操作流程 |
+| `werewolf__enable_button` |  否   | `False` |    是否在交互中添加按钮    |
 
-|             配置项              | 必填 | 默认值 |                             说明                              |
-| :-----------------------------: | :--: | :----: | :-----------------------------------------------------------: |
-|     `werewolf__enable_poke`     |  否  | `True` | 是否使用戳一戳简化操作流程<br/>仅在 `OneBot V11` 适配器下生效 |
-|     `werewolf__role_preset`     |  否  |   -    |                    覆写插件内置的职业预设                     |
-|  `werewolf__werewolf_priority`  |  否  |   -    |                     自定义狼人职业优先级                      |
-| `werewolf__priesthood_proirity` |  否  |   -    |                     自定义神职职业优先级                      |
-|  `werewolf__joker_probability`  |  否  | `0.0`  |              小丑职业替换平民的概率, 范围`[0,1]`              |
+`werewolf__enable_poke` 仅在 `OneBot V11` 适配器 / `Satori/chronocat` 下生效
 
-`werewolf__role_preset`, `werewolf__werewolf_priority`, `werewolf__priesthood_proirity` 的配置格式请参考 [`游戏内容`](#游戏内容) 部分
+`werewolf__enable_button` 仅在 `Telegram` 适配器下通过测试，不保证在其他适配器的可用性。如有疑问欢迎提出。
 
 ## 🎉 使用
 
@@ -133,24 +134,31 @@ _✨ 简单的狼人杀插件 ✨_
 
 而对于野生机器人，现有协议端通常不支持或不建议使用临时私聊消息。
 
-在使用本插件前，应当确保机器人可以正常向玩家发送私聊消息。
+在使用本插件前，应当确保机器人可以正常向玩家发送私聊消息。~~即保证机器人与玩家为好友关系~~
 
 </details>
 
 ### 指令表
 
-|        指令         |    权限    | 需要@ | 范围 |                说明                 |
-| :-----------------: | :--------: | :---: | :--: | :---------------------------------: |
-| `werewolf`/`狼人杀` |    群员    |  是   | 群聊 |       发起游戏 (进入准备阶段)       |
-|     `开始游戏`      | 游戏发起者 |  是   | 群聊 |   _[准备阶段]_ 游戏发起者开始游戏   |
-|     `结束游戏`      | 游戏发起者 |  是   | 群聊 |   _[准备阶段]_ 游戏发起者结束游戏   |
-|     `当前玩家`      |    群员    |  是   | 群聊 | _[准备阶段]_ 列出参与游戏的玩家列表 |
-|     `加入游戏`      |    群员    |  是   | 群聊 |      _[准备阶段]_ 玩家加入游戏      |
-|     `退出游戏`      |    群员    |  是   | 群聊 |      _[准备阶段]_ 玩家退出游戏      |
+|        指令         |        权限         | 需要@ | 范围  |                   说明                    |
+| :-----------------: | :-----------------: | :---: | :---: | :---------------------------------------: |
+| `werewolf`/`狼人杀` |        群员         |  是   | 群聊  |          发起游戏 (进入准备阶段)          |
+|     `开始游戏`      |     游戏发起者      |  否   | 群聊  |      _[准备阶段]_ 游戏发起者开始游戏      |
+|     `结束游戏`      | 游戏发起者/超级用户 |  否   | 群聊  | _[准备阶段]_ 游戏发起者/超级用户 结束游戏 |
+|     `当前玩家`      |        群员         |  否   | 群聊  |    _[准备阶段]_ 列出参与游戏的玩家列表    |
+|     `加入游戏`      |        群员         |  否   | 群聊  |         _[准备阶段]_ 玩家加入游戏         |
+|     `退出游戏`      |        群员         |  否   | 群聊  |         _[准备阶段]_ 玩家退出游戏         |
+|     `中止游戏`      |      超级用户       |  是   | 群聊  |      _[游戏内]_ 超级用户强制中止游戏      |
+|    `狼人杀预设`     |      超级用户       |  否   | 任意  |      _[游戏外]_ 超级用户编辑游戏预设      |
+
+ - 发起游戏时添加 `restart`/`重开`, 可加载上一次游戏的玩家列表, 快速发起游戏。例: `werewolf restart`/`狼人杀 重开`
+
+ - `狼人杀预设` 命令用法可通过 `狼人杀预设 --help` 获取，或参考 [游戏内容](#游戏内容) 部分的介绍
 
-_其他交互参考游戏内提示_
+ - 对于 `OneBot V11` 适配器和 `Satori` 适配器的 `chronocat`, 启用配置项 `werewolf__enable_poke` 后, 可以使用戳一戳代替 _准备阶段_ 的 `加入游戏` 操作 和 游戏内的 `stop` 命令
+
+ - _其他交互参考游戏内提示_
 
-对于 `OneBot V11` 适配器和 `Satori` 适配器的 `chronocat`, 启用配置项 `werewolf__enable_poke` 后, 可以使用戳一戳代替 _准备阶段_ 的 `加入游戏` 操作 和 游戏内的 `stop` 命令
 
 ### 游戏内容
 
@@ -164,31 +172,22 @@ _其他交互参考游戏内提示_
 
 | 总人数 | 狼人 | 神职 | 平民 |
 | ------ | ---- | ---- | ---- |
-| 6      | 1    | 2    | 3    |
-| 7      | 2    | 2    | 3    |
-| 8      | 2    | 3    | 3    |
-| 9      | 2    | 4    | 3    |
-| 10     | 3    | 4    | 3    |
-| 11     | 3    | 5    | 3    |
-| 12     | 4    | 5    | 3    |
+| 6      | 1    | 2    | 3    |
+| 7      | 2    | 2    | 3    |
+| 8      | 2    | 3    | 3    |
+| 9      | 2    | 4    | 3    |
+| 10     | 3    | 4    | 3    |
+| 11     | 3    | 5    | 3    |
+| 12     | 4    | 5    | 3    |
 
-职业预设可以通过配置项 `werewolf__role_preset` 修改
+职业预设可以通过命令 `狼人杀预设 职业 ...` 修改
 
 <details>
 <summary>示例</summary>
 
-配置项 `werewolf__role_preset`
-
-```env
-werewolf__role_preset='
-[
-    [6, 1, 3, 2],
-    [7, 2, 3, 2]
-]
-'
-```
+ - 命令: `狼人杀预设 职业 6 1 3 2`
 
-上述配置中，`[6, 1, 3, 2]` 表示当总人数为 6 时，狼人、神职、平民的数量分别为 1、3、2
+ - 上述命令指定当总人数为 6 时，狼人、神职、平民的数量分别为 1、3、2
 
 </details>
 <br/>
@@ -198,49 +197,43 @@ werewolf__role_preset='
 - `狼人`: `狼人`, `狼人`, `狼王`, `狼人`
 - `神职`: `女巫`, `预言家`, `猎人`, `守卫`, `白痴`
 
-职业分配优先级可以通过配置项 `werewolf__werewolf_priority` 和 `werewolf__priesthood_proirity` 修改
+职业分配优先级可以通过命令 `狼人杀预设 狼人/神职` 修改
 
 <details>
 <summary>示例</summary>
 
-#### 配置项 `werewolf__werewolf_priority`
+#### 命令 `狼人杀预设 狼人`
 
-```env
-werewolf__werewolf_priority=[1, 2, 1, 1]
-```
+ - 命令: `狼人杀预设 狼人 狼 狼王 狼 狼`
 
-上述配置中，`[1, 2, 1, 1]` 表示狼人的职业优先级为 `狼人`, `狼王`, `狼人`, `狼人`
+ - 上述命令指定狼人的职业优先级为 `狼人`, `狼王`, `狼人`, `狼人`
 
-#### 配置项 `werewolf__priesthood_proirity`
+#### 命令 `狼人杀预设 神职`
 
-```env
-werewolf__priesthood_proirity=[11, 12, 13, 14, 15]
-```
+ - 命令: `狼人杀预设 神职 预言家 女巫 猎人 守卫 白痴`
 
-上述配置中，`[11, 12, 13, 14, 15]` 表示神职的职业优先级为 `预言家`, `女巫`, `猎人`, `守卫`, `白痴`
+ - 上述命令指定狼人的职业优先级为 `预言家`, `女巫`, `猎人`, `守卫`, `白痴`
 
-#### 职业与数字的对应关系
+> [!note]
+>
+> 以上两条命令均支持交互式输入
+>
+> 例：向机器人发送命令 `狼人杀预设 狼人`，在接下来的一条消息中发送 `狼人 狼王 狼人 狼人`
+>
+> 其效果等同于以上描述中的单条命令 `狼人杀预设 狼人 狼人 狼王 狼人 狼人`
 
-上述配置示例中有大量~~意义不明的~~数字, 其对应的是 [`这里`](./nonebot_plugin_werewolf/constant.py) 的枚举类 `Role` 的值
+</details>
+<br/>
 
-以下列出目前的枚举值供参考
+对于 `小丑` 职业，当预设中的平民数量大于或等于 2 时，将有 *一定概率* 将其中一个平民替换为小丑。
 
-| 职业     | 枚举值 |
-| -------- | ------ |
-| `狼人`   | `1`    |
-| `狼王`   | `2`    |
-| `预言家` | `11`   |
-| `女巫`   | `12`   |
-| `猎人`   | `13`   |
-| `守卫`   | `14`   |
-| `白痴`   | `15`   |
-| `平民`   | `0`    |
+小丑属于第三方阵营，胜利条件为在投票阶段被票出，在预言家查验及游戏进程判断时视作平民。
 
-</details>
+小丑生成概率可以通过命令 `狼人杀预设 小丑 <概率>` 设置，默认值为 0 (不生成小丑)。
 
 ### 已知问题
 
-- 截止 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
+- 截止 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
 
 ## 📝 更新日志
 
@@ -249,6 +242,17 @@ werewolf__priesthood_proirity=[11, 12, 13, 14, 15]
 
 <!-- CHANGELOG -->
 
+- 2024.10.31 v1.1.7
+
+  - *Bug fix*
+
+- 2024.10.31 v1.1.6
+
+  - 新增超级用户中止游戏 (#7)
+  - 新增快速发起上次游戏 (#8)
+  - 准备阶段添加可选的交互按钮
+  - 新增超级用户修改游戏预设 (#9)
+
 - 2024.10.23 v1.1.5
 
   - 添加对 chronocat:poke 的支持