Add name to difficulty config (plbrault#80)

src/difficulty_levels.py

@@ -1,6 +1,6 @@
-_easy_difficulty = {
-    'name': 'Easy',
+_easy_difficulty = { 
     'config': {
+        'name': 'Easy',
         'num_cpus': 4,
         'num_processes_at_startup': 14,
         'num_ram_rows': 8,
@@ -10,8 +10,8 @@
 }
 
 _normal_difficulty = {
-    'name': 'Normal',
     'config': {
+        'name': 'Normal',
         'num_cpus': 4,
         'num_processes_at_startup': 14,
         'num_ram_rows': 5,
@@ -21,8 +21,8 @@
 }
 
 _hard_difficulty = {
-    'name': 'Hard',
     'config': {
+        'name': 'Hard',
         'num_cpus': 8,
         'num_processes_at_startup': 28,
         'num_ram_rows': 6,
@@ -32,8 +32,8 @@
 }
 
 _harder_difficulty = {
-    'name': 'Harder',
     'config': {
+        'name': 'Harder',
         'num_cpus': 12,
         'num_processes_at_startup': 35,
         'num_ram_rows': 6,
@@ -43,8 +43,8 @@
 }
 
 _insane_difficulty = {
-    'name': 'Insane',
     'config': {
+        'name': 'Insane',
         'num_cpus': 16,
         'num_processes_at_startup': 42,
         'num_ram_rows': 4,
@@ -62,7 +62,7 @@
 ]
 
 difficulty_levels_map = {
-    l['name'].lower(): l
+    l['config']['name'].lower(): l
     for l in difficulty_levels
 }
 

src/game_objects/custom_settings_dialog.py

@@ -54,6 +54,7 @@ def __init__(self, start_fn, cancel_fn, default_config=None):
     @property
     def config(self):
         config = {
+            'name': 'Custom',
             'num_cpus': int(
                 self._num_cpus_selector.selected_option),
             'num_processes_at_startup': int(

src/game_objects/game_over_dialog.py

@@ -5,9 +5,10 @@
 
 class GameOverDialog(GameObject):
     # pylint: disable=too-many-arguments
-    def __init__(self, uptime, score, restart_game_fn, main_menu_fn, standalone=False):
+    def __init__(self, uptime, difficulty, score, restart_game_fn, main_menu_fn, standalone=False):
         self.uptime = uptime
         self.score = score
+        self.difficulty = difficulty
         self.standalone = standalone
         super().__init__(GameOverDialogView(self))
 

src/game_objects/views/game_over_dialog_view.py

@@ -18,6 +18,8 @@ def __init__(self, game_over_dialog):
             'YOU GOT REBOOTED!', False, Color.WHITE)
         self._uptime_text_surface = FONT_PRIMARY_LARGE.render(
             'UPTIME: ' + game_over_dialog.uptime, False, Color.WHITE)
+        self._difficulty_text_surface = FONT_PRIMARY_LARGE.render(
+            'DIFFICULTY: ' + game_over_dialog.difficulty, False, Color.WHITE)
         self._score_text_surface = FONT_PRIMARY_LARGE.render(
             'SCORE: ' + str(game_over_dialog.score), False, Color.WHITE)
 
@@ -58,6 +60,15 @@ def draw(self, surface):
              self._main_text_surface.get_height() +
              self._image.get_height() +
              80))
+        surface.blit(
+            self._difficulty_text_surface,
+            (self.width -
+             self.x / 2 +
+             80, # Absolute weird way to measure middle, oops :p
+             self.y +
+             self._main_text_surface.get_height() +
+             self._image.get_height() +
+             80))
         surface.blit(
             self._score_text_surface,
             (self.x +

src/scenes/game.py

@@ -3,7 +3,7 @@
 
 from lib import event_manager
 from lib.scene import Scene
-from difficulty_levels import default_difficulty
+from difficulty_levels import default_difficulty, difficulty_levels
 from game_objects.button import Button
 from game_objects.game_over_dialog import GameOverDialog
 from game_objects.in_game_menu_dialog import InGameMenuDialog
@@ -173,6 +173,7 @@ def update(self, current_time, events):
                 if self._game_over_dialog is None:
                     self._game_over_dialog = GameOverDialog(
                         self._uptime_manager.uptime_text,
+                        self._config['name'],
                         self._score_manager.score,
                         self.setup,
                         self._return_to_main_menu,

src/scenes/main_menu.py

@@ -34,7 +34,7 @@ def setup(self):
         self._scene_objects.append(difficulty_selection_label)
 
         difficulty_level_names = list(
-            map(lambda difficulty_level: difficulty_level['name'], difficulty_levels))
+            map(lambda difficulty_level: difficulty_level['config']['name'], difficulty_levels))
         difficulty_level_names.append('Custom')
         self._difficulty_selector = OptionSelector(difficulty_level_names, 1)
         self._difficulty_selector.view.set_xy(