Upload app.py

app.py

@@ -91,11 +91,9 @@ async def handle_action(request: Request):
 
     game = games[pin]
 
-    # Return pending challenge status.
     if action == 'getStatus':
         return {"success": True, "challenge": game.get("challenge", None)}
 
-    # STEAL action (existing)
     if action == 'steal':
         if game["permissions"].get(player, {}).get("steal", True):
             game["challenge"] = {
@@ -110,7 +108,6 @@ async def handle_action(request: Request):
         else:
             return {"success": False, "message": "You can only steal once per turn."}
 
-    # COUP action (existing)
     if action == 'coup':
         player_data = next((p for p in game["players"] if p["name"] == player), None)
         if not player_data:
@@ -127,10 +124,11 @@ async def handle_action(request: Request):
         }
         return {"success": True, "message": f"Coup initiated by {player} targeting {target}."}
 
-    # ASSASSIN action and Contessa flow (existing from previous update)
     if action == 'assassin':
+        # Assassin action: must be the player's turn.
         if game["turn"] != player:
             return {"success": False, "message": "Not your turn."}
+        # Create an assassin challenge waiting for the target's decision.
         game["challenge"] = {
             "action": "assassin",
             "challenger": player,    # the assassin
@@ -141,45 +139,11 @@ async def handle_action(request: Request):
         }
         return {"success": True, "message": f"Assassin action initiated by {player} targeting {target}. Awaiting target's response."}
 
-    # DUKE TAX action (new)
-    if action == 'duke':
-        if game["turn"] != player:
-            return {"success": False, "message": "Not your turn."}
-        # Claiming Duke for Tax: create a challenge for all opponents.
-        game["challenge"] = {
-            "action": "duke",
-            "challenger": player,  # the one claiming Duke Tax
-            "challengeType": "duke",
-            "status": "pending",
-            "responses": {}
-        }
-        # Mark that the player cannot perform any further gain actions this turn.
-        game["permissions"][player]["gain"] = False
-        return {"success": True, "message": f"{player} claims Duke for Tax. Waiting for opponents to respond."}
-
-    # Foreign Aid action (modified to store initiator)
-    if action == 'foreignAid':
-        if game["turn"] != player:
-            return {"success": False, "message": "Not your turn."}
-        if not game["permissions"].get(player, {}).get("gain", True):
-            return {"success": False, "message": "You can only earn money once per turn."}
-        game["challenge"] = {
-            "action": "foreignAid",
-            "challenger": player,
-            "initiator": player,  # store who initiated foreign aid
-            "challengeType": "foreignAid",
-            "responses": {},
-            "status": "pending"
-        }
-        game["permissions"][player]["gain"] = False
-        return {"success": True, "message": f"Foreign Aid initiated by {player}. Waiting for opponents to respond."}
-
-    # CHALLENGE RESPONSE branch.
     if action == 'challengeResponse':
         if not game.get("challenge"):
             return {"success": False, "message": "No challenge pending."}
 
-        # STEAL challenge response (existing)
+        # --- Handle existing steal response ---
         if game["challenge"]["challengeType"] == "steal":
             challenger_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
             target_player = next(p for p in game["players"] if p["name"] == game["challenge"]["target"])
@@ -202,151 +166,123 @@ async def handle_action(request: Request):
                     game["challenge"]["status"] = 'choose'
                     return {"success": True, "message": f"Challenge successful. {challenger_player['name']} must choose a card to lose.", "challenge": game["challenge"]}
 
-        # DUKE Tax challenge response (new)
-        elif game["challenge"]["challengeType"] == "duke":
-            if response == "allow":
+        # --- Handle Ambassador response (existing) ---
+        elif game["challenge"]["challengeType"] == "ambassador":
+            if response == 'allow':
                 if "responses" not in game["challenge"]:
                     game["challenge"]["responses"] = {}
