X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fscenes%2Flevel.py;h=9c96b8dfeafe44124a526f00c36f88df89598be3;hb=6dd254908eb2a256c9d49b936a22caa4f1fcb140;hp=b17beb61231f1e2d817fe411d529e8e52eb535bc;hpb=369d7e6130ef8fc63ae3688f3fe9e280243ca66d;p=koperkapel.git

diff --git a/koperkapel/scenes/level.py b/koperkapel/scenes/level.py
index b17beb6..9c96b8d 100644
--- a/koperkapel/scenes/level.py
+++ b/koperkapel/scenes/level.py
@@ -7,7 +7,7 @@ from ..loaders.levelloader import levels
 from .base import (
     Scene, ChangeSceneEvent, MoveViewportEvent, WorldEvent, defer_to_update)
 from ..constants import TILE_SIZE, WIDTH, HEIGHT
-from ..gamelib.items import clone_old_item
+from ..gamelib.items import clone_old_item, create_new_item
 from ..roaches import build_roach
 from ..vehicles.base import Vehicle
 from ..weapons import weapon_by_name
@@ -195,15 +195,23 @@ class GameLevelScene(BaseLevelScene):
             self._level.remove_enemy(enemy)
             self._enemies.remove(enemy)
 
-    def _fire_bullet(self, bullet, pos, dp):
+    def _fire_bullet(self, bullet, pos, dp, angle):
         if len(self._bullets) >= 10:
             return
         bullet.game_pos = pos
         bullet.game_dp = dp
         bullet.dt = 0
         bullet.level_layer = self._level_layer
+        bullet.angle = angle
         self._bullets.add(bullet)
 
+    def _check_for_bullet_hits(self):
+        for bullet in list(self._bullets):
+            for enemy in list(self._enemies):
+                if enemy.collidepoint(bullet.pos):
+                    self._hit_enemy(enemy, bullet.weapon)
+                    self._bullets.remove(bullet)
+
     def _update_bullet(self, bullet, dt):
         bullet.dt += dt
         if bullet.dt > 0.1:
@@ -220,7 +228,8 @@ class GameLevelScene(BaseLevelScene):
         weapon.play_sound()
         if weapon.bullet_range > 0:
             self._fire_bullet(
-                weapon.assemble_bullet(), self._player_pos, self._angle_dp)
+                weapon.assemble_bullet(), self._player_pos, self._angle_dp,
+                self._angle)
         else:
             # melee
             pos, dp = self._player_pos, self._angle_dp
@@ -231,8 +240,25 @@ class GameLevelScene(BaseLevelScene):
 
     @defer_to_update
     def _change_vehicle(self, world):
-        vehicle = Vehicle.random()
-        world.vehicles.current = vehicle
+        x, y = self._player_pos
+
+        old_vehicle = world.vehicles.current
+
+        item = self._level.item_at(x, y)
+
+        if item and item.item_type == "vehicle":
+            world.vehicles.current = item.item_data["vehicle"]
+            self._level.remove_item(item)
+            self._items.remove(item)
+        else:
+            world.vehicles.current = "walking"
+
+        if old_vehicle != "walking":
+            dropped_vehicle = create_new_item(
+                "vehicle", (x, y), vehicle=old_vehicle)
+            self._level.items.append(dropped_vehicle)
+            self._items.add(dropped_vehicle)
+
         self._vehicle_changed()
 
     def update(self, world, engine, dt):
@@ -253,6 +279,7 @@ class GameLevelScene(BaseLevelScene):
             bullet.pos = self.calc_offset(
                 bullet.game_pos[0] * TILE_SIZE + (TILE_SIZE // 2),
                 bullet.game_pos[1] * TILE_SIZE + (TILE_SIZE // 2))
+        self._check_for_bullet_hits()
         more = self._check_held_keys(dt)
         if more:
             events.extend(more)
@@ -316,9 +343,10 @@ class GameLevelScene(BaseLevelScene):
             self._add_roach()
         elif self._level.item_at(x, y):
             item = self._level.item_at(x, y)
-            self._level.remove_item(item)
-            self._items.remove(item)
-            self._gain_item(item)
+            if item.item_type != "vehicle":
+                self._level.remove_item(item)
+                self._items.remove(item)
+                self._gain_item(item)
         elif self._level.is_exit(x, y):
             next_level = self._level.get_exit_level()
             return [