disable behaviours when placement mode

opencombat/simulation/behaviour.py

@@ -3,6 +3,10 @@ import random
 import time
 import typing
 
+from synergine2.simulation import Event
+from synergine2.simulation import disable_when
+from synergine2.simulation import config_value
+
 from opencombat.const import COLLECTION_ALIVE
 from opencombat.simulation.base import AliveSubjectBehaviour
 from opencombat.simulation.event import NoLongerVisibleOpponent
@@ -10,45 +14,6 @@ from opencombat.simulation.event import FireEvent
 from opencombat.simulation.event import DieEvent
 from opencombat.simulation.event import NewVisibleOpponent
 from opencombat.simulation.mechanism import OpponentVisibleMechanism
-from opencombat.user_action import UserAction
-from synergine2.simulation import Event
-# from synergine2_xyz.move.simulation import MoveToBehaviour as BaseMoveToBehaviour
-#
-#
-# class MoveToBehaviour(BaseMoveToBehaviour):
-#     def is_terminated(self) -> bool:
-#         return COLLECTION_ALIVE not in self.subject.collections
-#
-#     def _can_move_to_next_step(self, move_to_data: dict) -> bool:
-#         if move_to_data['gui_action'] == UserAction.ORDER_MOVE:
-#             return time.time() - move_to_data['last_intention_time'] >= \
-#                    self.subject.walk_duration
-#         if move_to_data['gui_action'] == UserAction.ORDER_MOVE_FAST:
-#             return time.time() - move_to_data['last_intention_time'] >= \
-#                    self.subject.run_duration
-#         if move_to_data['gui_action'] == UserAction.ORDER_MOVE_CRAWL:
-#             return time.time() - move_to_data['last_intention_time'] >= \
-#                    self.subject.crawl_duration
-#
-#         raise NotImplementedError(
-#             'Gui action {} unknown'.format(move_to_data['gui_action'])
-#         )
-#
-#     # FIXME remove this func when code with new move
-#     def get_move_duration(self, move_to_data: dict) -> float:
-#         if move_to_data['gui_action'] == UserAction.ORDER_MOVE:
-#             return self.subject.walk_duration
-#         if move_to_data['gui_action'] == UserAction.ORDER_MOVE_FAST:
-#             return self.subject.run_duration
-#         if move_to_data['gui_action'] == UserAction.ORDER_MOVE_CRAWL:
-#             return self.subject.crawl_duration
-#
-#         raise NotImplementedError(
-#             'Gui action {} unknown'.format(move_to_data['gui_action'])
-#         )
-#
-#     def finalize_event(self, move_to_data: dict, event: Event) -> None:
-#         event.move_duration = self.get_move_duration(move_to_data)
 
 
 class LookAroundBehaviour(AliveSubjectBehaviour):
@@ -86,6 +51,7 @@ class LookAroundBehaviour(AliveSubjectBehaviour):
 
         return new_visible_subject_events + no_longer_visible_subject_events
 
+    @disable_when(config_value('_runtime.placement_mode'))
     def run(self, data):
         visible_subjects = data[self.visible_mechanism]['visible_subjects']
         visible_subject_ids = [s.id for s in visible_subjects]
@@ -106,7 +72,6 @@ class LookAroundBehaviour(AliveSubjectBehaviour):
         }
 
 
-@disable_when(config_value('_runtime.placement_mode'))
 class EngageOpponent(AliveSubjectBehaviour):
     visible_mechanism = OpponentVisibleMechanism
     use = [visible_mechanism]
@@ -141,6 +106,7 @@ class EngageOpponent(AliveSubjectBehaviour):
 
         return events
 
+    @disable_when(config_value('_runtime.placement_mode'))
     def run(self, data):
         visible_subjects = data[self.visible_mechanism]['visible_subjects']
         if not visible_subjects:

opencombat/simulation/mechanism.py

@@ -1,14 +1,22 @@
 # coding: utf-8
 import typing
 
-from opencombat.const import SIDE, COLLECTION_ALIVE
 from synergine2_xyz.subjects import XYZSubject
 from synergine2_xyz.visible.simulation import VisibleMechanism
+from synergine2.simulation import disable_when
+from synergine2.simulation import config_value
+
+from opencombat.const import SIDE
+from opencombat.const import COLLECTION_ALIVE
 
 
 class OpponentVisibleMechanism(VisibleMechanism):
     from_collection = COLLECTION_ALIVE
 
+    @disable_when(config_value('_runtime.placement_mode'))
+    def run(self) -> dict:
+        return super().run()
+
     def reduce_subjects(self, subjects: typing.List[XYZSubject]) -> typing.Iterator[XYZSubject]:
         def filter_subject(subject: XYZSubject) -> bool:
             return self.subject.properties[SIDE] != subject.properties[SIDE]

opencombat/simulation/move.py

@@ -2,11 +2,14 @@
 import time
 import typing
 
-from synergine2.simulation import SubjectBehaviour, SubjectMechanism
+from synergine2.simulation import SubjectBehaviour
+from synergine2.simulation import SubjectMechanism
 from synergine2.simulation import Event
 from synergine2_xyz.move.intention import MoveToIntention
 from synergine2_xyz.simulation import XYZSimulation
 from synergine2_xyz.utils import get_angle
+from synergine2.simulation import disable_when
+from synergine2.simulation import config_value
 
 from opencombat.const import COLLECTION_ALIVE
 from opencombat.user_action import UserAction
@@ -107,6 +110,7 @@ class SubjectFinishMoveEvent(Event):
 
 
 class MoveToMechanism(SubjectMechanism):
+    @disable_when(config_value('_runtime.placement_mode'))
     def run(self) -> dict:
         try:
             # TODO: MoveToIntention doit être configurable
@@ -127,6 +131,7 @@ class MoveWithRotationBehaviour(SubjectBehaviour):
         super().__init__(*args, **kwargs)
         self.simulation = typing.cast(XYZSimulation, self.simulation)
 
+    @disable_when(config_value('_runtime.placement_mode'))
     def run(self, data) -> object:
         """
         Compute data relative to move
@@ -341,6 +346,7 @@ class MoveBehaviour(SubjectBehaviour):
         super().__init__(*args, **kwargs)
         self.simulation = typing.cast(XYZSimulation, self.simulation)
 
+    @disable_when(config_value('_runtime.placement_mode'))
     def run(self, data) -> object:
         """
         Compute data relative to move

run.py

@@ -80,8 +80,8 @@ if __name__ == '__main__':
         default='.',
     )
     parser.add_argument(
-        '--placement-mode',
-        dest='placement_mode',
+        '--placement',
+        dest='placement',
         action='store_true',
     )
 
@@ -92,5 +92,5 @@ if __name__ == '__main__':
         seed_value=args.seed,
         state_file_path=args.state,
         state_save_dir=args.state_save_dir,
-        placement_mode=args.placement_mode,
+        placement_mode=args.placement,
     )