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

nonebot_plugin_werewolf/constant.py

@@ -4,31 +4,33 @@ from dataclasses import dataclass
 from enum import Enum, auto
 from typing import TYPE_CHECKING
 
+from strenum import StrEnum
+
 from .config import config
 
 if TYPE_CHECKING:
     from .player import Player
 
 
-class Role(Enum):
+class Role(StrEnum):
     # 狼人
-    狼人 = auto()
-    狼王 = auto()
+    Werewolf = auto()
+    WolfKing = auto()
 
     # 神职
-    预言家 = auto()
-    女巫 = auto()
-    猎人 = auto()
-    守卫 = auto()
-    白痴 = auto()
+    Prophet = auto()
+    Witch = auto()
+    Hunter = auto()
+    Guard = auto()
+    Idiot = auto()
 
     # 平民
-    平民 = auto()
+    Civilian = auto()
 
 
-class RoleGroup(Enum):
-    狼人 = auto()
-    好人 = auto()
+class RoleGroup(StrEnum):
+    Werewolf = auto()
+    GoodGuy = auto()
 
 
 class KillReason(Enum):
@@ -53,6 +55,23 @@ class GameState:
     potion: tuple[Player | None, tuple[bool, bool]] = (None, (False, False))
 
 
+role_name_conv: dict[Role, str] = {
+    Role.Werewolf: "狼人",
+    Role.WolfKing: "狼王",
+    Role.Prophet: "预言家",
+    Role.Witch: "女巫",
+    Role.Hunter: "猎人",
+    Role.Guard: "守卫",
+    Role.Idiot: "白痴",
+    Role.Civilian: "平民",
+}
+
+
+role_group_name_conv: dict[RoleGroup, str] = {
+    RoleGroup.Werewolf: "狼人",
+    RoleGroup.GoodGuy: "好人",
+}
+
 player_preset: dict[int, tuple[int, int, int]] = {
     # 总人数: (狼, 神, 民)
     6: (1, 2, 3),
@@ -66,3 +85,4 @@ player_preset: dict[int, tuple[int, int, int]] = {
 
 if config.override_preset is not None:
     player_preset |= {i[0]: i[1:] for i in config.override_preset}
+    player_preset |= {i[0]: i[1:] for i in config.override_preset}

nonebot_plugin_werewolf/game.py

@@ -26,9 +26,13 @@ def init_players(bot: Bot, game: "Game", players: dict[str, str]) -> PlayerSet:
         )
 
     roles: list[Role] = []
-    roles.extend([Role.狼人, Role.狼人, Role.狼王, Role.狼人][: preset[0]])
-    roles.extend([Role.预言家, Role.女巫, Role.猎人, Role.守卫, Role.白痴][: preset[1]])
-    roles.extend([Role.平民] * preset[2])
+    roles.extend(
+        [Role.Werewolf, Role.Werewolf, Role.WolfKing, Role.Werewolf][: preset[0]]
+    )
+    roles.extend(
+        [Role.Prophet, Role.Witch, Role.Hunter, Role.Guard, Role.Idiot][: preset[1]]
+    )
+    roles.extend([Role.Civilian] * preset[2])
 
     r = random.Random(time.time())
     shuffled: list[Role] = []
@@ -82,20 +86,20 @@ class Game:
 
     def at_all(self) -> UniMessage:
         msg = UniMessage()
-        for p in sorted(self.players, key=lambda p: (p.role.name, p.user_id)):
+        for p in sorted(self.players, key=lambda p: (p.role_name, p.user_id)):
             msg.at(p.user_id)
         return msg
 
     def check_game_status(self) -> GameStatus:
         players = self.players.alive()
-        w = players.select(RoleGroup.狼人)
-        p = players.exclude(RoleGroup.狼人)
+        w = players.select(RoleGroup.Werewolf)
+        p = players.exclude(RoleGroup.Werewolf)
 
         if w.size >= p.size:
             return GameStatus.Bad
-        if not p.select(Role.平民):
+        if not p.select(Role.Civilian):
             return GameStatus.Bad
-        if not p.exclude(Role.平民):
+        if not p.exclude(Role.Civilian):
             return GameStatus.Bad
         if not w.size:
             return GameStatus.Good
@@ -162,7 +166,7 @@ class Game:
     ) -> None:
         players = self.players.alive().select(type_)
         text = (
-            type_.role.name  # Player
+            type_.role_name  # Player
             if isinstance(type_, Player)
             else (
                 type_.name  # Role
@@ -181,8 +185,8 @@ class Game:
         players = self.players.alive()
         self.state.killed = None
 
-        w = players.select(RoleGroup.狼人)
-        await self.interact(RoleGroup.狼人, 120)
+        w = players.select(RoleGroup.Werewolf)
+        await self.interact(RoleGroup.Werewolf, 120)
         if (s := w.player_selected()).size == 1:
             self.state.killed = s.pop()
             await w.broadcast(f"今晚选择的目标为: {self.state.killed.name}")
@@ -190,8 +194,8 @@ class Game:
             await w.broadcast("狼人阵营意见未统一，此晚空刀")
 
         # 如果女巫存活，正常交互，限时1分钟
-        if players.include(Role.女巫):
-            await self.interact(Role.女巫, 60)
+        if players.include(Role.Witch):
+            await self.interact(Role.Witch, 60)
         # 否则等待 5-20s
         else:
             await asyncio.sleep(random.uniform(5, 20))
@@ -228,7 +232,7 @@ class Game:
                 await self.send(
                     UniMessage.text("玩家 ")
                     .at(shoot.user_id)
-                    .text(f" 被{shooter.role.name}射杀, 请发表遗言\n")
+                    .text(f" 被{shooter.role_name}射杀, 请发表遗言\n")
                     .text("限时1分钟, 发送 “/stop” 结束发言")
                 )
                 await self.wait_stop(shoot, 60)
@@ -337,10 +341,10 @@ class Game:
             # 狼人、预言家、守卫 同时交互，女巫在狼人后交互
             await asyncio.gather(
                 self.select_killed(),
-                players.select(Role.女巫).broadcast("请等待狼人决定目标..."),
-                players.select(Role.平民).broadcast("请等待其他玩家结束交互..."),
-                self.interact(Role.预言家, 60),
-                self.interact(Role.守卫, 60),
+                players.select(Role.Witch).broadcast("请等待狼人决定目标..."),
+                players.select(Role.Civilian).broadcast("请等待其他玩家结束交互..."),
+                self.interact(Role.Prophet, 60),
+                self.interact(Role.Guard, 60),
             )
 
             # 狼人击杀目标
@@ -354,10 +358,12 @@ class Game:
             if killed is not None:
                 # 除非守卫保护或女巫使用解药，否则狼人正常击杀玩家
                 if not ((killed is protected) or (antidote and potioned is killed)):
-                    await killed.kill(KillReason.Kill, *players.select(RoleGroup.狼人))
+                    await killed.kill(
+                        KillReason.Kill, *players.select(RoleGroup.Werewolf)
+                    )
             # 如果女巫使用毒药且守卫未保护，杀死该玩家
             if poison and (potioned is not None) and (potioned is not protected):
-                await potioned.kill(KillReason.Poison, *players.select(Role.女巫))
+                await potioned.kill(KillReason.Poison, *players.select(Role.Witch))
 
             day_count += 1
             msg = UniMessage.text(f"『第{day_count}天』天亮了...\n")
@@ -401,7 +407,7 @@ class Game:
         winner = "好人" if self.check_game_status() == GameStatus.Good else "狼人"
         msg = UniMessage.text(f"🎉游戏结束，{winner}获胜\n\n")
         for p in sorted(self.players, key=lambda p: (p.role.value, p.user_id)):
-            msg.at(p.user_id).text(f": {p.role.name}\n")
+            msg.at(p.user_id).text(f": {p.role_name}\n")
         await self.send(msg)
         await self.send(f"玩家死亡报告:\n\n{self.show_killed_players()}")
 

nonebot_plugin_werewolf/player.py

@@ -3,13 +3,13 @@ from __future__ import annotations
 import asyncio
 import asyncio.timeouts
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, ClassVar, TypeVar
+from typing import TYPE_CHECKING, ClassVar, TypeVar, final
 from typing_extensions import override
 
 from nonebot.adapters import Bot
 from nonebot_plugin_alconna.uniseg import Receipt, Target, UniMessage
 
-from .constant import KillReason, Role, RoleGroup
+from .constant import KillReason, Role, RoleGroup, role_name_conv,role_group_name_conv
 from .utils import InputStore, check_index
 
 if TYPE_CHECKING:
@@ -45,12 +45,14 @@ class Player:
     kill_info: KillInfo | None = None
     selected: Player | None = None
 
+    @final
     def __init__(self, bot: Bot, game: Game, user: Target, name: str) -> None:
         self.bot = bot
         self.game = game
         self.user = user
         self.name = name
 
+    @final
     @classmethod
     def new(
         cls,
@@ -66,23 +68,30 @@ class Player:
         return PLAYER_CLASS[role](bot, game, user, name)
 
     def __repr__(self) -> str:
-        return f"<{self.role.name}: user={self.user} alive={self.alive}>"
+        return f"<{self.role_name}: user={self.user} alive={self.alive}>"
 
     @property
     def user_id(self) -> str:
         return self.user.id
 
+    @property
+    def role_name(self) -> str:
+        return role_name_conv[self.role]
+
+    @final
     async def send(self, message: str | UniMessage) -> Receipt:
         if isinstance(message, str):
             message = UniMessage.text(message)
 
         return await message.send(target=self.user, bot=self.bot)
 
+    @final
     async def receive(self, prompt: str | UniMessage | None = None) -> UniMessage:
         if prompt:
             await self.send(prompt)
         return await InputStore.fetch(self.user.id)
 
+    @final
     async def receive_text(self) -> str:
         return (await self.receive()).extract_plain_text()
 
@@ -90,7 +99,7 @@ class Player:
         return
 
     async def notify_role(self) -> None:
-        await self.send(f"你的身份: {self.role.name}")
+        await self.send(f"你的身份: {self.role_name}")
 
     async def kill(
         self,
@@ -136,9 +145,9 @@ class CanShoot(Player):
             return await super().post_kill()
 
         await self.game.send(
-            UniMessage.text(f"{self.role.name} ")
+            UniMessage.text(f"{self.role_name} ")
             .at(self.user_id)
-            .text(f" 死了\n请{self.role.name}决定击杀目标...")
+            .text(f" 死了\n请{self.role_name}决定击杀目标...")
         )
 
         self.game.state.shoot = (None, None)
@@ -147,14 +156,14 @@ class CanShoot(Player):
         if shoot is not None:
             self.game.state.shoot = (self, shoot)
             await self.send(
-                UniMessage.text(f"{self.role.name} ")
+                UniMessage.text(f"{self.role_name} ")
                 .at(self.user_id)
                 .text(" 射杀了玩家 ")
                 .at(shoot.user_id)
             )
             await shoot.kill(KillReason.Shoot, self)
         else:
-            await self.send(f"{self.role.name}选择了取消技能")
+            await self.send(f"{self.role_name}选择了取消技能")
         return await super().post_kill()
 
     async def shoot(self) -> Player | None:
@@ -183,23 +192,23 @@ class CanShoot(Player):
 
 @register_role
 class 狼人(Player):
-    role: ClassVar[Role] = Role.狼人
-    role_group: ClassVar[RoleGroup] = RoleGroup.狼人
+    role: ClassVar[Role] = Role.Werewolf
+    role_group: ClassVar[RoleGroup] = RoleGroup.Werewolf
 
     @override
     async def notify_role(self) -> None:
         await super().notify_role()
-        partners = self.game.players.alive().select(RoleGroup.狼人).exclude(self)
+        partners = self.game.players.alive().select(RoleGroup.Werewolf).exclude(self)
         if partners:
             await self.send(
                 "你的队友:\n"
-                + "\n".join(f"  {p.role.name}: {p.name}" for p in partners)
+                + "\n".join(f"  {p.role_name}: {p.name}" for p in partners)
             )
 
     @override
     async def interact(self) -> None:
         players = self.game.players.alive()
-        partners = players.select(RoleGroup.狼人).exclude(self)
+        partners = players.select(RoleGroup.Werewolf).exclude(self)
 
         # 避免阻塞
         def broadcast(msg: str | UniMessage):
@@ -209,7 +218,7 @@ class 狼人(Player):
         if partners:
             msg = (
                 msg.text("你的队友:\n")
-                .text("\n".join(f"  {p.role.name}: {p.name}" for p in partners))
+                .text("\n".join(f"  {p.role_name}: {p.name}" for p in partners))
                 .text("\n所有私聊消息将被转发至队友\n\n")
             )
         await self.send(
@@ -245,14 +254,14 @@ class 狼人(Player):
 
 @register_role
 class 狼王(CanShoot, 狼人):
-    role: ClassVar[Role] = Role.狼王
-    role_group: ClassVar[RoleGroup] = RoleGroup.狼人
+    role: ClassVar[Role] = Role.WolfKing
+    role_group: ClassVar[RoleGroup] = RoleGroup.Werewolf
 
 
 @register_role
 class 预言家(Player):
-    role: ClassVar[Role] = Role.预言家
-    role_group: ClassVar[RoleGroup] = RoleGroup.好人
+    role: ClassVar[Role] = Role.Prophet
+    role_group: ClassVar[RoleGroup] = RoleGroup.GoodGuy
 
     @override
     async def interact(self) -> None:
@@ -272,14 +281,14 @@ class 预言家(Player):
             await self.send("输入错误，请发送编号选择玩家")
 
         player = players[selected]
-        result = "狼人" if player.role == Role.狼人 else "好人"
+        result = role_group_name_conv[player.role_group]
         await self.send(f"玩家 {player.name} 的阵营是『{result}』")
 
 
 @register_role
 class 女巫(Player):
-    role: ClassVar[Role] = Role.女巫
-    role_group: ClassVar[RoleGroup] = RoleGroup.好人
+    role: ClassVar[Role] = Role.Witch
+    role_group: ClassVar[RoleGroup] = RoleGroup.GoodGuy
     antidote: int = 1
     poison: int = 1
 
@@ -367,14 +376,14 @@ class 女巫(Player):
 
 @register_role
 class 猎人(CanShoot, Player):
-    role: ClassVar[Role] = Role.猎人
-    role_group: ClassVar[RoleGroup] = RoleGroup.好人
+    role: ClassVar[Role] = Role.Hunter
+    role_group: ClassVar[RoleGroup] = RoleGroup.GoodGuy
 
 
 @register_role
 class 守卫(Player):
-    role: ClassVar[Role] = Role.守卫
-    role_group: ClassVar[RoleGroup] = RoleGroup.好人
+    role: ClassVar[Role] = Role.Guard
+    role_group: ClassVar[RoleGroup] = RoleGroup.GoodGuy
 
     @override
     async def interact(self) -> None:
@@ -405,8 +414,8 @@ class 守卫(Player):
 
 @register_role
 class 白痴(Player):
-    role: ClassVar[Role] = Role.白痴
-    role_group: ClassVar[RoleGroup] = RoleGroup.好人
+    role: ClassVar[Role] = Role.Idiot
+    role_group: ClassVar[RoleGroup] = RoleGroup.GoodGuy
     voted: bool = False
 
     @override
@@ -435,5 +444,5 @@ class 白痴(Player):
 
 @register_role
 class 平民(Player):
-    role: ClassVar[Role] = Role.平民
-    role_group: ClassVar[RoleGroup] = RoleGroup.好人
+    role: ClassVar[Role] = Role.Civilian
+    role_group: ClassVar[RoleGroup] = RoleGroup.GoodGuy

{nonebot_plugin_werewolf-1.0.5.dist-info → nonebot_plugin_werewolf-1.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-werewolf
-Version: 1.0.5
+Version: 1.0.6
 Summary: Default template for PDM package
 Author-Email: wyf7685 <wyf7685@163.com>
 License: MIT
@@ -9,6 +9,7 @@ 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
+Requires-Dist: StrEnum>=0.4.15
 Description-Content-Type: text/markdown
 
 <div align="center">
@@ -180,6 +181,10 @@ werewolf__override_preset='
 <details>
     <summary>更新日志</summary>
 
+- 2024.09.03 v1.0.6
+
+  - 修复预言家查验狼王返回好人的 bug
+
 - 2024.09.03 v1.0.5
 
   - 优化玩家交互体验

nonebot_plugin_werewolf-1.0.6.dist-info/RECORD

@@ -0,0 +1,13 @@
+nonebot_plugin_werewolf-1.0.6.dist-info/METADATA,sha256=VEQ_yjPRs3bB28Khz98EJA5XTlJ6fMrP_YNZBBp9PQc,6839
+nonebot_plugin_werewolf-1.0.6.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
+nonebot_plugin_werewolf-1.0.6.dist-info/licenses/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
+nonebot_plugin_werewolf/__init__.py,sha256=WEwQN8NtEtOfTrH23_MysaaS4OnCjxtGb-_brG9bGTQ,734
+nonebot_plugin_werewolf/config.py,sha256=3O63P1pjvJEwgOwxApAHbKQzvCR1zoG5UjTClZ_OJts,315
+nonebot_plugin_werewolf/constant.py,sha256=k4r0vKYtePDzAqNOdpAlSXnP37YvJSgmJvmGVoJDdeI,1746
+nonebot_plugin_werewolf/game.py,sha256=oGuqV4zmuX95CH7zjtx7wMFzQjzObWXbnnO8PHSnzYk,15525
+nonebot_plugin_werewolf/matchers.py,sha256=D8F2FsV03YhBfXCUeUJmpSFvMk9Z7F0lKeFx-lRN9To,2281
+nonebot_plugin_werewolf/ob11_ext.py,sha256=I6bPCv5SgAStTJuvBl5F7wqgiksWeFkb4R7n06jXprA,2399
+nonebot_plugin_werewolf/player.py,sha256=KjGtfMT7mZG-ACfn5z2z0UJDlLH6t1-6mls_H4UxtWU,14175
+nonebot_plugin_werewolf/player_set.py,sha256=pEXyjmA7INog23i5-TmuJA559y5eKUehrPxHcnzWCTU,2571
+nonebot_plugin_werewolf/utils.py,sha256=8ddVr_PyObxZ8PfWry_-IXnH2dys2bTowKmHfqVbhPE,6233
+nonebot_plugin_werewolf-1.0.6.dist-info/RECORD,,

nonebot_plugin_werewolf-1.0.5.dist-info/RECORD

@@ -1,13 +0,0 @@
-nonebot_plugin_werewolf-1.0.5.dist-info/METADATA,sha256=YAMSQ9RZA-0jUe8o1iXg5zLy-vNh7AEcpoo9ek_ar-E,6735
-nonebot_plugin_werewolf-1.0.5.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
-nonebot_plugin_werewolf-1.0.5.dist-info/licenses/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
-nonebot_plugin_werewolf/__init__.py,sha256=7Kp0xiD5XhE803lRegOex0oEe3ZfCEnPOxSd1FqdhWM,734
-nonebot_plugin_werewolf/config.py,sha256=3O63P1pjvJEwgOwxApAHbKQzvCR1zoG5UjTClZ_OJts,315
-nonebot_plugin_werewolf/constant.py,sha256=MUqLz4jXfXPWc8wJdUXb0yaU0BcXZ_xbGM0Sn3IhAr4,1260
-nonebot_plugin_werewolf/game.py,sha256=3W_oghotlxbUgp7RaFmzla-CW-MVzNdYRb7JD7Xp_UU,15437
-nonebot_plugin_werewolf/matchers.py,sha256=D8F2FsV03YhBfXCUeUJmpSFvMk9Z7F0lKeFx-lRN9To,2281
-nonebot_plugin_werewolf/ob11_ext.py,sha256=I6bPCv5SgAStTJuvBl5F7wqgiksWeFkb4R7n06jXprA,2399
-nonebot_plugin_werewolf/player.py,sha256=AqeYhILjFEuPO0rXbp9dnCmUZO_dk0MODg_jXjwduyI,13986
-nonebot_plugin_werewolf/player_set.py,sha256=pEXyjmA7INog23i5-TmuJA559y5eKUehrPxHcnzWCTU,2571
-nonebot_plugin_werewolf/utils.py,sha256=8ddVr_PyObxZ8PfWry_-IXnH2dys2bTowKmHfqVbhPE,6233
-nonebot_plugin_werewolf-1.0.5.dist-info/RECORD,,