Change string moves to enum

Author: Brecht Verhoeve

.vscode/settings.json

@@ -1,6 +1,8 @@
 {
   "python.pythonPath": "venv/bin/python3",
-  "spellright.language": [],
+  "spellright.language": [
+    "en"
+  ],
   "spellright.documentTypes": [
     "markdown",
     "latex"

viper/game.py

@@ -3,6 +3,7 @@
 from typing import Dict
 from .random_viper import RandomViper
 from .viper import Viper
+from .move import Move
 
 class Game:
     """A game of snake
@@ -28,10 +29,10 @@ def get_viper(self):
         return self.viper
 
     def move(self):
-        move: str = self.viper.move()
+        move: Move = self.viper.move()
 
         move_response: Dict = {
-            'move': move,
+            'move': move.value,
             'shout': self.viper.shout
         }
 

viper/move.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+class Move(Enum):
+    """Enum of available moves for a viper
+    """
+    UP = 'up'
+    DOWN = 'down'
+    LEFT = 'left'
+    RIGHT = 'right'

viper/random_viper.py

@@ -1,6 +1,7 @@
 import random
 
 from .viper import Viper
+from .move import Move
 
 class RandomViper(Viper):
 
@@ -12,5 +13,5 @@ def head(self) -> str:
     def tail(self) -> str:
         return 'freckled'
 
-    def move(self) -> str:
-        return random.choice(Viper.MOVES)
+    def move(self) -> Move:
+        return random.choice(list(Move))

viper/viper.py

@@ -1,8 +1,10 @@
 import abc
-from typing import Dict
+from typing import Dict, List
 import logging
 import random
 
+from .move import Move
+
 class Viper(abc.ABC):
     """An abstract viper
     """
@@ -22,13 +24,6 @@ class Viper(abc.ABC):
         'regular'
     ]
 
-    MOVES = [
-        'up',
-        'down',
-        'left',
-        'right'
-    ]
-
     viper_id: int
     name: str 
     health: int
@@ -46,6 +41,10 @@ def __init__(self, viper_id: int, name: str, health: int, body: Dict, shout: str
     def __str__(self):
         return f'Viper with name {self.name} and color: ${self.color}.'
 
+    ####################
+    # Abstract methods #
+    ####################
+
     @property
     @abc.abstractmethod
     def head(self) -> str:
@@ -56,13 +55,22 @@ def head(self) -> str:
     def tail(self) -> str:
         pass
 
+    @abc.abstractmethod
+    def move(self) -> Move:
+        pass
+
+    ###################
+    # General methods #
+    ###################
+
     def get_config(self) -> Dict:
         return {
             'color': self.color,
             'headType': self.head,
             'tailType': self.tail
         }
 
-    @abc.abstractmethod
-    def move(self):
-        pass
+    def determine_valid_moves(self) -> List[Move]:
+        pass
+
+