Add screen blackout to qchess
[progcomp2013.git] / qchess / qchess.py
index 501b3fd..d139462 100755 (executable)
@@ -1,5 +1,4 @@
 #!/usr/bin/python -u
-# +++ piece.py +++ #
 import random
 
 # I know using non-abreviated strings is inefficient, but this is python, who cares?
@@ -15,13 +14,13 @@ class Piece():
                self.types = types # List of possible types the piece can be (should just be two)
                self.current_type = "unknown" # Current type
                self.choice = -1 # Index of the current type in self.types (-1 = unknown type)
-               self.types_revealed = [True, False] # Whether the types are known (by default the first type is always known at game start)
                
-
-               # 
+               
                self.last_state = None
+               
                self.move_pattern = None
-
+               self.coverage = None
+               self.possible_moves = None
                
 
        def init_from_copy(self, c):
@@ -31,8 +30,7 @@ class Piece():
                self.types = c.types[:]
                self.current_type = c.current_type
                self.choice = c.choice
-               self.types_revealed = c.types_revealed[:]
-
+               
                self.last_state = None
                self.move_pattern = None
 
@@ -40,7 +38,7 @@ class Piece():
 
        # Make a string for the piece (used for debug)
        def __str__(self):
-               return str(self.current_type) + " " + str(self.types) + " at " + str(self.x) + ","+str(self.y)  
+               return str(self.colour) + " " + str(self.current_type) + " " + str(self.types) + " at " + str(self.x) + ","+str(self.y)  
 
        # Draw the piece in a pygame surface
        def draw(self, window, grid_sz = [80,80], style="quantum"):
@@ -60,7 +58,7 @@ class Piece():
 
                # Draw the two possible types underneath the current_type image
                for i in range(len(self.types)):
-                       if self.types_revealed[i] == True:
+                       if always_reveal_states == True or self.types[i][0] != '?':
                                img = small_images[self.colour][self.types[i]]
                        else:
                                img = small_images[self.colour]["unknown"] # If the type hasn't been revealed, show a placeholder
@@ -78,17 +76,18 @@ class Piece():
        
        # Collapses the wave function!          
        def select(self):
-               if self.current_type == "unknown":
+               if self.current_type == "unknown" or not self.choice in [0,1]:
                        self.choice = random.randint(0,1)
+                       if self.types[self.choice][0] == '?':
+                               self.types[self.choice] = self.types[self.choice][1:]
                        self.current_type = self.types[self.choice]
-                       self.types_revealed[self.choice] = True
                return self.choice
 
        # Uncollapses (?) the wave function!
        def deselect(self):
                #print "Deselect called"
                if (self.x + self.y) % 2 != 0:
-                       if (self.types[0] != self.types[1]) or (self.types_revealed[0] == False or self.types_revealed[1] == False):
+                       if (self.types[0] != self.types[1]) or (self.types[0][0] == '?' or self.types[1][0] == '?'):
                                self.current_type = "unknown"
                                self.choice = -1
                        else:
@@ -96,9 +95,10 @@ class Piece():
 
        # The sad moment when you realise that you do not understand anything about a subject you studied for 4 years...
 # --- piece.py --- #
-# +++ board.py +++ #
 [w,h] = [8,8] # Width and height of board(s)
 
+always_reveal_states = False
+
 # Class to represent a quantum chess board
 class Board():
        # Initialise; if master=True then the secondary piece types are assigned
@@ -110,9 +110,15 @@ class Board():
                self.grid = [[None] * w for _ in range(h)] # 2D List (you can get arrays in python, somehow, but they scare me)
                self.unrevealed_types = {"white" : piece_types.copy(), "black" : piece_types.copy()}
                self.king = {"white" : None, "black" : None} # We need to keep track of the king, because he is important
+               self.max_moves = None
+               self.moves = 0
+               self.move_stack = []
                for c in ["black", "white"]:
                        del self.unrevealed_types[c]["unknown"]
 
+               if style == "empty":
+                       return
+
                # Add all the pieces with known primary types
                for i in range(0, 2):
                        
@@ -124,7 +130,6 @@ class Board():
                        c.append(Piece(s, 1, y, ["knight"]))
                        c.append(Piece(s, 2, y, ["bishop"]))
                        k = Piece(s, 3, y, ["king", "king"]) # There can only be one ruler!
-                       k.types_revealed[1] = True
                        k.current_type = "king"
                        self.king[s] = k
                        c.append(k)
@@ -162,11 +167,10 @@ class Board():
                                        types_left[choice] -= 1
                                        if types_left[choice] <= 0:
                                                del types_left[choice]
-                                       piece.types.append(choice)
+                                       piece.types.append('?' + choice)
                                elif style == "classical":
                                        piece.types.append(piece.types[0])
                                        piece.current_type = piece.types[0]
-                                       piece.types_revealed[1] = True
                                        piece.choice = 0
 
        def clone(self):
@@ -176,6 +180,40 @@ class Board():
 
                for i in range(len(mypieces)):
                        newpieces[i].init_from_copy(mypieces[i])
+       
+       # Reset the board from a string
+       def reset_board(self, s):
+               self.pieces = {"white" : [], "black" : []}
+               self.king = {"white" : None, "black" : None}
+               self.grid = [[None] * w for _ in range(h)]
+               for x in range(w):
+                       for y in range(h):
+                               self.grid[x][y] = None
+
+               for line in s.split("\n"):
+                       if line == "":
+                               continue
+                       if line[0] == "#":
+                               continue
+
+                       tokens = line.split(" ")
+                       [x, y] = map(int, tokens[len(tokens)-1].split(","))
+                       current_type = tokens[1]
+                       types = map(lambda e : e.strip(" '[],"), line.split('[')[1].split(']')[0].split(','))
+                       
+                       target = Piece(tokens[0], x, y, types)
+                       target.current_type = current_type
+                       
+                       try:
+                               target.choice = types.index(current_type)
+                       except:
+                               target.choice = -1
+
+                       self.pieces[tokens[0]].append(target)
+                       if target.current_type == "king":
+                               self.king[tokens[0]] = target
+
+                       self.grid[x][y] = target
                        
 
        def display_grid(self, window = None, grid_sz = [80,80]):
@@ -241,15 +279,23 @@ class Board():
                                del self.unrevealed_types[piece.colour][state]
 
                piece.types[type_index] = state
-               piece.types_revealed[type_index] = True
                piece.current_type = state
 
                if len(self.possible_moves(piece)) <= 0:
                        piece.deselect() # Piece can't move; deselect it
+                       
+               # Piece needs to recalculate moves
+               piece.possible_moves = None
                
        # Update the board when a piece has been moved
        def update_move(self, x, y, x2, y2):
+                               
                piece = self.grid[x][y]
+               #print "Moving " + str(x) + "," + str(y) + " to " + str(x2) + "," + str(y2) + "; possible_moves are " + str(self.possible_moves(piece))
+               
+               if not [x2,y2] in self.possible_moves(piece):
+                       raise Exception("ILLEGAL move " + str(x2)+","+str(y2))
+               
                self.grid[x][y] = None
                taken = self.grid[x2][y2]
                if taken != None:
@@ -272,7 +318,13 @@ class Board():
                        piece.current_type = "queen"
 
                piece.deselect() # Uncollapse (?) the wavefunction!
-               self.verify()   
+               self.moves += 1
+               
+               # All other pieces need to recalculate moves
+               for p in self.pieces["white"] + self.pieces["black"]:
+                       p.possible_moves = None
+               
+               #self.verify()  
 
        # Update the board from a string
        # Guesses what to do based on the format of the string
@@ -329,7 +381,7 @@ class Board():
                        if prob > 0:
                                result.update({p : prob})
                
-               self.verify()
+               #self.verify()
                return result
 
 
@@ -354,7 +406,7 @@ class Board():
                for i in range(len(p.types)):
                        t = p.types[i]
                        prob = 0.5
