1 files changed, 99 insertions, 11 deletions

@@ -96,18 +96,19 @@ func _load():
 
         wanderer_achieve.translation = Vector3(-51, -33, 35)  # way under the map
 
-        # Turn THE COLORFUL into a cdp.
-        var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful")
         var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn")
-        var colorful_cdp = cdp_auto_scene.instance()
-        colorful_cdp.name = "CountdownPanel_colorful"
-        colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful"
-        colorful_cdp.panels = "../../Panels/Doorways Room"
-        colorful_cdp.translation = real_colorful.translation
-        colorful_cdp.rotation = real_colorful.rotation
-        get_node("CountdownPanels").add_child(colorful_cdp)
-        real_colorful.translation = Vector3(-51, -35, 35)  # way under the map
-        get_node("Doors/Doorway Room Doors/Door_gray2").queue_free()
+        if !apclient.wasGeneratedBeforeVersion(0, 4, 5):
+                # Turn THE COLORFUL into a cdp.
+                var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful")
+                var colorful_cdp = cdp_auto_scene.instance()
+                colorful_cdp.name = "CountdownPanel_colorful"
+                colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful"
+                colorful_cdp.panels = "../../Panels/Doorways Room"
+                colorful_cdp.translation = real_colorful.translation
+                colorful_cdp.rotation = real_colorful.rotation
+                get_node("CountdownPanels").add_child(colorful_cdp)
+                real_colorful.translation = Vector3(-51, -35, 35)  # way under the map
+                get_node("Doors/Doorway Room Doors/Door_gray2").queue_free()
 
         # Set up The Master to be variable.
         var old_master_cdp = get_node("CountdownPanels/CountdownPanel_countdown_16")
@@ -353,6 +354,8 @@ func _load():
                 victory_condition = "the master"
         elif apclient._victory_condition == apclient.kLEVEL_2:
                 victory_condition = "level 2"
+        elif apclient._victory_condition == apclient.kPILGRIMAGE:
+                victory_condition = "pilgrimage"
 
         set_static_panel("Entry Room/Panel_this_this", victory_condition)
         set_static_panel("Entry Room/Panel_hidden_hidden", "hewwo")
@@ -584,11 +587,84 @@ func _load():
                 level_2.get_node("Viewport/GUI/Panel/TextEdit").connect(
                         "answer_correct", apclient, "completedGoal"
                 )
+        elif apclient._victory_condition == apclient.kPILGRIMAGE:
+                var pilgrim_panel = self.get_node("Panels/Lingo Room/Panel_pilgrim")
+                pilgrim_panel.get_node("Viewport/GUI/Panel/TextEdit").connect(
+                        "answer_correct", apclient, "completedGoal"
+                )
         else:
                 var the_end = self.get_node("Decorations/EndPanel/Panel_end_end")
                 the_end.get_node("Viewport/GUI/Panel/TextEdit").connect(
                         "answer_correct", apclient, "completedGoal"
                 )