-                game["challenge"]["responses"][player] = "allow"
+                game["challenge"]["responses"][player] = 'allow'
                 total_opponents = len(game["players"]) - 1
                 if len(game["challenge"]["responses"]) == total_opponents:
-                    duke_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
-                    duke_player["coins"] += 3
+                    ambassador_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
+                    ambassador_player["cards"] = generate_cards()
                     game["challenge"] = None
-                    return {"success": True, "message": f"{duke_player['name']} successfully collects 3 coins with Duke Tax."}
-                else:
-                    return {"success": True, "message": f"{player} allowed the Duke tax. Awaiting other responses."}
-            elif response == "challenge":
-                duke_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
-                if "Duke" in duke_player["cards"]:
-                    game["challenge"]["status"] = "choose"
-                    game["challenge"]["challenger"] = player  # challenger loses a card
-                    game["challenge"]["target"] = duke_player["name"]
-                    return {"success": True, "message": f"Challenge failed. {player} must choose a card to lose.", "challenge": game["challenge"]}
+                    return {"success": True, "message": f"Ambassador action accepted. {ambassador_player['name']} swaps cards with the deck."}
                 else:
+                    return {"success": True, "message": f"{player} allowed the Ambassador action. Awaiting other responses."}
+            elif response == 'challenge':
+                ambassador_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
+                if "Ambassador" in ambassador_player["cards"]:
                     game["challenge"]["status"] = "choose"
-                    game["challenge"]["challenger"] = duke_player["name"]
-                    return {"success": True, "message": f"Challenge successful. {duke_player['name']} must choose a card to lose.", "challenge": game["challenge"]}
-
-        # FOREIGN AID response branch.
-        elif game["challenge"]["challengeType"] == "foreignAid":
-            if player == game["challenge"]["challenger"]:
-                return {"success": False, "message": "Challenger cannot respond to their own action."}
-            if response == "block":
-                # Instead of immediately canceling, create a new challenge for a Duke block.
-                # The blocking player is claiming Duke to block foreign aid.
-                game["challenge"] = {
-                    "action": "foreignAidBlock",
-                    "challengeType": "dukeBlock",
-                    "blocker": player,
-                    "initiator": game["challenge"]["initiator"],
-                    "status": "pending"
-                }
-                return {"success": True, "message": f"{player} blocks Foreign Aid claiming Duke. {game['challenge']['initiator']} may now challenge this block."}
-            else:  # response == "allow"
-                if "responses" not in game["challenge"]:
-                    game["challenge"]["responses"] = {}
-                game["challenge"]["responses"][player] = "allow"
-                total_opponents = len(game["players"]) - 1
-                if len(game["challenge"]["responses"]) == total_opponents:
-                    fa_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
-                    fa_player["coins"] += 2
+                    game["challenge"]["challenger"] = player  # challenger loses card
+                    game["challenge"]["target"] = ambassador_player["name"]
+                    ambassador_player["cards"] = generate_cards()
                     game["challenge"] = None
-                    return {"success": True, "message": f"Foreign Aid accepted. {fa_player['name']} gains 2 coins."}
-                else:
-                    return {"success": True, "message": f"{player} allowed Foreign Aid. Awaiting other responses."}
-
-        # DUKE BLOCK challenge response (new, from a foreign aid block)
-        elif game["challenge"]["challengeType"] == "dukeBlock":
-            # Only the Foreign Aid initiator may respond.
-            if player != game["challenge"]["initiator"]:
-                return {"success": False, "message": "Only the Foreign Aid initiator can respond to the Duke block challenge."}
-            if response == "challenge":
-                blocker = next(p for p in game["players"] if p["name"] == game["challenge"]["blocker"])
-                if "Duke" in blocker["cards"]:
-                    game["challenge"]["status"] = "choose"
-                    game["challenge"]["challenger"] = player
-                    return {"success": True, "message": f"Block challenge failed. {player} must choose a card to lose.", "challenge": game["challenge"]}
+                    return {"success": True, "message": f"Challenge failed. {player} must lose a card, while {ambassador_player['name']} swaps cards with the deck."}
                 else:
                     game["challenge"]["status"] = "choose"
