Merge branch 'master' of ctpug.org.za:koperkapel

[koperkapel.git] / koperkapel / weapons.py

diff --git a/koperkapel/weapons.py b/koperkapel/weapons.py
index d2213f6144a4e8f9b98ebf8e0e5611807b6a8e6a..f07caedb2404ae802bc94f280ea839fc9a38f621 100644 (file)
--- a/koperkapel/weapons.py
+++ b/koperkapel/weapons.py
@@ -30,6 +30,10 @@ WEAPONS = [
 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)
@@ -40,7 +44,7 @@ class WeaponFactory:
 
     def assemble_frame(self, suffix, weapon, tape):
         surf = images.load(safepath("weapons/%s%s")
-                            % (weapon.image_name, suffix))
+                           % (weapon.image_name, suffix))
         frame = surf.copy()
         if tape:
             tape_surf = images.load(safepath("weapons/tape"))
@@ -48,7 +52,7 @@ class WeaponFactory:
         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)