+        
+        # If pilgrimage does not allow roof access, add a node on the Crossroads
+        # Roof Access stairs that disables it.
+        if !apclient._pilgrimage_allows_roof_access:
+                var terminator = apclient.SCRIPT_pilgrimage_terminator.new()
+                terminator.name = "RoofAccessPilgrimageTerminator"
+                terminator.translation.x = -36
+                terminator.translation.y = 3
+                terminator.translation.z = -35
+
+                var terminator_shape = CollisionShape.new()
+                terminator_shape.shape = BoxShape.new()
+                terminator_shape.shape.extents.x = 0.1
+
+                terminator.add_child(terminator_shape)
+                get_node("Decorations").add_child(terminator)
+        
+        if apclient._sunwarp_shuffle:
+                # Sunwarps 1 and 6 are rotated differently from the rest, so we have to fix that.
+                get_node("Decorations/Teleporter Windows/localmap").rotation_degrees.y = 0
+                get_node("Decorations/Teleporter Windows/localmap2").rotation_degrees.y = 0
+                get_node("Decorations/Teleporter Windows/localmap11").rotation_degrees.y = 0
+                get_node("Decorations/Teleporter Windows/localmap12").rotation_degrees.y = 0
+                get_node("Decorations/Teleporter Windows/localmap13").rotation_degrees.y = -90
+
+                get_node("Warps/Teleporter Warps/Sunwarp_enter_1").translation.x = 19.5
+                get_node("Warps/Teleporter Warps/Sunwarp_exit_1").translation.x = -15.5
+                get_node("Warps/Teleporter Warps/Sunwarp_enter_6").translation.x = 4.5
+                get_node("Warps/Teleporter Warps/Sunwarp_exit_6").translation.x = -37.5
+                get_node("Warps/Teleporter Warps/Sunwarp_exit_7").translation.z = 23.5
+
+                # Change the sunwarps in accordance with the mapping.
+                var sw_orig_translations = []
+                var sw_text_translations = []
+                var sw_text_rotations = []
+                for i in range(1,7):
+                        sw_orig_translations.append(get_node("Warps/Teleporter Warps/Sunwarp_enter_%d" % i).translation)
+                        sw_text_translations.append(get_node("Decorations/Signs/Sunwarp Numbers/enter_%d" % i).translation)
+                        sw_text_rotations.append(get_node("Decorations/Signs/Sunwarp Numbers/enter_%d" % i).rotation_degrees)
+                for i in range(1,7):
+                        sw_orig_translations.append(get_node("Warps/Teleporter Warps/Sunwarp_exit_%d" % i).translation)
+                        sw_text_translations.append(get_node("Decorations/Signs/Sunwarp Numbers/exit_%d" % i).translation)
+                        sw_text_rotations.append(get_node("Decorations/Signs/Sunwarp Numbers/exit_%d" % i).rotation_degrees)
+
+                var sw_enter_indicators = [4, 5, 6, 12, 7, 10]
+                for i in range(1,7):
+                        get_node("Warps/Teleporter Warps/Sunwarp_enter_%d" % i).translation = sw_orig_translations[apclient._sunwarp_mapping[i-1]]
+                        get_node("Warps/Teleporter Warps/Sunwarp_exit_%d" % i).translation = sw_orig_translations[apclient._sunwarp_mapping[i+5]]
+
+                        get_node("Decorations/Signs/Sunwarp Numbers/enter_%d" % i).translation = sw_text_translations[apclient._sunwarp_mapping[i-1]]
+                        get_node("Decorations/Signs/Sunwarp Numbers/enter_%d" % i).rotation_degrees = sw_text_rotations[apclient._sunwarp_mapping[i-1]]
+
+                        get_node("Decorations/Signs/Sunwarp Numbers/exit_%d" % i).translation = sw_text_translations[apclient._sunwarp_mapping[i+5]]
+                        get_node("Decorations/Signs/Sunwarp Numbers/exit_%d" % i).rotation_degrees = sw_text_rotations[apclient._sunwarp_mapping[i+5]]
+
+                        var enter_rot = _dir_to_int(gamedata.sunwarps[apclient._sunwarp_mapping[i-1]]["orientation"]) * 90
+                        var exit_rot = _dir_to_int(gamedata.sunwarps[apclient._sunwarp_mapping[i+5]]["orientation"]) * 90
+                        var final_rot = enter_rot - exit_rot
+                        if final_rot < 0:
+                                final_rot += 360
+                        get_node("Warps/Teleporter Warps/Sunwarp_enter_%d" % i).rotate = str(final_rot)
+
+                        var sw_enter_indicator_pos = gamedata.sunwarps[apclient._sunwarp_mapping[i-1]]["entrance_indicator_pos"]
+                        var sw_enter_indicator = get_node("Decorations/Signs/Welcome Back Signs/Sign%d" % sw_enter_indicators[i-1])
+                        sw_enter_indicator.translation.x = sw_enter_indicator_pos[0]
+                        sw_enter_indicator.translation.y = sw_enter_indicator_pos[1]
+                        sw_enter_indicator.translation.z = sw_enter_indicator_pos[2]
+                        sw_enter_indicator.rotation_degrees.y = (enter_rot * -1) + 180
 
         # Create the effects node.
         var effects_script = apclient.SCRIPT_effects
@@ -719,3 +795,15 @@ func set_small_gridmap_tile(x, y, z, tile):
 
 func archipelago_disconnected(reason):
         messages.showMessage(reason)
+
+
+func _dir_to_int(dir):
+        if dir == "north":
+                return 0
+        elif dir == "west":
+                return 1
+        elif dir == "south":
+                return 2
+        elif dir == "east":
+                return 3
+        return 4