Merged master into game

dungeonbattle/game.py

@@ -1,5 +1,8 @@
+from typing import Any
+
 from .interfaces import Map
 from .mapdisplay import MapDisplay
+from .settings import Settings
 from .term_manager import TermManager
 
 
@@ -8,7 +11,9 @@ class Game:
 
     def init(self) -> None:
         Game.INSTANCE = self
-        self.key_handler = self.player_move
+        self.settings = Settings()
+        self.settings.load_settings()
+        self.settings.write_settings()
 
     def new_game(self):
         # TODO generate a new map procedurally
@@ -29,9 +34,9 @@ class Game:
             screen.refresh()
             self.d.display(self.player.getPosY(), self.player.getPosX())
             key = screen.getkey()
-            self.key_handler(key)
+            self.handle_key_pressed(key)
 
-    def player_move(self, key):
+    def handle_key_pressed(self, key: str) -> None:
         # TODO load keys from settings
         if key == 'z' or key == 'KEY_UP':
             self.player.move_up()
@@ -48,20 +53,14 @@ class Player:
     y: int = 0
     x: int = 0
 
-    def move_up(self):
+    def move_up(self) -> None:
         self.y -= 1
 
-    def move_down(self):
+    def move_down(self) -> None:
         self.y += 1
 
-    def move_left(self):
+    def move_left(self) -> None:
         self.x -= 1
 
-    def move_right(self):
+    def move_right(self) -> None:
         self.x += 1
-
-    def getPosX(self):
-        return self.x
-
-    def getPosY(self):
-        return self.y