set position when drag + drag only in placement mode

opencombat/gui/base.py

@@ -21,6 +21,7 @@ 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.simulation.interior import InteriorManager
 from opencombat.simulation.tmx import TileMap
@@ -74,6 +75,20 @@ class EditLayer(BaseEditLayer):
             )
         interaction.execute()
 
+    def can_move(self, selected) -> bool:
+        return self.config.resolve('_runtime.placement_mode', False)
+
+    def end_drag_move(self, wx, wy):
+        # set position
+        super().end_drag_move(wx, wy)
+
+        interaction = self.layer_manager \
+            .interaction_manager \
+            .get_for_user_action(
+                UserAction.SET_SUBJECTS_POSITION,
+            )
+        interaction.execute()
+
 
 class BackgroundLayer(cocos.layer.Layer):
     def __init__(
@@ -280,14 +295,30 @@ class Game(TMXGui):
         from opencombat.gui.move import MoveCrawlActorInteraction
         from opencombat.gui.fire import FireActorInteraction
 
-        self.layer_manager.interaction_manager.register(MoveActorInteraction, self.layer_manager)
-        self.layer_manager.interaction_manager.register(MoveFastActorInteraction, self.layer_manager)
-        self.layer_manager.interaction_manager.register(MoveCrawlActorInteraction, self.layer_manager)
-        self.layer_manager.interaction_manager.register(FireActorInteraction, self.layer_manager)
+        self.layer_manager.interaction_manager.register(
+            MoveActorInteraction,
+            self.layer_manager,
+        )
+        self.layer_manager.interaction_manager.register(
+            MoveFastActorInteraction,
+            self.layer_manager,
+        )
+        self.layer_manager.interaction_manager.register(
+            MoveCrawlActorInteraction,
+            self.layer_manager,
+        )
+        self.layer_manager.interaction_manager.register(
+            FireActorInteraction,
+            self.layer_manager,
+        )
         self.layer_manager.interaction_manager.register(
             SaveStateInteraction,
             self.layer_manager,
         )
+        self.layer_manager.interaction_manager.register(
+            SetSubjectPositionsInteraction,
+            self.layer_manager,
+        )
 
     def set_subject_position(
         self,

opencombat/gui/placement.py

@@ -0,0 +1,26 @@
+# coding: utf-8
+from synergine2.terminals import TerminalPackage
+from synergine2_cocos2d.interaction import Interaction
+
+from opencombat.simulation.placement import SetSubjectPositionsSimulationBehaviour  # nopep8
+from opencombat.user_action import UserAction
+
+
+class SetSubjectPositionsInteraction(Interaction):
+    gui_action = UserAction.SET_SUBJECTS_POSITION
+
+    def get_package_for_terminal(self) -> TerminalPackage:
+        data = []  # type: typing.List[typing.Tuple[int, typing.Tuple[int, int]]]  # nopep8
+        for moved_subject in self.layer_manager.edit_layer.selection.keys():
+            grid_position = self.layer_manager.grid_manager.get_grid_position(
+                moved_subject.position,
+            )
+            data.append(
+                (moved_subject.subject.id, grid_position),
+            )
+
+        return TerminalPackage(
+            simulation_actions=[
+                (SetSubjectPositionsSimulationBehaviour, data),
+            ]
+        )

opencombat/simulation/placement.py

@@ -0,0 +1,21 @@
+# coding: utf-8
+import typing
+
+from synergine2.simulation import SimulationBehaviour
+from synergine2.simulation import Event
+
+
+class SetSubjectPositionsSimulationBehaviour(SimulationBehaviour):
+    def action(self, data) -> typing.List[Event]:
+        for subject_id, new_position in data:
+            subject = self.simulation.subjects.index[subject_id]
+            subject.position = new_position
+
+        return []
+
+    @classmethod
+    def merge_data(cls, new_data, start_data=None):
+        pass
+
+    def run(self, data):
+        pass

opencombat/state.xsd

@@ -38,7 +38,7 @@
     </xs:simpleType>
 
     <xs:simpleType name="directiontype">
-        <xs:restriction base="xs:positiveInteger"/>
+        <xs:restriction base="xs:float"/>
     </xs:simpleType>
 
     <xs:complexType name="statetype">

opencombat/user_action.py

@@ -8,3 +8,4 @@ class UserAction(BaseUserAction):
     ORDER_MOVE_FAST = 'ORDER_MOVE_FAST'
     ORDER_MOVE_CRAWL = 'ORDER_MOVE_CRAWL'
     ORDER_FIRE = 'ORDER_FIRE'
+    SET_SUBJECTS_POSITION = 'SET_SUBJECTS_POSITION'