Browse Source

move subject/actor mapping into Gui class

Bastien Sevajol 7 years ago
parent
commit
b2e6b52f61
2 changed files with 9 additions and 9 deletions
  1. 9 0
      opencombat/gui/base.py
  2. 0 9
      opencombat/terminal/base.py

+ 9 - 0
opencombat/gui/base.py View File

28
 from synergine2_cocos2d.animation import Animate
28
 from synergine2_cocos2d.animation import Animate
29
 from synergine2_cocos2d.gl import draw_line
29
 from synergine2_cocos2d.gl import draw_line
30
 from synergine2_cocos2d.gui import EditLayer as BaseEditLayer
30
 from synergine2_cocos2d.gui import EditLayer as BaseEditLayer
31
+from synergine2_cocos2d.gui import SubjectMapper
31
 from synergine2_cocos2d.gui import Gui
32
 from synergine2_cocos2d.gui import Gui
32
 from synergine2_cocos2d.gui import TMXGui
33
 from synergine2_cocos2d.gui import TMXGui
33
 from synergine2_cocos2d.layer import LayerManager
34
 from synergine2_cocos2d.layer import LayerManager
39
 from opencombat.simulation.event import NoLongerVisibleOpponent
40
 from opencombat.simulation.event import NoLongerVisibleOpponent
40
 from opencombat.simulation.event import FireEvent
41
 from opencombat.simulation.event import FireEvent
41
 from opencombat.simulation.event import DieEvent
42
 from opencombat.simulation.event import DieEvent
43
+from opencombat.simulation.subject import TileSubject as ManSubject
44
+from opencombat.gui.actor import Man as ManActor
42
 
45
 
43
 
46
 
44
 class EditLayer(BaseEditLayer):
47
 class EditLayer(BaseEditLayer):
239
             'actors/man_d1.png',
242
             'actors/man_d1.png',
240
         ))
243
         ))
241
 
244
 
245
+        # subject/actor mapping
246
+        self.subject_mapper_factory.register_mapper(
247
+            ManSubject,
248
+            SubjectMapper(self.config, ManActor),
249
+        )
250
+
242
     def before_run(self) -> None:
251
     def before_run(self) -> None:
243
         from opencombat.gui.move import MoveActorInteraction
252
         from opencombat.gui.move import MoveActorInteraction
244
         from opencombat.gui.move import MoveFastActorInteraction
253
         from opencombat.gui.move import MoveFastActorInteraction

+ 0 - 9
opencombat/terminal/base.py View File

8
 from opencombat.simulation.event import DieEvent
8
 from opencombat.simulation.event import DieEvent
9
 from opencombat.simulation.event import NoLongerVisibleOpponent
9
 from opencombat.simulation.event import NoLongerVisibleOpponent
10
 from opencombat.simulation.physics import TilePhysics
10
 from opencombat.simulation.physics import TilePhysics
11
-from opencombat.simulation.subject import TileSubject as ManSubject
12
-from opencombat.gui.actor import Man as ManActor
13
 from synergine2_cocos2d.terminal import GameTerminal
11
 from synergine2_cocos2d.terminal import GameTerminal
14
 from synergine2_cocos2d.util import get_map_file_path_from_dir
12
 from synergine2_cocos2d.util import get_map_file_path_from_dir
15
 from synergine2_xyz.move.simulation import FinishMoveEvent
13
 from synergine2_xyz.move.simulation import FinishMoveEvent
40
 
38
 
41
     def run(self):
39
     def run(self):
42
         from opencombat.gui.base import Game
40
         from opencombat.gui.base import Game
43
-        from synergine2_cocos2d.gui import SubjectMapper
44
 
41
 
45
         self.gui = Game(
42
         self.gui = Game(
46
             self.config,
43
             self.config,
58
 
55
 
59
             return pyglet.event.EVENT_HANDLED
56
             return pyglet.event.EVENT_HANDLED
60
 
57
 
61
-        # TODO: Defind on some other place ?
62
-        self.gui.subject_mapper_factory.register_mapper(
63
-            ManSubject,
64
-            SubjectMapper(self.config, ManActor),
65
-        )
66
-
67
         self.gui.run()
58
         self.gui.run()