Commit Qwebchess before fucking with it

[progcomp2013.git] / qchess / src / piece.py

diff --git a/qchess/src/piece.py b/qchess/src/piece.py
index 81fbb56..a2faf9d 100644 (file)
--- a/qchess/src/piece.py
+++ b/qchess/src/piece.py
@@ -19,7 +19,7 @@ class Piece():
                
                self.move_pattern = None
                self.coverage = None
-
+               self.possible_moves = {}
                
 
        def init_from_copy(self, c):
@@ -58,7 +58,10 @@ class Piece():
                # Draw the two possible types underneath the current_type image
                for i in range(len(self.types)):
                        if always_reveal_states == True or self.types[i][0] != '?':
-                               img = small_images[self.colour][self.types[i]]
+                               if self.types[i][0] == '?':
+                                       img = small_images[self.colour][self.types[i][1:]]
+                               else:
+                                       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
 
@@ -75,7 +78,7 @@ 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:]