add a pause/resume option in the web client

dev_ffai.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+source ~/venvs/ffai_env/bin/activate
+pip install -e .
+spyder3
+

examples/server_example.py

@@ -5,4 +5,4 @@
 import ffai.web.server as server
 
 if __name__ == "__main__":
-    server.start_server(debug=True, use_reloader=False, port=1234)
+    server.start_server(debug=True, use_reloader=False, port=1234)

ffai/core/game.py

@@ -52,6 +52,7 @@ def to_json(self, ignore_reports=False):
             'can_away_team_use_reroll': self.can_use_reroll(self.state.away_team),
             'actor_id': self.actor.agent_id if self.actor is not None else None,
             'time_limits': self.config.time_limits.to_json(),
+            'pausing': self.config.pausing.to_json(),
             'active_other_player_id': self.get_other_active_player_id()
         }
 
@@ -187,9 +188,6 @@ def _check_clocks(self):
                     self.action = action
                     break
 
-        if not clock.is_running():
-            clock.resume()
-
     def _end_game(self):
         '''
         End the game
@@ -472,6 +470,16 @@ def pause_clocks(self):
         for clock in self.state.clocks:
             if clock.is_running():
                 clock.pause()
+
+    def pause_resume_clocks(self):
+        '''
+        Pauses all running clocks and resumes all paused clocks.
+        '''       
+        for clock in self.state.clocks:
+            if clock.is_running():
+                clock.pause()
+            else:
+                clock.resume()
 
     def add_secondary_clock(self, team):
         '''
@@ -2100,4 +2108,4 @@ def get_hypno_modifier(self, player):
         return 1 - self.num_tackle_zones_in(player) 
 
 
-
+

ffai/core/load.py

@@ -257,7 +257,14 @@ def load_config(name):
         secondary = data['time_limits']['secondary']
         init = data['time_limits']['init']
         end = data['time_limits']['end']
-    config.time_limits = TimeLimits(turn=turn, secondary=secondary, init=init, end=end)
+        config.time_limits = TimeLimits(turn=turn, secondary=secondary, init=init, end=end)
+    if 'pausing' in data:
+        if data['pausing'] is not None:
+            enabled = data['pausing']['enabled']
+            opp_unpausing = data['pausing']['opp_unpausing']
+            num_pauses = data['pausing']['num_pauses']
+            pause_time = data['pausing']['pause_time']
+            config.pausing = Pausing(enabled=enabled, opp_unpausing=opp_unpausing, num_pauses=num_pauses, pause_time=pause_time)
     return config
 
 

ffai/core/model.py

@@ -123,6 +123,22 @@ def to_json(self):
             'end': self.end
         }
 
+class Pausing:
+
+    def __init__(self, enabled, opp_unpausing, num_pauses, pause_time):
+        self.enabled = enabled
+        self.opp_unpausing = opp_unpausing
+        self.num_pauses = num_pauses
+        self.pause_time = pause_time
+
+    def to_json(self):
+        return {
+            'enabled': self.enabled,
+            'opp_unpausing': self.opp_unpausing,
+            'num_pauses': self.num_pauses,
+            'pause_time': self.pause_time
+        }
+
 
 class Configuration:
 
@@ -144,6 +160,7 @@ def __init__(self):
         self.offensive_formations = []
         self.defensive_formations = []
         self.time_limits = None
+        self.pausing = None
 
 
 class PlayerState:
@@ -371,6 +388,7 @@ def __init__(self, game, home_team, away_team):
         self.spectators = 0
         self.active_player = None
         self.game_over = False
+        self.game_paused = False
         self.available_actions = []
         self.clocks = []
         self.rerolled_procs = set()
@@ -388,6 +406,7 @@ def to_json(self, ignore_reports=False):
             'home_team': self.home_team.to_json(),
             'away_team': self.away_team.to_json(),
             'game_over': self.game_over,
+            'game_paused': self.game_paused,
             'weather': self.weather.name,
             'gentle_gust': self.gentle_gust,
             'available_actions': [action.to_json() for action in self.available_actions],

ffai/data/config/web.json

@@ -23,5 +23,10 @@
         "disqualification": 1000,
         "init": 10,
         "end": 10
-    }
+    },
+    "pausing": { 
+        "enabled": true, 
+        "opp_unpausing": true, 
+        "num_pauses": 10, 
+        "pause_time": 120 }
 }

ffai/data/teams/11/human_apo.json

