add Tank

opencombat/gui/actor.py

@@ -42,3 +42,21 @@ class Man(Actor):
         subject: Subject,
     ) -> None:
         super().__init__('actors/man.png', subject=subject, config=config)
+
+
+class HeavyVehicle(Actor):
+    animation_image_paths = {
+        ANIMATION_WALK: [
+            'actors/tank1.png',
+        ],
+        ANIMATION_CRAWL: [
+            'actors/tank1.png',
+        ]
+    }
+
+    def __init__(
+        self,
+        config: Config,
+        subject: Subject,
+    ) -> None:
+        super().__init__('actors/tank1.png', subject=subject, config=config)

opencombat/gui/base.py

@@ -40,8 +40,10 @@ from opencombat.simulation.event import NewVisibleOpponent
 from opencombat.simulation.event import NoLongerVisibleOpponent
 from opencombat.simulation.event import FireEvent
 from opencombat.simulation.event import DieEvent
-from opencombat.simulation.subject import TileSubject as ManSubject
+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
 
 
 class EditLayer(BaseEditLayer):
@@ -228,16 +230,6 @@ class Game(TMXGui):
             self.subject_die,
         )
 
-        # configs / resources
-        self.move_duration_ref = float(self.config.resolve(
-            'game.move.walk_ref_time',
-        ))
-        self.move_fast_duration_ref = float(self.config.resolve(
-            'game.move.run_ref_time',
-        ))
-        self.move_crawl_duration_ref = float(self.config.resolve(
-            'game.move.crawl_ref_time',
-        ))
         self.dead_soldier_image = pyglet.resource.image(self.graphic_path_manager.path(
             'actors/man_d1.png',
         ))
@@ -247,6 +239,10 @@ class Game(TMXGui):
             ManSubject,
             SubjectMapper(self.config, ManActor),
         )
+        self.subject_mapper_factory.register_mapper(
+            TankSubject,
+            SubjectMapper(self.config, HeavyVehicleActor),
+        )
 
     def before_run(self) -> None:
         from opencombat.gui.move import MoveActorInteraction
@@ -273,18 +269,18 @@ class Game(TMXGui):
         if event.gui_action == UserAction.ORDER_MOVE:
             animation = ANIMATION_WALK
             cycle_duration = 2
-            move_duration = self.move_duration_ref
         elif event.gui_action == UserAction.ORDER_MOVE_FAST:
             animation = ANIMATION_WALK
             cycle_duration = 0.5
-            move_duration = self.move_fast_duration_ref
         elif event.gui_action == UserAction.ORDER_MOVE_CRAWL:
             animation = ANIMATION_CRAWL
             cycle_duration = 2
-            move_duration = self.move_crawl_duration_ref
         else:
-            raise NotImplementedError()
+            raise NotImplementedError(
+                'Gui action {} unknown'.format(event.gui_action)
+            )
 
+        move_duration = event.move_duration
         move_action = MoveTo(new_world_position, move_duration)
         actor.do(move_action)
         actor.do(Animate(animation, duration=move_duration, cycle_duration=cycle_duration))

opencombat/simulation/behaviour.py

@@ -19,27 +19,38 @@ from synergine2_xyz.move.simulation import MoveToBehaviour as BaseMoveToBehaviou
 
 
 class MoveToBehaviour(BaseMoveToBehaviour):
-    def __init__(
-        self,
-        config: Config,
-        simulation: Simulation,
-        subject: Subject,
-    ) -> None:
-        super().__init__(config, simulation, subject)
-        self._walk_duration = float(self.config.resolve('game.move.walk_ref_time'))
-        self._run_duration = float(self.config.resolve('game.move.run_ref_time'))
-        self._crawl_duration = float(self.config.resolve('game.move.crawl_ref_time'))
-
     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._walk_duration
+            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'])
+        )
+
+    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 time.time() - move_to_data['last_intention_time'] >= self._run_duration
+            return self.subject.run_duration
         if move_to_data['gui_action'] == UserAction.ORDER_MOVE_CRAWL:
-            return time.time() - move_to_data['last_intention_time'] >= self._crawl_duration
+            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):

opencombat/simulation/subject.py

@@ -32,3 +32,34 @@ class TileSubject(BaseSubject):
     visible_opponent_ids = shared.create_self('visible_opponent_ids', lambda: [])
     combat_mode = shared.create_self('combat_mode', COMBAT_MODE_DEFENSE)
     behaviour_selector_class = TileBehaviourSelector
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._walk_ref_time = float(self.config.resolve('game.move.walk_ref_time'))
+        self._run_ref_time = float(self.config.resolve('game.move.run_ref_time'))
+        self._crawl_ref_time = float(self.config.resolve('game.move.crawl_ref_time'))
+
+    @property
+    def global_move_coeff(self) -> float:
+        return 1
+
+    @property
+    def run_duration(self) -> float:
+        return self._run_ref_time * self.global_move_coeff
+
+    @property
+    def walk_duration(self) -> float:
+        return self._walk_ref_time * self.global_move_coeff
+
+    @property
+    def crawl_duration(self) -> float:
+        return self._crawl_ref_time * self.global_move_coeff
+
+
+class ManSubject(TileSubject):
+    pass
+
+class TankSubject(TileSubject):
+    @property
+    def global_move_coeff(self) -> float:
+        return 3

run.py

@@ -16,7 +16,8 @@ from opencombat.const import FLAG_DE
 from opencombat.const import DE_COLOR
 from opencombat.const import URSS_COLOR
 from opencombat.const import FLAG_URSS
-from opencombat.simulation.subject import TileSubject
+from opencombat.simulation.subject import ManSubject
+from opencombat.simulation.subject import TankSubject
 from opencombat.simulation.base import TileStrategySimulation
 from opencombat.simulation.base import TileStrategySubjects
 from opencombat.terminal.base import CocosTerminal
@@ -37,7 +38,7 @@ def main(map_dir_path: str, seed_value: int=None):
     subjects = TileStrategySubjects(simulation=simulation)
 
     for position in ((10, 2), (11, 3), (11, 4), (12, 5),):
-        man = TileSubject(
+        man = ManSubject(
             config=config,
             simulation=simulation,
             position=position,
@@ -50,7 +51,20 @@ def main(map_dir_path: str, seed_value: int=None):
         subjects.append(man)
 
     for position in ((30, 15), (31, 16), (32, 17), (33, 18),):
-        man = TileSubject(
+        man = ManSubject(
+            config=config,
+            simulation=simulation,
+            position=position,
+            properties={
+                SELECTION_COLOR_RGB: URSS_COLOR,
+                FLAG: FLAG_URSS,
+                SIDE: 'ALLIES',
+            }
+        )
+        subjects.append(man)
+
+    for position in ((38, 24),):
+        man = TankSubject(
             config=config,
             simulation=simulation,
             position=position,