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

[koperkapel.git] / koperkapel / scenes / roach_management.py

diff --git a/koperkapel/scenes/roach_management.py b/koperkapel/scenes/roach_management.py
index cb939f80d999dc442014f6ba983713c123fea2d8..9a356ac918c9f8932b49e135b85abd0262fac4ea 100644 (file)
--- a/koperkapel/scenes/roach_management.py
+++ b/koperkapel/scenes/roach_management.py
@@ -4,8 +4,8 @@ from pgzero.constants import keys, mouse
 from pgzero.actor import Actor
 from ..actors.buttons import ImageButton
 from ..constants import WIDTH, HEIGHT
 from pgzero.actor import Actor
 from ..actors.buttons import ImageButton
 from ..constants import WIDTH, HEIGHT

-from ..roaches import big_roaches
-from ..serums import big_serums, SERUMS
+from ..roaches import big_roaches, roach_by_name
+from ..serums import big_serums, roach_is_serumless, SERUMS

 from ..vehicles.base import Vehicle
 from .base import Scene, ChangeSceneEvent
 
 from ..vehicles.base import Vehicle
 from .base import Scene, ChangeSceneEvent
 


@@ -17,6 +17,7 @@ VEHICLE_MID_X = WIDTH * 3 // 8
 VEHICLE_MID_Y = HEIGHT * 1 // 2
 BUTTON_INSET = (20, 20)
 SERUM_OFFSET = (0, 20)
 VEHICLE_MID_Y = HEIGHT * 1 // 2
 BUTTON_INSET = (20, 20)
 SERUM_OFFSET = (0, 20)

+ROACH_PAD_OFFSET = (0, 20)

 
 
 def inset_button(pos, d):
 
 
 def inset_button(pos, d):


@@ -31,7 +32,8 @@ class RoachesScene(Scene):
     def __init__(self):
         super().__init__()
         self._vehicle = None
     def __init__(self):
         super().__init__()
         self._vehicle = None

-        self._seat_pos = None
+        self._seat_pos = 0
+        self._outside_roach = None

         self._outside_roach_pos = 0
         self._inventory_pos = 0
         self._inventory_item = None
         self._outside_roach_pos = 0
         self._inventory_pos = 0
         self._inventory_item = None


@@ -45,10 +47,11 @@ class RoachesScene(Scene):
         self._init_serums()
 
     def enter(self, world):
         self._init_serums()
 
     def enter(self, world):

-        self._vehicle = Vehicle.by_type(world.vehicles.current)
+        self._vehicle = Vehicle.current(world)
+        self._update_calls = []

         self._init_bg()
         self._init_seats()
         self._init_bg()
         self._init_seats()

-        self._init_roaches(world.roaches)
+        self._init_roaches(world)

         self._update_inventory(world)
 
     def _init_bg(self):
         self._update_inventory(world)
 
     def _init_bg(self):


@@ -62,14 +65,12 @@ class RoachesScene(Scene):
             seat_actor.pos = (
                 seat.vehicle_pos[0] + VEHICLE_MID_X,
                 seat.vehicle_pos[1] + VEHICLE_MID_Y)
             seat_actor.pos = (
                 seat.vehicle_pos[0] + VEHICLE_MID_X,
                 seat.vehicle_pos[1] + VEHICLE_MID_Y)

+        self._seat_layer[self._seat_pos].selected = True

 
 

-    def _init_roaches(self, roaches):
-        self._roach_layer.clear()
-        for i, roach in enumerate(roaches):
-            roach_actor = self._roach_layer.add(big_roaches.assemble(roach))
-            # TODO: less hacky seat assignment
-            if i < len(self._seat_layer):
-                roach_actor.pos = self._seat_layer[i].pos
+    def _init_roaches(self, world):
+        self._roach_actors = {}
+        for roach in world.roaches:
+            self._roach_actors[roach.name] = big_roaches.assemble(roach)

 
     def _init_serums(self):
         self._serum_actors = {
 
     def _init_serums(self):
         self._serum_actors = {


@@ -88,6 +89,30 @@ class RoachesScene(Scene):
             inv_pad_centre[1] + SERUM_OFFSET[1])
         self._inventory_layer.add(serum_actor)
 
             inv_pad_centre[1] + SERUM_OFFSET[1])
         self._inventory_layer.add(serum_actor)
 

