smartness now required for keypads

[koperkapel.git] / koperkapel / gamelib / level.py

diff --git a/koperkapel/gamelib/level.py b/koperkapel/gamelib/level.py
index aed4cccb880b88b48cd33ba33e6afe0abcba9663..7641fbcd3de7b29ded0b1ad631c43eab74b16470 100644 (file)
--- a/koperkapel/gamelib/level.py
+++ b/koperkapel/gamelib/level.py
@@ -46,6 +46,14 @@ class Level(object):
     def can_crawl(self, x, y, layer):
         return 'crawl' in self.tiles[y][x][layer]['behaviour']
 
+    def can_bullet(self, x, y, layer):
+        if self.tiles[y][x][layer]['behaviour']:
+            for door in self.doors:
+                if (x, y) == door.game_pos and door.is_closed():
+                    return False
+            return True
+        return False
+
     def is_keypad(self, x, y):
         for keypad in self.keypads:
             if (x, y) == keypad.game_pos:
@@ -57,10 +65,10 @@ class Level(object):
             return True
         return False
 
-    def press_keypad(self, x, y, roaches):
+    def press_keypad(self, x, y, smart):
         for keypad in self.keypads:
             if (x, y) == keypad.game_pos:
-                keypad.activate(roaches)
+                keypad.activate(smart)
 
     def get_friends(self):
         return self._friends[:]
@@ -101,6 +109,8 @@ class Level(object):
 
     def remove_enemy(self, enemy):
         self.enemies.remove(enemy)
+        for generator in self.enemy_generators:
+            generator.killed(enemy)
 
     def add_enemy(self, enemy, x, y):
         """Add an enemy to an empty floor space near x, y"""