X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fvehicles%2Fbase.py;h=27e1b24d4f0633575ac9519260de5c05d8c1a002;hb=0cc8d28563e4caeec279a0207ac160bb9fffb217;hp=9eb3eb0cfe714f74f9517d934da6f8e73ba5c7d6;hpb=111540d13839e7d7e684feba986837ac9d7f6322;p=koperkapel.git

diff --git a/koperkapel/vehicles/base.py b/koperkapel/vehicles/base.py
index 9eb3eb0..27e1b24 100644
--- a/koperkapel/vehicles/base.py
+++ b/koperkapel/vehicles/base.py
@@ -7,6 +7,7 @@ from pygame.constants import BLEND_RGBA_MULT
 from pgzero.loaders import images
 from ..actors.orientatedsurf import OrientatedSurfActor
 from ..actors.animsurf import AnimatedSurfActor
+from ..weapons import default_weapons
 
 
 class Vehicle:
@@ -15,6 +16,7 @@ class Vehicle:
     vehicle_type = None
     overlay_frame_no = None
     approximate_radius = 200
+    weapons_taped_on = True
     selected_seat_overlay_color = (255, 0, 0, 255)
 
     def __init__(self):
@@ -89,14 +91,17 @@ class Vehicle:
         cls.register(Robot)
         cls.register(Roomba)
 
-    def _avatar_frame(self, i, suffix="_tiles"):
+    def _avatar_frame(self, i, weapon, suffix="_tiles"):
         vehicle = images.load("vehicle%s/%s_%d" % (
             suffix, self.vehicle_type, i + 1))
         frame = vehicle.copy()
+        frame.blit(weapon.surf, (0, 0))
         return frame
 
     def get_avatar(self, world):
-        frames = [self._avatar_frame(i) for i in range(4)]
+        weapon = default_weapons.assemble(
+            world.weapons.current, tape=self.weapons_taped_on)
+        frames = [self._avatar_frame(i, weapon) for i in range(4)]
         return AnimatedSurfActor(frames, anchor=(0, 0))