commit #1

Author: JeffGe05

baseplayer.py

@@ -8,6 +8,7 @@ def __init__(self, sender):
         self.user_id = sender["user_id"]
         self.name = sender.get("card") or sender["nickname"]
         self.role = "unassigned"
+        self.player_id = None
 
     # def __hash__(self):
     #     return hash(self.user_id)
@@ -19,6 +20,14 @@ def assignrole(self, role):
     def rolename(self):
         return self.ROLE[self.role]
 
+    @property
+    def string(self):
+        return f"[{self.player_id}] {self.name}"
+
+    @classmethod
+    def updaterolenames(cls, roles: dict):
+        cls.ROLE.update(roles)
+
 
 class BaseCampaign:
     PlayerConfig = dict()
@@ -40,26 +49,43 @@ def playernum(self):
         """返回玩家数量"""
         return len(self.players)
 
+    @property
+    def allplayerset(self):
+        """返回是否已收到所有玩家的指令"""
+        return all((cmd is not None for cmd in self.commands.values()))
+
     def assignroles(self):
-        """给玩家分配角色"""
+        """给玩家分配角色，并打乱座次"""
         if self.playernum not in self.PlayerConfig:
-            print("玩家数量不够或超出。")
+            print("玩家数量不够或超出。")  # TODO
             return
         roles = self.PlayerConfig[self.playernum].copy()
+        player_ids = list(range(1, self.playernum + 1))
         random.shuffle(roles)
+        random.shuffle(player_ids)
         for i, p in enumerate(self.players):
             p.assignrole(roles[i])
+            p.player_id = player_ids[i]
+        self.players.sort(key=lambda p: p.player_id)
 
     def _start(self):
         yield NotImplemented
         raise NotImplementedError
 
     def resume(self):
-        return next(self._game)
+        try:
+            return next(self._game)
+        except StopIteration:
+            print("游戏结束")  # TODO
+            return None
 
     def addprivatemsg(self, player, msg):
         self.messages.append(({"user_id": player.user_id}, msg))
 
+    def addprivatemsgforall(self, msg):
+        for p in self.players:
+            self.addprivatemsg(p, msg)
+
     def addgroupmsg(self, msg):
         self.messages.append(({"group_id": self.group_id}, msg))
 
@@ -69,19 +95,51 @@ def yieldmessages(self):
         return messages
 
     def acceptcommandfrom(self, acceptedplayers, commandparsers):
-        if isinstance(acceptedplayers, str) and acceptedplayers == "all":
-            self.acceptedplayers = self.players
-        elif isinstance(acceptedplayers, (set, tuple, list)):
-            self.acceptedplayers = acceptedplayers
+        """设置允许接收指令的玩家。
+
+        Arguments:
+            acceptedplayers {str, iterable[Player]} -- 允许发送指令的玩家，'all'代表所有玩家
+            commandparsers {callable, iterable[callable]} -- 设置玩家指令的解析器，单个代表解析器设置给所有玩家
+        """
+        if isinstance(acceptedplayers, str) and acceptedplayers == "all":  # 所有玩家
+            acceptedplayers = self.players
+        elif isinstance(acceptedplayers, (set, tuple, list)):  # 部分玩家
+            # acceptedplayers = acceptedplayers
+            pass
         else:
             raise NotImplementedError
-        self.commands = dict.fromkeys(acceptedplayers, None)
-        if isinstance(commandparsers, callable):
-            self.commandparsers = dict.fromkeys(acceptedplayers, commandparsers)
-        elif isinstance(commandparsers, (tuple, list)):
-            self.commandparsers = dict(zip(acceptedplayers, commandparsers))
+
+        self.acceptedplayers = (p.user_id for p in acceptedplayers)  # 转换为QQ号(int)
+        acceptedplayers = None  # Debug: 防止下面代码误用
+
+        self.commands = dict.fromkeys(self.acceptedplayers, None)  # 清空指令缓存
+
+        if callable(commandparsers):  # 单个解析器分配给所有acceptedplayers
+            self.commandparsers = dict.fromkeys(self.acceptedplayers, commandparsers)
+        elif isinstance(commandparsers, (tuple, list)):  # 解析器列表按顺序分配给acceptedplayers
+            if len(self.acceptedplayers) != len(commandparsers):  # 长度不匹配，抛出ValueError异常
+                raise ValueError
+            if isinstance(self.acceptedplayers, set):  # 集合无顺序，抛出ValueError异常
+                raise ValueError
+            self.commandparsers = dict(zip(self.acceptedplayers, commandparsers))
         else:
             raise NotImplementedError
 
     def handlemessage(self, context):
         raise NotImplementedError
