X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=blobdiff_plain;f=koperkapel%2Fgamelib%2Fenemy_roach.py;h=2a8438241f3bdc8ac3fa0380a57b28bc1b6e6834;hp=91b404b12bbdea431c1161298edda1a6f9e88d16;hb=1545515688e1bbc1ca4b7981bff6cc59636b0a98;hpb=a3e63589d1fb98f84c7ffec01afcf17f50be974c

diff --git a/koperkapel/gamelib/enemy_roach.py b/koperkapel/gamelib/enemy_roach.py
index 91b404b..2a84382 100644
--- a/koperkapel/gamelib/enemy_roach.py
+++ b/koperkapel/gamelib/enemy_roach.py
@@ -2,7 +2,7 @@
 
 import random
 
-from pgzero.clock import each_tick
+from pgzero.clock import each_tick, unschedule
 from functools import partial
 
 from ..roaches import t32_roaches, WorldRoach
@@ -10,12 +10,14 @@ from ..roaches import t32_roaches, WorldRoach
 
 def get_enemy_roach(level):
     roach = t32_roaches.assemble(WorldRoach(), color=(255, 0, 0, 255))
-    roach.anchor = (0, 0)
+    roach.anchor = (-16, -16)  # this should center them on the tile
     roach.game_pos = (0, 0)
     roach.health = 5
+    roach.angle = 0
     roach.level = level
     roach.move = partial(move, roach)
     roach.last_moved = 0
+    roach.start_pos = None
     each_tick(roach.move)
     return roach
 
@@ -23,6 +25,33 @@ def get_enemy_roach(level):
 def move(roach, dt):
     """Enemy roach move method"""
     roach.last_moved += dt
+    if not roach in roach.level.enemies:
+        unschedule(roach.move)
+        return
     if roach.last_moved > 0.5:
-        print('Moving')
+        if not roach.start_pos:
+            roach.start_pos = roach.game_pos
         roach.last_moved = 0
+        attempt = 0
+        while attempt < 4:
+            attempt += 1
+            dx = random.randint(-1, 1)
+            dy = random.randint(-1, 1)
+            if abs(roach.game_pos[0] + dx - roach.start_pos[0]) > 2:
+                continue
+            if abs(roach.game_pos[1] + dy - roach.start_pos[1]) > 2:
+                continue
+            if roach.level.can_walk(roach.game_pos[0] + dx, roach.game_pos[1] + dy, 'floor'):
+                enemy = roach.level.get_enemy(roach.game_pos[0] + dx, roach.game_pos[1] + dy)
+                if enemy and enemy is not roach:
+                    continue
+                roach.game_pos = (roach.game_pos[0] + dx, roach.game_pos[1] + dy)
+                if dy == 1:
+                    roach.angle = 180
+                elif dy == -1:
+                    roach.angle = 0
+                elif dx == 1:
+                    roach.angle = 270
+                else:
+                    roach.angle = 90
+                break