-                       if t == "unknown" or p.types_revealed[i] == False:
+                       if t == "unknown" or p.types[i][0] == '?':
                                total_types = 0
                                for t2 in self.unrevealed_types[p.colour].keys():
                                        total_types += self.unrevealed_types[p.colour][t2]
@@ -370,7 +422,7 @@ class Board():
                                for point in self.possible_moves(p, reject_allied):
                                        result[point[0]][point[1]] += prob
                
-               self.verify()
+               #self.verify()
                p.current_type = "unknown"
                return result
 
@@ -382,7 +434,7 @@ class Board():
                        if t == state:
                                result += prob
                                continue        
-                       if t == "unknown" or p.types_revealed[i] == False:
+                       if t == "unknown" or p.types[i][0] == '?':
                                total_prob = 0
                                for t2 in self.unrevealed_types[p.colour].keys():
                                        total_prob += self.unrevealed_types[p.colour][t2]
@@ -396,10 +448,25 @@ class Board():
        # This is probably inefficient, but I looked at some sample chess games and they seem to actually do things this way
        # reject_allied indicates whether squares occupied by allied pieces will be removed
        # (set to false to check for defense)
-       def possible_moves(self, p, reject_allied = True):
-               result = []
+       def possible_moves(self, p, reject_allied = True, state=None):
                if p == None:
+                       raise Exception("SANITY: No piece")
+               
+               
+               
+               if state != None and state != p.current_type:
+                       old_type = p.current_type
+                       p.current_type = state
+                       result = self.possible_moves(p, reject_allied, state=None)
+                       p.current_type = old_type
                        return result
+               
+               if p.possible_moves != None:
+                       return p.possible_moves
+               
+               
+               result = []
+               
 
                
                if p.current_type == "unknown":
@@ -471,7 +538,9 @@ class Board():
                        if g != None and (g.colour == p.colour and reject_allied == True):
                                result.remove(point) # Remove allied pieces
                
-               self.verify()
+               #self.verify()
+               
+               p.possible_moves = result
                return result
 
 
@@ -495,16 +564,57 @@ class Board():
                                        
                return p
 
+       # Returns "white", "black" or "DRAW" if the game should end
+       def end_condition(self):
+               if self.king["white"] == None:
+                       if self.king["black"] == None:
+                               return "DRAW" # This shouldn't happen
+                       return "black"
+               elif self.king["black"] == None:
+                       return "white"
+               elif len(self.pieces["white"]) == 1 and len(self.pieces["black"]) == 1:
+                       return "DRAW"
+               elif self.max_moves != None and self.moves > self.max_moves:
+                       return "DRAW"
+               return None
 
 
        # I typed the full statement about 30 times before writing this function...
        def on_board(self, x, y):
                return (x >= 0 and x < w) and (y >= 0 and y < h)
+       
+       # Pushes a move temporarily
+       def push_move(self, piece, x, y):
+               target = self.grid[x][y]
+               self.move_stack.append([piece, target, piece.x, piece.y, x, y])
+               [piece.x, piece.y] = [x, y]
+               self.grid[x][y] = piece
+               self.grid[piece.x][piece.y] = None
+               
+               for p in self.pieces["white"] + self.pieces["black"]:
+                       p.possible_moves = None
+               
+       # Restore move
+       def pop_move(self):
+               #print str(self.move_stack)
+               [piece, target, x1, y1, x2, y2] = self.move_stack[len(self.move_stack)-1]
+               self.move_stack = self.move_stack[:-1]
+               piece.x = x1
+               piece.y = y1
+               self.grid[x1][y1] = piece
+               if target != None:
+                       target.x = x2
+                       target.y = y2
+               self.grid[x2][y2] = target
+               
+               for p in self.pieces["white"] + self.pieces["black"]:
+                               p.possible_moves = None
+               
 # --- board.py --- #
-# +++ player.py +++ #
 import subprocess
 import select
 import platform
+import re
 
 agent_timeout = -1.0 # Timeout in seconds for AI players to make moves
                        # WARNING: Won't work for windows based operating systems
@@ -518,13 +628,19 @@ class Player():
                self.name = name
                self.colour = colour
 
+       def update(self, result):
+               pass
+
+       def reset_board(self, s):
+               pass
+
 # Player that runs from another process
-class AgentPlayer(Player):
+class ExternalAgent(Player):
 
 
        def __init__(self, name, colour):
                Player.__init__(self, name, colour)
