X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fweapons.py;h=ee83eb816c6eb5c9295db74c05fb78199d506e56;hb=11394cc68ca2f312c93706c52bb02a0e0999b01f;hp=d09c570b9a33d04e6b7ee3f44d00d3a8f6553730;hpb=96dd67b1005fa0123f96409cecb62ae1a2342152;p=koperkapel.git

diff --git a/koperkapel/weapons.py b/koperkapel/weapons.py
index d09c570..ee83eb8 100644
--- a/koperkapel/weapons.py
+++ b/koperkapel/weapons.py
@@ -1,31 +1,43 @@
 """ Tools for dealing with weapons. """
 
-from pgzero.loaders import images
+from pgzero.loaders import images, sounds
 from .actors.animsurf import AnimatedSurfActor
+from .util import safepath
 
 
 class Weapon:
     def __init__(self, name, damage, image_name=None, bullet_range=0,
-                 can_tape=True, frames=("_1", "_2")):
+                 can_tape=True, frames=("_1",), sound=None):
         self.name = name
         self.image_name = image_name or name
         self.frames = frames
         self.damage = damage
         self.bullet_range = bullet_range
         self.can_tape = can_tape
+        self.sound = None
+        if sound:
+            self.sound = sounds.load(sound)
+
+    def play_sound(self):
+        if self.sound:
+            self.sound.play()
 
 
 WEAPONS = [
     Weapon("spit", damage=1, bullet_range=2, can_tape=False,
-           image_name="blank", frames=("",)),
+           image_name="blank", frames=("",), sound="fire_spit"),
     Weapon("butter_knife", damage=2),
     Weapon("crowbar", damage=4),
-    Weapon("gun", damage=4, bullet_range=4),
+    Weapon("gun", damage=4, bullet_range=4, sound='gun_fire'),
 ]
 
 WEAPON_LOOKUP = {w.name: w for w in WEAPONS}
 
 
+def weapon_by_name(weapon_name):
+    return WEAPON_LOOKUP[weapon_name]
+
+
 class WeaponActor(AnimatedSurfActor):
     def __init__(self, weapon, **kw):
         super().__init__(**kw)
@@ -35,15 +47,16 @@ class WeaponActor(AnimatedSurfActor):
 class WeaponFactory:
 
     def assemble_frame(self, suffix, weapon, tape):
-        surf = images.load("weapons/%s%s" % (weapon.image_name, suffix))
+        surf = images.load(safepath("weapons/%s%s")
+                           % (weapon.image_name, suffix))
         frame = surf.copy()
         if tape:
-            tape_surf = images.load("weapons/tape")
+            tape_surf = images.load(safepath("weapons/tape"))
             frame.blit(tape_surf, (0, 0))
         return frame
 
     def assemble(self, weapon_name, tape=False):
-        weapon = WEAPON_LOOKUP[weapon_name]
+        weapon = weapon_by_name(weapon_name)
         tape = tape and weapon.can_tape
         frames = [
             self.assemble_frame(suffix, weapon, tape)