Merging master into village, conflicts were solved

squirrelbattle/game.py

@@ -40,6 +40,7 @@ class Game:
         self.main_menu = menus.MainMenu()
         self.settings_menu = menus.SettingsMenu()
         self.settings_menu.update_values(self.settings)
+        self.inventory_menu = menus.InventoryMenu()
         self.logs = Logs()
         self.message = None
 
@@ -48,13 +49,14 @@ class Game:
         Create a new game on the screen.
         """
         # TODO generate a new map procedurally
-        self.map = Map.load(ResourceManager.get_asset_path("example_map_2.txt"))
+        self.map = Map.load(ResourceManager.get_asset_path("example_map.txt"))
         self.map.logs = self.logs
         self.logs.clear()
         self.player = Player()
         self.map.add_entity(self.player)
         self.player.move(self.map.start_y, self.map.start_x)
         self.map.spawn_random_entities(randint(3, 10))
+        self.inventory_menu.update_player(self.player)
 
     def run(self, screen: Any) -> None:
         """
@@ -84,6 +86,8 @@ class Game:
 
         if self.state == GameMode.PLAY:
             self.handle_key_pressed_play(key)
+        elif self.state == GameMode.INVENTORY:
+            self.handle_key_pressed_inventory(key)
         elif self.state == GameMode.MAINMENU:
             self.handle_key_pressed_main_menu(key)
         elif self.state == GameMode.SETTINGS:
@@ -106,6 +110,8 @@ class Game:
         elif key == KeyValues.RIGHT:
             if self.player.move_right():
                 self.map.tick()
+        elif key == KeyValues.INVENTORY:
+            self.state = GameMode.INVENTORY
         elif key == KeyValues.SPACE:
             self.state = GameMode.MAINMENU
         elif key == KeyValues.T :
@@ -134,6 +140,29 @@ class Game:
                             self.state = GameMode.STORE
                 
 
+    def handle_key_pressed_inventory(self, key: KeyValues) -> None:
+        """
+        In the inventory menu, we can interact with items or close the menu.
+        """
+        if key == KeyValues.SPACE or key == KeyValues.INVENTORY:
+            self.state = GameMode.PLAY
+        elif key == KeyValues.UP:
+            self.inventory_menu.go_up()
+        elif key == KeyValues.DOWN:
+            self.inventory_menu.go_down()
+        if self.inventory_menu.values and not self.player.dead:
+            if key == KeyValues.USE:
+                self.inventory_menu.validate().use()
+            elif key == KeyValues.EQUIP:
+                self.inventory_menu.validate().equip()
+            elif key == KeyValues.DROP:
+                self.inventory_menu.validate().drop()
+
+            # Ensure that the cursor has a good position
+            self.inventory_menu.position = min(self.inventory_menu.position,
+                                               len(self.inventory_menu.values)
+                                               - 1)
+
     def handle_key_pressed_main_menu(self, key: KeyValues) -> None:
         """
         In the main menu, we can navigate through options.