X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=blobdiff_plain;f=koperkapel%2Fweapons.py;h=f07caedb2404ae802bc94f280ea839fc9a38f621;hp=d2213f6144a4e8f9b98ebf8e0e5611807b6a8e6a;hb=4d41e3b2902e496b7129f44b5b1c6b7a96191ee3;hpb=b83ddd7e5bf2ea9c59f6fb2d78ebddc9dc845046 diff --git a/koperkapel/weapons.py b/koperkapel/weapons.py index d2213f6..f07caed 100644 --- 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)