Merge pull request #214 from njustesen/fix/auto-setup

Fix to forced setup

Author: njustesen

botbowl/core/game.py

@@ -210,16 +210,15 @@ def step(self, action=None) -> None:
                 # Else continue procedure with no action
                 self.action = None
 
-
     def refresh(self) -> None:
         """
         Checks clocks and runs forced actions. Useful in called in human games.
         """
         self.action = None
         if self.config.competition_mode:
             self._check_clocks()
-        if self.action is not None:
-            self.step(self.action)
+        if not self.state.game_over and len(self.state.available_actions) == 0:
+            self.step(None)
 
     def _check_clocks(self) -> None:
         """
@@ -247,14 +246,11 @@ def _check_clocks(self) -> None:
                     action = None
 
                 # Take action if it doesn't end the turn
+                if self.config.debug_mode:
+                    print(f"Forcing action: {self.action.to_json() if self.action is not None else 'None'}")
                 if self.action is None or self.action.action_type not in [ActionType.END_TURN, ActionType.END_SETUP]:
-                    if self.config.debug_mode:
-                        print("Forced step action")
                     done = self._one_step(action)
                 else:
-                    if self.config.debug_mode:
-                        print(f"Forcing action: {self.action.to_json() if self.action is not None else 'None'}")
-                    self.action = action
                     break
 
         if not clock.is_running():
@@ -349,8 +345,17 @@ def _forced_action(self) -> Action:
                             ActionType.DONT_USE_APOTHECARY]:
             for action in self.state.available_actions:
                 if action.action_type == action_type:
-                    return Action(action_type)
+                    if action_type == ActionType.END_SETUP:
+                        if self.is_setup_legal(self.get_agent_team(self.actor)):
+                            return Action(action_type)
+                    else:
+                        return Action(action_type)
         # Take random action
+        while True:
+            action_choice = self.rnd.choice(self.state.available_actions)
+            # Ignore PLACE_PLAYER actions
+            if action_choice.action_type != botbowl.ActionType.PLACE_PLAYER:
+                break
         action_choice = self.rnd.choice(self.state.available_actions)
         position = self.rnd.choice(action_choice.positions) if len(action_choice.positions) > 0 else None
         player = self.rnd.choice(action_choice.players) if len(action_choice.players) > 0 else None

tests/framework/test_forced_action.py

@@ -0,0 +1,45 @@
+import pytest
+from botbowl.core.load import *
+from botbowl.core.game import Game
+
+
+def test_forced_action():
+    config = load_config("gym-11")
+    config.time_limits.turn = 0.01
+    config.time_limits.secondary = 0.01
+    config.competition_mode = True
+    config.fast_mode = True
+    ruleset = load_rule_set(config.ruleset)
+    home = load_team_by_filename("human", ruleset)
+    away = load_team_by_filename("human", ruleset)
+    home_agent = Agent("human1", human=True)
+    away_agent = Agent("human2", human=True)
+    game = Game(1, home, away, home_agent, away_agent, config)
+    game.init()
+    game.step(Action(ActionType.START_GAME))
+    for i in range(100):
+        time.sleep(config.time_limits.turn * 1.5)
+        game.refresh()
+    assert game.state.game_over
+
+
+def test_forced_setup():
+    config = load_config("gym-11")
+    config.time_limits.turn = 0.1
+    config.competition_mode = True
+    ruleset = load_rule_set(config.ruleset)
+    home = load_team_by_filename("human", ruleset)
+    away = load_team_by_filename("human", ruleset)
+    home_agent = Agent("human1", human=True)
+    away_agent = Agent("human2", human=True)
+    game = Game(1, home, away, home_agent, away_agent, config)
+    game.init()
+    game.step(Action(ActionType.START_GAME))
+    game.step(Action(ActionType.HEADS))
+    game.step(Action(ActionType.KICK))
+    time.sleep(config.time_limits.turn * 1.5)
+    game.refresh()
+    assert len(game.get_players_on_pitch()) == 11
+    time.sleep(config.time_limits.turn * 1.5)
+    game.refresh()
+    assert len(game.get_players_on_pitch()) == 22