nonebot-plugin-werewolf 1.1.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

nonebot_plugin_werewolf/__init__.py

@@ -8,7 +8,7 @@ require("nonebot_plugin_waiter")
 from . import matchers as matchers
 from .config import Config
 
-__version__ = "1.1.0"
+__version__ = "1.1.1"
 __plugin_meta__ = PluginMetadata(
     name="狼人杀",
     description="适用于 Nonebot2 的狼人杀插件",

nonebot_plugin_werewolf/config.py

@@ -1,9 +1,8 @@
-from typing import Literal, overload
+from typing import Literal, Self, overload
 
 from nonebot import get_plugin_config, logger
 from nonebot.compat import PYDANTIC_V2
 from pydantic import BaseModel, Field
-from typing_extensions import Self
 
 from .constant import (
     Role,

nonebot_plugin_werewolf/constant.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
+import dataclasses
 from enum import Enum, auto
 from typing import TYPE_CHECKING
 
@@ -43,17 +43,17 @@ class KillReason(Enum):
 class GameStatus(Enum):
     GoodGuy = auto()
     Werewolf = auto()
-    Unset = auto()
     Joker = auto()
 
 
-@dataclass
+@dataclasses.dataclass
 class GameState:
     day: int
     killed: Player | None = None
     shoot: tuple[Player, Player] | tuple[None, None] = (None, None)
-    protected: Player | None = None
-    potion: tuple[Player | None, tuple[bool, bool]] = (None, (False, False))
+    antidote: set[Player] = dataclasses.field(default_factory=set)
+    poison: set[tuple[Player, Player]] = dataclasses.field(default_factory=set)
+    protected: set[Player] = dataclasses.field(default_factory=set)
 
 
 role_name_conv: dict[Role | RoleGroup, str] = {

nonebot_plugin_werewolf/game.py

@@ -3,8 +3,7 @@ from __future__ import annotations
 import asyncio
 import asyncio.timeouts
 import contextlib
-import random
-import time
+import secrets
 from typing import TYPE_CHECKING, NoReturn
 
 from nonebot.log import logger
@@ -35,20 +34,19 @@ def init_players(bot: Bot, game: Game, players: dict[str, str]) -> PlayerSet:
             f"应为 {', '.join(map(str, role_preset))} 人, 传入{len(players)}人"
         )
 
+    w, p, c = preset
     roles: list[Role] = []
-    roles.extend(config.werewolf_priority[: preset[0]])
-    roles.extend(config.priesthood_proirity[: preset[1]])
-    roles.extend([Role.Civilian] * preset[2])
+    roles.extend(config.werewolf_priority[:w])
+    roles.extend(config.priesthood_proirity[:p])
+    roles.extend([Role.Civilian] * c)
 
-    r = random.Random(time.time())  # noqa: S311
-
-    if roles.count(Role.Civilian) >= 2 and r.random() <= config.joker_probability:
+    if c >= 2 and secrets.randbelow(100) <= config.joker_probability * 100:
         roles.remove(Role.Civilian)
         roles.append(Role.Joker)
 
     shuffled: list[Role] = []
-    for _ in range(len(players)):
-        idx = r.randint(0, len(roles) - 1)
+    while roles:
+        idx = secrets.randbelow(len(roles))
         shuffled.append(roles.pop(idx))
 
     logger.debug(f"职业分配: {shuffled}")
@@ -107,7 +105,7 @@ class Game:
             msg.at(p.user_id)
         return msg
 
-    def check_game_status(self) -> GameStatus:
+    def check_game_status(self) -> None:
         players = self.players.alive()
         w = players.select(RoleGroup.Werewolf)
         p = players.exclude(RoleGroup.Werewolf)
@@ -125,8 +123,6 @@ class Game:
         if not w.size:
             raise GameFinishedError(GameStatus.GoodGuy)
 
-        return GameStatus.Unset
-
     def show_killed_players(self) -> str:
         msg = ""
 
@@ -220,7 +216,7 @@ class Game:
             await self.interact(Role.Witch, 60)
         # 否则等待 5-20s
         else:
-            await asyncio.sleep(random.uniform(5, 20))  # noqa: S311
+            await asyncio.sleep(5 + secrets.randbelow(15))
 
     async def handle_new_dead(self, players: Player | PlayerSet) -> None:
         if isinstance(players, Player):
@@ -369,28 +365,28 @@ class Game:
                 self.interact(Role.Prophet, 60),
                 self.interact(Role.Guard, 60),
                 players.select(Role.Witch).broadcast("请等待狼人决定目标..."),
-                players.select(Role.Civilian, RoleGroup.Others).broadcast(
-                    "请等待其他玩家结束交互..."
-                ),
+                players.exclude(
+                    RoleGroup.Werewolf, Role.Prophet, Role.Witch, Role.Guard
+                ).broadcast("请等待其他玩家结束交互..."),
             )
 
             # 狼人击杀目标
-            killed = self.state.killed
-            # 守卫保护目标
-            protected = self.state.protected
-            # 女巫的操作目标和内容
-            potioned, (antidote, poison) = self.state.potion
-
-            # 狼人未空刀，除非守卫保护或女巫使用解药，否则狼人正常击杀玩家
-            if killed is not None and (
-                not ((killed is protected) or (antidote and potioned is killed))
+            if (
+                (killed := self.state.killed)  # 狼人未空刀
+                and killed not in self.state.protected  # 守卫保护
+                and killed not in self.state.antidote  # 女巫使用解药
             ):
+                # 狼人正常击杀玩家
                 await killed.kill(
-                    KillReason.Werewolf, *players.select(RoleGroup.Werewolf)
+                    KillReason.Werewolf,
+                    *players.select(RoleGroup.Werewolf),
                 )
-            # 如果女巫使用毒药且守卫未保护，杀死该玩家
-            if poison and (potioned is not None) and (potioned is not protected):
-                await potioned.kill(KillReason.Poison, *players.select(Role.Witch))
+
+            # 女巫操作目标
+            for witch, potioned in self.state.poison:
+                if potioned not in self.state.protected:  # 守卫未保护
+                    # 女巫毒杀玩家
+                    await potioned.kill(KillReason.Poison, witch)
 
             day_count += 1
             msg = UniMessage.text(f"『第{day_count}天』天亮了...\n")
@@ -440,8 +436,6 @@ class Game:
                 winner = "狼人"
             case GameStatus.Joker:
                 winner = "小丑"
-            case GameStatus.Unset:
-                raise RuntimeError(f"错误的游戏状态: {status!r}")
 
         msg = UniMessage.text(f"🎉游戏结束，{winner}获胜\n\n")
         for p in sorted(self.players, key=lambda p: (p.role.value, p.user_id)):

nonebot_plugin_werewolf/player.py

@@ -307,24 +307,6 @@ class Witch(Player):
     antidote: int = 1
     poison: int = 1
 
-    def set_state(
-        self,
-        *,
-        antidote: Player | None = None,
-        posion: Player | None = None,
-    ) -> None:
-        if antidote is not None:
-            self.antidote = 0
-            self.selected = antidote
-            self.game.state.potion = (antidote, (True, False))
-        elif posion is not None:
-            self.poison = 0
-            self.selected = posion
-            self.game.state.potion = (posion, (False, True))
-        else:
-            self.selected = None
-            self.game.state.potion = (None, (False, False))
-
     async def handle_killed(self) -> bool:
         msg = UniMessage()
         if (killed := self.game.state.killed) is not None:
@@ -343,7 +325,7 @@ class Witch(Player):
             text = await self.receive_text()
             if text == "1":
                 self.antidote = 0
-                self.set_state(antidote=killed)
+                self.game.state.antidote.add(killed)
                 await self.send(f"你对 {killed.name} 使用了解药，回合结束")
                 return True
             if text == "/stop":
@@ -357,7 +339,6 @@ class Witch(Player):
 
         if not self.poison:
             await self.send("你没有可以使用的药水，回合结束")
-            self.set_state()
             return
 
         players = self.game.players.alive()
@@ -377,13 +358,12 @@ class Witch(Player):
                 break
             if text == "/stop":
                 await self.send("你选择不使用毒药，回合结束")
-                self.set_state()
                 return
             await self.send("输入错误: 请发送玩家编号或 “/stop”")
 
         self.poison = 0
-        self.selected = player = players[selected]
-        self.set_state(posion=player)
+        player = players[selected]
+        self.game.state.poison.add((self, player))
         await self.send(f"当前回合选择对玩家 {player.name} 使用毒药\n回合结束")
 
 
@@ -418,7 +398,8 @@ class Guard(Player):
                 break
             await self.send("输入错误，请发送编号选择玩家")
 
-        self.game.state.protected = self.selected = players[selected]
+        self.selected = players[selected]
+        self.game.state.protected.add(self.selected)
         await self.send(f"本回合保护的玩家: {self.selected.name}")
 
 
@@ -462,11 +443,11 @@ class Joker(Player):
 
     @override
     async def kill(self, reason: KillReason, *killers: Player) -> bool:
-        result = await super().kill(reason, *killers)
+        await super().kill(reason, *killers)
         if reason == KillReason.Vote:
             self.game.killed_players.append(self)
             raise GameFinishedError(GameStatus.Joker)
-        return result
+        return True
 
 
 @register_role(Role.Civilian, RoleGroup.GoodGuy)

{nonebot_plugin_werewolf-1.1.0.dist-info → nonebot_plugin_werewolf-1.1.1.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-werewolf
-Version: 1.1.0
+Version: 1.1.1
 Summary: 适用于 Nonebot2 的狼人杀插件
 Author-email: wyf7685 <wyf7685@163.com>
 License: MIT
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: nonebot2 >=2.3.3
@@ -26,13 +26,18 @@ _✨ 简单的狼人杀插件 ✨_
 
 [![license](https://img.shields.io/github/license/wyf7685/nonebot-plugin-werewolf.svg)](./LICENSE)
 [![pypi](https://img.shields.io/pypi/v/nonebot-plugin-werewolf?logo=python&logoColor=edb641)](https://pypi.python.org/pypi/nonebot-plugin-werewolf)
-[![python](https://img.shields.io/badge/python-3.10+-blue?logo=python&logoColor=edb641)](https://www.python.org/)
-
+[![python](https://img.shields.io/badge/python-3.11+-blue?logo=python&logoColor=edb641)](https://www.python.org/)
 [![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
+[![ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![isort](https://img.shields.io/badge/%20imports-isort-%231674b1)](https://pycqa.github.io/isort/)
 [![black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![pyright](https://img.shields.io/badge/types-pyright-797952.svg?logo=python&logoColor=edb641)](https://github.com/Microsoft/pyright)
-[![ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+
+[![commits](https://img.shields.io/github/commit-activity/w/wyf7685/nonebot-plugin-werewolf)](https://github.com/wyf7685/nonebot-plugin-werewolf/commits)
+[![wakatime](https://wakatime.com/badge/user/b097681b-c224-44ec-8e04-e1cf71744655/project/70a7f68d-5625-4989-9476-be6877408332.svg)](https://wakatime.com/badge/user/b097681b-c224-44ec-8e04-e1cf71744655/project/70a7f68d-5625-4989-9476-be6877408332)
+[![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)
+[![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)
 
 [![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)
@@ -45,6 +50,10 @@ _✨ 简单的狼人杀插件 ✨_
 
 ## 💿 安装
 
+> [!note]
+> 
+> 请确保 NoneBot2 使用的 Python 解释器版本 >=3.11
+
 <details open>
 <summary>使用 nb-cli 安装</summary>
 在 nonebot2 项目的根目录下打开命令行, 输入以下指令即可安装
@@ -231,6 +240,11 @@ werewolf__priesthood_proirity=[11, 12, 13, 14, 15]
 
 <!-- CHANGELOG -->
 
+- 2024.09.11 v1.1.1
+
+  - 修改 Python 需求为 `>=3.11`
+  - 优化交互结果处理 ~~_可以在一局游戏中加入多个女巫了_~~
+
 - 2024.09.09 v1.1.0
 
   - 新增职业 `小丑`

nonebot_plugin_werewolf-1.1.1.dist-info/RECORD

@@ -0,0 +1,15 @@
+nonebot_plugin_werewolf/__init__.py,sha256=I6lFyJgJ4Tz4t8gS2lrsx-7paN2h_PNoGjGR8ryvSeU,734
+nonebot_plugin_werewolf/config.py,sha256=gl_ujiY-8fxQ5hN9_gjL1WpJJR5UOBIRBGofbLcQzaE,2900
+nonebot_plugin_werewolf/constant.py,sha256=1XNTcTicil90WSviI2e33FX0LstWXl1aV2ugbhsDlIk,1909
+nonebot_plugin_werewolf/exception.py,sha256=Ui8rB1sBg6_p8JHSvrjCpUaXJlgrM_9XsLJ09k8F1bg,391
+nonebot_plugin_werewolf/game.py,sha256=Y9MQASaNdm2uuNw37IjdQEQzikWmbql_PWLHaL7lcB8,17414
+nonebot_plugin_werewolf/matchers.py,sha256=5FioDfARlxTEibGL1JMKUMzmTzOwljjWKAJxBnyzaYs,2106
+nonebot_plugin_werewolf/ob11_ext.py,sha256=P8uc3AdN5K5MzJaK80WDK85VKFg_CK5avDHu7ueMkho,2418
+nonebot_plugin_werewolf/player.py,sha256=ifqTBfNepQY5FCY7hZoUA6DcObkcFEiNmKEeRkitJqY,14749
+nonebot_plugin_werewolf/player_set.py,sha256=AI8v6KjH9ACtP4lvrd5IJfayan0qALmpTRLC3s_3DFw,2754
+nonebot_plugin_werewolf/utils.py,sha256=l7oNSK471SV5CaB1eEVyZm10XSBFf_TwNotvb30U6vE,6835
+nonebot_plugin_werewolf-1.1.1.dist-info/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
+nonebot_plugin_werewolf-1.1.1.dist-info/METADATA,sha256=5ikh-mdZTIObaFs9w7qgzrgsx31lCxB5Ag--C8stl0g,10447
+nonebot_plugin_werewolf-1.1.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+nonebot_plugin_werewolf-1.1.1.dist-info/top_level.txt,sha256=wLTfg8sTKbH9lLT9LtU118C9cTspEBJareLsrYM52YA,24
+nonebot_plugin_werewolf-1.1.1.dist-info/RECORD,,

nonebot_plugin_werewolf-1.1.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-nonebot_plugin_werewolf/__init__.py,sha256=A2138SSGhd2FdZ8V9Op50k5-pdfIVSfT0xBNG6qWacM,734
-nonebot_plugin_werewolf/config.py,sha256=8HnSt7sk8WIwnQlHm0tLdiSk6OTwbysDwoQf8cvFgoE,2929
-nonebot_plugin_werewolf/constant.py,sha256=yrhyw67KTaZ7DoGWZl3USWheaHSsUI94kl6ChDs0phI,1829
-nonebot_plugin_werewolf/exception.py,sha256=Ui8rB1sBg6_p8JHSvrjCpUaXJlgrM_9XsLJ09k8F1bg,391
-nonebot_plugin_werewolf/game.py,sha256=t1Gq-adeD5xprDH4uxfGF70wV_N-YZKBXn2CrMEH5Sc,17761
-nonebot_plugin_werewolf/matchers.py,sha256=5FioDfARlxTEibGL1JMKUMzmTzOwljjWKAJxBnyzaYs,2106
-nonebot_plugin_werewolf/ob11_ext.py,sha256=P8uc3AdN5K5MzJaK80WDK85VKFg_CK5avDHu7ueMkho,2418
-nonebot_plugin_werewolf/player.py,sha256=IdkVKt31DMw6W_0idW04c-ix6JVtg7VPl7ZaegxUN0Y,15360
-nonebot_plugin_werewolf/player_set.py,sha256=AI8v6KjH9ACtP4lvrd5IJfayan0qALmpTRLC3s_3DFw,2754
-nonebot_plugin_werewolf/utils.py,sha256=l7oNSK471SV5CaB1eEVyZm10XSBFf_TwNotvb30U6vE,6835
-nonebot_plugin_werewolf-1.1.0.dist-info/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
-nonebot_plugin_werewolf-1.1.0.dist-info/METADATA,sha256=6hjSQYd7yYi9UgZ4OLqDUDwHhL6imH21MMDEu9hS6AA,9234
-nonebot_plugin_werewolf-1.1.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-nonebot_plugin_werewolf-1.1.0.dist-info/top_level.txt,sha256=wLTfg8sTKbH9lLT9LtU118C9cTspEBJareLsrYM52YA,24
-nonebot_plugin_werewolf-1.1.0.dist-info/RECORD,,