rename gui into game module

opencombat/gui/actor.py → opencombat/game/actor.py

@@ -14,17 +14,17 @@ from synergine2_xyz.exception import UnknownAnimationIndex
 from opencombat.exception import UnknownWeapon
 from opencombat.exception import WrongMode
 from opencombat.exception import UnknownFiringAnimation
-from opencombat.gui.animation import ANIMATION_CRAWL
-from opencombat.gui.animation import ANIMATION_WALK
-from opencombat.gui.const import MODE_MAN_STAND_UP
-from opencombat.gui.const import MODE_MAN_CRAWLING
-from opencombat.gui.image import TileImageCacheManager
-from opencombat.gui.weapon import RIFFLE
-from opencombat.gui.weapon import WeaponImageApplier
+from opencombat.game.animation import ANIMATION_CRAWL
+from opencombat.game.animation import ANIMATION_WALK
+from opencombat.game.const import MODE_MAN_STAND_UP
+from opencombat.game.const import MODE_MAN_CRAWLING
+from opencombat.game.image import TileImageCacheManager
+from opencombat.game.weapon import RIFFLE
+from opencombat.game.weapon import WeaponImageApplier
 from opencombat.user_action import UserAction
 
 if typing.TYPE_CHECKING:
-    from opencombat.gui.fire import GuiFiringEvent
+    from opencombat.game.fire import GuiFiringEvent
 
 
 MODE_DEFAULT = 'MODE_DEFAULT'

opencombat/gui/base.py → opencombat/game/base.py

@@ -18,11 +18,11 @@ from synergine2_cocos2d.interaction import InteractionManager
 from synergine2_cocos2d.middleware import MapMiddleware
 from synergine2_cocos2d.util import PathManager
 
-from opencombat.gui.animation import ANIMATION_WALK
-from opencombat.gui.animation import ANIMATION_CRAWL
-from opencombat.gui.fire import GuiFiringEvent
-from opencombat.gui.placement import SetSubjectPositionsInteraction
-from opencombat.gui.state import SaveStateInteraction
+from opencombat.game.animation import ANIMATION_WALK
+from opencombat.game.animation import ANIMATION_CRAWL
+from opencombat.game.fire import GuiFiringEvent
+from opencombat.game.placement import SetSubjectPositionsInteraction
+from opencombat.game.state import SaveStateInteraction
 from opencombat.simulation.interior import InteriorManager
 from opencombat.simulation.tmx import TileMap
 from opencombat.user_action import UserAction
@@ -45,8 +45,8 @@ from opencombat.simulation.event import FireEvent
 from opencombat.simulation.event import DieEvent
 from opencombat.simulation.subject import ManSubject
 from opencombat.simulation.subject import TankSubject
-from opencombat.gui.actor import Man as ManActor
-from opencombat.gui.actor import HeavyVehicle as HeavyVehicleActor
+from opencombat.game.actor import Man as ManActor
+from opencombat.game.actor import HeavyVehicle as HeavyVehicleActor
 
 
 class EditLayer(BaseEditLayer):
@@ -290,10 +290,10 @@ class Game(TMXGui):
         )
 
     def before_run(self) -> None:
-        from opencombat.gui.move import MoveActorInteraction
-        from opencombat.gui.move import MoveFastActorInteraction
-        from opencombat.gui.move import MoveCrawlActorInteraction
-        from opencombat.gui.fire import FireActorInteraction
+        from opencombat.game.move import MoveActorInteraction
+        from opencombat.game.move import MoveFastActorInteraction
+        from opencombat.game.move import MoveCrawlActorInteraction
+        from opencombat.game.fire import FireActorInteraction
 
         self.layer_manager.interaction_manager.register(
             MoveActorInteraction,

opencombat/gui/fire.py → opencombat/game/fire.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 import typing
 
-from opencombat.gui.actor import BaseActor
+from opencombat.game.actor import BaseActor
 from opencombat.simulation.event import DEFAULT_WEAPON_TYPE
 from opencombat.simulation.fire import RequestFireBehaviour
 from synergine2_cocos2d.interaction import BaseActorInteraction

opencombat/gui/image.py → opencombat/game/image.py

@@ -12,7 +12,7 @@ from opencombat.exception import UnknownWeapon
 from opencombat.exception import UnknownFiringAnimation
 
 if typing.TYPE_CHECKING:
-    from opencombat.gui.actor import BaseActor
+    from opencombat.game.actor import BaseActor
 
 
 class FiringImageCache(ImageCache):
@@ -72,7 +72,7 @@ class TileImageCacheManager(ImageCacheManager):
     ) -> None:
         super().__init__(actor, config)
         self.firing_cache = FiringImageCache()
-        from opencombat.gui.actor import BaseActor
+        from opencombat.game.actor import BaseActor
         self.actor = typing.cast(BaseActor, self.actor)
         self.path_manager = PathManager(
             self.config.resolve('global.include_path.graphics'),

opencombat/gui/weapon.py → opencombat/game/weapon.py

@@ -8,11 +8,11 @@ from synergine2.config import Config
 from synergine2_cocos2d.util import PathManager
 
 from opencombat.exception import UnknownWeapon
-from opencombat.gui.const import MODE_MAN_STAND_UP
-from opencombat.gui.const import MODE_MAN_CRAWLING
+from opencombat.game.const import MODE_MAN_STAND_UP
+from opencombat.game.const import MODE_MAN_CRAWLING
 
 if typing.TYPE_CHECKING:
-    from opencombat.gui.actor import BaseActor
+    from opencombat.game.actor import BaseActor
 
 RIFFLE = 'RIFFLE'
 

opencombat/terminal/base.py

@@ -39,7 +39,7 @@ class CocosTerminal(GameTerminal):
         self.map_dir_path = map_dir_path
 
     def run(self):
-        from opencombat.gui.base import Game
+        from opencombat.game.base import Game
 
         self.gui = Game(
             self.config,