From: Skullheadx <704277@pdsb.net>
Date: Wed, 13 Jul 2022 22:25:01 +0000 (-0400)
Subject: Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
X-Git-Url: http://git.skullheadx.com/tech/static/git-logo.png?a=commitdiff_plain;h=3d4c69b4ca56bbcd40dac93a13be0593ff852a68;p=Pygame-Jam.git

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

3d4c69b4ca56bbcd40dac93a13be0593ff852a68
diff --cc Game.py
index d52f38e,7874716..b03b807
--- a/Game.py
+++ b/Game.py
@@@ -59,14 -64,7 +59,15 @@@ class Game
                               self.collision_layer["potion"],
                               self.collision_layer["spike"],
                               self.collision_layer["arrow"])
 +        if jeff_position is not None:
 +            self.jeff = Enemy(jeff_position, self.collision_layer["enemy"],
 +                              [self.collision_layer["player"], self.collision_layer["world"],
 +                               self.collision_layer["enemy"]],is_jeff=True)
 +            self.jeff_target = [self.player]
 +        else:
 +            self.jeff = None
 +        # self.pet = Pet(center, self.collision_layer["pet"], [self.collision_layer["world"]])
+         self.pet = Pet(center, self.collision_layer["pet"], [self.collision_layer["world"]])
          self.enemies = [Enemy(pos, self.collision_layer["enemy"],
                                [self.collision_layer["player"], self.collision_layer["world"],
                                 self.collision_layer["enemy"]]) for pos in