+
+    @property
+    def allplayerstring(self):
+        return "\n".join((p.string for p in self.players))
+
+    def getplayerbyid(self, id):
+        for p in self.players:
+            if p.player_id == id:
+                return p
+
+    def playerstringat(self, player_ids):
+        if isinstance(player_ids, int):
+            return self.getplayerbyid(player_ids).string
+
+        player_ids = list(player_ids).sort()
+        return "\n".join((self.getplayerbyid(player_id) for player_id in player_ids))

bot.py

@@ -1,7 +1,3 @@
-import asyncio
-import threading
-from time import sleep
-
 from aiocqhttp import CQHttp
 
 from theresistance import TheResistanceCampaign
@@ -18,6 +14,8 @@ async def handle_msg(context):
 
 
 def test_setup():
+    from time import sleep
+
     campaign = TheResistanceCampaign(719231968)
     campaign.addplayer({"nickname": "一号玩家", "user_id": 498533576})
     campaign.addplayer({"nickname": "二号玩家", "user_id": 498533576})
@@ -27,21 +25,29 @@ def test_setup():
     campaign.addplayer({"nickname": "六号玩家", "user_id": 498533576})
     sendmessages(campaign.resume())
 
+    sleep(5)
+
 
 def sendmessages(messages):
+    import threading
+
     print(messages)
     for context, message in messages:
         threading.Thread(target=sendmessage, args=(context, message)).start()
 
 
 def sendmessage(context, message):
+    import asyncio
+
     print()
     print(context)
     print(message)
     asyncio.run(bot.send(context, message))
 
 
 if __name__ == "__main__":
+    import threading
+
     try:
         threading.Timer(5, test_setup).start()
         bot.run(host="127.0.0.1", port=8090)

test.py

@@ -1,4 +1,26 @@
-from theresistance import TheResistancePlayer
+from itertools import count
 
-player = TheResistancePlayer(498533576)
-print(player.ROLE)
+
+class Test:
+    counter = count()
+
+    def __init__(self):
+        self.id = next(self.counter)
+
+    def __repr__(self):
+        return f"Test({self.id})"
+
+    def __hash__(self):
+        return hash(self.id)
+
+
+if __name__ == "__main__":
+    t1 = Test()
+    t2 = Test()
+    di = {t1: "t1", t2: "t2"}
+    print(t1)
+    print(t2)
+    print(di)
+    print(di[t1])
+    print(t1 in di)
+    print(0 in di)

theresistance.json

@@ -1,9 +1,14 @@
 {
+    "ROLENAMES": {
+        "blue": "抵抗组织",
+        "red": "政府卧底"
+    },
     "ROLE_NOTIFICATION": "您的身份是【{rolename}】。",
     "RED_PLAYER_NOTIFICATION": "政府卧底的玩家分别是：\n",
     "GAME_START": "游戏开始！",
     "THIS_ROUND_STARTUP": "这一轮的任务首领是{player.name}。\n请在讨论后选择{missionplayernum}名玩家执行第{gameround}次任务。",
-    "LEADER_CHOOSE_PLAYER": "首领选择指派{}号玩家执行任务，请投票选择是否通过。",
+    "LEADER_CHOOSE_PLAYER": "请回复玩家前的数字选择执行任务的玩家：\n{}",
+    "VOTE_LEADER_CHOOSE_PLAYER": "首领选择指派以下玩家执行任务，请投票选择是否通过：\n{}",
     "INVALID_MESSAGE": "没看懂你在说啥……",
     "DUPLICATED_NUMBERS": "请不要选择重复的玩家。",
     "VOTE_AGREE": [
@@ -18,5 +23,8 @@
         "不通过",
         "不是",
         "否"
-    ]
+    ],
+    "VOTE_BEGIN": "请回复是否通过这一轮的投票。",
+    "VOTE_NOT_PASSED": "这一轮投票未被通过，请继续讨论并由下一位首领选择执行任务的玩家。",
+    "VOTE_PASSED": "投票通过！"
 }

theresistance.py

@@ -6,14 +6,14 @@
 from commandparser import getnumberparser, getboolparser, ErrorString
 
 with open("theresistance.json", encoding="utf8") as f:
