Merge branch 'sunwarps' into future

1 files changed, 11 insertions, 8 deletions

@@ -5,20 +5,23 @@ var _unlocked = true
 
 func _ready():
         var apclient = global.get_node("Archipelago")
-        if apclient._door_shuffle and !apclient.warpIsVanilla(self.get_parent().name + "/" + self.name):
-                if self.get_parent().name == "Teleporter Warps":
-                        if apclient._sunwarp_access != apclient.kSUNWARP_ACCESS_NORMAL:
-                                _unlocked = false
-                else:
+        if self.get_parent().name == "Teleporter Warps":
+                if apclient._sunwarp_access != apclient.kSUNWARP_ACCESS_NORMAL:
                         _unlocked = false
+        elif apclient._door_shuffle and !apclient.warpIsVanilla(self.get_parent().name + "/" + self.name):
+                _unlocked = false
 
-        ._ready()
 
-
-func _body_entered(var body):
+func _body_entered(body):
         if _unlocked:
                 ._body_entered(body)
 
+                if body.is_in_group("player"):
+                        var apclient = global.get_node("Archipelago")
+                        if !apclient._pilgrimage_enabled:
+                                global.sunwarp = 1
+                                body.get_node("pivot/camera/sunwarp_background").visible = false
+
 
 func unlock_warp():
         _unlocked = true