commit #2

Author: JeffGe05

baseplayer.py

@@ -40,6 +40,7 @@ def __init__(self, group_id):
         self.acceptedplayers = ()
         self.commands = dict()
         self.commandparsers = dict()
+        self.gameended = False
 
     def addplayer(self, sender):
         raise NotImplementedError
@@ -76,11 +77,21 @@ def resume(self):
         try:
             return next(self._game)
         except StopIteration:
-            print("游戏结束")  # TODO
+            self.gameended = True
             return None
 
     def addprivatemsg(self, player, msg):
-        self.messages.append(({"user_id": player.user_id}, msg))
+        if isinstance(player, int):
+            user_id = player
+        elif isinstance(player, BasePlayer):
+            user_id = player.user_id
+        else:
+            raise ValueError
+
+        # Debug: 添加玩家QQ号在消息前
+        # msg = f"[{user_id}] {msg}"
+
+        self.messages.append(({"user_id": user_id}, msg))
 
     def addprivatemsgforall(self, msg):
         for p in self.players:
@@ -107,9 +118,9 @@ def acceptcommandfrom(self, acceptedplayers, commandparsers):
             # acceptedplayers = acceptedplayers
             pass
         else:
-            raise NotImplementedError
+            raise ValueError
 
-        self.acceptedplayers = (p.user_id for p in acceptedplayers)  # 转换为QQ号(int)
+        self.acceptedplayers = tuple(p.user_id for p in acceptedplayers)  # 转换为QQ号(int)
         acceptedplayers = None  # Debug: 防止下面代码误用
 
         self.commands = dict.fromkeys(self.acceptedplayers, None)  # 清空指令缓存
@@ -123,7 +134,7 @@ def acceptcommandfrom(self, acceptedplayers, commandparsers):
                 raise ValueError
             self.commandparsers = dict(zip(self.acceptedplayers, commandparsers))
         else:
-            raise NotImplementedError
+            raise ValueError
 
     def handlemessage(self, context):
         raise NotImplementedError
@@ -141,5 +152,12 @@ 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))
+        player_ids = list(player_ids)
+        player_ids.sort()
+        return "\n".join(
+            (self.getplayerbyid(player_id).string for player_id in player_ids)
+        )
+
+    def __contains__(self, user_id):
+        """判断QQ号是否是本局游戏的玩家。"""
+        return user_id in (p.user_id for p in self.players)

bot.py

@@ -1,55 +1,86 @@
+import asyncio
+from defaultdict import DefaultDict
+
 from aiocqhttp import CQHttp
 
 from theresistance import TheResistanceCampaign
 
 bot = CQHttp(enable_http_post=False)
+group_message_handler = DefaultDict(default_group_message_handler)
+private_message_handler = DefaultDict(default_private_message_handler)
+campaigns = dict()
+
+
+def default_group_message_handler(context):
+    at_me = f"[CQ:at,qq={context['self_id']}]"
+    message = context["message"]
+    group_id = context["group_id"]
+    user_id = context["user_id"]
+
+    # 忽略没有at机器人的消息
+    if at_me not in message:
+        return
+
+    # 忽略已经在其他群进行游戏的QQ号消息，防止无法确定私聊消息应该交给哪个游戏处理
+    if user_id in private_message_handler:
+        return {"reply": "你已经在其它群的游戏中了……"}  # TODO:文字移到外部json文件中
+
+    # 预先防止群内已有游戏进行，但此代码应该不会被执行，因为后续群消息应该都交给其它message_handler处理了
+    if group_id in group_message_handler:
+        print("This line of code should not be excecuted. Please check.")
+        return
+
+    # 抵抗组织
+    if "抵抗组织" in message:  # TODO:文字移到外部json文件中
+        campaign = TheResistanceCampaign(group_id)
+        campaigns[group_id] = campaign
+        campaign.addplayer(context["sender"])
+        name = campaign.players[0].name
+        group_message_handler[group_id] = campaign.handlemessage
+        private_message_handler[user_id] = campaign.handlemessage
+        return {"reply": f"{name}发起了抵抗组织游戏，发送“加入游戏”来参与吧！"}  # TODO:文字移到外部json文件中
+
+
+def default_private_message_handler(context):
+    pass
 
 
 @bot.on_message()
 async def handle_msg(context):
-    pass
-    # print(context)
-    # if context["user_id"] == 498533576:
-    #     await bot.send({"user_id": 498533576}, "Hello!")
-
+    print(context)  # Debug
 
-def test_setup():
-    from time import sleep
+    # TODO: 添加游戏结束后移除message_handler的代码
 
-    campaign = TheResistanceCampaign(719231968)
-    campaign.addplayer({"nickname": "一号玩家", "user_id": 498533576})
-    campaign.addplayer({"nickname": "二号玩家", "user_id": 498533576})
-    campaign.addplayer({"nickname": "三号玩家", "user_id": 498533576})
-    campaign.addplayer({"nickname": "四号玩家", "user_id": 498533576})
-    campaign.addplayer({"nickname": "五号玩家", "user_id": 498533576})
-    campaign.addplayer({"nickname": "六号玩家", "user_id": 498533576})
-    sendmessages(campaign.resume())
+    if context["message_type"] == "private":
+        ret = private_message_handler[context["user_id"]](context)
+    elif context["message_type"] == "group":
+        ret = group_message_handler[context["group_id"]](context)
+    else:
+        print("Unknown message type. Please check.")
+        return
 
