From: lbcmk <30442978+lbcmk@users.noreply.github.com>
Date: Tue, 12 Jul 2022 21:02:04 +0000 (-0400)
Subject: Fixed options
X-Git-Url: http://git.skullheadx.com/nixos/static/gitweb.js?a=commitdiff_plain;h=b92d42f27f3e5fc39268b437c2aa63091ea92caf;p=Pygame-Jam.git

Fixed options
---

diff --git a/Game.py b/Game.py
index 75425d5..f204781 100644
--- a/Game.py
+++ b/Game.py
@@ -70,7 +70,7 @@ class Game:
         self.dialogue = DialogueUI()
 
         self.paused = False
-        self.PauseMenu = PauseMenu()
+        self.PauseMenu = PauseMenu(self.level)
 
         if self.level in [1,3,4]:
             # Density = total clouds / area
@@ -107,6 +107,7 @@ class Game:
 
     def update(self, delta):
         if self.paused == True:
+            self.level = self.PauseMenu.level
             pass
         else:
             Setup.camera_offset = self.player.update(delta)
@@ -135,6 +136,7 @@ class Game:
             self.world.update(delta)
             self.fade = self.Transition.fade
 
+
         # self.pet.update(delta, self.player, self.camera_pos)
 
     def draw(self, surf):
@@ -198,10 +200,11 @@ class Game:
             self.next_level = self.level + 1
             self.level = -4
 
+        if self.paused == True:
+            self.PauseMenu.update(self)
+            self.PauseMenu.draw()
+
         if self.player.dead:
             self.scene.update()
             self.scene.draw()
 
-        if self.paused == True:
-            self.PauseMenu.update(self)
-            self.PauseMenu.draw()
diff --git a/MainMenu.py b/MainMenu.py
index e3c3084..f737c23 100644
--- a/MainMenu.py
+++ b/MainMenu.py
@@ -11,7 +11,8 @@ class Menu:
         Y = SCREEN_HEIGHT/2
         self.texts.append(createText(X, Y, 48, white, "Bold", "Interstellar Pirate Title", "c"))
         self.texts.append(createText(X, Y+200, 32, white, "Regular", "Start", "c"))
-        self.texts.append(createText(X, Y+350, 32, white, "Regular", "Quit", "c"))
+        self.texts.append(createText(X, Y+350, 32, white, "Regular", "New Game", "c"))
+        self.texts.append(createText(X, Y+500, 32, white, "Regular", "Quit", "c"))
 
         backgroundImage = pg.image.load('./Assets/mainmenu_background.png')
         self.backgroundImage = pg.transform.scale(backgroundImage, (SCREEN_WIDTH, SCREEN_HEIGHT))
@@ -47,10 +48,13 @@ class Menu:
     def menuFunctions(self, num):
         match num:
             case 1:
-                print(LoadGame())
                 try:
                     self.level = LoadGame()
+                    if(self.level == 0):
+                        self.level = 1
                 except:
                     self.level = self.level + 1
             case 2:
+                self.level = 1
+            case 3:
                 pg.quit();
diff --git a/PauseMenu.py b/PauseMenu.py
index 24029e0..b340932 100644
--- a/PauseMenu.py
+++ b/PauseMenu.py
@@ -1,10 +1,11 @@
 from Setup import *
 from Function.createText import createText
 import time
+from Save.SaveGame import SaveGame
 
 class PauseMenu:
 
-    def __init__(self):
+    def __init__(self, level):
         X = SCREEN_WIDTH
         Y = SCREEN_HEIGHT/2
 
@@ -16,6 +17,8 @@ class PauseMenu:
         self.overlay.fill((0, 0 ,0))
         self.overlay.set_alpha(127)
 
+        self.level = level
+
 
     def update(self, game):
         for event in pg.event.get():
@@ -27,7 +30,8 @@ class PauseMenu:
                 if self.resume[1].collidepoint(mouse_loc):
                     game.paused = False
                 if self.main_menu[1].collidepoint(mouse_loc):
-                    print("Main Menu")
+                    SaveGame(self.level)
+                    self.level = 0
                 if self.quit[1].collidepoint(mouse_loc):
                     pg.quit()
             return