-                    game["challenge"]["challenger"] = blocker["name"]
-                    return {"success": True, "message": f"Block challenge successful. {blocker['name']} must choose a card to lose.", "challenge": game["challenge"]}
-            elif response == "accept":
-                game["challenge"] = None
-                return {"success": True, "message": "Foreign Aid blocked."}
+                    return {"success": True, "message": "Challenge successful. Ambassador user must choose a card to lose.", "challenge": game["challenge"]}
 
-        # ASSASSIN/CONTESSA response branch (existing)
+        # --- Handle Assassin/Contessa responses ---
         elif game["challenge"]["challengeType"] == "assassin":
+            # Phase 1: target's decision on assassination
             if game["challenge"].get("phase") == "target_decision":
                 if response == "allow":
+                    # Target accepts assassination: must lose one card.
                     game["challenge"]["status"] = "choose"
+                    # Set the losing player to the target.
                     game["challenge"]["challenger"] = game["challenge"]["target"]
                     return {"success": True, "message": f"{game['challenge']['target']} must now choose a card to lose."}
                 elif response == "challenge":
+                    # Target challenges the assassin's claim.
                     assassin_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
                     if "Assassin" in assassin_player["cards"]:
+                        # Assassin is truthful: target loses both cards.
                         target_player = next(p for p in game["players"] if p["name"] == game["challenge"]["target"])
-                        target_player["cards"] = []  # target loses both cards
+                        target_player["cards"] = []  # remove all cards (eliminated)
                         game["challenge"] = None
                         return {"success": True, "message": f"Challenge failed. {target_player['name']} loses both cards."}
                     else:
+                        # Assassin is lying: assassin must lose one card.
                         game["challenge"]["status"] = "choose"
                         game["challenge"]["challenger"] = assassin_player["name"]
                         return {"success": True, "message": f"Challenge successful. {assassin_player['name']} must choose a card to lose.", "challenge": game["challenge"]}
                 elif response == "contessa":
+                    # Target opts to block with Contessa. Shift phase.
                     game["challenge"]["phase"] = "assassin_contessa"
                     return {"success": True, "message": f"{game['challenge']['challenger']} must now choose to challenge or accept the Contessa."}
+            # Phase 2: assassin responding to contessa claim.
             elif game["challenge"].get("phase") == "assassin_contessa":
                 if response == "accept":
+                    # Assassin accepts contessa block: target loses one card.
                     game["challenge"]["status"] = "choose"
                     game["challenge"]["challenger"] = game["challenge"]["target"]
                     return {"success": True, "message": f"{game['challenge']['target']} must now choose a card to lose."}
                 elif response == "challenge":
+                    # Assassin challenges contessa.
                     target_player = next(p for p in game["players"] if p["name"] == game["challenge"]["target"])
                     if "Contessa" in target_player["cards"]:
+                        # Contessa is truthful: assassin loses one card.
                         game["challenge"]["status"] = "choose"
+                        # Losing player is the assassin.
                         game["challenge"]["challenger"] = game["challenge"]["challenger"]
                         return {"success": True, "message": f"Contessa challenge successful. {game['challenge']['challenger']} must choose a card to lose.", "challenge": game["challenge"]}
                     else:
+                        # Contessa is bluffing: target loses both cards.
                         target_player["cards"] = []
                         game["challenge"] = None
                         return {"success": True, "message": f"Contessa challenge failed. {target_player['name']} loses both cards."}
