X-Git-Url: https://git.ucc.asn.au/?p=progcomp2013.git;a=blobdiff_plain;f=qchess%2Fsrc%2Fgame.py;fp=qchess%2Fsrc%2Fgame.py;h=d91ea607026c81c8af992532c9f2766908623fd3;hp=a62e280a6efc46a268d2926850ecc7f22270b133;hb=337c794fe317a54c65bf5de103bf1a55c0ceb141;hpb=0325af7e6f9c20b549efa84754b4a4a206fe66cc

diff --git a/qchess/src/game.py b/qchess/src/game.py
index a62e280..d91ea60 100644
--- a/qchess/src/game.py
+++ b/qchess/src/game.py
@@ -71,15 +71,15 @@ class GameThread(StoppableThread):
 					if self.stopped():
 						break
 
-					if isinstance(log_file, HttpLog):
-						log_file.prelog()
+					result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)
+					log(result)
 
 					self.board.update_move(x, y, x2, y2)
-					result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)
+					
 					for p2 in self.players:
 						p2.update(result) # Inform players of what happened
 
-					log(result)					
+										
 
 					if isinstance(graphics, GraphicsThread):
 						with graphics.lock:
@@ -139,108 +139,94 @@ 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}
+		for x in range(w):
+			for y in range(h):
+				self.board.grid[x][y] = None
+		while line != "# Start game":
+			tokens = line.split(" ")
+			[x, y] = map(int, tokens[len(tokens)-1].split(","))
+			current_type = tokens[1]
+			types = map(lambda e : e.strip("'[], "), tokens[2].split(","))
+
+			target = Piece(tokens[0], x, y, current_type)
+			try:
+				target.choice = types.index(current_type)
+			except:
+				target.choice = -1
 
-	def setup(self):
-		sys.stderr.write("setup called for ReplayThread\n")
-		if True:
-			while self.src.readline().strip(" \r\n") != "# Initial board":
-				self.line_number += 1
+			pieces[token[0]].append(target)
+			if target.current_type == "king":
+				king[token[0]] = 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
 	
 	def run(self):
-		i = 0
-		phase = 0
-		count = 0
+		move_count = 0
 		line = self.src.readline().strip(" \r\n")
 		while line != "# EOF":
-			sys.stderr.write(sys.argv[0] + " : " + str(self.__class__.__name__) + " read: " + str(line) + "\n")
-			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]
+					
 
-			line = line.split(":")
-			result = line[len(line)-1].strip(" \r\n")
-			
+			if line[0] == '#':
+				line = self.src.readline().strip(" \r\n")
+				continue
 
+			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(":")[1]
+			tokens = move.split(" ")
 			try:
-				self.board.update(result)
-			except Exception, e:
-				sys.stderr.write("Exception! " + str(e.message) + "\n")
-				self.final_result = result
+				[x,y] = map(int, tokens[0:2])
+			except:
 				self.stop()
 				break
 
-			log(result)
-
-			[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)
-
-				elif phase == 1:
-					[x2,y2] = map(int, result.split(" ")[3:5])
-					with graphics.lock:
-						graphics.state["moves"] = [[x2,y2]]
+			if move_piece:
+				[x2,y2] = map(int, tokens[len(tokens)-2:])
 
-					if self.end:
-						time.sleep(turn_delay)
+			log(move)
+			self.board.update(move)
+			for p in self.players:
+				p.update(move)
+			
+			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")
-
-		sys.stderr.write(sys.argv[0] + " : " + str(self.__class__.__name__) + " finished...\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")