X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=blobdiff_plain;f=koperkapel%2Fweapons.py;h=3ef987919c9820b4bef15792b759376fc6f20914;hp=3962ecc96917cd14a3e7908af3dbe03485d40ea1;hb=e8bb29ef4dd7789bf9c20aebfb87f3911bb0d7b9;hpb=41fd09717b0a2a9f3523818f50fa7c3206f005a8 diff --git a/koperkapel/weapons.py b/koperkapel/weapons.py index 3962ecc..3ef9879 100644 --- a/koperkapel/weapons.py +++ b/koperkapel/weapons.py @@ -28,6 +28,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) @@ -38,7 +42,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")) @@ -46,7 +50,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)