X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fvehicles%2Fbase.py;h=c2a24f64ecbfb6cb5d9f27cc03ae11da0a3cf141;hb=55c4bcf03552816d8da08974179aac95b40996af;hp=1b2f3ed279ff471ff9d151d9c5a4ca93e7e3ba24;hpb=2c4c2428ac247ea8fdac2aaf6b2373fbf0275e3c;p=koperkapel.git

diff --git a/koperkapel/vehicles/base.py b/koperkapel/vehicles/base.py
index 1b2f3ed..c2a24f6 100644
--- a/koperkapel/vehicles/base.py
+++ b/koperkapel/vehicles/base.py
@@ -1,6 +1,10 @@
 """ Base class for vehicles.  """
 
+from itertools import chain, islice, repeat
+from pygame.constants import BLEND_RGBA_MULT
 from pgzero.actor import Actor
+from pgzero.loaders import images
+from ..actors.orientatedsurf import OrientatedSurfActor
 
 
 class Vehicle:
@@ -8,6 +12,7 @@ class Vehicle:
 
     vehicle_type = None
     approximate_radius = 200
+    selected_seat_overlay_color = (255, 0, 0, 255)
 
     def __init__(self):
         self.seats = self.init_seats()
@@ -18,18 +23,35 @@ class Vehicle:
     def init_seats(self):
         raise NotImplementedError("Vehicles should specify a list of seats")
 
-    def assign_seats(self, seating):
-        for roach_name, seat in zip(seating, self.seats):
-            seat.roach = roach_name
+    def seating(self, world):
+        roach_seating = world.vehicles[self.vehicle_type].seating
+        roach_seating_numbers = enumerate(zip(roach_seating, self.seats))
+        return {
+            roach: seat_pos
+            for seat_pos, (roach, _) in roach_seating_numbers if roach
+        }
+
+    def seat_roach(self, world, roach, seat_pos):
+        vehicle = world.vehicles[self.vehicle_type]
+        seats = len(self.seats)
+        seating = list(vehicle.seating)
+        seating = list(islice(
+            chain(seating, repeat(None, seats)), 0, seats))
+        seating[seat_pos] = roach
+        # line below records new seating on the world proxy
+        vehicle.seating = seating
+
+    def roach_at(self, world, seat_pos):
+        roach_seating = world.vehicles[self.vehicle_type].seating
+        if seat_pos >= len(roach_seating):
+            return None
+        return roach_seating[seat_pos]
 
     _vehicle_types = {}
 
     @classmethod
     def current(cls, world):
-        vehicle = cls.by_type(world.vehicles.current)
-        vehicle.assign_seats(
-            world.vehicles[vehicle.vehicle_type].seating)
-        return vehicle
+        return cls.by_type(world.vehicles.current)
 
     @classmethod
     def by_type(cls, vehicle_type):
@@ -65,7 +87,29 @@ class Seat:
         self.vehicle_pos = (pos[0] * vrad, pos[1] * vrad)
 
     def actor(self):
-        return Actor("vehicles/%s/seat" % (self.vehicle.vehicle_type,))
+        seat = images.load(
+            "vehicles/%s/seat" % (self.vehicle.vehicle_type,))
+        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
 
 
 Vehicle.register_all()