Minor clean-ups.

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

diff --git a/koperkapel/scenes/roach_management.py b/koperkapel/scenes/roach_management.py
index d5fc67ffe749bcb3039778b2f7142e29c96d47ec..c0e82107a93ec56ed08059e8dba3a89bbaa56b3c 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
 


@@ -29,8 +29,9 @@ def inset_button(pos, d):
 class RoachesScene(Scene):
     """ Roach management scene. """
 
 class RoachesScene(Scene):
     """ Roach management scene. """
 

-    def __init__(self):
+    def __init__(self, level_scene=None):

         super().__init__()
         super().__init__()

+        self._level_scene = level_scene

         self._vehicle = None
         self._seat_pos = 0
         self._outside_roach = None
         self._vehicle = None
         self._seat_pos = 0
         self._outside_roach = None


@@ -184,20 +185,43 @@ class RoachesScene(Scene):
         if world is None:
             self._update_calls.append(self._click_inventory_pad)
             return
         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):
 
     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):
         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:
 
     def on_mouse_down(self, pos, button):
         if button == mouse.LEFT: