armour

[koperkapel.git] / koperkapel / vehicles / base.py

diff --git a/koperkapel/vehicles/base.py b/koperkapel/vehicles/base.py
index ba21bbeb94857284f829ebbb8ccc1c731d84ee9e..fdc9b7f48e90bb12e6515ce0e4ad3ab4ff03d42f 100644 (file)
--- a/koperkapel/vehicles/base.py
+++ b/koperkapel/vehicles/base.py
@@ -8,6 +8,7 @@ from pgzero.loaders import images
 from ..actors.orientatedsurf import SelectableSurfActor
 from ..actors.animsurf import AnimatedSurfActor
 from ..weapons import default_weapons
+from ..util import safepath
 
 
 class Vehicle:
@@ -18,18 +19,19 @@ class Vehicle:
     approximate_radius = 200
     weapons_taped_on = True
     selected_seat_overlay_color = (255, 0, 0, 255)
+    armour = 0
 
     def __init__(self):
         self.seats = self.init_seats()
         self.game_pos = (0, 0)
 
     def roach_management_overlay(self):
-        return images.load("vehicles/walking/background")
+        return images.load(safepath("vehicles/walking/background"))
 
     def roach_management_frame(self):
         if self.overlay_frame_no is None:
             return None
-        return images.load("vehicle_big/%s_%d" % (
+        return images.load(safepath("vehicle_big/%s_%d") % (
             self.vehicle_type, self.overlay_frame_no))
 
     def init_seats(self):
@@ -92,16 +94,20 @@ class Vehicle:
         cls.register(Roomba)
 
     def _avatar_frame(self, i, weapon, suffix="_tiles"):
-        vehicle = images.load("vehicle%s/%s_%d" % (
+        vehicle = images.load(safepath("vehicle%s/%s_%d") % (
             suffix, self.vehicle_type, i + 1))
         frame = vehicle.copy()
-        frame.blit(weapon.surf, (0, 0))
+        if weapon:
+            frame.blit(weapon.surf, (0, 0))
         return frame
 
-    def get_avatar(self, world):
-        weapon = default_weapons.assemble(
+    def get_avatar(self, world=None, dead=False):
+        if not dead:
+            weapon = default_weapons.assemble(
             world.weapons.current, tape=self.weapons_taped_on)
-        frames = [self._avatar_frame(i, weapon) for i in range(4)]
+            frames = [self._avatar_frame(i, weapon) for i in range(4)]
+        else:
+            frames = [self._avatar_frame(0, weapon=None)]
         return AnimatedSurfActor(frames, anchor=(0, 0))
 
 
@@ -125,7 +131,7 @@ class Seat:
         self.vehicle_pos = (pos[0] * vrad, pos[1] * vrad)
 
     def actor(self):
-        seat = images.load("vehicles/walking/seat")
+        seat = images.load(safepath("vehicles/walking/seat"))
         selected_seat = seat.copy()
         selected_seat.fill(
             self.vehicle.selected_seat_overlay_color, None, BLEND_RGBA_MULT)