change

agents.py

@@ -30,10 +30,14 @@ class MaxDamagePlayer(Player):
             best_move = max(battle.available_moves, key=lambda move: move.base_power)
             # Creating an order for the selected move
             return self.create_order(best_move)
+        elif battle.available_switches:
+            # If no attacking moves available, switch to first available Pokemon
+            # Don't choose randomly - pick first available switch
+            first_switch = battle.available_switches[0]
+            return self.create_order(first_switch)
         else:
-            # If no attacking move is available, perform a random switch
-            # This involves choosing a random move, which could be a switch or another available action
-            return self.choose_random_move(battle)
+            # No moves or switches available - this shouldn't happen in normal gameplay
+            raise ValueError("MaxDamagePlayer: No moves or switches available")
 
 # --- Helper Function & Base Class ---
 def normalize_name(name: str) -> str:
@@ -236,13 +240,11 @@ class LLMAgentBase(Player):
                  else:
                       fallback_reason = "Unknown error processing LLM decision."
 
-            print(f"Warning: {fallback_reason} Choosing random action.")
-
-            if battle.available_moves or battle.available_switches:
-                 return self.choose_random_move(battle)
-            else:
-                 print("AI Fallback: No moves or switches available. Using Struggle/Default.")
-                 return self.choose_default_move(battle)
+            print(f"Warning: {fallback_reason} Cannot proceed without valid move.")
+            
+            # Instead of choosing random move, raise an exception or wait
+            # This prevents automatic random actions
+            raise ValueError(f"LLM Agent could not make a valid decision: {fallback_reason}")
 
     async def _get_llm_decision(self, battle_state: str) -> Dict[str, Any]:
         raise NotImplementedError("Subclasses must implement _get_llm_decision")
@@ -254,7 +256,7 @@ class GeminiAgent(LLMAgentBase):
         kwargs['avatar'] = avatar
         super().__init__(*args, **kwargs)
         self.model_name = model
-        used_api_key = api_key or os.environ.get("GOOGLE_API_KEY")
+        used_api_change = api_key or os.environ.get("GOOGLE_API_KEY")
         if not used_api_key:
             raise ValueError("Google API key not provided or found in GOOGLE_API_KEY env var.")
         

app.py

@@ -354,11 +354,10 @@ def get_supported_agents() -> dict:
         "supported_agents": get_supported_agent_types(),
         "default_models": get_default_models(),
         "description": {
-            "openai": "OpenAI GPT models (requires API key)",
-            "gemini": "Google Gemini models (requires API key)",
-            "mistral": "Mistral AI models (requires API key)",
-            "maxdamage": "Simple agent that chooses moves with highest base power",
-            "random": "Random move selection agent"
+            "openai": "OpenAI GPT models (requires API key) - Deterministic decisions",
+            "gemini": "Google Gemini models (requires API key) - Deterministic decisions",
+            "mistral": "Mistral AI models (requires API key) - Deterministic decisions",
+            "maxdamage": "Simple agent that chooses moves with highest base power - Deterministic decisions"
         }
     }
 
@@ -567,10 +566,10 @@ async def wait_30_seconds() -> dict:
 
 # --- Server Execution ---
 if __name__ == "__main__":
-    print(f"Pokemon Battle MCP Server starting on port 7861...")
+    print(f"Pokemon Battle MCP Server starting on port 7860...")
     print("Available battle types:")
     print("- Ladder battles")
-    print("- AI agent battles (OpenAI, Gemini, Mistral, MaxDamage, Random)")
+    print("- AI agent battles (OpenAI, Gemini, Mistral, MaxDamage) - NO RANDOM FALLBACKS")
     print("- Human player battles")
     print("Running Pokemon Battle MCP server with SSE transport")
     mcp.run(transport="sse") 

utils/agent_factory.py

@@ -104,20 +104,21 @@ def create_agent(agent_type: str, api_key: str = None, model: str = None, userna
             avatar=avatar,
         )
     
-    elif agent_type == 'random':
-        username = f"Random-{username_suffix}"
-        avatar = random.choice(AGENT_AVATARS['random'])
-        
-        return RandomPlayer(
-            account_configuration=AccountConfiguration(username, None),
-            server_configuration=custom_config,
-            max_concurrent_battles=1,
-            save_replays="battle_replays",
-            avatar=avatar,
-        )
+    # Random agents removed to prevent automatic random move selection
+    # elif agent_type == 'random':
+    #     username = f"Random-{username_suffix}"
+    #     avatar = random.choice(AGENT_AVATARS['random'])
+    #     
+    #     return RandomPlayer(
+    #         account_configuration=AccountConfiguration(username, None),
+    #         server_configuration=custom_config,
+    #         max_concurrent_battles=1,
+    #         save_replays="battle_replays",
+    #         avatar=avatar,
+    #     )
     
     else:
-        raise ValueError(f"Unknown agent type: {agent_type}. Supported types: openai, gemini, mistral, maxdamage, random")
+        raise ValueError(f"Unknown agent type: {agent_type}. Supported types: openai, gemini, mistral, maxdamage")
 
 def get_supported_agent_types():
     """
@@ -126,7 +127,7 @@ def get_supported_agent_types():
     Returns:
         list: List of supported agent type strings
     """
-    return ['openai', 'gemini', 'mistral', 'maxdamage', 'random']
+    return ['openai', 'gemini', 'mistral', 'maxdamage']
 
 def get_default_models():
     """

utils/pokemon_utils.py

@@ -52,19 +52,20 @@ class MCPPokemonAgent(LLMAgentBase):
             active_battles[battle.battle_tag]['available_switches'] = [pkmn.species for pkmn in battle.available_switches]
         
         try:
-            # Wait for external move selection (with timeout)
-            move_order = await asyncio.wait_for(self.external_move_queue.get(), timeout=30.0)
+            # Wait for external move selection (no timeout - wait indefinitely)
+            move_order = await self.external_move_queue.get()
             
             # Update battle state
             if battle.battle_tag in active_battles:
                 active_battles[battle.battle_tag]['waiting_for_move'] = False
             
             return move_order
-        except asyncio.TimeoutError:
-            print(f"Move selection timeout for battle {battle.battle_tag}, choosing random move")
+        except Exception as e:
+            print(f"Error in move selection for battle {battle.battle_tag}: {e}")
             if battle.battle_tag in active_battles:
                 active_battles[battle.battle_tag]['waiting_for_move'] = False
-            return self.choose_random_move(battle)
+            # Don't choose random move - raise the exception to handle gracefully
+            raise
     
     async def submit_move(self, move_name: str = None, pokemon_name: str = None, battle: Battle = None):
         """Submit a move or switch externally"""