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

repaired display

Browse Source
This commit is contained in:
eichhornchen
2020-11-09 01:33:23 +01:00
parent 8d5d9d38ff
commit a4876bb7af
7 changed files with 118 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dungeonbattle/game.py
View File

@ -33,7 +33,7 @@ class Game:
player: Player
menu_display: MenuDisplay
map_display: MapDisplay
current_display: Display
display: Display
def __init__(self) -> None:
"""
@ -54,11 +54,8 @@ class Game:
self.player = Player()
self.player.move(1, 6)
self.map.add_entity(self.player)
self.menu_display = MenuDisplay(screen, self.main_menu, 0, 0)
self.map_display = MapDisplay(
screen, self.map, self.player,
TexturePack.get_pack(self.settings.TEXTURE_PACK))
self.current_display = self.menu_display
self.display = Display(screen, TexturePack.get_pack(self.settings.TEXTURE_PACK))
# self.menu_display = MenuDisplay(screen, self.main_menu, 0, 0)
@staticmethod
def load_game(filename: str) -> None:
@ -74,7 +71,7 @@ class Game:
while True:
screen.clear()
screen.refresh()
self.current_display.refresh()
self.display.refresh()
key = screen.getkey()
self.handle_key_pressed(self.translate_key(key))
@ -110,7 +107,7 @@ class Game:
self.handle_key_pressed_main_menu(key)
elif self.state == GameMode.SETTINGS:
self.handle_key_pressed_settings(key)
self.current_display.refresh()
self.display.refresh()
def handle_key_pressed_play(self, key: KeyValues) -> None:
"""
@ -126,7 +123,7 @@ class Game:
self.player.move_right()
elif key == KeyValues.SPACE:
self.state = GameMode.MAINMENU
self.current_display = self.menu_display
self.display = self.menu_display
def handle_key_pressed_main_menu(self, key: KeyValues) -> None:
"""
@ -140,7 +137,7 @@ class Game:
option = self.main_menu.validate()
if option == menus.MainMenuValues.START:
self.state = GameMode.PLAY
self.current_display = self.map_display
self.display = self.map_display
elif option == menus.MainMenuValues.SETTINGS:
self.state = GameMode.SETTINGS
elif option == menus.MainMenuValues.EXIT:
@ -152,4 +149,4 @@ class Game:
"""
if key == KeyValues.SPACE:
self.state = GameMode.MAINMENU
self.current_display = self.menu_display
self.display = self.menu_display