From a02872352fa23cd0b4c6e224d8bdef436025768f Mon Sep 17 00:00:00 2001 From: gsverhoeven Date: Sat, 10 Oct 2020 16:47:54 +0200 Subject: [PATCH 1/7] add a pause/resume option in the web client --- examples/server_example.py | 2 +- ffai/core/game.py | 15 +++++++++++---- ffai/data/saves/.keep | 0 ffai/web/api.py | 8 +++++++- ffai/web/server.py | 6 ++++++ ffai/web/static/dist/js/pybowl.js | 13 +++++++++++++ ffai/web/static/js/controllers.js | 11 ++++++++++- ffai/web/static/js/services.js | 4 ++++ ffai/web/static/partials/game.play.html | 7 ++++--- 9 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 ffai/data/saves/.keep diff --git a/examples/server_example.py b/examples/server_example.py index 9192ca61..eb98f528 100755 --- a/examples/server_example.py +++ b/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) \ No newline at end of file + server.start_server(debug=True, use_reloader=False, port=1234) diff --git a/ffai/core/game.py b/ffai/core/game.py index 88a3ba9c..fb253d9a 100755 --- a/ffai/core/game.py +++ b/ffai/core/game.py @@ -187,9 +187,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 +469,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 +2107,4 @@ def get_hypno_modifier(self, player): return 1 - self.num_tackle_zones_in(player) - \ No newline at end of file + diff --git a/ffai/data/saves/.keep b/ffai/data/saves/.keep new file mode 100644 index 00000000..e69de29b diff --git a/ffai/web/api.py b/ffai/web/api.py index 9cfe5585..ad668c2e 100755 --- a/ffai/web/api.py +++ b/ffai/web/api.py @@ -60,6 +60,12 @@ 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() + + 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 +131,4 @@ def get_teams(ruleset, board_size=11): def get_bots(): bots = list_bots() - return bots \ No newline at end of file + return bots diff --git a/ffai/web/server.py b/ffai/web/server.py index a6c05ac4..7a7c47ec 100755 --- a/ffai/web/server.py +++ b/ffai/web/server.py @@ -60,6 +60,12 @@ def save(): raise Exception("Cannot save this game") +@app.route('/games//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() diff --git a/ffai/web/static/dist/js/pybowl.js b/ffai/web/static/dist/js/pybowl.js index d0819469..a0328fd5 100755 --- a/ffai/web/static/dist/js/pybowl.js +++ b/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"); }, diff --git a/ffai/web/static/js/controllers.js b/ffai/web/static/js/controllers.js index c4cb1786..ea5fb54f 100755 --- a/ffai/web/static/js/controllers.js +++ b/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' }); } -]); \ No newline at end of file +]); diff --git a/ffai/web/static/js/services.js b/ffai/web/static/js/services.js index 7132497e..c01bb66d 100755 --- a/ffai/web/static/js/services.js +++ b/ffai/web/static/js/services.js @@ -13,6 +13,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"); }, diff --git a/ffai/web/static/partials/game.play.html b/ffai/web/static/partials/game.play.html index 3e1efe00..ffd89743 100755 --- a/ffai/web/static/partials/game.play.html +++ b/ffai/web/static/partials/game.play.html @@ -5,6 +5,9 @@
  • Games
    • +
  • + Pause +
  • View
      @@ -14,13 +17,11 @@
  • - @@ -38,7 +39,7 @@
    Save game
    -

    This will save the game one the server. Please, specify a name.

    +

    This will save the game on the server. Please, specify a name.

    From 74a5e73981c80ff87455158534dfab26a2c35f80 Mon Sep 17 00:00:00 2001 From: gsverhoeven Date: Sat, 10 Apr 2021 19:51:02 +0200 Subject: [PATCH 2/7] make default config file us explicit --- ffai/web/server.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ffai/web/server.py b/ffai/web/server.py index 7a7c47ec..c56d6dc4 100755 --- a/ffai/web/server.py +++ b/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()) From 6538e0341e8c5de4bcbc05b49cf5fd09d308883a Mon Sep 17 00:00:00 2001 From: gsverhoeven Date: Sat, 10 Apr 2021 20:03:01 +0200 Subject: [PATCH 3/7] add attribute game_paused to GameState --- ffai/web/api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ffai/web/api.py b/ffai/web/api.py index ad668c2e..80802032 100755 --- a/ffai/web/api.py +++ b/ffai/web/api.py @@ -64,6 +64,7 @@ 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): From 84480e0ae8806c0b785be45361d2cc28af39691b Mon Sep 17 00:00:00 2001 From: gsverhoeven Date: Sat, 10 Apr 2021 20:05:06 +0200 Subject: [PATCH 4/7] add attribute game_paused to GameState --- ffai/core/model.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ffai/core/model.py b/ffai/core/model.py index a8aec8d4..8f06567f 100755 --- a/ffai/core/model.py +++ b/ffai/core/model.py @@ -371,6 +371,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 +389,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], From 5b21d6fcb33f290f100adcebc0cd2171db576d5a Mon Sep 17 00:00:00 2001 From: gsverhoeven Date: Sat, 10 Apr 2021 20:08:13 +0200 Subject: [PATCH 5/7] add pausing configuration based on TimeLImits configuration --- ffai/core/game.py | 1 + ffai/core/load.py | 9 ++++++++- ffai/core/model.py | 17 +++++++++++++++++ ffai/data/config/web.json | 7 ++++++- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ffai/core/game.py b/ffai/core/game.py index fb253d9a..14aed837 100755 --- a/ffai/core/game.py +++ b/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() } diff --git a/ffai/core/load.py b/ffai/core/load.py index e79d42c6..236e2514 100755 --- a/ffai/core/load.py +++ b/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 diff --git a/ffai/core/model.py b/ffai/core/model.py index 8f06567f..1d18c068 100755 --- a/ffai/core/model.py +++ b/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: diff --git a/ffai/data/config/web.json b/ffai/data/config/web.json index 8a5e3fca..c7883a7c 100644 --- a/ffai/data/config/web.json +++ b/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 } } \ No newline at end of file From 3c15238c7a0671d893fe303870c6697185e5e3ba Mon Sep 17 00:00:00 2001 From: gsverhoeven Date: Sat, 10 Apr 2021 20:09:36 +0200 Subject: [PATCH 6/7] add human team with apothecary --- ffai/data/teams/11/human_apo.json | 168 ++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100755 ffai/data/teams/11/human_apo.json diff --git a/ffai/data/teams/11/human_apo.json b/ffai/data/teams/11/human_apo.json new file mode 100755 index 00000000..df126167 --- /dev/null +++ b/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 + } + ] +} From d492cedba4b73d74c33b37055cb7febe41f3bf9b Mon Sep 17 00:00:00 2001 From: gsverhoeven Date: Sat, 10 Apr 2021 20:12:38 +0200 Subject: [PATCH 7/7] venv shell scripts --- dev_ffai.sh | 6 ++++++ play_ffai.sh | 7 +++++++ 2 files changed, 13 insertions(+) create mode 100755 dev_ffai.sh create mode 100755 play_ffai.sh diff --git a/dev_ffai.sh b/dev_ffai.sh new file mode 100755 index 00000000..d11b5f0e --- /dev/null +++ b/dev_ffai.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +source ~/venvs/ffai_env/bin/activate +pip install -e . +spyder3 + diff --git a/play_ffai.sh b/play_ffai.sh new file mode 100755 index 00000000..307fee0a --- /dev/null +++ b/play_ffai.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +source ~/venvs/ffai_env/bin/activate +pip install -e . +python ./examples/server_example.py +deactivate +