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

diff --git a/koperkapel/weapons.py b/koperkapel/weapons.py
index ee83eb8..80d1e93 100644
--- a/koperkapel/weapons.py
+++ b/koperkapel/weapons.py
@@ -1,19 +1,22 @@
 """ Tools for dealing with weapons. """
 
+from pygame.surface import Surface
+from pygame.draw import circle
 from pgzero.loaders import images, sounds
-from .actors.animsurf import AnimatedSurfActor
+from .actors.anim import AnimatedSurfActor
 from .util import safepath
 
 
 class Weapon:
     def __init__(self, name, damage, image_name=None, bullet_range=0,
-                 can_tape=True, frames=("_1",), sound=None):
+                 can_tape=True, frames=("_1",), projectile=None, 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.projectile = projectile
         self.sound = None
         if sound:
             self.sound = sounds.load(sound)
@@ -22,13 +25,18 @@ class Weapon:
         if self.sound:
             self.sound.play()
 
+    def assemble_bullet(self):
+        return BulletActor(self)
+
 
 WEAPONS = [
     Weapon("spit", damage=1, bullet_range=2, can_tape=False,
-           image_name="blank", frames=("",), sound="fire_spit"),
+           image_name="blank", frames=("",), sound="fire_spit",
+           projectile="spit"),
     Weapon("butter_knife", damage=2),
     Weapon("crowbar", damage=4),
-    Weapon("gun", damage=4, bullet_range=4, sound='gun_fire'),
+    Weapon("gun", damage=4, bullet_range=4, sound='gun_fire',
+           projectile="bullet"),
 ]
 
 WEAPON_LOOKUP = {w.name: w for w in WEAPONS}
@@ -44,6 +52,29 @@ class WeaponActor(AnimatedSurfActor):
         self.weapon = weapon
 
 
+class BulletActor(AnimatedSurfActor):
+    def __init__(self, weapon, **kw):
+        frames = self._shiny_frames(weapon)
+        if frames is None:
+            frames = self._ugly_circle_frames(weapon)
+        super().__init__(frames=frames, **kw)
+        self.weapon = weapon
+
+    def _shiny_frames(self, weapon):
+        if weapon.projectile is None:
+            return None
+        surf = images.load(safepath("projectiles/%s" % (weapon.projectile,)))
+        return [surf]
+
+    def _ugly_circle_frames(self, weapon):
+        radius = min(weapon.damage * 5, 32)
+        surf = Surface((radius * 2, radius * 2))
+        surf.convert_alpha()
+        surf.fill((255, 255, 255, 0))
+        circle(surf, (255, 0, 255, 32), (radius, radius), radius)
+        return [surf]
+
+
 class WeaponFactory:
 
     def assemble_frame(self, suffix, weapon, tape):