+    def _update_roaches(self, world):
+        self._roach_layer.clear()
+        seating = self._vehicle.seating(world)
+        self._outside_roaches = []
+        for roach in world.roaches:
+            seat_pos = seating.get(roach.name)
+            if seat_pos is not None:
+                roach_actor = self._roach_actors[roach.name]
+                roach_actor.pos = self._seat_layer[seat_pos].pos
+                self._roach_layer.add(roach_actor)
+            else:
+                self._outside_roaches.append(roach.name)
+        if self._outside_roaches:
+            self._outside_roach_pos %= len(self._outside_roaches)
+            roach_actor = self._roach_actors[
+                self._outside_roaches[self._outside_roach_pos]]
+            roach_pad_center = self._roach_pad.center
+            roach_actor.pos = (
+                roach_pad_center[0] + ROACH_PAD_OFFSET[0],
+                roach_pad_center[1] + ROACH_PAD_OFFSET[1])
+            self._roach_layer.add(roach_actor)
+        else:
+            self._outside_roach_pos = 0
+

     def _init_pads(self):
         self._roach_pad = self._pad_layer.add(
             Actor("roach_management/roach_pad", anchor=("left", "bottom")))
     def _init_pads(self):
         self._roach_pad = self._pad_layer.add(
             Actor("roach_management/roach_pad", anchor=("left", "bottom")))


@@ -136,11 +161,59 @@ class RoachesScene(Scene):
     def _inventory_right(self):
         self._inventory_pos += 1
 
     def _inventory_right(self):
         self._inventory_pos += 1
 

-    def _eject_roach(self):
-        print("Eject roach.")
+    def _select_seat(self, seat_pos):
+        self._seat_layer[self._seat_pos].selected = False
+        self._seat_pos = seat_pos
+        self._seat_layer[self._seat_pos].selected = True
+
+    def _eject_roach(self, world=None):
+        if world is None:
+            self._update_calls.append(self._eject_roach)
+            return
+        self._vehicle.seat_roach(world, None, self._seat_pos)
+
+    def _click_roach_pad(self, world=None):
+        if world is None:
+            self._update_calls.append(self._click_roach_pad)
+            return
+        if self._outside_roaches:
+            roach = self._outside_roaches[self._outside_roach_pos]
+            self._vehicle.seat_roach(world, roach, self._seat_pos)

 
 

-    def update(self, world, dt):
+    def _click_inventory_pad(self, world=None):
+        if world is None:
+            self._update_calls.append(self._click_inventory_pad)
+            return
+        roach_name = self._vehicle.roach_at(world, self._seat_pos)
+        if roach_name is None:
+            return
+        roach = roach_by_name(world, roach_name)
+        if roach is None:
+            return
+        serums = list(world.serums)
+        if self._inventory_pos >= len(serums):
+            return
+        serum = serums.pop(self._inventory_pos)
+        if roach_is_serumless(roach):
+            roach[serum] = True
+            world.serums = serums
+            self._update_calls.append((self._update_roach_actor, roach_name))
+
+    def _update_roach_actor(self, world, roach_name):
+        roach = roach_by_name(world, roach_name)
+        self._roach_actors[roach_name] = big_roaches.assemble(roach)
+
+    def update(self, world, engine, dt):
+        update_calls, self._update_calls = self._update_calls, []
+        while update_calls:
+            f, args = update_calls.pop(), ()
+            if type(f) is tuple:
+                f, args = f[0], f[1:]
+            f(world, *args)
+        events = world.pop_events()

         self._update_inventory(world)
         self._update_inventory(world)

+        self._update_roaches(world)
+        return events

 
     def on_key_down(self, key, mod, unicode):
         if key == keys.ESCAPE:
 
     def on_key_down(self, key, mod, unicode):
         if key == keys.ESCAPE:


@@ -151,5 +224,11 @@ class RoachesScene(Scene):
         if button == mouse.LEFT:
             for actor in self.actors.buttons:
                 if actor.collidepoint(pos):
         if button == mouse.LEFT:
             for actor in self.actors.buttons:
                 if actor.collidepoint(pos):

-                    actor.action()
-                    break
+                    return actor.action()
+            for i, actor in enumerate(self.actors.seats):
+                if actor.collidepoint(pos):
+                    return self._select_seat(i)
+            if self._roach_pad.collidepoint(pos):
+                return self._click_roach_pad()
+            if self._inventory_pad.collidepoint(pos):
+                return self._click_inventory_pad()