Skip to content

Commit

Permalink
Various changes
Browse files Browse the repository at this point in the history
  • Loading branch information
NiallEgan committed Sep 3, 2018
1 parent 3ffc83f commit f418f7e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
1 change: 0 additions & 1 deletion aimmo-game/simulation/game_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ def __init__(self, worker_manager_class, game_state_generator, django_api_url, p
self.game_state = game_state_generator(AvatarManager())
self.communicator = DjangoCommunicator(django_api_url=django_api_url,
completion_url=django_api_url + 'complete/')
self.subscriber = None
self.simulation_runner = ConcurrentSimulationRunner(communicator=self.communicator,
game_state=self.game_state)
self._end_turn_callback = lambda: None
Expand Down
4 changes: 2 additions & 2 deletions docs/architecture/games/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
## Game Components
- [Game Runner](game-runner.md)
- [Worker Manager](worker-manager.md)
- [Turn Manager](simulation-runner.md)
- [Simulation Runner](simulation-runner.md)
- [Worker](worker.md)
- [Map Generator](generators.md)
- [World Map](world-map.md)
Expand Down Expand Up @@ -44,4 +44,4 @@ squares).

Files for the game are stored in `aimmo-game`.

[game-api]: https://github.com/ocadotechnology/aimmo/blob/master/aimmo-game/service.py
[game-api]: https://github.com/ocadotechnology/aimmo/blob/master/aimmo-game/service.py
4 changes: 2 additions & 2 deletions docs/architecture/games/simulation-runner.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@



The [`SimulationRunner`](simulation-runner-file)is responsible
The [`SimulationRunner`](simulation-runner-file) is responsible
for running a turn in the simulation.

The `run_turn` method is called from `GameRunner`, and it
Expand All @@ -26,4 +26,4 @@ then apply actions in order of priority

[simulation-runner-file]: /aimmo-game/simulation/simulation_runner.py
[avatar-wrapper-file]: /aimmo-game/simulation/avatar/avatar_wrapper.py
[world-map-doc]: world-map.md
[world-map-doc]: world-map.md
2 changes: 1 addition & 1 deletion docs/architecture/games/worker-manager.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ locally and on the cloud. Locally, we use threads, each
running on different pods. With Kubernetes, we create and
remove pods manually.

[green-threads]: https://en.wikipedia.org/wiki/Green_threads
[green-threads]: https://en.wikipedia.org/wiki/Green_threads
2 changes: 1 addition & 1 deletion docs/architecture/games/world-map.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ All the map updates are regulated using the settings of a map. Some useful setti
* TARGET_NUM_PICKUPS_PER_AVATAR - regulate the number of pickups similarly to how the number of score locations are regulated
* PICKUP_SPAWN_CHANCE - a regulation parameter similar to SCORE_DESPAWN_CHANCE

[simulation-runner]: simulation-runner.md
[simulation-runner]: simulation-runner.md

0 comments on commit f418f7e

Please sign in to comment.