-    sleep(5)
+    if isinstance(ret, dict) and "reply" in ret:
+        return ret
+    elif ret is None:
+        return
+    elif isinstance(ret, list):
+        await sendmessages(ret)
 
 
-def sendmessages(messages):
-    import threading
-
-    print(messages)
+async def sendmessages(messages):
+    coros = []
     for context, message in messages:
-        threading.Thread(target=sendmessage, args=(context, message)).start()
-
+        # Debug: 去除QQ号后面添加的id
+        # if "user_id" in context:
+        #     context["user_id"] = context["user_id"] // 10
 
-def sendmessage(context, message):
-    import asyncio
+        coros.append(bot.send(context, message))
 
-    print()
-    print(context)
-    print(message)
-    asyncio.run(bot.send(context, message))
+    await asyncio.gather(*coros)
 
 
 if __name__ == "__main__":
-    import threading
-
     try:
-        threading.Timer(5, test_setup).start()
         bot.run(host="127.0.0.1", port=8090)
     except KeyboardInterrupt:
         print("Exit.")

commandparser.py

@@ -16,11 +16,12 @@ def getnumberparser(include=None, exclude=None, commandnumber=1, maxnum=None):
     """
     if include is None:
         include = set(range(1, maxnum + 1))
+    if exclude is None:
+        exclude = set()
     # if exclude is not None:
     #     include -= set(exclude)
 
     def commandparser(message: str):
-        message = message.strip(" ,")
         pattern = (
             r"^[^\d]*"
             + r"[,.\s\u3000\u3001\u3002\uFF0C\uFF1B\u548C]".join(

defaultdict.py

@@ -0,0 +1,7 @@
+class DefaultDict(dict):
+    def __init__(self, defaultvalue=None, *args, **kwargs):
+        dict.__init__(self, *args, **kwargs)
+        self.defaultvalue = defaultvalue
+
+    def __getitem__(self, key):
+        return self.get(key, self.defaultvalue)

test.py

@@ -3,24 +3,17 @@
 
 class Test:
     counter = count()
+    allinstance = []
 
     def __init__(self):
         self.id = next(self.counter)
+        self.allinstance.append(self.id)
 
-    def __repr__(self):
-        return f"Test({self.id})"
-
-    def __hash__(self):
-        return hash(self.id)
+    def __contains__(self, other):
+        return other in self.allinstance
 
 
 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)
+    print(0 in t1)

theresistance.json

@@ -8,9 +8,10 @@
     "GAME_START": "游戏开始！",
     "THIS_ROUND_STARTUP": "这一轮的任务首领是{player.name}。\n请在讨论后选择{missionplayernum}名玩家执行第{gameround}次任务。",
     "LEADER_CHOOSE_PLAYER": "请回复玩家前的数字选择执行任务的玩家：\n{}",
-    "VOTE_LEADER_CHOOSE_PLAYER": "首领选择指派以下玩家执行任务，请投票选择是否通过：\n{}",
+    "VOTE_LEADER_CHOOSE_PLAYER": "首领选择指派以下玩家执行任务，请投票选择是否通过：\n{missionplayers}\n这是此项任务的第{votecount}次投票。",
     "INVALID_MESSAGE": "没看懂你在说啥……",
     "DUPLICATED_NUMBERS": "请不要选择重复的玩家。",
+    "COMMAND_RECEIVED": "收到！",
     "VOTE_AGREE": [
         ".y",
         "同意",
@@ -19,12 +20,26 @@
     ],
     "VOTE_DISAGREE": [
         ".n",
-        "不同意",
-        "不通过",
-        "不是",
+        "不",
         "否"
     ],
     "VOTE_BEGIN": "请回复是否通过这一轮的投票。",
     "VOTE_NOT_PASSED": "这一轮投票未被通过，请继续讨论并由下一位首领选择执行任务的玩家。",
-    "VOTE_PASSED": "投票通过！"
+    "VOTE_PASSED": "投票通过！请以上玩家准备执行任务……",
+    "MISSION_VOTE_1": "准备执行第{gameround}次任务，请回复是否配合此次任务执行，注意只要有一位玩家不配合，此次任务就失败。",
+    "MISSION_VOTE_2": "准备执行第{gameround}次任务，请回复是否配合此次任务执行，注意本任务两位玩家不配合才视为失败。",
+    "MISSION_COOP": [
+        ".y",
+        "配合",
+        "是"
+    ],
+    "MISSION_NOT_COOP": [
+        ".n",
+        "不",
+        "否"
+    ],
+    "MISSION_SUCCESS": "任务成功完成！",
+    "MISSION_SUCCESS_WITH_1_NOTCOOP": "虽然有一票不配合，但是任务仍然成功完成！",
+    "MISSION_FAIL": "任务失败，有{notcoop}位玩家选择了不配合。",
+    "GAME_END": "游戏结束，{winners}阵营胜利！"
 }