From: lbcmk <30442978+lbcmk@users.noreply.github.com>
Date: Wed, 13 Jul 2022 22:57:49 +0000 (-0400)
Subject: fix
X-Git-Url: http://git.skullheadx.com/nixos/static/gitweb.css?a=commitdiff_plain;h=b0af79d1076a6f8428b92c0282f8afd294420471;p=Pygame-Jam.git

fix
---

diff --git a/Game.py b/Game.py
index dae904e..d80c77d 100644
--- a/Game.py
+++ b/Game.py
@@ -63,6 +63,7 @@ class Game:
             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"],
@@ -72,7 +73,6 @@ class Game:
         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
@@ -296,6 +296,7 @@ class Game:
                 # print(self.player.position)
                 if self.player.position[0] > 6750 and self.player.position[1] >= 1500:
                     self.has_pet = True
+                self.pet.has_pet = self.has_pet
 
             if self.has_pet == True:
                 self.pet.update(delta, self.player)
diff --git a/Pet.py b/Pet.py
index 36bebe7..4d3cf8f 100644
--- a/Pet.py
+++ b/Pet.py
@@ -15,6 +15,7 @@ class Pet(Actor):
     def __init__(self, pos, collision_layer, collision_mask):
         super().__init__(pos, collision_layer, collision_mask)
         self.frame = 0
+        self.has_pet = False;
     
     def update(self, delta, target):
         super().update(delta)
@@ -32,9 +33,11 @@ class Pet(Actor):
             display = pg.transform.flip(display, True, False)
 
         surf.blit(display, get_display_rect(self.get_collision_rect()).topleft + d_off)
-        diff = self.position - plpos
-        if(abs(diff[0]) >= 1500 or abs(diff[1]) >= 1000):
-            self.position = plpos
+        if(self.has_pet == True):
+            diff = self.position - plpos
+            if(abs(diff[0]) >= 1500 or abs(diff[1]) >= 1000):
+                self.position = plpos
+        print(self.position)
 
         if(self.frame + 0.1 < len(self.move_frames)):
             self.frame += 0.08