From: Skullheadx <704277@pdsb.net>
Date: Wed, 13 Jul 2022 19:03:33 +0000 (-0400)
Subject: Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
X-Git-Url: http://git.skullheadx.com/img_1.png?a=commitdiff_plain;h=1e6a93f2790bdfd91bc0680d1ea09a2205b4dc45;p=Pygame-Jam.git

Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
---

1e6a93f2790bdfd91bc0680d1ea09a2205b4dc45
diff --cc Game.py
index caf2496,200dfda..2acf9de
--- a/Game.py
+++ b/Game.py
@@@ -65,8 -54,14 +65,9 @@@ class Game
                                     [self.collision_layer["player"], self.collision_layer["world"],
                                      self.collision_layer["enemy"]]) for pos in
                            self.skele_positions]
 -        if king_position is not None:
 -            self.king = King(king_position, self.collision_layer["enemy"],
 -                             [self.collision_layer["player"], self.collision_layer["world"],
 -                              self.collision_layer["enemy"]],(self.collision_layer["world"], self.collision_layer["arrow"]))
 -        else:
 -            self.king = None
 +
  
+ 
          self.scene = EndScreen()
          # self.dashMeter = DashMeter(self.player.dashCooldown)
          self.healthBar = HealthBar()
@@@ -221,24 -206,16 +226,23 @@@
              if self.king is not None and isinstance(self.king, King):
                  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])
+                         if(len(self.skeleton_spawn_coords) < 2):
+                             self.skeleton_spawn_coords.append([(random.randint(4000, 5000), random.randint(3250, 3350)), 0])
                      self.king.skeleton_attack = False
  
 +            if isinstance(self.king, PhysicsBody):
 +                for t in self.treasure:
 +                    t.draw(surf)
 +
              for i in range(len(self.skeleton_spawn_coords)):
                  try:
 -                    surf.blit(self.skeleton_portal_gif[self.skeleton_spawn_coords[i][1]], get_display_point((self.skeleton_spawn_coords[i][0][0] + 40, 3150)))  
 +                    surf.blit(self.skeleton_portal_gif[self.skeleton_spawn_coords[i][1]],
 +                              get_display_point((self.skeleton_spawn_coords[i][0][0] + 40, 3150)))
  
 -                    if(self.skeleton_spawn_coords[i][0][1] <= 3050):
 -                        skele = Skeleton(self.skeleton_spawn_coords[i][0], self.collision_layer["enemy"], [self.collision_layer["player"],self.collision_layer["world"],self.collision_layer["enemy"]])
 +                    if (self.skeleton_spawn_coords[i][0][1] <= 3050):
 +                        skele = Skeleton(self.skeleton_spawn_coords[i][0], self.collision_layer["enemy"],
 +                                         [self.collision_layer["player"], self.collision_layer["world"],
 +                                          self.collision_layer["enemy"]])
                          self.skeletons.append(skele)
                          self.skeleton_spawn_coords[i][0] = (100000, 100000)
                      else: