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

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

diff --git a/koperkapel/vehicles/base.py b/koperkapel/vehicles/base.py
index 3d7765c11f53094273bfc310b1f6816d118e956a..fdc9b7f48e90bb12e6515ce0e4ad3ab4ff03d42f 100644 (file)
--- a/koperkapel/vehicles/base.py
+++ b/koperkapel/vehicles/base.py
@@ -5,7 +5,7 @@ import random
 from itertools import chain, islice, repeat
 from pygame.constants import BLEND_RGBA_MULT
 from pgzero.loaders import images
-from ..actors.orientatedsurf import OrientatedSurfActor
+from ..actors.orientatedsurf import SelectableSurfActor
 from ..actors.animsurf import AnimatedSurfActor
 from ..weapons import default_weapons
 from ..util import safepath
@@ -19,6 +19,7 @@ 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()
@@ -96,13 +97,17 @@ class Vehicle:
         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))
 
 
@@ -130,24 +135,7 @@ class Seat:
         selected_seat = seat.copy()
         selected_seat.fill(
             self.vehicle.selected_seat_overlay_color, None, BLEND_RGBA_MULT)
-        return SeatActor(seat, selected_seat)
-
-
-class SeatActor(OrientatedSurfActor):
-    def __init__(self, seat, selected_seat):
-        self._selected = False
-        self._seat = seat
-        self._selected_seat = selected_seat
-        super().__init__(surf=self._seat, angle=0)
-
-    @property
-    def selected(self):
-        return self._selected
-
-    @selected.setter
-    def selected(self, value):
-        self._selected = value
-        self.surf = self._selected_seat if value else self._seat
+        return SelectableSurfActor(seat, selected_seat)
 
 
 def circle_of_seats(n_seats, **kw):