X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fscenes%2Froach_management.py;h=4cc0395ae1e668abbcb4978f425f6d6d47f9d870;hb=5d47fb682df83ec2fb5e4e9851a4508e39498695;hp=d5fc67ffe749bcb3039778b2f7142e29c96d47ec;hpb=803254edba328148045841cd2cbdc0e4bd19655b;p=koperkapel.git

diff --git a/koperkapel/scenes/roach_management.py b/koperkapel/scenes/roach_management.py
index d5fc67f..4cc0395 100644
--- a/koperkapel/scenes/roach_management.py
+++ b/koperkapel/scenes/roach_management.py
@@ -2,10 +2,12 @@
 
 from pgzero.constants import keys, mouse
 from pgzero.actor import Actor
+from pgzero.screen import Screen
 from ..actors.buttons import ImageButton
+from ..actors.surf import SurfActor
 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
 
@@ -29,8 +31,9 @@ def inset_button(pos, d):
 class RoachesScene(Scene):
     """ Roach management scene. """
 
-    def __init__(self):
+    def __init__(self, level_scene=None):
         super().__init__()
+        self._level_scene = level_scene
         self._vehicle = None
         self._seat_pos = 0
         self._outside_roach = None
@@ -56,7 +59,18 @@ class RoachesScene(Scene):
 
     def _init_bg(self):
         self.actors.default.clear()
-        self.actors.default.add(self._vehicle.roach_management_overlay())
+        overlay = self._vehicle.roach_management_overlay()
+        base = overlay.copy()
+        if self._level_scene is not None:
+            base.fill((0, 0, 0))
+            self._level_scene.draw(Screen(base))
+        else:
+            base.fill((10, 10, 10))
+        base.blit(overlay, (0, 0))
+        frame = self._vehicle.roach_management_frame()
+        if frame is not None:
+            base.blit(frame, (0, 0))
+        self.actors.default.add(SurfActor(base))
 
     def _init_seats(self):
         self._seat_layer.clear()
@@ -184,20 +198,43 @@ class RoachesScene(Scene):
         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):
-        while self._update_calls:
-            f = self._update_calls.pop()
-            f(world)
+        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_roaches(world)
         return events
 
     def on_key_down(self, key, mod, unicode):
-        if key == keys.ESCAPE:
-            from .menu import MenuScene
-            return [ChangeSceneEvent(MenuScene())]
+        if key in (keys.ESCAPE, keys.Z):
+            if self._level_scene is None:
+                from .menu import MenuScene
+                return [ChangeSceneEvent(MenuScene())]
+            return [ChangeSceneEvent(self._level_scene)]
 
     def on_mouse_down(self, pos, button):
         if button == mouse.LEFT: