Merging master into village, conflicts were solved

squirrelbattle/enums.py

@@ -38,6 +38,10 @@ class KeyValues(Enum):
     LEFT = auto()
     RIGHT = auto()
     ENTER = auto()
+    INVENTORY = auto()
+    USE = auto()
+    EQUIP = auto()
+    DROP = auto()
     SPACE = auto()
     T = auto()
 
@@ -60,6 +64,14 @@ class KeyValues(Enum):
             return KeyValues.UP
         elif key == settings.KEY_ENTER:
             return KeyValues.ENTER
+        elif key == settings.KEY_INVENTORY:
+            return KeyValues.INVENTORY
+        elif key == settings.KEY_USE:
+            return KeyValues.USE
+        elif key == settings.KEY_EQUIP:
+            return KeyValues.EQUIP
+        elif key == settings.KEY_DROP:
+            return KeyValues.DROP
         elif key == ' ':
             return KeyValues.SPACE
         elif key == 't':