-    texts = json.load(f)
+    TEXT = json.load(f)
 
 
 class TheResistancePlayer(BasePlayer):
     pass
 
 
-TheResistancePlayer.ROLE.update({"blue": "抵抗组织", "red": "政府卧底"})
+TheResistancePlayer.updaterolenames(TEXT["ROLENAMES"])
 
 
 class TheResistanceCampaign(BaseCampaign):
@@ -57,13 +57,12 @@ def _start(self):
         """游戏流程"""
         self.assignroles()  # 分发身份
         for p in self.players:  # 告诉玩家自己的身份
-            self.addprivatemsg(
-                p, texts["ROLE_NOTIFICATION"].format(rolename=p.rolename)
-            )
-        msg = texts["RED_PLAYER_NOTIFICATION"] + "\n".join(self.redplayername)
+            self.addprivatemsg(p, TEXT["ROLE_NOTIFICATION"].format(rolename=p.rolename))
+
+        msg = TEXT["RED_PLAYER_NOTIFICATION"] + "\n".join(self.redplayername)
         for p in self.redplayers:  # 告诉卧底玩家其它卧底身份
             self.addprivatemsg(p, msg)
-        self.addgroupmsg(texts["GAME_START"])
+        self.addgroupmsg(TEXT["GAME_START"])
         leadergen = cycle(self.players)
         for _ in range(random.randint(0, self.playernum - 1)):  # 随机初始首领玩家
             next(leadergen)
@@ -73,38 +72,57 @@ def _start(self):
         missionrequire = self.MissionRequire[self.playernum]  # 任务所需玩家数量
         for leader in leadergen:  # 无限循环，用 break 跳出
             self.addgroupmsg(
-                texts["THIS_ROUND_STARTUP"].format(
+                TEXT["THIS_ROUND_STARTUP"].format(
                     player=leader,
                     gameround=gameround,
                     missionplayernum=missionrequire[gameround - 1],
                 )
             )
+            self.addprivatemsg(
+                leader, TEXT["LEADER_CHOOSE_PLAYER"].format(self.allplayerstring)
+            )
             self.acceptcommandfrom(
                 (leader,),
                 getnumberparser(
                     maxnum=self.playernum, commandnumber=missionrequire[gameround - 1]
                 ),
             )
             yield self.yieldmessages()
+
             self.addgroupmsg(
-                texts["LEADER_CHOOSE_PLAYER"].format("、".join(self.commands[leader]))
+                TEXT["VOTE_LEADER_CHOOSE_PLAYER"].format(
+                    self.getplayerbyid(self.commands[leader])
+                )
             )
+            self.addprivatemsgforall(TEXT["VOTE_BEGIN"])
             self.acceptcommandfrom(
-                "all", getboolparser(yes=texts["VOTE_AGREE"], no=texts["VOTE_DISAGREE"])
+                "all", getboolparser(yes=TEXT["VOTE_AGREE"], no=TEXT["VOTE_DISAGREE"])
             )
             yield self.yieldmessages()
+
+            voteyescount = sum(self.commands.values())  # 通过的玩家数
+            if voteyescount <= self.playernum / 2:  # 如果一半及以上的玩家否决了本回合首领任命的人选
+                self.addgroupmsg(TEXT["VOTE_NOT_PASSED"])
+                continue
+
+            self.addgroupmsg(TEXT["VOTE_PASSED"])
+
             # TODO: 游戏流程
 
     def handlemessage(self, context):
         player = context["user_id"]
         if player not in self.acceptedplayers:
             return None
+
         cmd = self.commandparsers[player](context["message"])
         if isinstance(cmd, ErrorString):
-            return {"reply": texts[cmd]}  # TODO
+            return {"reply": TEXT[cmd]}
         else:
             self.commands[player] = cmd
-        if all((cmd is not None for cmd in self.commands.values())):  # 收到所有指令
+
+        # TODO: 回复指令已收到
+
+        if self.allplayerset:  # 收到所有指令
             return self.resume()
         else:
             return None
@@ -127,12 +145,4 @@ def blueplayername(self):
 
 
 if __name__ == "__main__":
-    missionrequire = TheResistanceCampaign.MissionRequire[6]
-    gameround = 1
-    print(
-        texts["THIS_ROUND_STARTUP"].format(
-            player=TheResistancePlayer({"nickname": "六号玩家", "user_id": 498533576}),
-            gameround=gameround,
-            missionplayernum=missionrequire[gameround - 1],
-        )
-    )
+    pass