From: lbcmk <30442978+lbcmk@users.noreply.github.com>
Date: Wed, 13 Jul 2022 22:43:28 +0000 (-0400)
Subject: Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
X-Git-Url: http://git.skullheadx.com/nixos/blog/openbsd_html_css.html?a=commitdiff_plain;h=d0ab12615cb0176ed65cc02529487481afe08d0e;p=Pygame-Jam.git

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

d0ab12615cb0176ed65cc02529487481afe08d0e
diff --cc Game.py
index a8f15a7,b03b807..0c126d4
--- a/Game.py
+++ b/Game.py
@@@ -64,11 -59,15 +59,20 @@@ class Game
                               self.collision_layer["potion"],
                               self.collision_layer["spike"],
                               self.collision_layer["arrow"])
 +        if(level == 1):
 +            self.pet = Pet([6852, 1500], self.collision_layer["pet"], [self.collision_layer["world"]])
 +        else:
 +            self.pet = Pet(self.player.position, self.collision_layer["pet"], [self.collision_layer["world"]])
 +        self.has_pet = False
+         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