weapon man position matching with gui move type

opencombat/gui/actor.py

@@ -9,19 +9,25 @@ from synergine2_cocos2d.actor import Actor
 from opencombat.exception import UnknownWeapon
 from opencombat.gui.animation import ANIMATION_CRAWL
 from opencombat.gui.animation import ANIMATION_WALK
-from opencombat.gui.const import MAN_STAND_UP
+from opencombat.gui.const import POSITION_MAN_STAND_UP
+from opencombat.gui.const import POSITION_MAN_CRAWLING
 from opencombat.gui.weapon import RIFFLE
 from opencombat.gui.weapon import WeaponImageApplier
 
 
 class BaseActor(Actor):
+    position_matching = {
+        ANIMATION_WALK: POSITION_MAN_STAND_UP,
+        ANIMATION_CRAWL: POSITION_MAN_CRAWLING,
+    }
+
     def __init__(
         self,
         image_path: str,
         config: Config,
         subject: Subject,
     ) -> None:
-        self._mode = MAN_STAND_UP
+        self._mode = POSITION_MAN_STAND_UP
         self.weapon_image_applier = WeaponImageApplier(config, self)
         super().__init__(image_path, subject=subject, config=config)
 
@@ -52,10 +58,12 @@ class BaseActor(Actor):
         if not self.weapons:
             return []
 
+        position = self.position_matching[animation_name]
+
         try:
             return [
                 self.weapon_image_applier.get_animation_image_for_weapon(
-                    animation_name,
+                    position,
                     self.weapons[0],
                     animation_position,
                 )

opencombat/gui/const.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 
-MAN_STAND_UP = 'MAN_STAND_UP'
-MAN_CRAWLING = 'MAN_CRAWLING'
+POSITION_MAN_STAND_UP = 'POSITION_MAN_STAND_UP'
+POSITION_MAN_CRAWLING = 'POSITION_MAN_CRAWLING'
 FLAG_DE = 'DE'
 FLAG_COLORS = {
     FLAG_DE

opencombat/gui/weapon.py

@@ -6,8 +6,8 @@ from synergine2.config import Config
 from synergine2_cocos2d.util import PathManager
 
 from opencombat.exception import UnknownWeapon
-from opencombat.gui.const import MAN_STAND_UP
-from opencombat.gui.const import MAN_CRAWLING
+from opencombat.gui.const import POSITION_MAN_STAND_UP
+from opencombat.gui.const import POSITION_MAN_CRAWLING
 
 if typing.TYPE_CHECKING:
     from opencombat.gui.actor import BaseActor
@@ -30,16 +30,14 @@ class WeaponImageApplier(ImageApplier):
         self.path_manager = PathManager(config.resolve('global.include_path.graphics'))
         self._cache = {}  # type: typing.Dict[str, Image.Image]
 
-    def get_images_scheme(self) -> typing.Dict[str, typing.Dict[str, str]]:
+    def get_images_scheme(self) -> typing.Dict[str, typing.Dict[str, typing.List[str]]]:
         return {
-            MAN_STAND_UP: {
+            POSITION_MAN_STAND_UP: {
                 RIFFLE: [
                     'actors/man_weap1.png'
                 ],
             },
-            # FIXME NOW
-            # MAN_CRAWLING: {
-            'CRAWL': {
+            POSITION_MAN_CRAWLING: {
                 RIFFLE: [
                     'actors/man_c1_weap1.png',
                     'actors/man_c2_weap1.png',
@@ -84,4 +82,8 @@ class WeaponImageApplier(ImageApplier):
             raise UnknownWeapon(
                 'Unknown weapon "{}" for mode "{}"'.format(weapon_type, mode),
             )
+        except IndexError:
+            raise UnknownWeapon(
+                'Unknown weapon "{}" for mode "{}"'.format(weapon_type, mode),
+            )