Random bot colours, improvements to random bots.

1 files changed, 32 insertions, 3 deletions

diff --git a/bots.py b/bots.py
index dba440d..f3e7cee 100644
--- a/bots.py
+++ b/bots.py
@@ -1,9 +1,14 @@
 import random
 
+from common import *
+
 def right_bot(board, (x, y)):
     return 'R'
 
 def random_bot(board, (x, y)):
+    return random.choice('UDLR')
+
+def random_bounds_bot(board, (x, y)):
     height = len(board)
     width = len(board[0])
     moves = []
@@ -15,9 +20,33 @@ def random_bot(board, (x, y)):
         moves.append('U')
     if y < height - 1:
         moves.append('D')
-    return random.choice(moves)
 
-def random_bot2(board, (x, y)):
+    move = 'U'
+    while moves and move not in moves:
+        move = random_bot(board, (x, y))
+    return move
+
+def random_square_bot(board, (x, y)):
+    def in_bounds(x, y, w, h):
+        return x >= 0 and y >= 0 and x < w and y < h
+
+    h = len(board)
+    w = len(board[0])
+
+    todo = directions.keys()
+
     move = random_bot(board, (x, y))
-    nx, ny = x
+    dx, dy = directions[move]
+    nx = x + dx
+    ny = y + dy
+
+    while todo and in_bounds(nx, ny, w, h) and \
+          board[ny][nx] not in (Squares.EMPTY, Squares.APPLE):
+        if move in todo:
+            todo.remove(move)
+        move = random_bot(board, (x, y))
+        dx, dy = directions[move]
+        nx = x + dx
+        ny = y + dy
+    return move