-               self.p = subprocess.Popen(name, stdin=subprocess.PIPE, stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+               self.p = subprocess.Popen(name,bufsize=0,stdin=subprocess.PIPE, stdout=subprocess.PIPE, shell=True,universal_newlines=True)
                
                self.send_message(colour)
 
@@ -534,13 +650,13 @@ class AgentPlayer(Player):
                else:
                        ready = [self.p.stdin]
                if self.p.stdin in ready:
-                       #print "Writing to p.stdin"
+                       #sys.stderr.write("Writing \'" + s + "\' to " + str(self.p) + "\n")
                        try:
                                self.p.stdin.write(s + "\n")
                        except:
                                raise Exception("UNRESPONSIVE")
                else:
-                       raise Exception("UNRESPONSIVE")
+                       raise Exception("TIMEOUT")
 
        def get_response(self):
                if agent_timeout > 0.0:
@@ -548,13 +664,15 @@ class AgentPlayer(Player):
                else:
                        ready = [self.p.stdout]
                if self.p.stdout in ready:
-                       #print "Reading from p.stdout"
+                       #sys.stderr.write("Reading from " + str(self.p) + " 's stdout...\n")
                        try:
-                               return self.p.stdout.readline().strip("\r\n")
+                               result = self.p.stdout.readline().strip(" \t\r\n")
+                               #sys.stderr.write("Read \'" + result + "\' from " + str(self.p) + "\n")
+                               return result
                        except: # Exception, e:
                                raise Exception("UNRESPONSIVE")
                else:
-                       raise Exception("UNRESPONSIVE")
+                       raise Exception("TIMEOUT")
 
        def select(self):
 
@@ -562,7 +680,8 @@ class AgentPlayer(Player):
                line = self.get_response()
                
                try:
-                       result = map(int, line.split(" "))
+                       m = re.match("\s*(\d+)\s+(\d+)\s*", line)
+                       result = map(int, [m.group(1), m.group(2)])
                except:
                        raise Exception("GIBBERISH \"" + str(line) + "\"")
                return result
@@ -578,11 +697,19 @@ class AgentPlayer(Player):
                line = self.get_response()
                
                try:
-                       result = map(int, line.split(" "))
+                       m = re.match("\s*(\d+)\s+(\d+)\s*", line)
+                       result = map(int, [m.group(1), m.group(2)])
+
                except:
                        raise Exception("GIBBERISH \"" + str(line) + "\"")
                return result
 
+       def reset_board(self, s):
+               self.send_message("BOARD")
+               for line in s.split("\n"):
+                       self.send_message(line.strip(" \r\n"))
+               self.send_message("END BOARD")
+
        def quit(self, final_result):
                try:
                        self.send_message("QUIT " + final_result)
@@ -650,14 +777,31 @@ class HumanPlayer(Player):
                        sys.stdout.write(result + "\n") 
 
 
-# Player that makes random moves
-class AgentRandom(Player):
+# Default internal player (makes random moves)
+class InternalAgent(Player):
        def __init__(self, name, colour):
                Player.__init__(self, name, colour)
                self.choice = None
 
                self.board = Board(style = "agent")
 
+
+
+       def update(self, result):
+               
+               self.board.update(result)
+               self.board.verify()
+
+       def reset_board(self, s):
+               self.board.reset_board(s)
+
+       def quit(self, final_result):
+               pass
+
+class AgentRandom(InternalAgent):
+       def __init__(self, name, colour):
+               InternalAgent.__init__(self, name, colour)
+
        def select(self):
                while True:
                        self.choice = self.board.pieces[self.colour][random.randint(0, len(self.board.pieces[self.colour])-1)]
@@ -682,15 +826,300 @@ class AgentRandom(Player):
                move = moves[random.randint(0, len(moves)-1)]
                return move
 
+
+# Terrible, terrible hacks
+
+def run_agent(agent):
+       #sys.stderr.write(sys.argv[0] + " : Running agent " + str(agent) + "\n")
+       while True:
+               line = sys.stdin.readline().strip(" \r\n")
+               if line == "SELECTION?":
+                       #sys.stderr.write(sys.argv[0] + " : Make selection\n")
+                       [x,y] = agent.select() # Gets your agent's selection
+                       #sys.stderr.write(sys.argv[0] + " : Selection was " + str(agent.choice) + "\n")
+                       sys.stdout.write(str(x) + " " + str(y) + "\n")                          
+               elif line == "MOVE?":
+                       #sys.stderr.write(sys.argv[0] + " : Make move\n")
+                       [x,y] = agent.get_move() # Gets your agent's move
+                       sys.stdout.write(str(x) + " " + str(y) + "\n")
+               elif line.split(" ")[0] == "QUIT":
+                       #sys.stderr.write(sys.argv[0] + " : Quitting\n")
+                       agent.quit(" ".join(line.split(" ")[1:])) # Quits the game
+                       break
+               elif line.split(" ")[0] == "BOARD":
+                       s = ""
+                       line = sys.stdin.readline().strip(" \r\n")
+                       while line != "END BOARD":
+                               s += line + "\n"
+                               line = sys.stdin.readline().strip(" \r\n")
+                       agent.board.reset_board(s)
+                       
+               else:
+                       agent.update(line) # Updates agent.board
+       return 0
+
+
+# Sort of works?
+
+class ExternalWrapper(ExternalAgent):
+       def __init__(self, agent):
+               run = "python -u -c \"import sys;import os;from qchess import *;agent = " + agent.__class__.__name__ + "('" + agent.name + "','"+agent.colour+"');sys.stdin.readline();sys.exit(run_agent(agent))\""
+               # str(run)
+               ExternalAgent.__init__(self, run, agent.colour)
+
+       
+
+# --- player.py --- #
+# A sample agent
+
+
+class AgentBishop(AgentRandom): # Inherits from AgentRandom (in qchess)
+       def __init__(self, name, colour):
+               InternalAgent.__init__(self, name, colour)
+               self.value = {"pawn" : 1, "bishop" : 3, "knight" : 3, "rook" : 5, "queen" : 9, "king" : 100, "unknown" : 4}
+
+               self.aggression = 2.0 # Multiplier for scoring due to aggressive actions
+               self.defence = 1.0 # Multiplier for scoring due to defensive actions
+               
+               self.depth = 0 # Current depth
+               self.max_depth = 2 # Recurse this many times (for some reason, makes more mistakes when this is increased???)
+               self.recurse_for = -1 # Recurse for the best few moves each times (less than 0 = all moves)
+
+               for p in self.board.pieces["white"] + self.board.pieces["black"]:
+                       p.last_moves = None
+                       p.selected_moves = None
+
+               
+
+       def get_value(self, piece):
+               if piece == None:
+                       return 0.0
+               return float(self.value[piece.types[0]] + self.value[piece.types[1]]) / 2.0
+               
+       # Score possible moves for the piece
+       
+       def prioritise_moves(self, piece):
+
+               #sys.stderr.write(sys.argv[0] + " : " + str(self) + " prioritise called for " + str(piece) + "\n")
+
+               
+               
+               grid = self.board.probability_grid(piece)
+               #sys.stderr.write("\t Probability grid " + str(grid) + "\n")
+               moves = []
+               for x in range(w):
+                       for y in range(h):
+                               if grid[x][y] < 0.3: # Throw out moves with < 30% probability
+                                       #sys.stderr.write("\tReject " + str(x) + "," + str(y) + " (" + str(grid[x][y]) + ")\n")
+                                       continue
+
+                               target = self.board.grid[x][y]
+                       
+                               
+                               
+                               
+                               # Get total probability that the move is protected
+                               self.board.push_move(piece, x, y)
+                               
+
+                               
+                               defenders = self.board.coverage(x, y, piece.colour, reject_allied = False)
+                               d_prob = 0.0
+                               for d in defenders.keys():
+                                       d_prob += defenders[d]
+                               if len(defenders.keys()) > 0:
+                                       d_prob /= float(len(defenders.keys()))
+
+                               if (d_prob > 1.0):
+                                       d_prob = 1.0
+
+                               # Get total probability that the move is threatened
+                               attackers = self.board.coverage(x, y, opponent(piece.colour), reject_allied = False)
+                               a_prob = 0.0
+                               for a in attackers.keys():
+                                       a_prob += attackers[a]
+                               if len(attackers.keys()) > 0:
+                                       a_prob /= float(len(attackers.keys()))
+
+                               if (a_prob > 1.0):
+                                       a_prob = 1.0
+
+                               self.board.pop_move()
+                               
+
+                               
+                               # Score of the move
+                               value = self.aggression * (1.0 + d_prob) * self.get_value(target) - self.defence * (1.0 - d_prob) * a_prob * self.get_value(piece)
+
+                               # Adjust score based on movement of piece out of danger
+                               attackers = self.board.coverage(piece.x, piece.y, opponent(piece.colour))
+                               s_prob = 0.0
+                               for a in attackers.keys():
+                                       s_prob += attackers[a]
+                               if len(attackers.keys()) > 0:
+                                       s_prob /= float(len(attackers.keys()))
+
+                               if (s_prob > 1.0):
+                                       s_prob = 1.0
+                               value += self.defence * s_prob * self.get_value(piece)
+                               
+                               # Adjust score based on probability that the move is actually possible
+                               moves.append([[x, y], grid[x][y] * value])
+
+               moves.sort(key = lambda e : e[1], reverse = True)
+               #sys.stderr.write(sys.argv[0] + ": Moves for " + str(piece) + " are " + str(moves) + "\n")
+
+               piece.last_moves = moves
+               piece.selected_moves = None
+
+               
+
+               
+               return moves
+
+       def select_best(self, colour):
+
+               self.depth += 1
+               all_moves = {}
+               for p in self.board.pieces[colour]:
+                       self.choice = p # Temporarily pick that piece
+                       m = self.prioritise_moves(p)
+                       if len(m) > 0:
+                               all_moves.update({p : m[0]})
+
+               if len(all_moves.items()) <= 0:
+                       return None
+               
+               
+               opts = all_moves.items()
+               opts.sort(key = lambda e : e[1][1], reverse = True)
+
+               if self.depth >= self.max_depth:
+                       self.depth -= 1
+                       return list(opts[0])
+
+               if self.recurse_for >= 0:
+                       opts = opts[0:self.recurse_for]
+               #sys.stderr.write(sys.argv[0] + " : Before recurse, options are " + str(opts) + "\n")
+
+               # Take the best few moves, and recurse
+               for choice in opts[0:self.recurse_for]:
+                       [xx,yy] = [choice[0].x, choice[0].y] # Remember position
+                       [nx,ny] = choice[1][0] # Target
+                       [choice[0].x, choice[0].y] = [nx, ny] # Set position
+                       target = self.board.grid[nx][ny] # Remember piece in spot
+                       self.board.grid[xx][yy] = None # Remove piece
+                       self.board.grid[nx][ny] = choice[0] # Replace with moving piece
+                       
+                       # Recurse
+                       best_enemy_move = self.select_best(opponent(choice[0].colour))
+                       choice[1][1] -= best_enemy_move[1][1] / float(self.depth + 1.0)
+                       
+                       [choice[0].x, choice[0].y] = [xx, yy] # Restore position
+                       self.board.grid[nx][ny] = target # Restore taken piece
+                       self.board.grid[xx][yy] = choice[0] # Restore moved piece
+                       
+               
+
+               opts.sort(key = lambda e : e[1][1], reverse = True)
+               #sys.stderr.write(sys.argv[0] + " : After recurse, options are " + str(opts) + "\n")
+
+               self.depth -= 1
+               return list(opts[0])
+
+               
+
+       # Returns [x,y] of selected piece
+       def select(self):
+               #sys.stderr.write("Getting choice...")
+               self.choice = self.select_best(self.colour)[0]
+               
+               #sys.stderr.write(" Done " + str(self.choice)+"\n")
+               return [self.choice.x, self.choice.y]
+       
+       # Returns [x,y] of square to move selected piece into
+       def get_move(self):
+               #sys.stderr.write("Choice is " + str(self.choice) + "\n")
+               self.choice.selected_moves = self.choice.last_moves
+               moves = self.prioritise_moves(self.choice)
+               if len(moves) > 0:
+                       return moves[0][0]
+               else:
+                       return AgentRandom.get_move(self)
+
+# --- agent_bishop.py --- #
+import multiprocessing
+
+# Hacky alternative to using select for timing out players
+
+# WARNING: Do not wrap around HumanPlayer or things breakify
+# WARNING: Do not use in general or things breakify
+
+class Sleeper(multiprocessing.Process):
+       def __init__(self, timeout):
+               multiprocessing.Process.__init__(self)
+               self.timeout = timeout
+
+       def run(self):
+               time.sleep(self.timeout)
+
+
+class Worker(multiprocessing.Process):
+       def __init__(self, function, args, q):
+               multiprocessing.Process.__init__(self)
+               self.function = function
+               self.args = args
+               self.q = q
+
+       def run(self):
+               #print str(self) + " runs " + str(self.function) + " with args " + str(self.args) 
+               self.q.put(self.function(*self.args))
+               
+               
+
+def TimeoutFunction(function, args, timeout):
+       q = multiprocessing.Queue()
+       w = Worker(function, args, q)
+       s = Sleeper(timeout)
+       w.start()
+       s.start()
+       while True: # Busy loop of crappyness
+               if not w.is_alive():
+                       s.terminate()
+                       result = q.get()
+                       w.join()
+                       #print "TimeoutFunction gets " + str(result)
+                       return result
+               elif not s.is_alive():
+                       w.terminate()
+                       s.join()
+                       raise Exception("TIMEOUT")
+
+       
+               
+
+# A player that wraps another player and times out its moves
+# Uses threads
+# A (crappy) alternative to the use of select()
+class TimeoutPlayer(Player):
+       def __init__(self, base_player, timeout):
+               Player.__init__(self, base_player.name, base_player.colour)
+               self.base_player = base_player
+               self.timeout = timeout
+               
+       def select(self):
+               return TimeoutFunction(self.base_player.select, [], self.timeout)
+               
+       
+       def get_move(self):
+               return TimeoutFunction(self.base_player.get_move, [], self.timeout)
+
        def update(self, result):
-               #sys.stderr.write(sys.argv[0] + " : Update board for AgentRandom\n")
-               self.board.update(result)
-               self.board.verify()
+               return TimeoutFunction(self.base_player.update, [result], self.timeout)
 
        def quit(self, final_result):
-               pass
-# --- player.py --- #
-# +++ network.py +++ #
+               return TimeoutFunction(self.base_player.quit, [final_result], self.timeout)
+# --- timeout_player.py --- #
 import socket
 import select
 
@@ -883,7 +1312,6 @@ class NetworkReceiver(Player,Network):
                self.src.close()
        
 # --- network.py --- #
-# +++ thread_util.py +++ #
 import threading
 
 # A thread that can be stopped!
@@ -900,7 +1328,191 @@ class StoppableThread(threading.Thread):
        def stopped(self):
                return self._stop.isSet()
 # --- thread_util.py --- #
-# +++ game.py +++ #
+log_files = []
+import datetime
+import urllib2
+
+class LogFile():
+       def __init__(self, log):        
+               
+               self.log = log
+               self.logged = []
+               self.log.write("# Log starts " + str(datetime.datetime.now()) + "\n")
+
+       def write(self, s):
+               now = datetime.datetime.now()
+               self.log.write(str(now) + " : " + s + "\n")
+               self.logged.append((now, s))
+
+       def setup(self, board, players):
+               
+               for p in players:
+                       self.log.write("# " + p.colour + " : " + p.name + "\n")
+               
+               self.log.write("# Initial board\n")
+               for x in range(0, w):
+                       for y in range(0, h):
+                               if board.grid[x][y] != None:
+                                       self.log.write(str(board.grid[x][y]) + "\n")
+
+               self.log.write("# Start game\n")
+
+       def close(self):
+               self.log.write("# EOF\n")
+               if self.log != sys.stdout:
+                       self.log.close()
+
+class ShortLog(LogFile):
+       def __init__(self, file_name):
+               if file_name == "":
+                       self.log = sys.stdout
+               else:
+                       self.log = open(file_name, "w", 0)
+               LogFile.__init__(self, self.log)
+               self.file_name = file_name
+               self.phase = 0
+
+       def write(self, s):
+               now = datetime.datetime.now()
+               self.logged.append((now, s))
+               
+               if self.phase == 0:
+                       if self.log != sys.stdout:
+                               self.log.close()
+                               self.log = open(self.file_name, "w", 0)
+                       self.log.write("# Short log updated " + str(datetime.datetime.now()) + "\n")    
+                       LogFile.setup(self, game.board, game.players)
+
+               elif self.phase == 1:
+                       for message in self.logged[len(self.logged)-2:]:
+                               self.log.write(str(message[0]) + " : " + message[1] + "\n")
+
+               self.phase = (self.phase + 1) % 2               
+               
+       def close(self):
+               if self.phase == 1:
+                       ending = self.logged[len(self.logged)-1]
+                       self.log.write(str(ending[0]) + " : " + ending[1] + "\n")
+               self.log.write("# EOF\n")
+               if self.log != sys.stdout:
+                       self.log.close()
+               
+
+class HeadRequest(urllib2.Request):
+       def get_method(self):
+               return "HEAD"
+
+class HttpGetter(StoppableThread):
+       def __init__(self, address):
+               StoppableThread.__init__(self)
+               self.address = address
+               self.log = urllib2.urlopen(address)
+               self.lines = []
+               self.lock = threading.RLock() #lock for access of self.state
+               self.cond = threading.Condition() # conditional
+
+       def run(self):
+               while not self.stopped():
+                       line = self.log.readline()
+                       if line == "":
+                               date_mod = datetime.datetime.strptime(self.log.headers['last-modified'], "%a, %d %b %Y %H:%M:%S GMT")
+                               self.log.close()
+       
+                               next_log = urllib2.urlopen(HeadRequest(self.address))
+                               date_new = datetime.datetime.strptime(next_log.headers['last-modified'], "%a, %d %b %Y %H:%M:%S GMT")
+                               while date_new <= date_mod and not self.stopped():
+                                       next_log = urllib2.urlopen(HeadRequest(self.address))
+                                       date_new = datetime.datetime.strptime(next_log.headers['last-modified'], "%a, %d %b %Y %H:%M:%S GMT")
+                               if self.stopped():
+                                       break
+
+                               self.log = urllib2.urlopen(self.address)
+                               line = self.log.readline()
+
+                       self.cond.acquire()
+                       self.lines.append(line)
+                       self.cond.notifyAll()
+                       self.cond.release()
+
+                       #sys.stderr.write(" HttpGetter got \'" + str(line) + "\'\n")
+
+               self.log.close()
+                               
+                               
+       
+               
+               
+class HttpReplay():
+       def __init__(self, address):
+               self.getter = HttpGetter(address)
+               self.getter.start()
+               
+       def readline(self):
+               self.getter.cond.acquire()
+               while len(self.getter.lines) == 0:
+                       self.getter.cond.wait()
+                       
+               result = self.getter.lines[0]
+               self.getter.lines = self.getter.lines[1:]
+               self.getter.cond.release()
+
+               return result
+                       
+                       
+       def close(self):
+               self.getter.stop()
+
+class FileReplay():
+       def __init__(self, filename):
+               self.f = open(filename, "r", 0)
+               self.filename = filename
+               self.mod = os.path.getmtime(filename)
+               self.count = 0
+       
+       def readline(self):
+               line = self.f.readline()
+               
+               while line == "":
+                       mod2 = os.path.getmtime(self.filename)
+                       if mod2 > self.mod:
+                               #sys.stderr.write("File changed!\n")
+                               self.mod = mod2
+                               self.f.close()
+                               self.f = open(self.filename, "r", 0)
+                               
+                               new_line = self.f.readline()
+                               
+                               if " ".join(new_line.split(" ")[0:3]) != "# Short log":
+                                       for i in range(self.count):
+                                               new_line = self.f.readline()
+                                               #sys.stderr.write("Read back " + str(i) + ": " + str(new_line) + "\n")
+                                       new_line = self.f.readline()
+                               else:
+                                       self.count = 0
+                               
+                               line = new_line
+
+               self.count += 1
+               return line
+
+       def close(self):
+               self.f.close()
+               
+                                               
+def log(s):
+       for l in log_files:
+               l.write(s)
+               
+
+def log_init(board, players):
+       for l in log_files:
+               l.setup(board, players)
+
+# --- log.py --- #
+
+
+
+       
 
 # A thread that runs the game
 class GameThread(StoppableThread):
@@ -913,6 +1525,8 @@ class GameThread(StoppableThread):
                self.lock = threading.RLock() #lock for access of self.state
                self.cond = threading.Condition() # conditional for some reason, I forgot
                self.final_result = ""
+               
+               
 
        # Run the game (run in new thread with start(), run in current thread with run())
        def run(self):
@@ -925,7 +1539,8 @@ class GameThread(StoppableThread):
                                                self.state["turn"] = p.base_player # "turn" contains the player who's turn it is
                                        else:
                                                self.state["turn"] = p
-                               try:
+                               #try:
+                               if True:
                                        [x,y] = p.select() # Player selects a square
                                        if self.stopped():
                                                break
@@ -938,6 +1553,7 @@ class GameThread(StoppableThread):
                                                p2.update(result) # Inform players of what happened
 
 
+                                       log(result)
 
                                        target = self.board.grid[x][y]
                                        if isinstance(graphics, GraphicsThread):
@@ -966,9 +1582,15 @@ class GameThread(StoppableThread):
                                        if self.stopped():
                                                break
 
-                                       result = self.board.update_move(x, y, x2, y2)
+                                       result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)
+                                       log(result)
+
+                                       self.board.update_move(x, y, x2, y2)
+                                       
                                        for p2 in self.players:
-                                               p2.update(str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)) # Inform players of what happened
+                                               p2.update(result) # Inform players of what happened
+
+                                                                               
 
                                        if isinstance(graphics, GraphicsThread):
                                                with graphics.lock:
@@ -983,28 +1605,23 @@ class GameThread(StoppableThread):
                                                        graphics.state["moves"] = None
 
                        # Commented out exception stuff for now, because it makes it impossible to tell if I made an IndentationError somewhere
-                               except Exception,e:
-                                       result = e.message
-                                       #sys.stderr.write(result + "\n")
-                                       
-                                       self.stop()
-                                       with self.lock:
-                                               self.final_result = self.state["turn"].colour + " " + e.message
-
-                               if self.board.king["black"] == None:
-                                       if self.board.king["white"] == None:
-                                               with self.lock:
-                                                       self.final_result = self.state["turn"].colour + " DRAW"
-                                       else:
-                                               with self.lock:
-                                                       self.final_result = "white"
-                                       self.stop()
-                               elif self.board.king["white"] == None:
+                       #       except Exception,e:
+                       #               result = e.message
+                       #               #sys.stderr.write(result + "\n")
+                       #               
+                       #               self.stop()
+                       #               with self.lock:
+                       #                       self.final_result = self.state["turn"].colour + " " + e.message
+
+                               end = self.board.end_condition()
+                               if end != None:         
                                        with self.lock:
-                                               self.final_result = "black"
+                                               if end == "DRAW":
+                                                       self.final_result = self.state["turn"].colour + " " + end
+                                               else:
+                                                       self.final_result = end
                                        self.stop()
-                                               
-
+                               
                                if self.stopped():
                                        break
 
@@ -1012,10 +1629,186 @@ class GameThread(StoppableThread):
                for p2 in self.players:
                        p2.quit(self.final_result)
 
-               graphics.stop()
+               log(self.final_result)
+
+               if isinstance(graphics, GraphicsThread):
+                       graphics.stop()
+
+       
+# A thread that replays a log file
+class ReplayThread(GameThread):
+       def __init__(self, players, src, end=False,max_moves=None):
+               self.board = Board(style="empty")
+               self.board.max_moves = max_moves
+               GameThread.__init__(self, self.board, players)
+               self.src = src
+               self.end = end
+
+               self.reset_board(self.src.readline())
+
+       def reset_board(self, line):
+               agent_str = ""
+               self_str = ""
+               while line != "# Start game" and line != "# EOF":
+                       
+                       while line == "":
+                               line = self.src.readline().strip(" \r\n")
+                               continue
+
+                       if line[0] == '#':
+                               line = self.src.readline().strip(" \r\n")
+                               continue
+
+                       self_str += line + "\n"
+
+                       if self.players[0].name == "dummy" and self.players[1].name == "dummy":
+                               line = self.src.readline().strip(" \r\n")
+                               continue
+                       
+                       tokens = line.split(" ")
+                       types = map(lambda e : e.strip("[] ,'"), tokens[2:4])
+                       for i in range(len(types)):
+                               if types[i][0] == "?":
+                                       types[i] = "unknown"
+
+                       agent_str += tokens[0] + " " + tokens[1] + " " + str(types) + " ".join(tokens[4:]) + "\n"
+                       line = self.src.readline().strip(" \r\n")
+
+               for p in self.players:
+                       p.reset_board(agent_str)
+               
+               
+               self.board.reset_board(self_str)
 
        
+       def run(self):
+               move_count = 0
+               last_line = ""
+               line = self.src.readline().strip(" \r\n")
+               while line != "# EOF":
+
+
+                       if self.stopped():
+                               break
+                       
+                       if len(line) <= 0:
+                               continue
+                                       
+
+                       if line[0] == '#':
+                               last_line = line
+                               line = self.src.readline().strip(" \r\n")
+                               continue
+
+                       tokens = line.split(" ")
+                       if tokens[0] == "white" or tokens[0] == "black":
+                               self.reset_board(line)
+                               last_line = line
+                               line = self.src.readline().strip(" \r\n")
+                               continue
+
+                       move = line.split(":")
+                       move = move[len(move)-1].strip(" \r\n")
+                       tokens = move.split(" ")
+                       
+                       
+                       try:
+                               [x,y] = map(int, tokens[0:2])
+                       except:
+                               last_line = line
+                               self.stop()
+                               break
+
+                       log(move)
 