@@ -0,0 +1,168 @@
+{
+  "name": "Human Team /w Apo",
+  "race": "Human",
+  "treasury": 0,
+  "apothecaries": 1,
+  "rerolls": 3,
+  "fan_factor": 3,
+  "ass_coaches": 1,
+  "cheerleaders": 2,
+  "players": [
+    {
+      "nr" : 1,
+      "name": "Ziggi Abschuss",
+      "position": "Blitzer",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    },
+    {
+      "nr" : 2,
+      "name": "Dieter Blunt",
+      "position": "Blitzer",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    },
+    {
+      "nr" : 3,
+      "name": "Luigi Di Passella",
+      "position": "Thrower",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    },
+    {
+      "nr" : 4,
+      "name": "'Fast' Ben Jansen",
+      "position": "Catcher",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    },
+    {
+      "nr" : 5,
+      "name": "Helmut Headreka",
+      "position": "Catcher",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    },
+    {
+      "nr" : 6,
+      "name": "Henny Himmelstein",
+      "position": "Lineman",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    },
+    {
+      "nr" : 7,
+      "name": "Dirk Hero Heldman",
+      "position": "Lineman",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    },
+    {
+      "nr" : 8,
+      "name": "Erdrich Holstein",
+      "position": "Lineman",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    },
+    {
+      "nr" : 9,
+      "name": "Gruff Hackson",
+      "position": "Lineman",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    },
+    {
+      "nr" : 10,
+      "name": "Ivan Kellhoofer",
+      "position": "Lineman",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    },
+    {
+      "nr" : 11,
+      "name": "Walter Damm Kempft",
+      "position": "Lineman",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    },
+    {
+      "nr" : 12,
+      "name": "Gerhard Linebreaker",
+      "position": "Lineman",
+      "extra_skills" : [],
+      "extra_ma" : 0,
+      "extra_st" : 0,
+      "extra_ag" : 0,
+      "extra_av" : 0,
+      "spp": 0,
+      "niggling": false,
+      "mng": false
+    }
+  ]
+}

ffai/web/api.py

@@ -60,6 +60,13 @@ def save_game(game_id, name, team_id):
     host.save_game(game_id, name, team_id)
 
 
+def pause_resume_game(game_id):
+    game = host.get_game(game_id) 
+    if game is not None and game.actor is not None and game.actor.human:
+        game.pause_resume_clocks() 
+        game.state.game_paused = not game.state.game_paused
+
+
 def get_game(game_id):
     game = host.get_game(game_id)
     if game is not None and game.actor is not None and game.actor.human:
@@ -125,4 +132,4 @@ def get_teams(ruleset, board_size=11):
 
 def get_bots():
     bots = list_bots()
-    return bots
+    return bots

ffai/web/server.py

@@ -42,7 +42,10 @@ def create():
         num_human_players += 1
         awayAgent = Agent(f"Player {num_human_players}", human=True)
 
-    game = api.new_game(home_team_name=data['game']['home_team_name'], away_team_name=data['game']['away_team_name'], home_agent=homeAgent, away_agent=awayAgent)
+    game = api.new_game(home_team_name=data['game']['home_team_name'], 
+                        away_team_name=data['game']['away_team_name'],                        
+                        home_agent=homeAgent, away_agent=awayAgent,
+                        config_name="web.json")
     return json.dumps(game.to_json())
 
 
@@ -60,6 +63,12 @@ def save():
         raise Exception("Cannot save this game")
 
 
+@app.route('/games/<game_id>/pause', methods=['POST'])
+def pause(game_id):   
+    api.pause_resume_game(game_id)
+    return json.dumps("Game clocks succesfully turned on/off")
+
+
 @app.route('/games/', methods=['GET'])
 def get_all_games():
     games = api.get_games()

ffai/web/static/dist/js/pybowl.js

@@ -930,6 +930,15 @@ appControllers.controller('GamePlayCtrl', ['$scope', '$routeParams', '$location'
             }
         };
 
+        $scope.pauseResumeClocks = function pauseResumeClocks(){
+            // do pause 
+            GameService.pause($scope.game.game_id).success(function(data){
+              console.log("Clocks paused button clicked");
+            });
+            // do a refresh of the game data
+            $scope.reload();
+        };
+
         $scope.checkForReload = function checkForReload(time){
             if ($scope.available_positions.length === 0 && !$scope.game.state.game_over){
                 setTimeout(function(){
@@ -1572,6 +1581,10 @@ appServices.factory('GameService', function($http) {
             return $http.post(options.api.base_url + '/games/' + id + '/act', {'action': action});
         },
 
+        pause: function(id) {
+            return $http.post(options.api.base_url + '/games/' + id + '/pause');
+        },
+
         delete: function(id) {
             return $http.delete(options.api.base_url + '/games/' + id + "/delete");
         },

ffai/web/static/js/controllers.js

@@ -878,6 +878,15 @@ appControllers.controller('GamePlayCtrl', ['$scope', '$routeParams', '$location'
             }
         };
 
+        $scope.pauseResumeClocks = function pauseResumeClocks(){
+            // do pause 
+            GameService.pause($scope.game.game_id).success(function(data){
+              console.log("Clocks paused button clicked");
+            });
+            // do a refresh of the game data
+            $scope.reload();
+        };
+
         $scope.checkForReload = function checkForReload(time){
             if ($scope.available_positions.length === 0 && !$scope.game.state.game_over){
                 setTimeout(function(){
@@ -1463,4 +1472,4 @@ appControllers.controller('GamePlayCtrl', ['$scope', '$routeParams', '$location'
         });
 
     }
-]);
+]);