Merge branch 'sunwarps' into future

10 files changed, 196 insertions, 19 deletions

@@ -7,6 +7,7 @@ var SCRIPT_multiplayer
 var SCRIPT_mypainting
 var SCRIPT_notifier
 var SCRIPT_panel
+var SCRIPT_pilgrimage_terminator
 var SCRIPT_uuid
 
 var ap_server = ""
@@ -42,7 +43,7 @@ const progressive_items = {
         ],
         "Progressive Hallway Room":
         [
-                {"item": "Outside The Agreeable - Hallway Door", "display": "First Door"},
+                {"item": "Hallway Room (1) - Exit", "display": "First Door"},
                 {"item": "Hallway Room (2) - Exit", "display": "Second Door"},
                 {"item": "Hallway Room (3) - Exit", "display": "Third Door"},
                 {"item": "Hallway Room (4) - Exit", "display": "Fourth Door"},
@@ -67,18 +68,19 @@ const progressive_items = {
         ],
         "Progressive Pilgrimage":
         [
-                {"item": "Hub Room - 1 Sunwarp", "display": "1 Sunwarp"},
-                {"item": "Orange Tower Fourth Floor - 2 Sunwarp", "display": "2 Sunwarp"},
-                {"item": "Orange Tower Third Floor - 3 Sunwarp", "display": "3 Sunwarp"},
-                {"item": "Orange Tower First Floor - 4 Sunwarp", "display": "4 Sunwarp"},
-                {"item": "Orange Tower Fourth Floor - 5 Sunwarp", "display": "5 Sunwarp"},
-                {"item": "Outside The Agreeable - 6 Sunwarp", "display": "6 Sunwarp"},
+                {"item": "1 Sunwarp", "display": "1 Sunwarp"},
+                {"item": "2 Sunwarp", "display": "2 Sunwarp"},
+                {"item": "3 Sunwarp", "display": "3 Sunwarp"},
+                {"item": "4 Sunwarp", "display": "4 Sunwarp"},
+                {"item": "5 Sunwarp", "display": "5 Sunwarp"},
+                {"item": "6 Sunwarp", "display": "6 Sunwarp"},
         ]
 }
 
 const kTHE_END = 0
 const kTHE_MASTER = 1
 const kLEVEL_2 = 2
+const kPILGRIMAGE = 3
 
 const kNO_PANEL_SHUFFLE = 0
 const kREARRANGE_PANELS = 1
@@ -94,7 +96,8 @@ const kCLASSIFICATION_REMOTE_INSANITY = 2
 const kSUNWARP_ACCESS_NORMAL = 0
 const kSUNWARP_ACCESS_DISABLED = 1
 const kSUNWARP_ACCESS_UNLOCK = 2
-const kSUNWARP_ACCESS_PROGRESSIVE = 3
+const kSUNWARP_ACCESS_INDIVIDUAL = 3
+const kSUNWARP_ACCESS_PROGRESSIVE = 4
 
 var _client = WebSocketClient.new()
 var _should_process = false
@@ -133,6 +136,12 @@ var _mastery_achievements = 21
 var _level_2_requirement = 223
 var _location_classification_bit = 0
 var _early_color_hallways = false
+var _pilgrimage_compatibility = false  # set to true for pre-0.4.6
+var _pilgrimage_enabled = false
+var _pilgrimage_allows_roof_access = false
+var _pilgrimage_allows_paintings = false
+var _sunwarp_shuffle = false
+var _sunwarp_mapping = []
 var _slot_seed = 0
 
 var _map_loaded = false
@@ -305,6 +314,8 @@ func _on_data():
                                 _panel_shuffle = _slot_data["shuffle_panels"]
                         if _slot_data.has("sunwarp_access"):
                                 _sunwarp_access = _slot_data["sunwarp_access"]
+                        else:
+                                _sunwarp_access = kSUNWARP_ACCESS_NORMAL
                         if _slot_data.has("seed"):
                                 _slot_seed = _slot_data["seed"]
                         if _slot_data.has("painting_entrance_to_exit"):
@@ -322,6 +333,25 @@ func _on_data():
                                         _location_classification_bit = kCLASSIFICATION_LOCAL_INSANITY
                         if _slot_data.has("early_color_hallways"):
                                 _early_color_hallways = _slot_data["early_color_hallways"]
+                        if _slot_data.has("enable_pilgrimage"):
+                                _pilgrimage_enabled = _slot_data["enable_pilgrimage"]
+                        else:
+                                _pilgrimage_compatibility = true
+                                _pilgrimage_enabled = true
+                        if _slot_data.has("pilgrimage_allows_roof_access"):
+                                _pilgrimage_allows_roof_access = _slot_data["pilgrimage_allows_roof_access"]
+                        else:
+                                _pilgrimage_allows_roof_access = true
+                        if _slot_data.has("pilgrimage_allows_paintings"):
+                                _pilgrimage_allows_paintings = _slot_data["pilgrimage_allows_paintings"]
+                        else:
+                                _pilgrimage_allows_paintings = true
+                        if _slot_data.has("shuffle_sunwarps"):
+                                _sunwarp_shuffle = _slot_data["shuffle_sunwarps"]
+                        else:
+                                _sunwarp_shuffle = false
+                        if _slot_data.has("sunwarp_permutation"):
+                                _sunwarp_mapping = _slot_data["sunwarp_permutation"]
 
                         if track_player:
                                 setValue("PlayerPos", {"x": 0, "z": 0})
