Merge branch 'master' into 'familiars'

# Conflicts:
#   squirrelbattle/display/display_manager.py
#   squirrelbattle/display/logsdisplay.py
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/display/menudisplay.py
#   squirrelbattle/menus.py

squirrelbattle/display/statsdisplay.py

@@ -4,6 +4,7 @@
 import curses
 
 from ..entities.player import Player
+from ..game import Game
 from ..translations import gettext as _
 from .display import Display
 
@@ -18,8 +19,8 @@ class StatsDisplay(Display):
         super().__init__(*args, **kwargs)
         self.pad = self.newpad(self.rows, self.cols)
 
-    def update_player(self, p: Player) -> None:
-        self.player = p
+    def update(self, game: Game) -> None:
+        self.player = game.player
 
     def update_pad(self) -> None:
         string2 = "Player -- LVL {}\nEXP {}/{}\nHP {}/{}"\