man firing when crawl mode

opencombat/exception.py

@@ -11,3 +11,7 @@ class UnknownWeapon(OpenCombatException):
 
 class UnknownFiringAnimation(OpenCombatException):
     pass
+
+
+class WrongMode(OpenCombatException):
+    pass

opencombat/gui/actor.py

@@ -11,6 +11,7 @@ from synergine2_cocos2d.actor import Actor
 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
@@ -19,6 +20,7 @@ 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.user_action import UserAction
 
 if typing.TYPE_CHECKING:
     from opencombat.gui.fire import GuiFiringEvent
@@ -40,6 +42,7 @@ class BaseActor(Actor):
     ]
     weapons_firing_image_scheme = {}
     weapon_image_scheme = {}
+    move_for_gui_actions = {}
 
     def __init__(
         self,
@@ -69,10 +72,25 @@ class BaseActor(Actor):
 
     @property
     def mode(self) -> str:
-        # FIXME: When man is moving (crawling for example), must change mode
-        # and man must stay "crawled"
         return self._mode
 
+    @mode.setter
+    def mode(self, value) -> None:
+        if value not in self.get_modes():
+            raise WrongMode('Actor "{}" has no mode "{}" ({})'.format(
+                self.__class__.__name__,
+                value,
+                ', '.join(self.get_modes()),
+            ))
+
+        self._mode = value
+
+    def get_mode_for_gui_action(self, gui_action: str) -> str:
+        try:
+            return self.move_for_gui_actions[gui_action]
+        except KeyError:
+            return self.get_default_mode()
+
     @property
     def weapons(self) -> typing.List[str]:
         return []
@@ -199,6 +217,18 @@ class Man(BaseActor):
                 'actors/man_weap1_firing3.png',
             ],
         },
+        MODE_MAN_CRAWLING: {
+            RIFFLE: [
+                'actors/man_weap1_firing1.png',
+                'actors/man_weap1_firing2.png',
+                'actors/man_weap1_firing3.png',
+            ]
+        }
+    }
+    move_for_gui_actions = {
+        UserAction.ORDER_MOVE: MODE_MAN_STAND_UP,
+        UserAction.ORDER_MOVE_FAST: MODE_MAN_STAND_UP,
+        UserAction.ORDER_MOVE_CRAWL: MODE_MAN_CRAWLING,
     }
 
     def __init__(

opencombat/gui/base.py

@@ -267,6 +267,7 @@ class Game(TMXGui):
     def start_move_subject(self, event: StartMoveEvent):
         actor = self.layer_manager.subject_layer.subjects_index[event.subject_id]
         new_world_position = self.layer_manager.grid_manager.get_world_position_of_grid_position(event.to_position)
+        actor_mode = actor.get_mode_for_gui_action(event.gui_action)
 
         if event.gui_action == UserAction.ORDER_MOVE:
             animation = ANIMATION_WALK
@@ -287,6 +288,7 @@ class Game(TMXGui):
         actor.do(move_action)
         actor.do(Animate(animation, duration=move_duration, cycle_duration=cycle_duration))
         actor.rotation = get_angle(event.from_position, event.to_position)
+        actor.mode = actor_mode
 
     def new_visible_opponent(self, event: NewVisibleOpponent):
         self.visible_or_no_longer_visible_opponent(event, (153, 0, 153))
@@ -349,7 +351,6 @@ class Game(TMXGui):
             self.sound_lib.get_sound('gunshot_default').play()
 
         firing_event = GuiFiringEvent(shooter_actor, event.weapon_type)
-        original_actor_image = shooter_actor.image
 
         def actor_rotate():
             shooter_actor.rotation = get_angle(
@@ -361,7 +362,7 @@ class Game(TMXGui):
             shooter_actor.firing(firing_event)
 
         def actor_end_firing():
-            shooter_actor.update_image(original_actor_image)
+            shooter_actor.reset_default_texture()
 
         # To avoid all in same time
         # TODO BS 2018-01-24: This should be unecessary when core events sending will be

opencombat/gui/image.py

@@ -69,7 +69,7 @@ class TileImageCacheManager(ImageCacheManager):
 
     def build_firing(self) -> None:
         for mode in self.actor.get_modes():
-            mode_image_path = self.actor.default_image_path  # FIXME !
+            mode_image_path = self.actor.get_mode_image_path(mode)
             mode_image = Image.open(self.path_manager.path(mode_image_path))
 
             for weapon in self.actor.weapons: