From: Skullheadx <704277@pdsb.net>
Date: Wed, 13 Jul 2022 18:02:59 +0000 (-0400)
Subject: fix win condition
X-Git-Url: http://git.skullheadx.com/sitemap.xml?a=commitdiff_plain;h=d7aef3029fb56edca86f354a90bc533a41236f65;p=Pygame-Jam.git

fix win condition
---

diff --git a/Enemy.py b/Enemy.py
index 49e5cbc..7fbaf6f 100644
--- a/Enemy.py
+++ b/Enemy.py
@@ -148,7 +148,7 @@ class Skeleton(Actor):
         self.direction = -1
         self.prev_direction = self.direction
 
-        self.health = 0 # for debugging without getting killed
+        # self.health = 0 # for debugging without getting killed
 
         self.weapon = Sword(self.position, (0, 0), self.width, -1)
 
@@ -290,7 +290,7 @@ class King(Actor):
 
 
                 if (self.position - target.position).length_squared() > 750 ** 2:
-                    self.ranged_attack.append(RangedAttack(target.position + pg.Vector2(0,-400),self.arrow_collision_mask, self.arrow_collision_layer))
+                    self.ranged_attack.append(RangedAttack(target.position + pg.Vector2(0,-250),self.arrow_collision_mask, self.arrow_collision_layer))
                     self.attack_cooldown = random.randint(5,10) * 1000
                 else:
                     print("Summon Skeles!")
diff --git a/Game.py b/Game.py
index 92b568a..70c45b7 100644
--- a/Game.py
+++ b/Game.py
@@ -102,7 +102,6 @@ class Game:
             if self.level == 2:
                 pg.mixer.music.load("Assets/Music/Cave_Music.ogg")
                 self.sky = pg.image.load("Assets/world/VOID.png").convert()
-
             if self.level == 3:
                 pg.mixer.music.load("Assets/Music/Sky_Music.ogg")
             if self.level == 4:
@@ -154,7 +153,12 @@ class Game:
             if self.king is not None:
                 self.king.update(delta, self.player)
                 if self.king.dead:
-                    print("You win!")
+                    self.collision_layer["enemy"].remove(self.king)
+                    self.king = PhysicsBody(self.king.position, self.king.velocity, self.king.width/2, self.king.height/2,
+                                                  self.king.colour,
+                                                  self.collision_layer["body"],
+                                                  [self.collision_layer["world"], self.collision_layer["body"]], goon_skin=False)
+                    self.collision_layer["body"].add(self.king)
 
             for particle in particles:
                 particle.update(delta)
diff --git a/main.py b/main.py
index a380606..7d66202 100644
--- a/main.py
+++ b/main.py
@@ -16,7 +16,7 @@ delta = 1000//fps
 # scene = TransitionScene()
 scene = DevLevelSelect()
 old_level = 0
-level =4
+level =0
 next_level = 0
 
 # final_level = 6