projects
/
koperkapel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ctpug.org.za:koperkapel
[koperkapel.git]
/
koperkapel
/
scenes
/
level.py
diff --git
a/koperkapel/scenes/level.py
b/koperkapel/scenes/level.py
index c5a847b37de719da32810dd786ad36a7e78aa998..6845ea2fcac2b7e6326029c77d9de3e2812625cf 100644
(file)
--- a/
koperkapel/scenes/level.py
+++ b/
koperkapel/scenes/level.py
@@
-204,6
+204,13
@@
class GameLevelScene(BaseLevelScene):
bullet.level_layer = self._level_layer
self._bullets.add(bullet)
bullet.level_layer = self._level_layer
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:
def _update_bullet(self, bullet, dt):
bullet.dt += dt
if bullet.dt > 0.1:
@@
-269,6
+276,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))
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)
more = self._check_held_keys(dt)
if more:
events.extend(more)