Merge pull request ocadotechnology#266 from OlafSzmidt/stage_package_fix

Minimum Product: State Package

aimmo-game/service.py

@@ -2,9 +2,9 @@
 import logging
 import os
 import sys
+from json import loads
 
 import eventlet
-from json import loads
 
 eventlet.sleep()
 eventlet.monkey_patch()
@@ -17,7 +17,7 @@
 from simulation.avatar.avatar_manager import AvatarManager
 from simulation.turn_manager import ConcurrentTurnManager
 from simulation.worker_manager import WORKER_MANAGERS
-from simulation.world_state import WorldState
+from simulation.state.world_state import WorldState
 
 app = flask.Flask(__name__)
 socketio = SocketIO()

aimmo-game/simulation/custom_map.py

@@ -1,13 +1,12 @@
 import abc
 
-from simulation.levels.levels import LEVELS
-
 from simulation.geography.location import Location
-from simulation.game_state import GameState
+from simulation.levels.levels import LEVELS
 from simulation.pickups import DeliveryPickup
+from simulation.state.game_state import GameState
+from simulation.world_map import DEFAULT_LEVEL_SETTINGS
 from simulation.world_map import WorldMap
 from simulation.world_map import world_map_static_spawn_decorator
-from simulation.world_map import DEFAULT_LEVEL_SETTINGS
 
 
 class BaseGenerator(object):

aimmo-game/tests/test_service.py

@@ -2,19 +2,18 @@
 
 from unittest import TestCase, skip
 
-from simulation.game_state import GameState
+import service
+from simulation.avatar.avatar_manager import AvatarManager
 from simulation.geography.location import Location
+from simulation.state.game_state import GameState
+from simulation.state.world_state import WorldState
 from simulation.turn_manager import state_provider
 from simulation.world_map import WorldMap
-from simulation.world_state import WorldState
-from simulation.avatar.avatar_manager import AvatarManager
-
-import service
-
 from .test_simulation.dummy_avatar import MoveEastDummy
 from .test_simulation.maps import MockPickup
 from .test_simulation.test_world_map import MockCell
 
+
 class SimpleAvatarManager(AvatarManager):
     def __init__(self):
         super(SimpleAvatarManager, self).__init__()

aimmo-game/tests/test_simulation/test_action.py

@@ -6,8 +6,8 @@
 from simulation import event
 from simulation.avatar.avatar_manager import AvatarManager
 from simulation.geography.direction import EAST
-from simulation.game_state import GameState
 from simulation.geography.location import Location
+from simulation.state.game_state import GameState
 from .dummy_avatar import MoveDummy
 from .maps import InfiniteMap, EmptyMap, AvatarMap
 

aimmo-game/tests/test_simulation/test_game_state.py

@@ -2,8 +2,8 @@
 
 from unittest import TestCase
 
-from simulation.game_state import GameState
 from simulation.geography.location import Location
+from simulation.state.game_state import GameState
 from .dummy_avatar import DummyAvatar
 from .dummy_avatar import DummyAvatarManager
 from .maps import InfiniteMap, AvatarMap, EmptyMap

aimmo-game/tests/test_simulation/test_turn_manager.py

@@ -3,8 +3,8 @@
 import unittest
 
 from simulation.avatar.avatar_appearance import AvatarAppearance
-from simulation.game_state import GameState
 from simulation.geography.location import Location
+from simulation.state.game_state import GameState
 from simulation.turn_manager import ConcurrentTurnManager
 from simulation.turn_manager import SequentialTurnManager
 from .dummy_avatar import DummyAvatarManager

aimmo-game/tests/test_simulation/test_worker_manager.py

@@ -6,7 +6,7 @@
 from httmock import HTTMock
 
 from simulation.avatar.avatar_manager import AvatarManager
-from simulation.game_state import GameState
+from simulation.state.game_state import GameState
 from simulation.worker_manager import WorkerManager
 from .maps import InfiniteMap