]> Skullheadx's Git Forge - Pygame-Jam.git/commitdiff
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
authorSkullheadx <704277@pdsb.net>
Wed, 13 Jul 2022 22:25:01 +0000 (18:25 -0400)
committerSkullheadx <704277@pdsb.net>
Wed, 13 Jul 2022 22:25:01 +0000 (18:25 -0400)
1  2 
Game.py

diff --cc Game.py
index d52f38e1d1097d9b6753271f7ba922438d737f9e,7874716eca5d80c444bc24af71bed4afedcff836..b03b807507529183804dc36e80309979e4676f25
+++ 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