Changes in [109:7352863453bc:110:763c07539658]

Files:

• engine.py (modified) (2 diffs, 1 prop)
• main.py (modified) (1 diff, 1 prop)

engine.py

@@ -88 +88 @@
         return
     def move_snake(self, snake):
-        dir_to_numb_of_rot={
-            (0,-1):0,
-            (1,0):1,
-            (0,1):2,
-            (-1,0):3}
-        applied_dir = None
+        head = snake.cells[0]
         for rule in snake.rules:
-            if applied_dir == None:
-                for direction in snake.legal_dir:
-                    rule.rotate(dir_to_numb_of_rot[direction])
-                    if rule.applies(self.field, snake.cells[0].x, snake.cells[0].y) == True:
-                        applied_dir = direction
-                        break
-            else:
-                self.move_do(snake, applied_dir)
-                break
-        if applied_dir == None:
+            for direction in snake.legal_dir:
+                rule.rotate(direction)
+                if rule.applies(self.field, head.x, head.y) == True:
+                    self.move_do(snake, direction)
+                    return
+        if snake.legal_dir != []:
             self.move_do(snake, snake.legal_dir[0])
             pass
         return
     def move_do(self, snake, applied_dir):
-        dir_cell = self.field[snake.cells[0].y + applied_dir[0], snake.cells[0].x + applied_dir[1]]
+        head = snake.cells[0]
+        dir_cell = self.field[head.x + applied_dir[0], head.y + applied_dir[1]]
         if dir_cell.type == 'empty':
             snake.cells.insert(0,dir_cell)
@@ -156 +148 @@
     def legal_moves(self, snake):
         snake.legal_dir = []
+        head = snake.cells[0]
         for direction in directions:
-            dir_cell = self.field[snake.cells[0].y + direction[0], snake.cells[0].x + direction[1]]
+            dir_cell = self.field[head.x + direction[0], head.y + direction[1]]
             if (dir_cell.type == 'empty' or (dir_cell.type == 'tail' and dir_cell.snake != snake)):
                 snake.legal_dir.append(direction)

main.py

@@ -37 +37 @@
             self.step_id = 0
             pass
-        elif self.step_id == 0:
+        if self.step_id == 0:
             file_name = tkfd.askopenfilename(title="Open file")
             snake = self.engine.create_snake(snake_number)
             snake.load(open(file_name, "r"))
-            pass
-        else:
             pass
         self.engine.refill()