Upload app.py

app.py

@@ -88,24 +88,11 @@ async def handle_action(request: Request):
 
     if pin not in games:
         raise HTTPException(status_code=404, detail="Game not found.")
+
     game = games[pin]
 
-    # --- getStatus: update coins & remove players with no cards ---
     if action == 'getStatus':
-        # Remove players with no cards.
-        removed = []
-        for p in game["players"][:]:
-            if not p["cards"]:
-                removed.append(p["name"])
-                game["players"].remove(p)
-                game["permissions"].pop(p["name"], None)
-        # Update required coup: if a player has 10+ coins, mark them.
-        for p in game["players"]:
-            if p["coins"] >= 10:
-                game["permissions"][p["name"]]["requiredCoup"] = True
-            else:
-                game["permissions"][p["name"]]["requiredCoup"] = False
-        return {"success": True, "challenge": game.get("challenge", None), "players": game["players"]}
+        return {"success": True, "challenge": game.get("challenge", None)}
 
     if action == 'steal':
         if game["permissions"].get(player, {}).get("steal", True):
@@ -122,7 +109,6 @@ async def handle_action(request: Request):
             return {"success": False, "message": "You can only steal once per turn."}
 
     if action == 'coup':
-        # Regular coup process – assume caller has already paid coins.
         player_data = next((p for p in game["players"] if p["name"] == player), None)
         if not player_data:
             return {"success": False, "message": "Player not found."}
@@ -139,188 +125,143 @@ async def handle_action(request: Request):
         return {"success": True, "message": f"Coup initiated by {player} targeting {target}."}
 
     if action == 'assassin':
+        # Assassin action: must be the player's turn.
         if game["turn"] != player:
             return {"success": False, "message": "Not your turn."}
-        # Assassin action: create a challenge for the chosen target.
+        # Create an assassin challenge waiting for the target's decision.
         game["challenge"] = {
             "action": "assassin",
-            "challenger": player,      # the assassin
-            "target": target,          # the chosen target
+            "challenger": player,    # the assassin
+            "target": target,        # the chosen target
             "challengeType": "assassin",
             "status": "pending",
-            "phase": "target_decision"  # awaiting target's decision: allow, challenge, or use contessa
+            "phase": "target_decision"  # awaiting target's decision: allow/challenge/contessa
         }
         return {"success": True, "message": f"Assassin action initiated by {player} targeting {target}. Awaiting target's response."}
 
-    if action == 'duke':
-        if game["turn"] != player:
-            return {"success": False, "message": "Not your turn."}
-        # Create a Duke challenge so that all opponents may challenge or allow.
-        game["challenge"] = {
-            "action": "duke",
-            "challenger": player,
-            "challengeType": "duke",
-            "status": "pending",
-            "responses": {}
-        }
-        return {"success": True, "message": f"{player} is claiming Duke for Tax. Waiting for opponents to respond."}
-
-    # --- challengeResponse branch: handle various challenge types ---
     if action == 'challengeResponse':
         if not game.get("challenge"):
             return {"success": False, "message": "No challenge pending."}
 
-        # Handle Steal challenge.
+        # --- Handle existing steal response ---
         if game["challenge"]["challengeType"] == "steal":
-            assassin_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
+            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"])
             if response == 'accept':
                 coins_to_steal = min(target_player["coins"], 2)
                 target_player["coins"] -= coins_to_steal
-                assassin_player["coins"] += coins_to_steal
+                challenger_player["coins"] += coins_to_steal
                 game["challenge"] = None
-                return {"success": True, "message": f"Steal accepted. {coins_to_steal} coins transferred from {target_player['name']} to {assassin_player['name']}."}
+                return {"success": True, "message": f"Steal accepted. {coins_to_steal} coins transferred from {target_player['name']} to {challenger_player['name']}."}
             elif response == 'challenge':
-                if "Captain" in assassin_player["cards"]:
+                if "Captain" in challenger_player["cards"]:
                     coins_to_steal = min(target_player["coins"], 2)
                     target_player["coins"] -= coins_to_steal
-                    assassin_player["coins"] += coins_to_steal
+                    challenger_player["coins"] += coins_to_steal
                     game["challenge"]["status"] = 'choose'
                     game["challenge"]["challenger"] = target_player['name']
