nonebot-plugin-werewolf 1.1.9__py3-none-any.whl → 1.1.10__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.10"
 __plugin_meta__ = PluginMetadata(
     name="狼人杀",
     description="适用于 Nonebot2 的狼人杀插件",

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
 
@@ -162,11 +162,10 @@ class Game:
         self.state = GameState(0)
         self.killed_players = []
         self._player_map: dict[str, Player] = {}
+        self._shuffled: list[Player] = []
         self._scene = None
-        self._finished = None
-        self._task_group = None
-        self._send_handler = _SendHandler()
-        self._send_handler.update(group, bot)
+        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/edit_behavior.py

@@ -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/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/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.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-werewolf
-Version: 1.1.9
+Version: 1.1.10
 Summary: 适用于 Nonebot2 的狼人杀插件
 Author-email: wyf7685 <wyf7685@163.com>
 License: MIT
@@ -240,6 +240,11 @@ _✨ 简单的狼人杀插件 ✨_
 
 <!-- CHANGELOG -->
 
+- 2025.04.17 v1.1.10
+
+  - 添加狼人多选目标配置项显示
+  - 在游戏开始时打乱并固定轮流发言模式的发言顺序
+
 - 2025.04.15 v1.1.9
 
   - 添加游戏行为配置 `werewolf_multi_select`

{nonebot_plugin_werewolf-1.1.9.dist-info → nonebot_plugin_werewolf-1.1.10.dist-info}/RECORD

@@ -1,15 +1,15 @@
-nonebot_plugin_werewolf/__init__.py,sha256=lDOYm3Z6UA_fFXiKT9cGweOiND3X-Y3RAiKB5iqpTVc,931
+nonebot_plugin_werewolf/__init__.py,sha256=ed2tOFc-Q0Rw2OYZFmBVzu2NUKPtSwc2ioYVU0X-Ntk,932
 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/game.py,sha256=iCduTjl33k-0Mk5MN57Qj-TfGtDKe96aBDvCiTU0AlU,19357
 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.py,sha256=1FPsvNkt9d5D2EH7vXCXmDabdcOOAGFcI4Ky9rUe99s,11223
 nonebot_plugin_werewolf/player_set.py,sha256=RF3aQXLZyUBPa0_G-Q48NUARictMRp6IV2WD-BKtNTQ,2913
-nonebot_plugin_werewolf/utils.py,sha256=bwbBLApPWis15_perT89Mmy33gAdaHR8fKJWVnDGh9E,6803
+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=TITA2brcyHSavFA3K_HgqkoQtkwxdM8miyEKafcfZz4,1343
-nonebot_plugin_werewolf/matchers/edit_behavior.py,sha256=DaxMS9wcSyYpdhnHHXb0GqRgRNm6LNr5W1vbk-B63n4,7014
+nonebot_plugin_werewolf/matchers/edit_behavior.py,sha256=hppkSB4CJ5FYuT5mWQZ3gwIurBVO_Zz2mBOUA-oV5tU,7231
 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
@@ -28,8 +28,8 @@ nonebot_plugin_werewolf/players/shooter.py,sha256=1bWkqcSFX6Crynh3IrlI-2RGrNiP6d
 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,,
+nonebot_plugin_werewolf-1.1.10.dist-info/licenses/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
+nonebot_plugin_werewolf-1.1.10.dist-info/METADATA,sha256=N3PDI77wVJA-Ps6i9K_KQjDW_Ldq1LPk8qzEFYSF41I,12051
+nonebot_plugin_werewolf-1.1.10.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nonebot_plugin_werewolf-1.1.10.dist-info/top_level.txt,sha256=wLTfg8sTKbH9lLT9LtU118C9cTspEBJareLsrYM52YA,24
+nonebot_plugin_werewolf-1.1.10.dist-info/RECORD,,