@@ -704,7 +734,12 @@ func processItem(item, index, from, flags):
                                 painting_node = fake_parent_node.get_node_or_null(painting_id)
                                 if painting_node != null:
                                         painting_node.get_node("Script").movePainting()
-        
+
+        if gamedata.warp_ids_by_item_id.has(int(item)):
+                var warpsNode = get_tree().get_root().get_node("Spatial/Warps")
+                for warp_id in gamedata.warp_ids_by_item_id[int(item)]:
+                        warpsNode.get_node(warp_id).unlock_warp()
+
         if gamedata.warp_ids_by_item_id.has(int(item)):
                 var warpsNode = get_tree().get_root().get_node("Spatial/Warps")
                 for warp_id in gamedata.warp_ids_by_item_id[int(item)]:
@@ -354,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")
@@ -583,11 +585,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
@@ -718,3 +793,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
@@ -86,6 +86,11 @@ func _looked_at(body, painting):
                         body.rotate_y(3 * PI / 2)
                         body.velocity = body.velocity.rotated(Vector3(0, 1, 0), 3 * PI / 2)
 
+                var apclient = global.get_node("Archipelago")
+                if !apclient._pilgrimage_allows_paintings:
+                        global.sunwarp = 1
+                        body.get_node("pivot/camera/sunwarp_background").visible = false
+
 
 func _dir_to_int(dir):
         if dir == "north":
@@ -0,0 +1,10 @@
+extends "res://scripts/painting.gd"
+
+func _looked_at(var body, var painting):
+    ._looked_at(body, painting)
+    
+    if body.is_in_group("player") && (painting.get_name() == self.get_name()):
+        var apclient = global.get_node("Archipelago")
+        if !apclient._pilgrimage_allows_paintings:
+            global.sunwarp = 1
+            body.get_node("pivot/camera/sunwarp_background").visible = false
@@ -3,9 +3,23 @@ extends "res://scripts/painting_eye.gd"
 
 func _answer_correct():
         var apclient = global.get_node("Archipelago")
-        if not apclient._door_shuffle or apclient.paintingIsVanilla(self.name):
+        if !apclient._pilgrimage_compatibility and get_name() == "pilgrim_painting2":
+                # When pilgrimage is enabled, the HOT CRUST panel should actually move the sun painting.
+                if apclient._pilgrimage_enabled:
+                        movePainting()
+        elif not apclient._door_shuffle or apclient.paintingIsVanilla(self.name):
                 ._answer_correct()
 
 
 func movePainting():
         ._answer_correct()
+
+
+func _looked_at(var body, var painting):
+        ._looked_at(body, painting)
+
+        if body.is_in_group("player") && (painting.get_name() == self.get_name()):
+                var apclient = global.get_node("Archipelago")
+                if !apclient._pilgrimage_allows_paintings:
+                        global.sunwarp = 1
+                        body.get_node("pivot/camera/sunwarp_background").visible = false
@@ -9,3 +9,13 @@ func _answer_correct():
 
 func movePainting():
         ._answer_correct()
+
+
+func _looked_at(var body, var painting):
+        ._looked_at(body, painting)
+
+        if body.is_in_group("player") && (painting.get_name() == self.get_name()):
+                var apclient = global.get_node("Archipelago")
+                if !apclient._pilgrimage_allows_paintings:
+                        global.sunwarp = 1
+                        body.get_node("pivot/camera/sunwarp_background").visible = false
@@ -22,7 +22,7 @@ func _ready():
                 else:
                         atbash_text += old_char
 
-        self.get_parent().get_node("Viewport/GUI/Panel/TextEdit").connect(
+        var _ignore = self.get_parent().get_node("Viewport/GUI/Panel/TextEdit").connect(
                 "answer_correct", self, "answer_correct"
         )
 
@@ -0,0 +1,11 @@
+extends Area
+
+
+func _ready():
+        var _connected = self.connect("body_entered", self, "_body_entered")
+
+
+func _body_entered(body):
+        if body.is_in_group("player"):
+                global.sunwarp = 1
+                body.get_node("pivot/camera/sunwarp_background").visible = false
@@ -30,6 +30,7 @@ func _ready():
                 apclient_instance.SCRIPT_mypainting = load("user://maps/Archipelago/mypainting.gd")
                 apclient_instance.SCRIPT_notifier = load("user://maps/Archipelago/notifier.gd")
                 apclient_instance.SCRIPT_panel = load("user://maps/Archipelago/panel.gd")
+                apclient_instance.SCRIPT_pilgrimage_terminator = load("user://maps/Archipelago/pilgrimage_terminator.gd")
                 apclient_instance.SCRIPT_uuid = load("user://maps/Archipelago/vendor/uuid.gd")
 
                 var apdata = ResourceLoader.load("user://maps/Archipelago/gamedata.gd")
@@ -45,6 +46,7 @@ func _ready():
                 # Let's also inject any scripts we need to inject now.
                 installScriptExtension(apclient_instance.SCRIPT_doorControl)
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/load.gd"))
+                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting_eye.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/painting_scenery.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelLevelSwitch.gd"))
@@ -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