From: Simon Cross <hodgestar@gmail.com>
Date: Sat, 5 Mar 2016 20:02:11 +0000 (+0200)
Subject: Merge branch 'master' of ctpug.org.za:koperkapel
X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=commitdiff_plain;h=c6c34ad340c5a1cf273b64b4983ef3e8510a728c;hp=56e7ffe48b515da894612297500ae9847862d165

Merge branch 'master' of ctpug.org.za:koperkapel
---

diff --git a/koperkapel/gamelib/level.py b/koperkapel/gamelib/level.py
index 3df9fe0..23701b9 100644
--- a/koperkapel/gamelib/level.py
+++ b/koperkapel/gamelib/level.py
@@ -87,7 +87,7 @@ class Level(object):
     def get_exit_level(self):
         return self.exit["next level"]
 
-    def is_on_enemy(self, x, y):
+    def enemy_at(self, x, y):
         for enemy in self.enemies:
             if (x, y) == enemy.game_pos:
                 return True
@@ -104,8 +104,8 @@ class Level(object):
         added = False
         while not added:
             if self.can_walk(x, y, 'floor'):
-                if not self.is_on_friend(x, y):
-                    if not self.is_on_enemy(x, y):
+                if not self.friend_at(x, y):
+                    if not self.enemy_at(x, y):
                         added = True
                         enemy.game_pos = (x, y)
                         self.enemies.append(enemy)
diff --git a/koperkapel/scenes/level.py b/koperkapel/scenes/level.py
index e5d102a..7978a73 100644
--- a/koperkapel/scenes/level.py
+++ b/koperkapel/scenes/level.py
@@ -146,7 +146,7 @@ class GameLevelScene(BaseLevelScene):
 
     def _can_move(self, x, y):
         if self._mode == 'walk':
-            if not self._level.is_on_enemy(x, y):
+            if not self._level.enemy_at(x, y):
                 return self._level.can_walk(x, y, self._level_layer)
             return False
         elif self._mode == 'fly':