weapon images

.gitignore

@@ -75,3 +75,6 @@ ENV/
 
 # other
 *~
+
+# OpenCombat
+/cache

config.yaml

@@ -19,6 +19,7 @@ game:
       draw_interior_gap: 2
 
 global:
+    cache_dir_path: 'cache'
     include_path:
       maps:
         - "maps"

opencombat/exception.py

@@ -0,0 +1,9 @@
+# coding: utf-8
+
+
+class OpenCombatException(Exception):
+    pass
+
+
+class UnknownWeapon(OpenCombatException):
+    pass

opencombat/gui/actor.py

@@ -1,12 +1,15 @@
 # coding: utf-8
-import pyglet
+import typing
+
+from PIL import Image
 from synergine2.config import Config
 
 from synergine2.simulation import Subject
 from synergine2_cocos2d.actor import Actor
 from opencombat.gui.animation import ANIMATION_WALK
 from opencombat.gui.animation import ANIMATION_CRAWL
-
+from opencombat.gui.weapon import WeaponImageApplier
+from opencombat.gui.weapon import RIFFLE
 
 FLAG_DE = 'DE'
 FLAG_URSS = 'URSS'
@@ -15,8 +18,43 @@ FLAG_COLORS = {
     FLAG_DE
 }
 
+MAN_STAND_UP = 'MAN_STAND_UP'
+
+
+class BaseActor(Actor):
+    def __init__(
+        self,
+        image_path: str,
+        config: Config,
+        subject: Subject,
+    ) -> None:
+        self.weapon_image_applier = WeaponImageApplier(config, self)
+        super().__init__(image_path, subject=subject, config=config)
 
-class Man(Actor):
+    @property
+    def mode(self) -> str:
+        return MAN_STAND_UP
+
+    @property
+    def weapons(self) -> typing.List[str]:
+        return []
+
+    def get_default_appliable_images(self) -> typing.List[Image.Image]:
+        if not self.weapons:
+            return []
+
+        return [
+            self.weapon_image_applier.get_default_image_for_weapon(
+                self.mode,
+                self.weapons[0],
+            )
+        ]
+
+    def firing(self) -> None:
+        pass
+
+
+class Man(BaseActor):
     animation_image_paths = {
         ANIMATION_WALK: [
             'actors/man.png',
@@ -43,6 +81,11 @@ class Man(Actor):
     ) -> None:
         super().__init__('actors/man.png', subject=subject, config=config)
 
+    @property
+    def weapons(self) -> typing.List[str]:
+        # TODO BS 2018-01-26: Will be managed by complex part of code
+        return [RIFFLE]
+
 
 class HeavyVehicle(Actor):
     animation_image_paths = {

opencombat/gui/base.py

@@ -346,13 +346,29 @@ class Game(TMXGui):
         def gunshot_sound():
             self.sound_lib.get_sound('gunshot_default').play()
 
+        def actor_firing():
+            shooter_actor.firing(event.weapon_type)
+
         # To avoid all in same time
         # TODO BS 2018-01-24: This should be unecessary when core events sending will be
         # base on time base instead cycle base. Remove it to ensure.
         delay = random.uniform(0.0, 0.6)
 
-        self.layer_manager.edit_layer.append_callback(gunshot_trace, duration=0.1, delay=delay)
-        self.layer_manager.edit_layer.append_callback(gunshot_sound, duration=0.0, delay=delay)
+        self.layer_manager.edit_layer.append_callback(
+            gunshot_trace,
+            duration=0.1,
+            delay=delay,
+        )
+        self.layer_manager.edit_layer.append_callback(
+            gunshot_sound,
+            duration=0.0,
+            delay=delay,
+        )
+        self.layer_manager.edit_layer.append_callback(
+            actor_firing,
+            duration=0.2,  # TODO BS 2018-01-25: Wil depend of weapon type
+            delay=delay,
+        )
 
     def subject_die(self, event: DieEvent) -> None:
         killed_actor = self.layer_manager.subject_layer.subjects_index[event.shoot_subject_id]

opencombat/gui/weapon.py

@@ -0,0 +1,49 @@
+# coding: utf-8
+import typing
+
+from PIL import Image
+from synergine2.config import Config
+from synergine2_cocos2d.util import PathManager
+
+from opencombat.exception import UnknownWeapon
+
+if typing.TYPE_CHECKING:
+    from opencombat.gui.actor import BaseActor
+
+RIFFLE = 'RIFFLE'
+
+
+class ImageApplier(object):
+    pass  # FIXME: refact here
+
+
+class WeaponImageApplier(ImageApplier):
+    def __init__(
+        self,
+        config: Config,
+        actor: 'BaseActor',
+    ) -> None:
+        self.actor = actor
+        self._images_scheme = self.get_images_scheme()
+        self.path_manager = PathManager(config.resolve('global.include_path.graphics'))
+
+    def get_images_scheme(self) -> typing.Dict[str, typing.Dict[str, str]]:
+        from opencombat.gui.actor import MAN_STAND_UP
+        return {
+            MAN_STAND_UP: {
+                RIFFLE: 'actors/man_weap1.png',
+            }
+        }
+
+    def get_default_image_for_weapon(self, mode: str, weapon_type: str) -> Image.Image:
+        try:
+            # FIXME Cache
+            image_file_path = self.path_manager.path(
+                self._images_scheme[mode][weapon_type],
+            )
+            return Image.open(image_file_path)
+        except KeyError:
+            raise UnknownWeapon(
+                'Unknown weapon "{}" for mode "{}"'.format(weapon_type, mode),
+            )
+

opencombat/simulation/event.py

@@ -8,6 +8,8 @@ from opencombat.const import COLLECTION_ALIVE
 if typing.TYPE_CHECKING:
     from opencombat.simulation.subject import TileSubject
 
+DEFAULT_WEAPON_TYPE = 'DEFAULT_WEAPON_TYPE'
+
 
 class NewVisibleOpponent(Event):
     def __init__(
@@ -34,9 +36,11 @@ class FireEvent(Event):
         self,
         shooter_subject_id: int,
         target_position: typing.Tuple[int, int],
+        weapon_type: str=DEFAULT_WEAPON_TYPE,
     ) -> None:
         self.shooter_subject_id = shooter_subject_id
         self.target_position = target_position
+        self.weapon_type = weapon_type
 
 
 class DieEvent(Event):