Pull SelectableSurfActor out of vehicles.

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

diff --git a/koperkapel/vehicles/base.py b/koperkapel/vehicles/base.py
index 9eb3eb0cfe714f74f9517d934da6f8e73ba5c7d6..ba21bbeb94857284f829ebbb8ccc1c731d84ee9e 100644 (file)
--- a/koperkapel/vehicles/base.py
+++ b/koperkapel/vehicles/base.py
@@ -5,8 +5,9 @@ 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
 
 
 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))
 
 
@@ -124,24 +129,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):