ynerant/squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Merge branch 'inventory' into entities

Browse Source
This commit is contained in:
Yohann D'ANELLO
2020-11-11 20:34:30 +01:00
parent c329ec927f e3d28409f5
commit f33d8b8170
4 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dungeonbattle/game.py
View File

@ -37,9 +37,11 @@ class Game:
"""
self.state = GameMode.MAINMENU
self.main_menu = menus.MainMenu()
self.settings_menu = menus.SettingsMenu()
self.settings = Settings()
self.settings.load_settings()
self.settings.write_settings()
self.settings_menu.update_values(self.settings)
def new_game(self) -> None:
"""
@ -68,7 +70,7 @@ class Game:
screen.refresh()
self.display_refresh()
key = screen.getkey()
self.handle_key_pressed(self.translate_key(key))
self.handle_key_pressed(self.translate_key(key), screen)
def translate_key(self, key: str) -> KeyValues:
"""
@ -91,7 +93,7 @@ class Game:
elif key == ' ':
return KeyValues.SPACE
def handle_key_pressed(self, key: KeyValues) -> None:
def handle_key_pressed(self, key: KeyValues, screen) -> None:
"""
Indicates what should be done when the given key is pressed,
according to the current game state.
@ -101,7 +103,7 @@ class Game:
elif self.state == GameMode.MAINMENU:
self.handle_key_pressed_main_menu(key)
elif self.state == GameMode.SETTINGS:
self.handle_key_pressed_settings(key)
self.handle_key_pressed_settings(key,screen)
self.display_refresh()
def handle_key_pressed_play(self, key: KeyValues) -> None:
@ -140,9 +142,20 @@ class Game:
elif option == menus.MainMenuValues.EXIT:
sys.exit(0)
def handle_key_pressed_settings(self, key: KeyValues) -> None:
def handle_key_pressed_settings(self, key: KeyValues, screen : Any) -> None:
"""
For now, in the settings mode, we can only go backwards.
"""
if key == KeyValues.SPACE:
self.state = GameMode.MAINMENU
if key == KeyValues.DOWN:
self.settings_menu.go_down()
if key == KeyValues.UP:
self.settings_menu.go_up()
if key == KeyValues.ENTER:
option = self.settings_menu.validate().split(": ")[0]
if option != "TEXTURE_PACK":
newkey = screen.getkey()
self.settings.__setattr__(option, newkey)
self.settings.write_settings()
self.settings_menu.update_values(self.settings)