+                       target = self.board.grid[x][y]
+                       with self.lock:
+                               if target.colour == "white":
+                                       self.state["turn"] = self.players[0]
+                               else:
+                                       self.state["turn"] = self.players[1]
+                       
+                       move_piece = (tokens[2] == "->")
+                       if move_piece:
+                               [x2,y2] = map(int, tokens[len(tokens)-2:])
+
+                       if isinstance(graphics, GraphicsThread):
+                               with graphics.lock:
+                                       graphics.state["select"] = target
+                                       
+                       if not move_piece:
+                               self.board.update_select(x, y, int(tokens[2]), tokens[len(tokens)-1])
+                               if isinstance(graphics, GraphicsThread):
+                                       with graphics.lock:
+                                               if target.current_type != "unknown":
+                                                       graphics.state["moves"] = self.board.possible_moves(target)
+                                               else:
+                                                       graphics.state["moves"] = None
+                                       time.sleep(turn_delay)
+                       else:
+                               self.board.update_move(x, y, x2, y2)
+                               if isinstance(graphics, GraphicsThread):
+                                       with graphics.lock:
+                                               graphics.state["moves"] = [[x2,y2]]
+                                       time.sleep(turn_delay)
+                                       with graphics.lock:
+                                               graphics.state["select"] = None
+                                               graphics.state["moves"] = None
+                                               graphics.state["dest"] = None
+                       
+
+                       
+                       
+                       
+                       for p in self.players:
+                               p.update(move)
+
+                       last_line = line
+                       line = self.src.readline().strip(" \r\n")
+                       
+                       
+                       end = self.board.end_condition()
+                       if end != None:
+                               self.final_result = end
+                               self.stop()
+                               break
+                                       
+                                               
+                                               
+
+                       
+                                       
+
+
+                       
+
+                               
+                       
+
+               
+
+               if self.end and isinstance(graphics, GraphicsThread):
+                       #graphics.stop()
+                       pass # Let the user stop the display
+               elif not self.end and self.board.end_condition() == None:
+                       global game
+                       # Work out the last move
+                                       
+                       t = last_line.split(" ")
+                       if t[len(t)-2] == "black":
+                               self.players.reverse()
+                       elif t[len(t)-2] == "white":
+                               pass
+                       elif self.state["turn"] != None and self.state["turn"].colour == "white":
+                               self.players.reverse()
+
+
+                       game = GameThread(self.board, self.players)
+                       game.run()
+               else:
+                       pass
+
+               
 
 def opponent(colour):
        if colour == "white":
@@ -1023,8 +1816,11 @@ def opponent(colour):
        else:
                return "white"
 # --- game.py --- #
-# +++ graphics.py +++ #
-import pygame
+try:
+       import pygame
+except:
+       pass
+import os
 
 # Dictionary that stores the unicode character representations of the different pieces
 # Chess was clearly the reason why unicode was invented
