nonebot-plugin-werewolf 1.0.1__tar.gz → 1.0.3__tar.gz

{nonebot_plugin_werewolf-1.0.1 → nonebot_plugin_werewolf-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-werewolf
-Version: 1.0.1
+Version: 1.0.3
 Summary: Default template for PDM package
 Author-Email: wyf7685 <wyf7685@163.com>
 License: MIT
@@ -12,9 +12,9 @@ Requires-Dist: nonebot-plugin-waiter>=0.7.1
 Description-Content-Type: text/markdown
 
 <div align="center">
-  <a href="https://v2.nonebot.dev/store"><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/nbp_logo.png" width="180" height="180" alt="NoneBotPluginLogo"></a>
-  <br>
-  <p><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/NoneBotPlugin.svg" width="240" alt="NoneBotPluginText"></p>
+  <a href="https://v2.nonebot.dev/store">
+    <img src="https://github.com/wyf7685/wyf7685/blob/main/assets/NoneBotPlugin.svg" width="300" alt="logo">
+  </a>
 </div>
 
 <div align="center">
@@ -24,7 +24,7 @@ Description-Content-Type: text/markdown
 _✨ 简单的狼人杀插件 ✨_
 
 [![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-exe-code)
+[![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/)
 
 [![pdm-managed](https://img.shields.io/endpoint?url=https%3A%2F%2Fcdn.jsdelivr.net%2Fgh%2Fpdm-project%2F.github%2Fbadge.json)](https://pdm-project.org)
@@ -143,7 +143,9 @@ _✨ 简单的狼人杀插件 ✨_
 职业预设可以通过配置项 `werewolf__override_preset` 修改
 
 <details>
-    <summary>配置项 `werewolf__override_preset` 示例</summary>
+<summary>示例</summary>
+
+配置项 `werewolf__override_preset`
 
 ```env
 werewolf__override_preset='
@@ -169,6 +171,10 @@ werewolf__override_preset='
 <details>
     <summary>更新日志</summary>
 
+- 2024.09.01 v1.0.3
+
+  - 优化玩家交互体验
+
 - 2024.08.31 v1.0.1
 
   - 允许通过配置项修改职业预设

{nonebot_plugin_werewolf-1.0.1 → nonebot_plugin_werewolf-1.0.3}/README.md

@@ -1,7 +1,7 @@
 <div align="center">
-  <a href="https://v2.nonebot.dev/store"><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/nbp_logo.png" width="180" height="180" alt="NoneBotPluginLogo"></a>
-  <br>
-  <p><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/NoneBotPlugin.svg" width="240" alt="NoneBotPluginText"></p>
+  <a href="https://v2.nonebot.dev/store">
+    <img src="https://github.com/wyf7685/wyf7685/blob/main/assets/NoneBotPlugin.svg" width="300" alt="logo">
+  </a>
 </div>
 
 <div align="center">
@@ -11,7 +11,7 @@
 _✨ 简单的狼人杀插件 ✨_
 
 [![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-exe-code)
+[![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/)
 
 [![pdm-managed](https://img.shields.io/endpoint?url=https%3A%2F%2Fcdn.jsdelivr.net%2Fgh%2Fpdm-project%2F.github%2Fbadge.json)](https://pdm-project.org)
@@ -130,7 +130,9 @@ _✨ 简单的狼人杀插件 ✨_
 职业预设可以通过配置项 `werewolf__override_preset` 修改
 
 <details>
-    <summary>配置项 `werewolf__override_preset` 示例</summary>
+<summary>示例</summary>
+
+配置项 `werewolf__override_preset`
 
 ```env
 werewolf__override_preset='
@@ -156,6 +158,10 @@ werewolf__override_preset='
 <details>
     <summary>更新日志</summary>
 
+- 2024.09.01 v1.0.3
+
+  - 优化玩家交互体验
+
 - 2024.08.31 v1.0.1
 
   - 允许通过配置项修改职业预设

{nonebot_plugin_werewolf-1.0.1 → nonebot_plugin_werewolf-1.0.3}/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.1"
+__version__ = "1.0.3"
 __plugin_meta__ = PluginMetadata(
     name="狼人杀",
     description="适用于 Nonebot2 的狼人杀插件",

{nonebot_plugin_werewolf-1.0.1 → nonebot_plugin_werewolf-1.0.3}/nonebot_plugin_werewolf/constant.py

@@ -44,6 +44,7 @@ class GameStatus(Enum):
 
 @dataclass
 class GameState:
+    day: int
     killed: "Player | None" = None
     shoot: tuple["Player", "Player"] | tuple[None, None] = (None, None)
     protected: "Player | None" = None

{nonebot_plugin_werewolf-1.0.1 → nonebot_plugin_werewolf-1.0.3}/nonebot_plugin_werewolf/game.py

@@ -1,13 +1,16 @@
 import asyncio
 import asyncio.timeouts
 import random
-from collections.abc import Callable
 
 from nonebot.adapters import Bot
 from nonebot_plugin_alconna import Target, UniMessage
 
 from .constant import GameState, GameStatus, KillReason, Role, RoleGroup, player_preset
-from .player import Player, PlayerSet
+from .player import Player
+from .player_set import PlayerSet
+
+starting_games: dict[str, dict[str, str]] = {}
+running_games: dict[str, tuple["Game", asyncio.Task[None]]] = {}
 
 
 def init_players(bot: Bot, game: "Game", players: dict[str, str]) -> PlayerSet:
@@ -15,7 +18,7 @@ def init_players(bot: Bot, game: "Game", players: dict[str, str]) -> PlayerSet:
     if preset is None:
         raise ValueError(
             f"玩家人数不符: "
-            f"应为{min(player_preset)}-{max(player_preset)}人, 传入{len(players)}人"
+            f"应为 {', '.join(map(str, player_preset))} 人, 传入{len(players)}人"
         )
 
     roles: list[Role] = []
@@ -50,20 +53,18 @@ class Game:
     group: Target
     players: PlayerSet
     state: GameState
-    _on_exit: Callable[[], None]
+    killed_players: list[Player]
 
     def __init__(
         self,
         bot: Bot,
         group: Target,
         players: dict[str, str],
-        on_exit: Callable[[], None],
     ) -> None:
         self.bot = bot
         self.group = group
         self.players = init_players(bot, self, players)
-        self.state = GameState()
-        self._on_exit = on_exit
+        self.state = GameState(0)
 
     async def send(self, message: str | UniMessage):
         if isinstance(message, str):
@@ -78,27 +79,49 @@ class Game:
 
     def check_game_status(self) -> GameStatus:
         players = self.players.alive()
-
         w = players.select(RoleGroup.狼人)
-        if not w.size:
-            return GameStatus.Good
-
         p = players.exclude(RoleGroup.狼人)
+
         if w.size >= p.size:
             return GameStatus.Bad
-        if not players.select(Role.平民):
+        if not p.select(Role.平民):
             return GameStatus.Bad
-        if not players.select(RoleGroup.好人).exclude(Role.平民):
+        if not p.exclude(Role.平民):
             return GameStatus.Bad
+        if not w.size:
+            return GameStatus.Good
 
         return GameStatus.Unset
 
+    def show_killed_players(self) -> str:
+        msg = ""
+
+        for player in self.killed_players:
+            if player.kill_info is None:
+                continue
+
+            msg += f"{player.name} 被 " + ", ".join(
+                p.name for p in player.kill_info.killers
+            )
+            match player.kill_info.reason:
+                case KillReason.Kill:
+                    msg += " 刀了"
+                case KillReason.Poison:
+                    msg += " 毒死"
+                case KillReason.Shoot:
+                    msg += " 射杀"
+                case KillReason.Vote:
+                    msg += " 投票放逐"
+            msg += "\n\n"
+
+        return msg.strip()
+
     async def notify_player_role(self) -> None:
         preset = player_preset[len(self.players)]
         await asyncio.gather(
             self.send(
                 self.at_all()
-                .text("\n正在分配职业，请注意查看私聊消息\n")
+                .text("\n\n正在分配职业，请注意查看私聊消息\n")
                 .text(f"当前玩家数: {len(self.players)}\n")
                 .text(f"职业分配: 狼人x{preset[0]}, 神职x{preset[1]}, 平民x{preset[2]}")
             ),
@@ -125,8 +148,10 @@ class Game:
             type_.role.name  # Player
             if isinstance(type_, Player)
             else (
-                type_.name if isinstance(type_, Role) else f"{type_.name}阵营"  # Role
-            )  # RoleGroup
+                type_.name  # Role
+                if isinstance(type_, Role)
+                else f"{type_.name}阵营"  # RoleGroup
+            )
         )
 
         await players.broadcast(f"{text}交互开始，限时 {timeout_secs/60:.2f} 分钟")
@@ -176,9 +201,10 @@ class Game:
         if not players:
             return
 
-        for player in players:
+        for player in players.dead():
             await player.post_kill()
             await self.handle_new_dead(player)
+            self.killed_players.append(player)
 
             (shooter, shoot) = self.state.shoot
             if shooter is not None and shoot is not None:
@@ -189,27 +215,32 @@ class Game:
                     .text("限时1分钟, 发送 “/stop” 结束发言")
                 )
                 await self.wait_stop(shoot, 60)
+                await self.post_kill(shoot)
             self.state.shoot = (None, None)
 
     async def run_vote(self) -> None:
         # 统计投票结果
-        vote_result: dict[Player | None, int] = {}
+        players = self.players.alive()
+
+        # 被票玩家: [投票玩家]
+        vote_result: dict[Player, list[Player]] = await players.vote(60)
+        # 票数: [被票玩家]
         vote_reversed: dict[int, list[Player]] = {}
-        for p in await self.players.alive().vote(60):
-            vote_result[p] = vote_result.get(p, 0) + 1
+        # 收集到的总票数
+        total_votes = sum(map(len, vote_result.values()))
 
         # 投票结果公示
         msg = UniMessage.text("投票结果:\n")
         for p, v in sorted(vote_result.items(), key=lambda x: x[1], reverse=True):
             if p is not None:
                 msg.at(p.user_id).text(f": {v} 票\n")
-                vote_reversed[v] = [*vote_reversed.get(v, []), p]
-        if v := vote_result.get(None, 0):
+                vote_reversed[len(v)] = [*vote_reversed.get(len(v), []), p]
+        if v := (len(players) - total_votes):
             msg.text(f"弃票: {v} 票\n")
         await self.send(msg)
 
         # 全员弃票  # 不是哥们？
-        if not vote_reversed:
+        if total_votes == 0:
             await self.send("没有人被票出")
             return
 
@@ -224,7 +255,7 @@ class Game:
 
         # 仅有一名玩家票数最高
         voted = vs.pop()
-        if not await voted.kill(KillReason.Vote):
+        if not await voted.kill(KillReason.Vote, *vote_result[voted]):
             # 投票放逐失败 (例: 白痴)
             return
 
@@ -267,7 +298,7 @@ class Game:
 
         while self.check_game_status() == GameStatus.Unset:
             # 重置游戏状态，进入下一夜
-            self.state = GameState()
+            self.state = GameState(day_count)
             players = self.players.alive()
             await self.send("天黑请闭眼...")
 
@@ -290,19 +321,19 @@ class Game:
             if killed is not None:
                 # 除非守卫保护或女巫使用解药，否则狼人正常击杀玩家
                 if not ((killed is protected) or (antidote and potioned is killed)):
-                    await killed.kill(KillReason.Kill)
+                    await killed.kill(KillReason.Kill, *players.select(RoleGroup.狼人))
             # 如果女巫使用毒药且守卫未保护，杀死该玩家
             if poison and (potioned is not None) and (potioned is not protected):
-                await potioned.kill(KillReason.Poison)
+                await potioned.kill(KillReason.Poison, *players.select(Role.女巫))
 
             day_count += 1
-            msg = UniMessage.text(f"【第{day_count}天】天亮了...\n")
+            msg = UniMessage.text(f"『第{day_count}天』天亮了...\n")
             # 没有玩家死亡，平安夜
             if not (dead := players.dead()):
                 await self.send(msg.text("昨晚是平安夜"))
             # 有玩家死亡，执行死亡流程
             else:
-                # 公开死者名单
+                # 公布死者名单
                 msg.text("昨晚的死者是:")
                 for p in dead.sorted():
                     msg.text("\n").at(p.user_id)
@@ -336,8 +367,9 @@ class Game:
         # 游戏结束
         dead_channel.cancel()
         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.name, p.user_id)):
+        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.text(f"\n{self.show_killed_players()}")
         await self.send(msg)
-        self._on_exit()
+        running_games.pop(self.group.id, None)

nonebot_plugin_werewolf-1.0.3/nonebot_plugin_werewolf/matchers.py

@@ -0,0 +1,66 @@
+import asyncio
+import asyncio.timeouts
+from typing import Annotated
+
+from nonebot import on_command, on_message
+from nonebot.adapters import Bot, Event
+from nonebot.rule import to_me
+from nonebot_plugin_alconna import MsgTarget, UniMessage, UniMsg
+from nonebot_plugin_userinfo import EventUserInfo, UserInfo
+
+from .game import Game, running_games, starting_games
+from .ob11_ext import ob11_ext_enabled
+from .utils import InputStore, is_group, prepare_game, rule_in_game, rule_not_in_game
+
+in_game_message = on_message(rule=rule_in_game)
+start_game = on_command(
+    "werewolf",
+    rule=to_me() & is_group & rule_not_in_game,
+    aliases={"狼人杀"},
+)
+
+
+@in_game_message.handle()
+async def handle_input(event: Event, target: MsgTarget, msg: UniMsg) -> None:
+    if target.private:
+        InputStore.put(target.id, None, msg)
+    else:
+        InputStore.put(event.get_user_id(), target.id, msg)
+
+
+@start_game.handle()
+async def handle_start(
+    bot: Bot,
+    event: Event,
+    target: MsgTarget,
+    admin_info: Annotated[UserInfo, EventUserInfo()],
+) -> None:
+    if target.id in running_games:
+        await UniMessage.text("当前群聊内有正在进行的游戏，无法创建游戏").finish()
+
+    admin_id = event.get_user_id()
+    msg = (
+        UniMessage.at(admin_id)
+        .text("成功创建游戏\n")
+        .text("玩家请 @我 发送 “加入游戏”、“退出游戏”\n")
+        .text("玩家 @我 发送 “当前玩家” 可查看玩家列表\n")
+        .text("游戏发起者 @我 发送 “结束游戏” 可结束当前游戏\n")
+        .text("玩家均加入后，游戏发起者请 @我 发送 “开始游戏”\n")
+    )
+    if ob11_ext_enabled():
+        msg.text("\n可使用戳一戳代替游戏交互中的 “/stop” 命令")
+    await msg.text("\n\n游戏准备阶段限时5分钟，超时将自动结束").send()
+
+    players = starting_games[target.id] = {admin_id: admin_info.user_name}
+
+    try:
+        async with asyncio.timeouts.timeout(5 * 60):
+            await prepare_game(event, players)
+    except TimeoutError:
+        await UniMessage.text("游戏准备超时，已自动结束").finish()
+    finally:
+        del starting_games[target.id]
+
+    game = Game(bot=bot, group=target, players=players)
+    task = asyncio.create_task(game.run())
+    running_games[target.id] = (game, task)

nonebot_plugin_werewolf-1.0.3/nonebot_plugin_werewolf/ob11_ext.py

@@ -0,0 +1,72 @@
+import contextlib
+
+from nonebot import on_type
+from nonebot.internal.matcher import current_bot
+from nonebot_plugin_alconna import UniMessage
+
+from .config import config
+from .game import starting_games
+from .utils import InputStore, user_in_game
+
+
+def ob11_ext_enabled() -> bool:
+    return False
+
+
+with contextlib.suppress(ImportError):
+    from nonebot.adapters.onebot.v11 import Bot, MessageSegment
+    from nonebot.adapters.onebot.v11.event import PokeNotifyEvent
+
+    # 游戏内戳一戳等效 "/stop"
+    async def _rule_poke_1(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 (
+            config.enable_poke
+            and (event.target_id == event.self_id)
+            and user_in_game(user_id, group_id)
+        )
+
+    @on_type(PokeNotifyEvent, rule=_rule_poke_1).handle()
+    async def handle_poke_1(event: PokeNotifyEvent) -> None:
+        InputStore.put(
+            user_id=str(event.user_id),
+            group_id=str(event.group_id) if event.group_id is not None else None,
+            msg=UniMessage.text("/stop"),
+        )
+
+    # 准备阶段戳一戳等效加入游戏
+    async def _rule_poke_2(event: PokeNotifyEvent) -> bool:
+        if not config.enable_poke or event.group_id is None:
+            return False
+
+        user_id = str(event.user_id)
+        group_id = str(event.group_id)
+        return (
+            (event.target_id == event.self_id)
+            and not user_in_game(user_id, group_id)
+            and group_id in starting_games
+        )
+
+    @on_type(PokeNotifyEvent, rule=_rule_poke_2).handle()
+    async def handle_poke_2(bot: Bot, event: PokeNotifyEvent) -> None:
+        user_id = str(event.user_id)
+        group_id = str(event.group_id)
+        players = starting_games[group_id]
+
+        if user_id not in players:
+            res: dict[str, str] = await bot.get_group_member_info(
+                group_id=int(group_id),
+                user_id=int(user_id),
+            )
+            players[user_id] = res.get("nickname") or user_id
+            await bot.send(event, MessageSegment.at(user_id) + "成功加入游戏")
+
+    def ob11_ext_enabled() -> bool:
+        if not config.enable_poke:
+            return False
+
+        return isinstance(current_bot.get(), Bot)