X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fscenes%2Flevel.py;h=6a8e232284b14746b6b592b5b9c8239754b2ad93;hb=fa0ff98d6c1a2966313684d8b4372167f3f8a2b2;hp=856f4cec8e9ead960cc666a1866d48fdd38363b1;hpb=9ef65a0121f312e32cc92ac23a2ec586aa94ad05;p=koperkapel.git

diff --git a/koperkapel/scenes/level.py b/koperkapel/scenes/level.py
index 856f4ce..6a8e232 100644
--- a/koperkapel/scenes/level.py
+++ b/koperkapel/scenes/level.py
@@ -4,9 +4,10 @@ from pgzero.constants import keys
 from pygame import Surface
 import pygame.locals as pgl
 from ..loaders.levelloader import levels
-from .base import Scene, ChangeSceneEvent, MoveViewportEvent
+from .base import Scene, ChangeSceneEvent, MoveViewportEvent, AddRoachEvent, defer_to_update
 from ..constants import TILE_SIZE, WIDTH, HEIGHT
 from ..vehicles.base import Vehicle
+from ..roaches import RoachFactory, WorldRoach
 
 
 class BaseLevelScene(Scene):
@@ -51,6 +52,7 @@ class BaseLevelScene(Scene):
 
     def update(self, world, engine, dt):
         """Fix the door and keypad positions"""
+        super().update(world, engine, dt)
         for door in self._doors:
             door.pos = self.calc_offset(
                 door.game_pos[0] * TILE_SIZE, door.game_pos[1] * TILE_SIZE)
@@ -86,6 +88,7 @@ class GameLevelScene(BaseLevelScene):
             return
         super().enter(world)
         self._roaches = self.actors.add_layer("roaches", level=10)
+        self._friends = self.actors.add_layer("friendly roaches", level=9)
         self._vehicle = Vehicle.current(world)
         self._mode = 'walk'
         self._angle = 0
@@ -98,6 +101,8 @@ class GameLevelScene(BaseLevelScene):
         self._set_pos(x, y)
         self._avatar.pos = (WIDTH // 2, HEIGHT // 2)
         self._roaches.add(self._avatar)
+        for friend in self._level.friends:
+            self._friends.add(friend)
         # Fix viewport offset
         return [
             MoveViewportEvent((
@@ -106,6 +111,7 @@ class GameLevelScene(BaseLevelScene):
 
     def _set_pos(self, x, y):
         self._player_pos = (x, y)
+        #print('At ', (x, y))
 
     def _can_move(self, x, y):
         if self._mode == 'walk':
@@ -119,14 +125,28 @@ class GameLevelScene(BaseLevelScene):
         self._angle = angle
         self._avatar.angle = angle
 
+    @defer_to_update
+    def _vehicle_changed(self, world):
+        self._roaches.remove(self._avatar)
+        self._vehicle = Vehicle.current(world)
+        self._avatar = self._vehicle.get_avatar(world)
+        self._avatar.pos = (WIDTH // 2, HEIGHT // 2)
+        self._roaches.add(self._avatar)
+        self._set_angle(self._angle)
+
+    @defer_to_update
+    def _change_vehicle(self, world):
+        vehicle = Vehicle.random()
+        world.vehicles.current = vehicle
+        self._vehicle_changed()
+
     def update(self, world, engine, dt):
-        if self._vehicle.changed():
-            self._roaches.remove(self._avatar)
-            self._avatar = self._vehicle.get_avatar(world)
-            self._avatar.pos = (WIDTH // 2, HEIGHT // 2)
-            self._roaches.add(self._avatar)
-            self._avatar.set_angle(self._angle)
         super().update(world, engine, dt)
+        events = world.pop_events()
+        for friend in self._friends:
+            friend.pos = self.calc_offset(
+                friend.game_pos[0] * TILE_SIZE, friend.game_pos[1] * TILE_SIZE)
+        return events
 
     def on_key_down(self, key, mod, unicode):
         offset = None
@@ -164,13 +184,18 @@ class GameLevelScene(BaseLevelScene):
                     self._mode = 'walk'
             elif self._level.is_keypad(x, y):
                 self._level.press_keypad(x, y, self._roaches)
+            elif self._level.is_on_friend(x, y):
+                friend = self._level.remove_friend(x, y)
+                self._friends.remove(friend)
+                self._vehicle_changed()
+                return [AddRoachEvent()]
             return
         elif key == keys.X:
             # Fire
             print('Boom')
         elif key == keys.V:
             # Leave vehicle
-            print('Vehicle key pressed')
+            self._change_vehicle()
         elif key == keys.Z:
             # Vehicle management
             from .roach_management import RoachesScene