Merge branch 'equipment-in-inventory' into 'master'

Resolve "Display equipment in inventory"

Closes #75

See merge request ynerant/squirrel-battle!71

squirrelbattle/game.py

@@ -309,7 +309,8 @@ class Game:
             if key == KeyValues.USE:
                 self.inventory_menu.validate().use()
             elif key == KeyValues.EQUIP:
-                self.inventory_menu.validate().equip()
+                item = self.inventory_menu.validate()
+                item.unequip() if item.equipped else item.equip()
             elif key == KeyValues.DROP:
                 self.inventory_menu.validate().drop()