X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fscenes%2Froach_management.py;h=7dc9c5eaff4952fb37e2e33f9cb57b415189ad6c;hb=73f160f2e18b0fde0bab8490f0e86fe78663b7aa;hp=3ed1ab0f4ac88df5b976774aebb2bcb722cb70c1;hpb=0f2d2e9c4d31d58d0c0cfe1eb7327ce430a61dbd;p=koperkapel.git diff --git a/koperkapel/scenes/roach_management.py b/koperkapel/scenes/roach_management.py index 3ed1ab0..7dc9c5e 100644 --- a/koperkapel/scenes/roach_management.py +++ b/koperkapel/scenes/roach_management.py @@ -17,6 +17,7 @@ VEHICLE_MID_X = WIDTH * 3 // 8 VEHICLE_MID_Y = HEIGHT * 1 // 2 BUTTON_INSET = (20, 20) SERUM_OFFSET = (0, 20) +ROACH_PAD_OFFSET = (0, 20) def inset_button(pos, d): @@ -30,49 +31,52 @@ class RoachesScene(Scene): def __init__(self): super().__init__() + self._vehicle = None + self._seat_pos = 0 + self._outside_roach = None 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._roach_layer = self.actors.add_layer("roaches", level=10) + self._inventory_layer = self.actors.add_layer("inventory", level=10) + self._pad_layer = self.actors.add_layer("pads", level=5) + self._seat_layer = self.actors.add_layer("seats", level=5) + self._button_layer = 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._vehicle = Vehicle.current(world) self._init_bg() self._init_seats() - self._init_roaches(world.roaches) + self._init_roaches(world) self._update_inventory(world) def _init_bg(self): - self.actors.default.add(self._vehicle.background) + self.actors.default.clear() + self.actors.default.add(self._vehicle.roach_management_overlay()) def _init_seats(self): - vrad = self._vehicle.approximate_radius + self._seat_layer.clear() for seat in self._vehicle.seats: - seat_actor = self._seats.add(seat.actor) + seat_actor = self._seat_layer.add(seat.actor()) seat_actor.pos = ( - seat.pos[0] * vrad + VEHICLE_MID_X, - seat.pos[1] * vrad + VEHICLE_MID_Y) + 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): - 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_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 = { serum: big_serums.assemble(serum) for serum in SERUMS} def _update_inventory(self, world): - self._inventory.clear() + self._inventory_layer.clear() serums = world.serums if not serums: return @@ -82,23 +86,46 @@ class RoachesScene(Scene): serum_actor.pos = ( inv_pad_centre[0] + SERUM_OFFSET[0], inv_pad_centre[1] + SERUM_OFFSET[1]) - self._inventory.add(serum_actor) + self._inventory_layer.add(serum_actor) + + def _update_roaches(self, world): + self._roach_layer.clear() + seating = self._vehicle.seating(world) + 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: + outside_roaches.append(roach.name) + self._outside_roach_pos %= len(outside_roaches) + if outside_roaches: + roach_actor = self._roach_actors[ + 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) def _init_pads(self): - self._roach_pad = self._pads.add( + self._roach_pad = self._pad_layer.add( Actor("roach_management/roach_pad", anchor=("left", "bottom"))) self._roach_pad.pos = (TOOLBAR_LEFT_X, TOOLBAR_MID_Y) - self._inventory_pad = self._pads.add( + self._inventory_pad = self._pad_layer.add( Actor("roach_management/inventory_pad", anchor=("left", "top"))) self._inventory_pad.pos = (TOOLBAR_LEFT_X, TOOLBAR_MID_Y) def _add_button(self, name, anchor, inset, pos, action): - button = self._buttons.add( + button = self._button_layer.add( ImageButton(name, anchor=anchor, action=action)) button.pos = inset_button(pos, inset) return button def _init_buttons(self): + self._button_layer.clear() self._add_button( "roach_management/left_button", ("left", "bottom"), (1, -1), self._roach_pad.bottomleft, self._roach_left) @@ -131,11 +158,17 @@ class RoachesScene(Scene): def _inventory_right(self): self._inventory_pos += 1 + 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): print("Eject roach.") def update(self, world, dt): self._update_inventory(world) + self._update_roaches(world) def on_key_down(self, key, mod, unicode): if key == keys.ESCAPE: @@ -146,5 +179,7 @@ class RoachesScene(Scene): 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)