X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;ds=sidebyside;f=koperkapel%2Fscenes%2Flevel.py;h=9c96b8dfeafe44124a526f00c36f88df89598be3;hb=6dd254908eb2a256c9d49b936a22caa4f1fcb140;hp=6845ea2fcac2b7e6326029c77d9de3e2812625cf;hpb=c286465018f7a246e38c4d70b5bffb7e5f37556b;p=koperkapel.git diff --git a/koperkapel/scenes/level.py b/koperkapel/scenes/level.py index 6845ea2..9c96b8d 100644 --- a/koperkapel/scenes/level.py +++ b/koperkapel/scenes/level.py @@ -195,13 +195,14 @@ 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): @@ -227,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 @@ -241,9 +243,9 @@ class GameLevelScene(BaseLevelScene): 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) @@ -252,7 +254,8 @@ class GameLevelScene(BaseLevelScene): world.vehicles.current = "walking" if old_vehicle != "walking": - dropped_vehicle = create_new_item("vehicle", (x, y), vehicle=old_vehicle) + dropped_vehicle = create_new_item( + "vehicle", (x, y), vehicle=old_vehicle) self._level.items.append(dropped_vehicle) self._items.add(dropped_vehicle)