Merge branch 'master' into 'mouse_interaction'
# Conflicts: # squirrelbattle/display/display_manager.py # squirrelbattle/display/menudisplay.py # squirrelbattle/entities/items.py
This commit is contained in:
@ -27,6 +27,7 @@ class GameMode(Enum):
|
||||
PLAY = auto()
|
||||
SETTINGS = auto()
|
||||
INVENTORY = auto()
|
||||
STORE = auto()
|
||||
|
||||
|
||||
class KeyValues(Enum):
|
||||
@ -44,6 +45,7 @@ class KeyValues(Enum):
|
||||
EQUIP = auto()
|
||||
DROP = auto()
|
||||
SPACE = auto()
|
||||
CHAT = auto()
|
||||
|
||||
@staticmethod
|
||||
def translate_key(key: str, settings: Settings) -> Optional["KeyValues"]:
|
||||
@ -74,4 +76,6 @@ class KeyValues(Enum):
|
||||
return KeyValues.DROP
|
||||
elif key == ' ':
|
||||
return KeyValues.SPACE
|
||||
elif key == settings.KEY_CHAT:
|
||||
return KeyValues.CHAT
|
||||
return None
|
||||
|
Reference in New Issue
Block a user