I think I just borked things...
[progcomp2013.git] / qchess / src / game.py
index 9938e0d..66b782f 100644 (file)
@@ -71,12 +71,15 @@ class GameThread(StoppableThread):
                                        if self.stopped():
                                                break
 
-                                       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(result) # Inform players of what happened
 
-                                       log(result)
+                                                                               
 
                                        if isinstance(graphics, GraphicsThread):
                                                with graphics.lock:
@@ -122,7 +125,8 @@ class GameThread(StoppableThread):
 
                log(self.final_result)
 
-               graphics.stop()
+               if isinstance(graphics, GraphicsThread):
+                       graphics.stop()
 
        
 # A thread that replays a log file
@@ -135,101 +139,108 @@ class ReplayThread(GameThread):
                self.line_number = 0
                self.end = end
 
-               self.setup()
+               self.reset_board(self.src.readline())
+
+       def reset_board(self, line):
+               pieces = {"white" : [], "black" : []}
+               king = {"white" : None, "black" : None}
+               grid = [[None] * w for _ in range(h)]
+               for x in range(w):
+                       for y in range(h):
+                               self.board.grid[x][y] = None
+               while line != "# Start game":
+                       if line[0] == "#":
+                               line = self.src.readline().strip(" \r\n")
+                               continue
+
+                       tokens = line.split(" ")
+                       [x, y] = map(int, tokens[len(tokens)-1].split(","))
+                       current_type = tokens[1]
+                       types = map(lambda e : e.strip("'[], "), (tokens[2]+tokens[3]).split(","))
+                       
+                       target = Piece(tokens[0], x, y, types)
+                       target.current_type = current_type
+                       
+                       try:
+                               target.choice = types.index(current_type)
+                       except:
+                               target.choice = -1
 
-       def setup(self):
-               if True:
-                       while self.src.readline().strip(" \r\n") != "# Initial board":
-                               self.line_number += 1
+                       pieces[tokens[0]].append(target)
+                       if target.current_type == "king":
+                               king[tokens[0]] = target
+                       grid[x][y] = target
                
                        line = self.src.readline().strip(" \r\n")
-                       
-                       while line != "# Start game":
-                               #print "Reading line " + str(line)
-                               self.line_number += 1
-                               [x,y] = map(int, line.split("at")[1].strip(" \r\n").split(","))
-                               colour = line.split(" ")[0]
-                               current_type = line.split(" ")[1]
-                               types = map(lambda e : e.strip(" [],'"), line.split(" ")[2:4])
-                               p = Piece(colour, x, y, types)
-                               if current_type != "unknown":
-                                       p.current_type = current_type
-                                       p.choice = types.index(current_type)
-
-                               self.board.pieces[colour].append(p)
-                               self.board.grid[x][y] = p
-                               if current_type == "king":
-                                       self.board.king[colour] = p
 
-                               line = self.src.readline().strip(" \r\n")
-                               
-               #except Exception, e:
-               #       raise Exception("FILE line: " + str(self.line_number) + " \""+str(line)+"\"") #\n" + e.message)
+               self.board.pieces = pieces
+               self.board.king = king
+               self.board.grid = grid
        
        def run(self):
-               i = 0
-               phase = 0
-               count = 0
+               move_count = 0
                line = self.src.readline().strip(" \r\n")
                while line != "# EOF":
-                       count += 1
-                       if self.max_lines != None and count > self.max_lines:
-                               self.stop()
-
                        if self.stopped():
                                break
 
-                       with self.lock:
-                               self.state["turn"] = self.players[i]
+                                       
+
+                       if line[0] == '#':
+                               line = self.src.readline().strip(" \r\n")
+                               continue
 
-                       line = line.split(":")
-                       result = line[len(line)-1].strip(" \r\n")
-                       log(result)
+                       tokens = line.split(" ")
+                       if tokens[0] == "white" or tokens[0] == "black":
+                               self.reset_board(line)
+                               line = self.src.readline().strip(" \r\n")
+                               continue
 
+                       move = line.split(":")
+                       move = move[len(move)-1].strip(" \r\n")
+                       tokens = move.split(" ")
+                       
+                       
                        try:
-                               self.board.update(result)
+                               [x,y] = map(int, tokens[0:2])
                        except:
-                               self.final_result = result
                                self.stop()
                                break
 
-                       [x,y] = map(int, result.split(" ")[0:2])
                        target = self.board.grid[x][y]
+                       
+                       move_piece = (tokens[2] == "->")
 
-                       if isinstance(graphics, GraphicsThread):
-                               if phase == 0:
-                                       with graphics.lock:
-                                               graphics.state["moves"] = self.board.possible_moves(target)
-                                               graphics.state["select"] = target
-
-                                       if self.end:
-                                               time.sleep(turn_delay)
+                       if move_piece:
+                               [x2,y2] = map(int, tokens[len(tokens)-2:])
 
-                               elif phase == 1:
-                                       [x2,y2] = map(int, result.split(" ")[3:5])
-                                       with graphics.lock:
-                                               graphics.state["moves"] = [[x2,y2]]
+                       log(move)
+                       self.board.update(move)
+                       for p in self.players:
+                               p.update(move)
 
-                                       if self.end:
-                                               time.sleep(turn_delay)
+                       line = self.src.readline().strip(" \r\n")
+                       
+                       if isinstance(graphics, GraphicsThread):
+                               with self.lock:
+                                       if target.colour == "white":
+                                               self.state["turn"] = self.players[0]
+                                       else:
+                                               self.state["turn"] = self.players[1]
 
-                                       with graphics.lock:
-                                               graphics.state["select"] = None
-                                               graphics.state["dest"] = None
-                                               graphics.state["moves"] = None
-                                               
+                               with graphics.lock:
+                                       graphics.state["select"] = target
+                                       if move_piece:
+                                               graphics.state["moves"] = [[x2, y2]]
+                                       elif target.current_type != "unknown":
+                                               graphics.state["moves"] = self.board.possible_moves(target)
+                                       
 
 
                        
 
-                       for p in self.players:
-                               p.update(result)
+                               
                        
-                       phase = (phase + 1) % 2
-                       if phase == 0:
-                               i = (i + 1) % 2
-
-                       line = self.src.readline().strip(" \r\n")
 
                if self.max_lines != None and self.max_lines > count:
                        sys.stderr.write(sys.argv[0] + " : Replaying from file; stopping at last line (" + str(count) + ")\n")

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