From: lbcmk <30442978+lbcmk@users.noreply.github.com>
Date: Wed, 13 Jul 2022 21:52:00 +0000 (-0400)
Subject: Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
X-Git-Url: http://git.skullheadx.com/nixos/blog/static/gitweb.js?a=commitdiff_plain;h=12d824f6d5cba02e057f469ca2fc7014e47ed318;p=Pygame-Jam.git

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

12d824f6d5cba02e057f469ca2fc7014e47ed318
diff --cc Game.py
index 9c9e737,c85b833..7874716
--- a/Game.py
+++ b/Game.py
@@@ -239,7 -239,16 +239,16 @@@ class Game
              if self.level == 4:
                  self.bosshealthBar.update()
  
-         self.pet.update(delta, self.player)
+             if self.level == 1:
+                 print(self.player.position)
+                 if self.player.position[0] > 6750 and self.player.position[1] >= 1500:
+                     self.player.has_pet = True
+ 
+             if self.player.has_pet == True:
 -                pass
++                self.pet.update(delta, self.player)
+                 #update pet
+ 
+         # self.pet.update(delta, self.player, self.camera_pos)
  
      def draw(self, surf):