Merged with Upstream

aakash049 · Apr 19, 2017 · b991c0f · b991c0f
1 parent abfb4fe
commit b991c0f
Show file tree

Hide file tree

Showing 32 changed files with 5 additions and 7 deletions.
diff --git a/Training_Data/Back/move/0.bmp b/Training_Data/Back/move/0.bmp
diff --git a/Training_Data/Back/move/1.bmp b/Training_Data/Back/move/1.bmp
diff --git a/Training_Data/Back/move/10.bmp b/Training_Data/Back/move/10.bmp
diff --git a/Training_Data/Back/move/11.bmp b/Training_Data/Back/move/11.bmp
diff --git a/Training_Data/Back/move/12.bmp b/Training_Data/Back/move/12.bmp
diff --git a/Training_Data/Back/move/13.bmp b/Training_Data/Back/move/13.bmp
diff --git a/Training_Data/Back/move/14.bmp b/Training_Data/Back/move/14.bmp
diff --git a/Training_Data/Back/move/15.bmp b/Training_Data/Back/move/15.bmp
diff --git a/Training_Data/Back/move/16.bmp b/Training_Data/Back/move/16.bmp
diff --git a/Training_Data/Back/move/17.bmp b/Training_Data/Back/move/17.bmp
diff --git a/Training_Data/Back/move/18.bmp b/Training_Data/Back/move/18.bmp
diff --git a/Training_Data/Back/move/19.bmp b/Training_Data/Back/move/19.bmp
diff --git a/Training_Data/Back/move/2.bmp b/Training_Data/Back/move/2.bmp
diff --git a/Training_Data/Back/move/20.bmp b/Training_Data/Back/move/20.bmp
diff --git a/Training_Data/Back/move/21.bmp b/Training_Data/Back/move/21.bmp
diff --git a/Training_Data/Back/move/22.bmp b/Training_Data/Back/move/22.bmp
diff --git a/Training_Data/Back/move/23.bmp b/Training_Data/Back/move/23.bmp
diff --git a/Training_Data/Back/move/24.bmp b/Training_Data/Back/move/24.bmp
diff --git a/Training_Data/Back/move/25.bmp b/Training_Data/Back/move/25.bmp
diff --git a/Training_Data/Back/move/26.bmp b/Training_Data/Back/move/26.bmp
diff --git a/Training_Data/Back/move/27.bmp b/Training_Data/Back/move/27.bmp
diff --git a/Training_Data/Back/move/28.bmp b/Training_Data/Back/move/28.bmp
diff --git a/Training_Data/Back/move/3.bmp b/Training_Data/Back/move/3.bmp
diff --git a/Training_Data/Back/move/4.bmp b/Training_Data/Back/move/4.bmp
diff --git a/Training_Data/Back/move/5.bmp b/Training_Data/Back/move/5.bmp
diff --git a/Training_Data/Back/move/6.bmp b/Training_Data/Back/move/6.bmp
diff --git a/Training_Data/Back/move/7.bmp b/Training_Data/Back/move/7.bmp
diff --git a/Training_Data/Back/move/8.bmp b/Training_Data/Back/move/8.bmp
diff --git a/Training_Data/Back/move/9.bmp b/Training_Data/Back/move/9.bmp
diff --git a/back_decoder.py b/back_decoder.py
@@ -32,7 +32,6 @@ def load(self):
         self._load(pt + '/end', end)
         self._load(pt + '/intro', intro)
         self._load(pt + '/loading', loading)
-        self._load(pt + '/move', move)
         self._load(pt + '/scoreboard', scoreboard)
         self._load(pt + '/shop', shop)
 

diff --git a/move_maker.py b/move_maker.py
@@ -168,19 +168,19 @@ def evaluate_board(self, start, end, board):
     def check_direction(self, start, dir):
         end = (start[0] + dir[0], start[1] + dir[1])
         board = dc(self.game_board)
-        if start[0] < 0 or start[0] > self.board_size or end[0] < 0 or end[0] > self.board_size \
-                or start[1] < 0 or start[1] > self.board_size or end[1] < 0 or end[1] > self.board_size:
-            return -1, [], None
+        if start[0] < 0 or start[0] > self.board_size or end[0] <= 0 or end[0] >= self.board_size - 1 \
+                or start[1] < 0 or start[1] > self.board_size or end[1] <= 0 or end[1] >= self.board_size - 1:
+            return -1, []
 
         # swap
         board[start[0]][start[1]], board[end[0]][end[1]] = board[end[0]][end[1]], board[start[0]][start[1]]
         score_start, start_board = self.evaluate_board(start, end, board)
         score_end, end_board = self.evaluate_board(end, start, board)
 
         if score_start > score_end:
-            return score_start, [start, end], start_board
+            return score_start, [start, end]
         else:
-            return score_end, [end, start], end_board
+            return score_end, [end, start]
 
     # main function to start solving the board
 

diff --git a/utils.py b/utils.py
@@ -86,7 +86,6 @@ def print_board(board):
 end = 101
 intro = 102
 loading = 103
-move = 104
 scoreboard = 105
 shop = 106