all dialogue good now

diff --git a/Game.py b/Game.py
index 9b6bc39b847c1bdd895dc7813f6524dc790fe28e..b4f9f5aa1765d0c33ab52241f78f0b3edc3f697e 100644 (file)
--- a/Game.py
+++ b/Game.py
@@ -207,8 +207,8 @@ class Game:
                 self.jeff.update(delta, self.player)
                 if self.jeff.dead:
                     self.collision_layer["enemy"].remove(self.jeff)
-                    self.jeff = PhysicsBody(self.jeff.position, self.jeff.velocity, self.jeff.width / 2,
-                                            self.jeff.height / 4,
+                    self.jeff = PhysicsBody(self.jeff.position, self.jeff.velocity, self.jeff.width,
+                                            self.jeff.height,
                                             self.jeff.colour,
                                             self.collision_layer["body"],
                                             [self.collision_layer["world"], self.collision_layer["body"]],
@@ -227,7 +227,7 @@ class Game:
             self.fade = self.Transition.fade
 
             if self.level == 3 and self.fade:
-                if (isinstance(self.jeff, PhysicsBody) and not self.jeff.was_beaten) and (not (isinstance(self.jeff, Enemy) and self.jeff.position.y > 10000)):
+                if self.jeff.position.y < 10000 and (isinstance(self.jeff, PhysicsBody) and not self.jeff.was_beaten):
                     self.saved_jeff = True
                     print('good')
 

diff --git a/PhysicsBody.py b/PhysicsBody.py
index 6fe41504ef36ef233b433be0a0e8c0e918413386..c4fa02f377fe41d59a96b7b4069b4f58a84f4da5 100644 (file)
--- a/PhysicsBody.py
+++ b/PhysicsBody.py
@@ -37,7 +37,7 @@ class PhysicsBody:
             self.offset = pg.Vector2(-50,-65)
         elif is_jeff:
             self.display = pg.transform.scale(pg.image.load("Assets/enemy/Jeff_Death.png"), (200,200))
-            self.offset = pg.Vector2(-50,-160)
+            self.offset = pg.Vector2(-50,-140)
             self.goon_skin = True
         else:
             self.display = pg.transform.scale(pg.image.load("Assets/skeleton/SKELETON.png"), (50,50))
@@ -110,6 +110,6 @@ class PhysicsBody:
 
     def draw(self, surf):
         # print(self.position, self.velocity)
-        pg.draw.rect(surf, self.colour, get_display_rect(self.get_collision_rect()), border_radius=8)
+        # pg.draw.rect(surf, self.colour, get_display_rect(self.get_collision_rect()), border_radius=8)
         surf.blit(self.display,get_display_rect(self.get_collision_rect()).topleft + self.offset)
         # surf.blit(self.display,get_display_rect(self.get_collision_rect()))

diff --git a/main.py b/main.py
index 747a8b4aaa8fac2a692af260c405039b80535fad..07c51b5a0262ca910c3cbeb14608cb0bee637abb 100644 (file)
--- a/main.py
+++ b/main.py
@@ -16,7 +16,7 @@ delta = 1000//fps
 # scene = TransitionScene()
 scene = Menu()
 old_level = 0
-level = 1
+level = 3
 next_level = 0
 
 # final_level = 6