From: lbcmk <30442978+lbcmk@users.noreply.github.com>
Date: Wed, 13 Jul 2022 18:37:47 +0000 (-0400)
Subject: Fixed Screens
X-Git-Url: http://git.skullheadx.com/blog/static/gitweb.css?a=commitdiff_plain;h=adea9c530f1cd2e80bf19986331f92ea3d37b51d;p=Pygame-Jam.git

Fixed Screens
---

diff --git a/Game.py b/Game.py
index 56f185c..d0151bb 100644
--- a/Game.py
+++ b/Game.py
@@ -61,6 +61,7 @@ class Game:
         else:
             self.king = None
 
+
         self.scene = EndScreen()
         # self.dashMeter = DashMeter(self.player.dashCooldown)
         self.healthBar = HealthBar()
@@ -68,6 +69,7 @@ class Game:
         self.level = level
         self.scene.level = self.level
 
+        
         self.Transition = Transition()
         self.fade = self.Transition.fade
         self.fadeT = fade()
@@ -123,6 +125,8 @@ class Game:
         except:
             pass;
         # self.test = RangedAttack((1650,1250),self.collision_layer["world"], self.collision_layer["arrow"])
+        if(self.level == 4):
+            self.portal_position = (5475, 2000)
 
     # def load_world(self, level):
 
@@ -191,12 +195,11 @@ class Game:
         surf.blit(self.sky, (0, 0))
 
         if (self.level == 4):
-            print(get_camera_offset())
             if self.king is not None:
                 if self.king.skeleton_attack == True:
                     for i in range(random.randint(1, 2)):
                         if(len(self.skeleton_spawn_coords) < 2):
-                            self.skeleton_spawn_coords.append([(random.randint(4000, 5200), random.randint(3250, 3350)), 0])
+                            self.skeleton_spawn_coords.append([(random.randint(4000, 5000), random.randint(3250, 3350)), 0])
                     self.king.skeleton_attack = False
 
             for i in range(len(self.skeleton_spawn_coords)):
@@ -221,6 +224,15 @@ class Game:
                             self.skeleton_spawn_coords.pop(i)
                 except IndexError:
                     pass;
+
+            if(self.king.dead == True):
+                self.Transition.update()
+                self.Transition.draw(surf, self.player.position, self.portal_position)
+                if(self.portal_position[1] < 3150):
+                    lst = list(self.portal_position)
+                    lst[1] += 2
+                    self.portal_position = tuple(lst)
+                # print(get_camera_offset(), getWorldCoords(0, 0))
         
         if (self.player.position[1] > 10000):
             self.player.dead = True
diff --git a/UI/Credits.py b/UI/Credits.py
index 41cc9d5..3b9a543 100644
--- a/UI/Credits.py
+++ b/UI/Credits.py
@@ -55,4 +55,4 @@ class Credits:
     def menuFunctions(self, num):
         match num:
             case 0:
-                self.level = 6
+                self.level = 5
diff --git a/UI/FinalScreen.py b/UI/FinalScreen.py
index 6e4084f..d74fdf1 100644
--- a/UI/FinalScreen.py
+++ b/UI/FinalScreen.py
@@ -14,7 +14,7 @@ class FinalScreen:
         self.texts.append(createText(X, Y+350, 32, black, "Regular", "Main Menu", "c"))
         self.texts.append(createText(X, Y+500, 32, black, "Regular", "Quit", "c"))
 
-        self.level = 6
+        self.level = 5
 
         try:
             pg.mixer.music.load('Assets/Music/Main_Menu_Music.ogg')
diff --git a/main.py b/main.py
index a380606..ddad700 100644
--- a/main.py
+++ b/main.py
@@ -16,7 +16,7 @@ delta = 1000//fps
 # scene = TransitionScene()
 scene = DevLevelSelect()
 old_level = 0
-level =4
+level = 4
 next_level = 0
 
 # final_level = 6
@@ -41,7 +41,7 @@ while Setup.is_running:
                 scene = LevelCreator()
             case 0:
                 scene = Menu()
-            case 6:
+            case 5:
                 scene = FinalScreen()
             case _:
                 scene = Game(level)