-        # Ambassador response branch (existing)
-        elif game["challenge"]["challengeType"] == "ambassador":
-            if response == 'allow':
-                if "responses" not in game["challenge"]:
-                    game["challenge"]["responses"] = {}
-                game["challenge"]["responses"][player] = 'allow'
+
+        # --- Handle Foreign Aid responses ---
+        elif game["challenge"]["challengeType"] == "foreignAid":
+            if player == game["challenge"]["challenger"]:
+                return {"success": False, "message": "Challenger cannot respond to their own action."}
+            game["challenge"]["responses"][player] = response
+            if response == "block":
+                game["challenge"]["status"] = "blocked"
+                game["challenge"] = None
+                return {"success": True, "message": f"Foreign Aid blocked by {player}."}
+            else:
                 total_opponents = len(game["players"]) - 1
                 if len(game["challenge"]["responses"]) == total_opponents:
-                    ambassador_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
-                    ambassador_player["cards"] = generate_cards()
+                    challenger_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
+                    challenger_player["coins"] += 2
                     game["challenge"] = None
-                    return {"success": True, "message": f"Ambassador action accepted. {ambassador_player['name']} swaps cards with the deck."}
+                    return {"success": True, "message": f"Foreign Aid accepted. {challenger_player['name']} gains 2 coins."}
                 else:
-                    return {"success": True, "message": f"{player} allowed the Ambassador action. Awaiting other responses."}
-            elif response == 'challenge':
-                ambassador_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
-                if "Ambassador" in ambassador_player["cards"]:
-                    game["challenge"]["status"] = "choose"
-                    game["challenge"]["challenger"] = player
-                    game["challenge"]["target"] = ambassador_player["name"]
-                    ambassador_player["cards"] = generate_cards()
-                    game["challenge"] = None
-                    return {"success": True, "message": f"Challenge failed. {player} must lose a card, while {ambassador_player['name']} swaps cards with the deck."}
-                else:
-                    game["challenge"]["status"] = "choose"
-                    return {"success": True, "message": "Challenge successful. Ambassador user must choose a card to lose.", "challenge": game["challenge"]}
-        # CHOOSE action to lose a card.
-        if action == 'choose':
-            acting_player = next((p for p in game["players"] if p["name"] == game["challenge"]["challenger"]), None)
-            if acting_player and target in acting_player["cards"]:
-                acting_player["cards"].remove(target)
-                game["challenge"] = None
-                return {"success": True, "message": f"{acting_player['name']} loses the {target} card."}
-            else:
-                return {"success": False, "message": f"Card {target} not found in {acting_player['name']}'s hand."}
-    # INCOME action (existing)
+                    return {"success": True, "message": f"{player} allowed Foreign Aid. Awaiting other responses."}
+
+    if action == 'ambassador':
+        if game["turn"] != player:
+            return {"success": False, "message": "Not your turn."}
+        game["challenge"] = {
+            "action": "ambassador",
+            "challenger": player,
+            "challengeType": "ambassador",
+            "status": "pending",
+            "responses": {}
+        }
+        return {"success": True, "message": f"Ambassador action initiated by {player}. Waiting for opponents to respond."}
+
+    if action == 'choose':
+        acting_player = next((p for p in game["players"] if p["name"] == game["challenge"]["challenger"]), None)
+        if acting_player and target in acting_player["cards"]:
+            acting_player["cards"].remove(target)
+            game["challenge"] = None
+            return {"success": True, "message": f"{acting_player['name']} loses the {target} card."}
+        else:
+            return {"success": False, "message": f"Card {target} not found in {acting_player['name']}'s hand."}
+
     if action == 'income':
         player_found = False
         for p in game["players"]:
@@ -395,7 +331,7 @@ async def handle_action(request: Request):
             else:
                 return {"success": True, "message": f"{player} allowed Foreign Aid. Awaiting other responses."}
 
-    return {"success": True, "message": f"Action '{action}' received for player {player}."}
+    return {"success": True, "message": f"Action '{action}' processed for player {player}."}
 
 @app.post("/api/joinGame")
 async def join_game(request: Request):