X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fscenes%2Froach_management.py;h=3ed1ab0f4ac88df5b976774aebb2bcb722cb70c1;hb=0ea7bed7719ea87b9a57843f027a834a1b6e89a9;hp=cecd6ef30d2ff6e29233729b7db727009001ecdc;hpb=f4c4d8fa3ddcbd3884b939833f6542441b2e746b;p=koperkapel.git

diff --git a/koperkapel/scenes/roach_management.py b/koperkapel/scenes/roach_management.py
index cecd6ef..3ed1ab0 100644
--- a/koperkapel/scenes/roach_management.py
+++ b/koperkapel/scenes/roach_management.py
@@ -2,8 +2,10 @@
 
 from pgzero.constants import keys, mouse
 from pgzero.actor import Actor
-from ..actors.buttons import TextButton, ImageButton
+from ..actors.buttons import ImageButton
 from ..constants import WIDTH, HEIGHT
+from ..roaches import big_roaches
+from ..serums import big_serums, SERUMS
 from ..vehicles.base import Vehicle
 from .base import Scene, ChangeSceneEvent
 
@@ -14,6 +16,7 @@ TOOLBAR_MID_Y = HEIGHT * 1 // 2
 VEHICLE_MID_X = WIDTH * 3 // 8
 VEHICLE_MID_Y = HEIGHT * 1 // 2
 BUTTON_INSET = (20, 20)
+SERUM_OFFSET = (0, 20)
 
 
 def inset_button(pos, d):
@@ -27,18 +30,24 @@ class RoachesScene(Scene):
 
     def __init__(self):
         super().__init__()
-        self._roach_actors = {}
+        self._outside_roach_pos = 0
+        self._inventory_pos = 0
+        self._inventory_item = None
         self._roaches = self.actors.add_layer("roaches", level=10)
+        self._inventory = self.actors.add_layer("inventory", level=10)
         self._pads = self.actors.add_layer("pads", level=5)
         self._seats = self.actors.add_layer("seats", level=5)
         self._buttons = self.actors.add_layer("buttons", level=6)
         self._init_pads()
         self._init_buttons()
+        self._init_serums()
 
     def enter(self, world):
         self._vehicle = Vehicle.by_type(world.vehicles.current)
         self._init_bg()
         self._init_seats()
+        self._init_roaches(world.roaches)
+        self._update_inventory(world)
 
     def _init_bg(self):
         self.actors.default.add(self._vehicle.background)
@@ -51,6 +60,30 @@ class RoachesScene(Scene):
                 seat.pos[0] * vrad + VEHICLE_MID_X,
                 seat.pos[1] * vrad + VEHICLE_MID_Y)
 
+    def _init_roaches(self, roaches):
+        for i, roach in enumerate(roaches):
+            roach_actor = self._roaches.add(big_roaches.assemble(roach))
+            # TODO: less hacky seat assignment
+            if i < len(self._seats):
+                roach_actor.pos = self._seats[i].pos
+
+    def _init_serums(self):
+        self._serum_actors = {
+            serum: big_serums.assemble(serum) for serum in SERUMS}
+
+    def _update_inventory(self, world):
+        self._inventory.clear()
+        serums = world.serums
+        if not serums:
+            return
+        self._inventory_pos %= len(serums)
+        serum_actor = self._serum_actors[serums[self._inventory_pos]]
+        inv_pad_centre = self._inventory_pad.center
+        serum_actor.pos = (
+            inv_pad_centre[0] + SERUM_OFFSET[0],
+            inv_pad_centre[1] + SERUM_OFFSET[1])
+        self._inventory.add(serum_actor)
+
     def _init_pads(self):
         self._roach_pad = self._pads.add(
             Actor("roach_management/roach_pad", anchor=("left", "bottom")))
@@ -87,34 +120,22 @@ class RoachesScene(Scene):
             (TOOLBAR_LEFT_X, TOOLBAR_TOP_Y), self._eject_roach)
 
     def _roach_left(self):
-        print("Cycle outside roaches left.")
+        self._outside_roach_pos -= 1
 
     def _roach_right(self):
-        print("Cycle outside roaches right.")
+        self._outside_roach_pos += 1
 
     def _inventory_left(self):
-        print("Cycle inventory left.")
+        self._inventory_pos -= 1
 
     def _inventory_right(self):
-        print("Cycle inventory right.")
+        self._inventory_pos += 1
 
     def _eject_roach(self):
         print("Eject roach.")
 
     def update(self, world, dt):
-        for i, roach in enumerate(world.roaches):
-            if roach.name in self._roach_actors:
-                actor = self._roach_actors[roach.name]
-            else:
-                actor = TextButton("%s [%s]" % (
-                    roach.name,
-                    ", ".join("%s=%s" % kv for kv in sorted(
-                        roach.attributes.items()),
-                    )))
-                self._roach_actors[roach.name] = actor
-                self._roaches.add(actor)
-            # TODO: remove missing roaches
-            actor.pos = (300, 100 + i * 100)
+        self._update_inventory(world)
 
     def on_key_down(self, key, mod, unicode):
         if key == keys.ESCAPE: