From: lbcmk <30442978+lbcmk@users.noreply.github.com>
Date: Mon, 11 Jul 2022 18:37:41 +0000 (-0400)
Subject: Fixed Merge Conflict
X-Git-Url: http://git.skullheadx.com/nixos/static/projects/dotfiles.html?a=commitdiff_plain;h=dd23fadb4e898c00af9b56a9c3a436711f8c1dfc;p=Pygame-Jam.git

Fixed Merge Conflict
---

dd23fadb4e898c00af9b56a9c3a436711f8c1dfc
diff --cc Function/Portal.py
index 8d94ebc,feb4a05..a35239d
--- a/Function/Portal.py
+++ b/Function/Portal.py
@@@ -31,11 -38,9 +38,11 @@@ class Transition
  
          coords[1] += self.portalYAnim
          a = (((offsetX-self.width/2) + coords[0], offsetY + coords[1]), (offsetX+coords[0], offsetY-self.height/2+coords[1]), (offsetX+self.width/2 + coords[0], offsetY+coords[1]), (offsetX + coords[0], offsetY+self.height/2 + coords[1]))
-         portal_rect = (a[0][0], a[1][1], a[2][0], a[3][1])
-         # print(portal_rect)
+         portal_rect = pg.Rect(a[0][0], a[1][1], a[2][0], a[3][1])
+         # print(a[0][0], a[1][1], a[2][0], a[3][1])
          # print(playerPos[0], playerPos[1])
 +
 +        print(portal_rect, coords, playerPos)
          
          if(a[0][0] < playerPos[0]+self.width/2 < a[2][0] and a[1][1] < playerPos[1] < a[3][1]):
              # self.buttonStage += 0.1