@@ -1047,6 +1843,44 @@ piece_char = {"white" : {"king" : u'\u2654',
 images = {"white" : {}, "black" : {}}
 small_images = {"white" : {}, "black" : {}}
 
+def create_images(grid_sz, font_name=os.path.join(os.path.curdir, "data", "DejaVuSans.ttf")):
+
+       # Get the font sizes
+       l_size = 5*(grid_sz[0] / 8)
+       s_size = 3*(grid_sz[0] / 8)
+
+       for c in piece_char.keys():
+               
+               if c == "black":
+                       for p in piece_char[c].keys():
+                               images[c].update({p : pygame.font.Font(font_name, l_size).render(piece_char[c][p], True,(0,0,0))})
+                               small_images[c].update({p : pygame.font.Font(font_name, s_size).render(piece_char[c][p],True,(0,0,0))})         
+               elif c == "white":
+                       for p in piece_char[c].keys():
+                               images[c].update({p : pygame.font.Font(font_name, l_size+1).render(piece_char["black"][p], True,(255,255,255))})
+                               images[c][p].blit(pygame.font.Font(font_name, l_size).render(piece_char[c][p], True,(0,0,0)),(0,0))
+                               small_images[c].update({p : pygame.font.Font(font_name, s_size+1).render(piece_char["black"][p],True,(255,255,255))})
+                               small_images[c][p].blit(pygame.font.Font(font_name, s_size).render(piece_char[c][p],True,(0,0,0)),(0,0))
+       
+
+def load_images(image_dir=os.path.join(os.path.curdir, "data", "images")):
+       if not os.path.exists(image_dir):
+               raise Exception("Couldn't load images from " + image_dir + " (path doesn't exist)")
+       for c in piece_char.keys():
+               for p in piece_char[c].keys():
+                       images[c].update({p : pygame.image.load(os.path.join(image_dir, c + "_" + p + ".png"))})
+                       small_images[c].update({p : pygame.image.load(os.path.join(image_dir, c + "_" + p + "_small.png"))})
+# --- images.py --- #
+graphics_enabled = True
+try:
+       import pygame
+except:
+       graphics_enabled = False
+       
+import time
+
+
+
 # A thread to make things pretty
 class GraphicsThread(StoppableThread):
        def __init__(self, board, title = "UCC::Progcomp 2013 - QChess", grid_sz = [80,80]):
@@ -1056,25 +1890,29 @@ class GraphicsThread(StoppableThread):
                pygame.init()
                self.window = pygame.display.set_mode((grid_sz[0] * w, grid_sz[1] * h))
                pygame.display.set_caption(title)
+
+               #print "Initialised properly"
+               
                self.grid_sz = grid_sz[:]
                self.state = {"select" : None, "dest" : None, "moves" : None, "overlay" : None, "coverage" : None}
                self.error = 0
                self.lock = threading.RLock()
                self.cond = threading.Condition()
+               self.sleep_timeout = None
+               self.last_event = time.time()
+
+               #print "Test font"
+               pygame.font.Font(os.path.join(os.path.curdir, "data", "DejaVuSans.ttf"), 32).render("Hello", True,(0,0,0))
 
-               # Get the font sizes
-               l_size = 5*(self.grid_sz[0] / 8)
-               s_size = 3*(self.grid_sz[0] / 8)
-               for p in piece_types.keys():
-                       c = "black"
-                       images[c].update({p : pygame.font.Font("data/DejaVuSans.ttf", l_size).render(piece_char[c][p], True,(0,0,0))})
-                       small_images[c].update({p : pygame.font.Font("data/DejaVuSans.ttf", s_size).render(piece_char[c][p],True,(0,0,0))})
-                       c = "white"
+               #load_images()
+               load_images()
 
-                       images[c].update({p : pygame.font.Font("data/DejaVuSans.ttf", l_size+1).render(piece_char["black"][p], True,(255,255,255))})
-                       images[c][p].blit(pygame.font.Font("data/DejaVuSans.ttf", l_size).render(piece_char[c][p], True,(0,0,0)),(0,0))
-                       small_images[c].update({p : pygame.font.Font("data/DejaVuSans.ttf", s_size+1).render(piece_char["black"][p],True,(255,255,255))})
-                       small_images[c][p].blit(pygame.font.Font("data/DejaVuSans.ttf", s_size).render(piece_char[c][p],True,(0,0,0)),(0,0))
+               """
+               for c in images.keys():
+                       for p in images[c].keys():
+                               images[c][p] = images[c][p].convert(self.window)
+                               small_images[c][p] = small_images[c][p].convert(self.window)
+               """
 
                
        
@@ -1085,16 +1923,25 @@ class GraphicsThread(StoppableThread):
                
                while not self.stopped():
                        
-                       self.board.display_grid(window = self.window, grid_sz = self.grid_sz) # Draw the board
+                       if self.sleep_timeout == None or (time.time() - self.last_event) < self.sleep_timeout:
+                       
+                               #print "Display grid"
+                               self.board.display_grid(window = self.window, grid_sz = self.grid_sz) # Draw the board
 
-                       self.overlay()
+                               #print "Display overlay"
+                               self.overlay()
 
-                       self.board.display_pieces(window = self.window, grid_sz = self.grid_sz) # Draw the board                
+                               #print "Display pieces"
+                               self.board.display_pieces(window = self.window, grid_sz = self.grid_sz) # Draw the board                
+                               
+                       else:
+                               self.window.fill((0,0,0))
 
                        pygame.display.flip()
 
                        for event in pygame.event.get():
-                               if event.type == pygame.QUIT:
+                               self.last_event = time.time()
+                               if event.type == pygame.QUIT or (event.type == pygame.KEYDOWN and event.key == pygame.K_q):
                                        if isinstance(game, GameThread):
                                                with game.lock:
                                                        game.final_result = ""
@@ -1106,8 +1953,11 @@ class GraphicsThread(StoppableThread):
                                        break
                                elif event.type == pygame.MOUSEBUTTONDOWN:
                                        self.mouse_down(event)
+                                       
                                elif event.type == pygame.MOUSEBUTTONUP:
-                                       self.mouse_up(event)
+                                       self.mouse_up(event)                    
+                               
+                               
                                        
 
                                
@@ -1238,7 +2088,7 @@ class GraphicsThread(StoppableThread):
                                                mp = [self.grid_sz[i] * [x,y][i] for i in range(2)]
                                                square_img.fill(pygame.Color(255,0,255,int(m[x][y] * 128))) # Draw in purple
                                                self.window.blit(square_img, mp)
-                                               font = pygame.font.Font(None, 14)
+                                               font = pygame.font.Font(os.path.join(os.path.curdir, "data", "DejaVuSans.ttf"), 14)
                                                text = font.render("{0:.2f}".format(round(m[x][y],2)), 1, pygame.Color(0,0,0))
                                                self.window.blit(text, mp)
                                
@@ -1250,7 +2100,7 @@ class GraphicsThread(StoppableThread):
                                mp = [self.grid_sz[i] * [p.x,p.y][i] for i in range(2)]
                                square_img.fill(pygame.Color(0,255,255, int(m[p] * 196))) # Draw in pale blue
                                self.window.blit(square_img, mp)
-                               font = pygame.font.Font(None, 14)
+                               font = pygame.font.Font(os.path.join(os.path.curdir, "data", "DejaVuSans.ttf"), 14)
                                text = font.render("{0:.2f}".format(round(m[p],2)), 1, pygame.Color(0,0,0))
                                self.window.blit(text, mp)
                        # Draw a square where the mouse is
@@ -1273,8 +2123,9 @@ class GraphicsThread(StoppableThread):
                        self.window.blit(square_img, mp)
 
        # Message in a bottle
-       def message(self, string, pos = None, colour = None, font_size = 32):
-               font = pygame.font.Font(None, font_size)
+       def message(self, string, pos = None, colour = None, font_size = 20):
+               #print "Drawing message..."
+               font = pygame.font.Font(os.path.join(os.path.curdir, "data", "DejaVuSans.ttf"), font_size)
                if colour == None:
                        colour = pygame.Color(0,0,0)
                
@@ -1332,11 +2183,13 @@ class GraphicsThread(StoppableThread):
 
 
        # Function to pick a button
-       def SelectButton(self, choices, prompt = None, font_size=32):
+       def SelectButton(self, choices, prompt = None, font_size=20):
+
+               #print "Select button called!"
                self.board.display_grid(self.window, self.grid_sz)
                if prompt != None:
                        self.message(prompt)
-               font = pygame.font.Font(None, font_size)
+               font = pygame.font.Font(os.path.join(os.path.curdir, "data", "DejaVuSans.ttf"), font_size)
                targets = []
                sz = self.window.get_size()
 
@@ -1385,6 +2238,7 @@ class GraphicsThread(StoppableThread):
        def SelectPlayers(self, players = []):
 
 
+               #print "SelectPlayers called"
                
                missing = ["white", "black"]
                for p in players:
@@ -1393,42 +2247,55 @@ class GraphicsThread(StoppableThread):
                for colour in missing:
                        
                        
-                       choice = self.SelectButton(["human", "agent", "network"],prompt = "Choose " + str(colour) + " player", font_size=32)
+                       choice = self.SelectButton(["human", "agent", "network"],prompt = "Choose " + str(colour) + " player")
                        if choice == 0:
                                players.append(HumanPlayer("human", colour))
                        elif choice == 1:
-                               try:
-                                       import Tkinter
-                                       from tkFileDialog import askopenfilename
-                                       root = Tkinter.Tk() # Need a root to make Tkinter behave
-                                       root.withdraw() # Some sort of magic incantation
-                                       path = askopenfilename(parent=root, initialdir="../agents",title=
-'Choose an agent.')
-                                       if path == "":
-                                               return self.SelectPlayers()
-                                       players.append(make_player(path, colour))       
-                               except Exception,e:
-                                       print "Exception was " + str(e.message)
-                                       p = None
-                                       while p == None:
-                                               self.board.display_grid(self.window, self.grid_sz)
-                                               pygame.display.flip()
-                                               path = self.getstr(prompt = "Enter path:")
-                                               if path == None:
-                                                       return None
+                               import inspect
+                               internal_agents = inspect.getmembers(sys.modules[__name__], inspect.isclass)
+                               internal_agents = [x for x in internal_agents if issubclass(x[1], InternalAgent)]
+                               internal_agents.remove(('InternalAgent', InternalAgent)) 
+                               if len(internal_agents) > 0:
+                                       choice2 = self.SelectButton(["internal", "external"], prompt="Type of agent")
+                               else:
+                                       choice2 = 1
 
+                               if choice2 == 0:
+                                       agent = internal_agents[self.SelectButton(map(lambda e : e[0], internal_agents), prompt="Choose internal agent")]
+                                       players.append(agent[1](agent[0], colour))                                      
+                               elif choice2 == 1:
+                                       try:
+                                               import Tkinter
+                                               from tkFileDialog import askopenfilename
+                                               root = Tkinter.Tk() # Need a root to make Tkinter behave
+                                               root.withdraw() # Some sort of magic incantation
+                                               path = askopenfilename(parent=root, initialdir="../agents",title=
+'Choose an agent.')
                                                if path == "":
                                                        return self.SelectPlayers()
-
-                                               try:
-                                                       p = make_player(path, colour)
-                                               except:
+                                               players.append(make_player(path, colour))       
+                                       except:
+                                               
+                                               p = None
+                                               while p == None:
                                                        self.board.display_grid(self.window, self.grid_sz)
                                                        pygame.display.flip()
-                                                       self.message("Invalid path!")
-                                                       time.sleep(1)
-                                                       p = None
-                                       players.append(p)
+                                                       path = self.getstr(prompt = "Enter path:")
+                                                       if path == None:
+                                                               return None
+       
+                                                       if path == "":
+                                                               return self.SelectPlayers()
+       
+                                                       try:
+                                                               p = make_player(path, colour)
+                                                       except:
+                                                               self.board.display_grid(self.window, self.grid_sz)
+                                                               pygame.display.flip()
+                                                               self.message("Invalid path!")
+                                                               time.sleep(1)
+                                                               p = None
+                                               players.append(p)
                        elif choice == 2:
                                address = ""
                                while address == "":
@@ -1456,7 +2323,6 @@ class GraphicsThread(StoppableThread):
                                
                        
 # --- graphics.py --- #
-# +++ main.py +++ #
 #!/usr/bin/python -u
 
 # Do you know what the -u does? It unbuffers stdin and stdout
@@ -1475,6 +2341,7 @@ import os
 import time
 
 turn_delay = 0.5
+sleep_timeout = None
 [game, graphics] = [None, None]
 
 def make_player(name, colour):
@@ -1487,9 +2354,29 @@ def make_player(name, colour):
                        if len(s) > 1:
                                address = s[1]
                        return NetworkReceiver(colour, address)
+               if s[0] == "internal":
+
+                       import inspect
+                       internal_agents = inspect.getmembers(sys.modules[__name__], inspect.isclass)
+                       internal_agents = [x for x in internal_agents if issubclass(x[1], InternalAgent)]
+                       internal_agents.remove(('InternalAgent', InternalAgent)) 
+                       
+                       if len(s) != 2:
+                               sys.stderr.write(sys.argv[0] + " : '@internal' should be followed by ':' and an agent name\n")
+                               sys.stderr.write(sys.argv[0] + " : Choices are: " + str(map(lambda e : e[0], internal_agents)) + "\n")
+                               return None
+
+                       for a in internal_agents:
+                               if s[1] == a[0]:
+                                       return a[1](name, colour)
+                       
+                       sys.stderr.write(sys.argv[0] + " : Can't find an internal agent matching \"" + s[1] + "\"\n")
+                       sys.stderr.write(sys.argv[0] + " : Choices are: " + str(map(lambda e : e[0], internal_agents)) + "\n")
+                       return None
+                       
 
        else:
-               return AgentPlayer(name, colour)
+               return ExternalAgent(name, colour)
                        
 
 
@@ -1503,15 +2390,24 @@ def main(argv):
        
        global turn_delay
        global agent_timeout
-       global log_file
+       global log_files
        global src_file
+       global graphics_enabled
+       global always_reveal_states
+       global sleep_timeout
 
-
-
+       max_moves = None
+       src_file = None
        
        style = "quantum"
        colour = "white"
-       graphics_enabled = True
+
+       # Get the important warnings out of the way
+       if platform.system() == "Windows":
+               sys.stderr.write(sys.argv[0] + " : Warning - You are using " + platform.system() + "\n")
+               if platform.release() == "Vista":
+                       sys.stderr.write(sys.argv[0] + " : God help you.\n")
+       
 
        players = []
        i = 0
@@ -1519,7 +2415,11 @@ def main(argv):
                i += 1
                arg = argv[i]
                if arg[0] != '-':
-                       players.append(make_player(arg, colour))
+                       p = make_player(arg, colour)
+                       if not isinstance(p, Player):
+                               sys.stderr.write(sys.argv[0] + " : Fatal error creating " + colour + " player\n")
+                               return 100
+                       players.append(p)
                        if colour == "white":
                                colour = "black"
                        elif colour == "black":
@@ -1533,20 +2433,36 @@ def main(argv):
                        style = "classical"
                elif arg[1] == '-' and arg[2:] == "quantum":
                        style = "quantum"
+               elif arg[1] == '-' and arg[2:] == "reveal":
+                       always_reveal_states = True
                elif (arg[1] == '-' and arg[2:] == "graphics"):
-                       graphics_enabled = not graphics_enabled
+                       graphics_enabled = True
+               elif (arg[1] == '-' and arg[2:] == "no-graphics"):
+                       graphics_enabled = False
                elif (arg[1] == '-' and arg[2:].split("=")[0] == "file"):
                        # Load game from file
                        if len(arg[2:].split("=")) == 1:
-                               src_file = sys.stdout
+                               src_file = sys.stdin
                        else:
-                               src_file = arg[2:].split("=")[1]
+                               f = arg[2:].split("=")[1]
+                               if f[0:7] == "http://":
+                                       src_file = HttpReplay(f)
+                               else:
+                                       src_file = FileReplay(f.split(":")[0])
+
+                                       if len(f.split(":")) == 2:
+                                               max_moves = int(f.split(":")[1])
+
                elif (arg[1] == '-' and arg[2:].split("=")[0] == "log"):
                        # Log file
                        if len(arg[2:].split("=")) == 1:
-                               log_file = sys.stdout
+                               log_files.append(LogFile(sys.stdout))
                        else:
-                               log_file = arg[2:].split("=")[1]
+                               f = arg[2:].split("=")[1]
+                               if f[0] == '@':
+                                       log_files.append(ShortLog(f[1:]))
+                               else:
+                                       log_files.append(LogFile(open(f, "w", 0)))
                elif (arg[1] == '-' and arg[2:].split("=")[0] == "delay"):
                        # Delay
                        if len(arg[2:].split("=")) == 1:
@@ -1558,11 +2474,14 @@ def main(argv):
                        # Timeout
                        if len(arg[2:].split("=")) == 1:
                                agent_timeout = -1
-                       elif platform.system() != "Windows": # Windows breaks this option
+                       else:
                                agent_timeout = float(arg[2:].split("=")[1])
+               elif (arg[1] == '-' and arg[2:].split("=")[0] == "blackout"):
+                       # Screen saver delay
+                       if len(arg[2:].split("=")) == 1:
+                               sleep_timeout = -1
                        else:
-                               sys.stderr.write(sys.argv[0] + " : Warning - You are using Windows\n")
-                               agent_timeout = -1
+                               sleep_timeout = float(arg[2:].split("=")[1])
                                
                elif (arg[1] == '-' and arg[2:] == "help"):
                        # Help
@@ -1571,13 +2490,40 @@ def main(argv):
 
 
        # Create the board
-       board = Board(style)
+       
+       # Construct a GameThread! Make it global! Damn the consequences!
+                       
+       if src_file != None:
+               # Hack to stop ReplayThread from exiting
+               #if len(players) == 0:
+               #       players = [HumanPlayer("dummy", "white"), HumanPlayer("dummy", "black")]
+
+               # Normally the ReplayThread exits if there are no players
+               # TODO: Decide which behaviour to use, and fix it
+               end = (len(players) == 0)
+               if end:
+                       players = [Player("dummy", "white"), Player("dummy", "black")]
+               elif len(players) != 2:
+                       sys.stderr.write(sys.argv[0] + " : Usage " + sys.argv[0] + " white black\n")
+                       if graphics_enabled:
+                               sys.stderr.write(sys.argv[0] + " : (You won't get a GUI, because --file was used, and the author is lazy)\n")
+                       return 44
+               game = ReplayThread(players, src_file, end=end, max_moves=max_moves)
+       else:
+               board = Board(style)
+               board.max_moves = max_moves
+               game = GameThread(board, players) 
+
+
 
 
        # Initialise GUI
        if graphics_enabled == True:
                try:
-                       graphics = GraphicsThread(board, grid_sz = [64,64]) # Construct a GraphicsThread!
+                       graphics = GraphicsThread(game.board, grid_sz = [64,64]) # Construct a GraphicsThread!
+                       
+                       graphics.sleep_timeout = sleep_timeout
+
                except Exception,e:
                        graphics = None
                        sys.stderr.write(sys.argv[0] + " : Got exception trying to initialise graphics\n"+str(e.message)+"\nDisabled graphics\n")
@@ -1617,23 +2563,70 @@ def main(argv):
                                graphics.message("Connecting to " + p.colour + " player...")
                        p.connect()
 
+       
+       # If using windows, select won't work; use horrible TimeoutPlayer hack
+       if agent_timeout > 0:
+               if platform.system() == "Windows":
+                       for i in range(len(players)):
+                               if isinstance(players[i], ExternalAgent) or isinstance(players[i], InternalAgent):
+                                       players[i] = TimeoutPlayer(players[i], agent_timeout)
+
+               else:
+                       warned = False
+                       # InternalAgents get wrapped to an ExternalAgent when there is a timeout
+                       # This is not confusing at all.
+                       for i in range(len(players)):
+                               if isinstance(players[i], InternalAgent):
+                                               players[i] = ExternalWrapper(players[i])
+
+
+               
 
-       # Construct a GameThread! Make it global! Damn the consequences!
-       game = GameThread(board, players) 
 
 
+
+       log_init(game.board, players)
+       
        
        if graphics != None:
                game.start() # This runs in a new thread
                graphics.run()
-               game.join()
-               return game.error + graphics.error
+               if game.is_alive():
+                       game.join()
+       
+
+               error = game.error + graphics.error
        else:
                game.run()
-               return game.error
+               error = game.error
+       
+
+       for l in log_files:
+               l.close()
+
+       if src_file != None and src_file != sys.stdin:
+               src_file.close()
+
+       sys.stdout.write(game.final_result + "\n")
+
+       return error
 
 # This is how python does a main() function...
 if __name__ == "__main__":
-       sys.exit(main(sys.argv))
+       try:
+               sys.exit(main(sys.argv))
+       except KeyboardInterrupt:
+               sys.stderr.write(sys.argv[0] + " : Got KeyboardInterrupt. Stopping everything\n")
+               if isinstance(graphics, StoppableThread):
+                       graphics.stop()
+                       graphics.run() # Will clean up graphics because it is stopped, not run it (a bit dodgy)
+
+               if isinstance(game, StoppableThread):
+                       game.stop()
+                       if game.is_alive():
+                               game.join()
+
+               sys.exit(102)
+
 # --- main.py --- #
-# EOF - created from make on Thu Jan 24 17:04:54 WST 2013
+# EOF - created from make on Tue Mar 19 07:36:32 WST 2013

UCC git Repository :: git.ucc.asn.au