Smash snake, fix matrix.

Author: yegorLitvinov

game.py

@@ -33,9 +33,9 @@ class Direction:
 
 
 class DrawableObject:
-    EMPTY = 1
-    APPLE = 2
-    SNAKE = 3
+    EMPTY = ""
+    APPLE = "@"
+    SNAKE = "#"
 
 
 class Snake:
@@ -103,6 +103,11 @@ def move(self, direction):
     def eat(self):
         self.is_eating = True
 
+    def is_smashed(self):
+        for i in range(1, len(self.skeleton)):
+            if self.head.current_position == self.skeleton[i].current_position:
+                return True
+        return False
 
 class Apple:
     def __init__(self, height: int, width: int):
@@ -123,15 +128,15 @@ class BaseDisplay:
     def __init__(self, width: int, height: int):
         self.width = width
         self.height = height
-        self.matrix = [[False for j in range(width)] for i in range(height)]
+        self.matrix = [[DrawableObject.EMPTY for j in range(width)] for i in range(height)]
 
     def set_position(self, position: Position, obj):
         self.matrix[position.y][position.x] = obj
 
     def clear(self):
         for i in range(self.height):
             for j in range(self.width):
-                self.matrix[i][j] = False
+                self.matrix[i][j] = DrawableObject.EMPTY
 
     def draw(self):
         raise NotImplementedError()
@@ -142,12 +147,10 @@ def draw(self):
         print("")
         for i in range(self.height):
             for j in range(self.width):
-                if self.matrix[i][j] == DrawableObject.SNAKE:
-                    print("#", end="")
-                elif self.matrix[i][j] == DrawableObject.APPLE:
-                    print("@", end="")
-                else:
+                if self.matrix[i][j] == DrawableObject.EMPTY:
                     print(".", end="")
+                else:
+                    print(self.matrix[i][j], end="")
             print("")
         print("")
 
@@ -183,10 +186,12 @@ def step(self):
         self.display.clear()
         direction = self.controller.get_direction()
         self.snake.move(direction)
+        if self.snake.is_smashed():
+            raise Exception()
+        for vertebra in self.snake.skeleton:
+            self.display.set_position(vertebra.current_position, DrawableObject.SNAKE)
         if self.snake.head.current_position == self.apple.position:
             self.snake.eat()
             self.apple.respawn(self.display.matrix)
-        for vertebra in self.snake.skeleton:
-            self.display.set_position(vertebra.current_position, DrawableObject.SNAKE)
         self.display.set_position(self.apple.position, DrawableObject.APPLE)
         self.display.draw()

main.py

@@ -3,11 +3,17 @@
 from game import Game
 
 
-WIDHT = 10
-HEIGHT = 10
-g = Game(WIDHT, HEIGHT)
+def play():
+    WIDHT = 3
+    HEIGHT = WIDHT
+    g = Game(WIDHT, HEIGHT)
+    while True:
+        try:
+            g.step()
+        except Exception:
+            print("Oops...")
+            g = Game(WIDHT, HEIGHT)
+        # utime.sleep(1)
 
 
-while True:
-    g.step()
-    # utime.sleep(1)
+play()

tests.py

@@ -46,19 +46,23 @@ def test_snake_move():
 
 
 def test_apple_respawn():
-    size = 10
-    matrix = [[False for j in range(size)] for i in range(size)]
+    size = 3
+    matrix = [
+        ["#", "", ""],
+        ["#", "#", ""],
+        ["#", "", "#"],
+    ]
     apple = Apple(size, size)
     assert apple.position.x == 0
     assert apple.position.y == 0
-    assert apple.width == 10
-    assert apple.height == 10
-    for i in range(10):
+    for i in range(100):
+        apple.respawn(matrix)
         x = apple.position.x
         y = apple.position.y
-        apple.respawn(matrix)
-        assert 0 <= apple.position.x < size
-        assert 0 <= apple.position.y < size
+        assert 0 <= x < size
+        assert 0 <= y < size
+        assert x != y
+        assert x != 0
 
 
 def test_randchoice():