-                    game["challenge"]["target"] = assassin_player['name']
-                    return {"success": True, "message": f"Challenge failed. {target_player['name']} loses {coins_to_steal} coins to {assassin_player['name']}."}
+                    game["challenge"]["target"] = challenger_player['name']
+                    return {"success": True, "message": f"Challenge failed. {target_player['name']} loses {coins_to_steal} coins to {challenger_player['name']}."}
                 else:
                     game["challenge"]["status"] = 'choose'
-                    return {"success": True, "message": f"Challenge successful. {assassin_player['name']} must choose a card to lose.", "challenge": game["challenge"]}
+                    return {"success": True, "message": f"Challenge successful. {challenger_player['name']} must choose a card to lose.", "challenge": game["challenge"]}
 
-        # Handle Duke challenge (for Tax action).
-        elif game["challenge"]["challengeType"] == "duke":
+        # --- 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'
                 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
-                    # Prevent further gain actions.
-                    game["permissions"][duke_player["name"]]["gain"] = False
+                    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 claimed Duke Tax and gains 3 coins."}
+                    return {"success": True, "message": f"Ambassador action accepted. {ambassador_player['name']} swaps cards with the deck."}
                 else:
-                    return {"success": True, "message": f"{player} allowed Duke claim. Awaiting other responses."}
+                    return {"success": True, "message": f"{player} allowed the Ambassador action. 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  # the challenger must lose a card.
-                    return {"success": True, "message": f"Challenge failed. {player} must choose a card to lose.", "challenge": game["challenge"]}
-                else:
+                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"]}
-
-        # Handle Foreign Aid challenge/duke block.
-        elif game["challenge"]["challengeType"] == "foreignAid":
-            if game["challenge"].get("phase") == "foreignAid_duke":
-                if response == "accept":
+                    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 blocked by {game['challenge'].get('blocker', 'opponent')}."}
-                elif response == "challenge":
-                    blocker_player = next(p for p in game["players"] if p["name"] == game["challenge"]["blocker"])
-                    if "Duke" in blocker_player["cards"]:
-                        game["challenge"]["status"] = "choose"
-                        game["challenge"]["challenger"] = game["challenge"]["challenger"]
-                        return {"success": True, "message": f"Challenge failed. {game['challenge']['challenger']} must choose a card to lose.", "challenge": game["challenge"]}
-                    else:
-                        game["challenge"]["status"] = "choose"
-                        game["challenge"]["challenger"] = blocker_player["name"]
-                        return {"success": True, "message": f"Challenge successful. {blocker_player['name']} must choose a card to lose.", "challenge": game["challenge"]}
-            else:
-                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"]["phase"] = "foreignAid_duke"
-                    game["challenge"]["blocker"] = player
-                    return {"success": True, "message": f"{player} is blocking Foreign Aid by claiming Duke. {game['challenge']['challenger']} may now challenge or accept."}
+                    return {"success": True, "message": f"Challenge failed. {player} must lose a card, while {ambassador_player['name']} swaps cards with the deck."}
                 else:
-                    total_opponents = len(game["players"]) - 1
-                    if len(game["challenge"]["responses"]) == total_opponents:
-                        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"Foreign Aid accepted. {challenger_player['name']} gains 2 coins."}
-                    else:
-                        return {"success": True, "message": f"{player} allowed Foreign Aid. Awaiting other responses."}
+                    game["challenge"]["status"] = "choose"
+                    return {"success": True, "message": "Challenge successful. Ambassador user must choose a card to lose.", "challenge": game["challenge"]}
 
-        # Handle Assassin/Contessa responses.
+        # --- 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"
-                    # Target loses one card.
+                    # 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"] = []  # loses all cards (eliminated)
+                        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"
-                        # Assassin loses a card.
+                        # 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."}
 
-        # Handle Ambassador responses.
-        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"]}
-        # End of challengeResponse branch.
-    
+                    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."}
@@ -343,16 +284,16 @@ async def handle_action(request: Request):
             return {"success": False, "message": f"Card {target} not found in {acting_player['name']}'s hand."}
 
     if action == 'income':
-        found = False
+        player_found = False
         for p in game["players"]:
             if p["name"] == player:
-                found = True
+                player_found = True
                 if not game["permissions"].get(player, {}).get("gain", True):
                     return {"success": False, "message": "You can only earn money once per turn."}
                 p["coins"] += 1
                 game["permissions"][player]["gain"] = False
                 return {"success": True, "message": f"You now have {p['coins']} coins."}
-        if not found:
+        if not player_found:
             raise HTTPException(status_code=404, detail="Player not found in the game.")
 
     if action == 'foreignAid':