Remove some fiddling with pygzero internals.

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

diff --git a/koperkapel/scenes/roach_management.py b/koperkapel/scenes/roach_management.py
index 9a356ac918c9f8932b49e135b85abd0262fac4ea..77100ab7435290d03f7c77d10e45aac171339427 100644 (file)
--- a/koperkapel/scenes/roach_management.py
+++ b/koperkapel/scenes/roach_management.py
@@ -2,7 +2,9 @@
 
 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, roach_by_name
 from ..serums import big_serums, roach_is_serumless, SERUMS
@@ -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,15 @@ 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))
+        self.actors.default.add(SurfActor(base))
 
     def _init_seats(self):
         self._seat_layer.clear()
@@ -216,9 +227,11 @@ class RoachesScene(Scene):
         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: