From ae493337ededfe5eef63e40c6856d037e3350275 Mon Sep 17 00:00:00 2001 From: Charles Peyrat Date: Fri, 13 Nov 2020 18:08:48 +0100 Subject: [PATCH] Modified main menu to be able to override the current game with a new one --- dungeonbattle/display/mapdisplay.py | 2 -- dungeonbattle/game.py | 1 + dungeonbattle/menus.py | 6 +++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dungeonbattle/display/mapdisplay.py b/dungeonbattle/display/mapdisplay.py index aa40039..36cd616 100644 --- a/dungeonbattle/display/mapdisplay.py +++ b/dungeonbattle/display/mapdisplay.py @@ -1,11 +1,9 @@ #!/usr/bin/env python -from dungeonbattle.entities.player import Player from dungeonbattle.interfaces import Map from .display import Display class MapDisplay(Display): - player: Player def __init__(self, *args): super().__init__(*args) diff --git a/dungeonbattle/game.py b/dungeonbattle/game.py index 39e7b48..46dd0a5 100644 --- a/dungeonbattle/game.py +++ b/dungeonbattle/game.py @@ -12,6 +12,7 @@ from typing import Callable class Game: map: Map player: Player + # display_actions is a display interface set by the bootstrapper display_actions: Callable[[DisplayActions], None] def __init__(self) -> None: diff --git a/dungeonbattle/menus.py b/dungeonbattle/menus.py index 1990b27..fdf224a 100644 --- a/dungeonbattle/menus.py +++ b/dungeonbattle/menus.py @@ -24,7 +24,8 @@ class Menu: class MainMenuValues(Enum): - START = 'Jouer' + START = 'Nouvelle partie' + RESUME = 'Continuer' SETTINGS = 'Paramètres' EXIT = 'Quitter' @@ -46,6 +47,9 @@ class MainMenu(Menu): if key == KeyValues.ENTER: option = self.validate() if option == MainMenuValues.START: + game.new_game() + game.state = GameMode.PLAY + elif option == MainMenuValues.RESUME: game.state = GameMode.PLAY elif option == MainMenuValues.SETTINGS: game.state = GameMode.SETTINGS