Update app.py

app.py

@@ -125,25 +125,39 @@ 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."}
-        # 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,
+            "target": target,
             "challengeType": "assassin",
             "status": "pending",
-            "phase": "target_decision"  # awaiting target's decision: allow/challenge/contessa
+            "phase": "target_decision"
         }
         return {"success": True, "message": f"Assassin action initiated by {player} targeting {target}. Awaiting target's response."}
 
+    if action == 'duke':
+        # Duke is a money-earning action and only works if the player is allowed to gain.
+        player_data = next((p for p in game["players"] if p["name"] == player), None)
+        if not game["permissions"].get(player, {}).get("gain", True):
+            return {"success": False, "message": "You can only earn money once per turn."}
+        # Set gain to false immediately.
+        game["permissions"][player]["gain"] = False
+        game["challenge"] = {
+            "action": "duke",
+            "challenger": player,
+            "challengeType": "duke",
+            "responses": {},
+            "status": "pending"
+        }
+        return {"success": True, "message": f"Duke action initiated by {player}. Waiting for opponents to respond."}
+
     if action == 'challengeResponse':
         if not game.get("challenge"):
             return {"success": False, "message": "No challenge pending."}
 
-        # --- Handle existing steal response ---
+        # Handle 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"])
@@ -166,7 +180,7 @@ 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"]}
 
-        # --- Handle Ambassador response (existing) ---
+        # Handle Ambassador response.
         elif game["challenge"]["challengeType"] == "ambassador":
             if response == 'allow':
                 if "responses" not in game["challenge"]:
@@ -184,7 +198,7 @@ async def handle_action(request: Request):
                 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  # challenger loses card
+                    game["challenge"]["challenger"] = player
                     game["challenge"]["target"] = ambassador_player["name"]
                     ambassador_player["cards"] = generate_cards()
                     game["challenge"] = None
@@ -193,75 +207,105 @@ async def handle_action(request: Request):
                     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"
-                    # 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"] = []  # remove all cards (eliminated)
+                        target_player["cards"] = []
                         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."}
 
-        # --- Handle Foreign Aid responses ---
+        # 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}."}
+            # If the response is coming from an opponent (blocking the action)
+            if player != game["challenge"]["challenger"]:
+                if response == "block":
+                    # Instead of immediately ending the action, record the blocker and set status to pending block challenge.
+                    game["challenge"]["blocker"] = player
+                    game["challenge"]["status"] = "block_pending"
+                    return {"success": True, "message": f"{player} is attempting to block Foreign Aid. {game['challenge']['challenger']} may now challenge or allow the block.", "challenge": game["challenge"]}
+                else:
+                    game["challenge"]["responses"][player] = response
+                    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."}
+            # Response from the challenger to a pending block.
             else:
+                # This branch is for the foreign aid requester responding to a block.
+                if response == "allow":
+                    game["challenge"] = None
+                    return {"success": True, "message": "Block accepted. Foreign Aid fails."}
+                elif response == "challenge":
+                    blocker = game["challenge"].get("blocker")
+                    blocker_player = next(p for p in game["players"] if p["name"] == blocker)
+                    if "Duke" in blocker_player["cards"]:
+                        game["challenge"]["status"] = "choose_on_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_on_blocker"
+                        return {"success": True, "message": f"Challenge successful. {blocker} must choose a card to lose.", "challenge": game["challenge"]}
+
+        # Handle Duke responses.
+        elif game["challenge"]["challengeType"] == "duke":
+            if player == game["challenge"]["challenger"]:
+                # The player who initiated duke doesn't respond here.
+                return {"success": False, "message": "Initiator cannot respond to their own Duke action."}
+            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:
-                    challenger_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
-                    challenger_player["coins"] += 2
+                    acting_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
+                    acting_player["coins"] += 3
                     game["challenge"] = None
-                    return {"success": True, "message": f"Foreign Aid accepted. {challenger_player['name']} gains 2 coins."}
+                    return {"success": True, "message": f"Duke action accepted. {acting_player['name']} gains 3 coins."}
                 else:
-                    return {"success": True, "message": f"{player} allowed Foreign Aid. Awaiting other responses."}
-
+                    return {"success": True, "message": f"{player} allowed the Duke action. Awaiting other responses."}
+            elif response == "challenge":
+                acting_player = next(p for p in game["players"] if p["name"] == game["challenge"]["challenger"])
+                if "Duke" in acting_player["cards"]:
+                    game["challenge"]["status"] = "choose"
+                    game["challenge"]["challenger"] = player
+                    game["challenge"]["target"] = acting_player["name"]
+                    return {"success": True, "message": f"Challenge failed. {player} must choose a card to lose.", "challenge": game["challenge"]}
+                else:
+                    game["challenge"]["status"] = "choose"
+                    return {"success": True, "message": f"Challenge successful. {acting_player['name']} must choose a card to lose.", "challenge": game["challenge"]}
+        
     if action == 'ambassador':
         if game["turn"] != player:
             return {"success": False, "message": "Not your turn."}
@@ -301,6 +345,7 @@ async def handle_action(request: Request):
             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."}
+        # Initiate Foreign Aid but allow opponents to respond (block or allow).
         game["challenge"] = {
             "action": "foreignAid",
             "challenger": player,
@@ -311,28 +356,9 @@ async def handle_action(request: Request):
         game["permissions"][player]["gain"] = False
         return {"success": True, "message": f"Foreign Aid initiated by {player}. Waiting for opponents to respond."}
 
-    if action == 'foreignAidResponse':
-        if not game.get("challenge") or game["challenge"].get("challengeType") != "foreignAid":
-            return {"success": False, "message": "No foreign aid action pending."}
-        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:
-                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."}
-
     return {"success": True, "message": f"Action '{action}' processed for player {player}."}
 
+
 @app.post("/api/joinGame")
 async def join_game(request: Request):
     data = await request.json()