Save and Load game functionality

diff --git a/EndScreen.py b/EndScreen.py
index ee973796782ca134dc09a9efe5cc489a2a2283b2..19496edbb67a43d01a7f79f3f699ff66d6999dc3 100644 (file)
--- a/EndScreen.py
+++ b/EndScreen.py
@@ -2,18 +2,19 @@ import Setup
 from Setup import *
 from CommonImports.colours import black
 from Function.createText import createText
+from Save.SaveGame import SaveGame
 
 class EndScreen:
 
-    def __init__(self):
+    def __init__(self, level=-1):
         self.texts = []
         X = SCREEN_WIDTH
         Y = SCREEN_HEIGHT/2
         self.texts.append(createText(X, Y, 32, black, "Bold", "You Died", 'c'))
         self.texts.append(createText(X, Y+150, 24, black, "Regular", "Respawn", 'c'))
-        self.texts.append(createText(X, Y+300, 24, black, "Regular", "Quit", 'c'))
+        self.texts.append(createText(X, Y+300, 24, black, "Regular", "Save and Exit", 'c'))
 
-        self.level = -1
+        self.level = level
 
         
     def update(self):
@@ -40,5 +41,6 @@ class EndScreen:
             case 1:
                 self.level = -1
             case 2:
-                Setup.is_running = False
+                SaveGame(self.level)
+                self.level = 0
                 # pg.quit();

diff --git a/MainMenu.py b/MainMenu.py
index a18c2a4fb6328505be126a023964d6609dae2321..e3c308456e7275485fb23693473355887358319d 100644 (file)
--- a/MainMenu.py
+++ b/MainMenu.py
@@ -1,6 +1,7 @@
 from Setup import *
 from CommonImports.colours import white
 from Function.createText import createText
+from Save.SaveGame import LoadGame
 
 class Menu:
 
@@ -17,9 +18,11 @@ class Menu:
 
         self.level = 0
 
-        pg.mixer.music.load('Assets/Music/Main_Menu_Music.ogg')
-        pg.mixer.music.play(-1)
-
+        try:
+            pg.mixer.music.load('Assets/Music/Main_Menu_Music.ogg')
+            pg.mixer.music.play(-1)
+        except:
+            pass;
         
     def update(self, delta):
         for ev in pg.event.get(pg.MOUSEBUTTONDOWN):
@@ -44,6 +47,10 @@ class Menu:
     def menuFunctions(self, num):
         match num:
             case 1:
-                self.level = self.level + 1
+                print(LoadGame())
+                try:
+                    self.level = LoadGame()
+                except:
+                    self.level = self.level + 1
             case 2:
                 pg.quit();