1 files changed, 10 insertions, 418 deletions

@@ -19,404 +19,10 @@ func _ready():
 
         ap.start_batching_locations()
 
-        # Block off roof access in Daedalus.
-        if global.map == "daedalus" and not ap.daedalus_roof_access:
-                _set_up_invis_wall(75.5, 11, -24.5, 1, 10, 49)
-                _set_up_invis_wall(51.5, 11, -17, 16, 10, 1)
-                _set_up_invis_wall(46, 10, -9.5, 1, 10, 10)
-                _set_up_invis_wall(67.5, 11, 17, 16, 10, 1)
-                _set_up_invis_wall(50.5, 11, 14, 10, 10, 1)
-                _set_up_invis_wall(39, 10, 18.5, 1, 10, 22)
-                _set_up_invis_wall(20, 15, 18.5, 1, 10, 16)
-                _set_up_invis_wall(11.5, 15, 3, 32, 10, 1)
-                _set_up_invis_wall(11.5, 16, -20, 14, 20, 1)
-                _set_up_invis_wall(14, 16, -26.5, 1, 20, 4)
-                _set_up_invis_wall(28.5, 20.5, -26.5, 1, 15, 25)
-                _set_up_invis_wall(40.5, 20.5, -11, 30, 15, 1)
-                _set_up_invis_wall(50.5, 15, 5.5, 7, 10, 1)
-                _set_up_invis_wall(83.5, 33.5, 5.5, 1, 7, 11)
-                _set_up_invis_wall(83.5, 33.5, -5.5, 1, 7, 11)
-
-                var warp_exit_prefab = preload("res://objects/nodes/exit.tscn")
-                var warp_exit = warp_exit_prefab.instantiate()
-                warp_exit.name = "roof_access_blocker_warp_exit"
-                warp_exit.position = Vector3(58, 10, 0)
-                warp_exit.rotation_degrees.y = 90
-                get_parent().add_child.call_deferred(warp_exit)
-
-                var warp_enter_prefab = preload("res://objects/nodes/teleportAuto.tscn")
-                var warp_enter = warp_enter_prefab.instantiate()
-                warp_enter.target = warp_exit
-                warp_enter.position = Vector3(76.5, 30, 1)
-                warp_enter.scale = Vector3(4, 1.5, 1)
-                warp_enter.rotation_degrees.y = 90
-                get_parent().add_child.call_deferred(warp_enter)
-
-        if global.map == "the_entry":
-                # Remove door behind X1.
-                var door_node = get_tree().get_root().get_node("/root/scene/Components/Doors/exit_1")
-                door_node.handleTriggered()
-
-                # Display win condition.
-                var sign_prefab = preload("res://objects/nodes/sign.tscn")
-                var sign1 = sign_prefab.instantiate()
-                sign1.position = Vector3(-7, 5, -15.01)
-                sign1.text = "victory"
-                get_parent().add_child.call_deferred(sign1)
-
-                var sign2 = sign_prefab.instantiate()
-                sign2.position = Vector3(-7, 4, -15.01)
-                sign2.text = "%s ending" % ap.kEndingNameByVictoryValue.get(ap.victory_condition, "?")
-
-                var sign2_color = ap.kEndingNameByVictoryValue.get(ap.victory_condition, "coral").to_lower()
-                if sign2_color == "white":
-                        sign2_color = "silver"
-
-                sign2.material = load("res://assets/materials/%s.material" % sign2_color)
-                get_parent().add_child.call_deferred(sign2)
-
-                # Add the gift map entry panel if needed.
-                if not ap.enable_gift_maps.is_empty():
-                        var panel_prefab = preload("res://objects/nodes/panel.tscn")
-                        var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-                        var wpl_prefab = preload("res://objects/nodes/listeners/worldportListener.tscn")
-
-                        var giftmap_parent = Node.new()
-                        giftmap_parent.name = "GiftMapEntrance"
-                        get_node("/root/scene/Components").add_child.call_deferred(giftmap_parent)
-
-                        var symbolless_player = ""
-                        for i in range(ap.client.ap_user.length()):
-                                if "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".contains(
-                                        ap.client.ap_user[i]
-                                ):
-                                        symbolless_player = symbolless_player + ap.client.ap_user[i].to_lower()
-
-                        var giftmap_panel = panel_prefab.instantiate()
-                        giftmap_panel.name = "Panel"
-                        giftmap_panel.position = Vector3(33.5, -190, 5.5)
-                        giftmap_panel.rotation_degrees = Vector3(-45, 0, 0)
-                        giftmap_panel.clue = "player"
-                        giftmap_panel.answer = symbolless_player
-
-                        if ap.enable_gift_maps.has("The Advanced"):
-                                var icely_panel = panel_prefab.instantiate()
-                                icely_panel.name = "IcelyPanel"
-                                icely_panel.answer = "icely"
-                                icely_panel.position = Vector3(33.5, -200, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../IcelyPanel"))
-                                giftmap_parent.add_child.call_deferred(icely_panel)
-
-                                var icely_wpl = wpl_prefab.instantiate()
-                                icely_wpl.name = "IcelyWpl"
-                                icely_wpl.exit = "the_advanced"
-                                icely_wpl.senders.append(NodePath("../IcelyPanel"))
-                                giftmap_parent.add_child.call_deferred(icely_wpl)
-
-                        if ap.enable_gift_maps.has("The Charismatic"):
-                                var souvey_panel = panel_prefab.instantiate()
-                                souvey_panel.name = "SouveyPanel"
-                                souvey_panel.answer = "souvey"
-                                souvey_panel.position = Vector3(33.5, -210, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../SouveyPanel"))
-                                giftmap_parent.add_child.call_deferred(souvey_panel)
-
-                                var souvey_wpl = wpl_prefab.instantiate()
-                                souvey_wpl.name = "SouveyWpl"
-                                souvey_wpl.exit = "the_charismatic"
-                                souvey_wpl.senders.append(NodePath("../SouveyPanel"))
-                                giftmap_parent.add_child.call_deferred(souvey_wpl)
-
-                        if ap.enable_gift_maps.has("The Crystalline"):
-                                var q_panel = panel_prefab.instantiate()
-                                q_panel.name = "QPanel"
-                                q_panel.answer = "q"
-                                q_panel.position = Vector3(33.5, -220, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../QPanel"))
-                                giftmap_parent.add_child.call_deferred(q_panel)
-
-                                var q_wpl = wpl_prefab.instantiate()
-                                q_wpl.name = "QWpl"
-                                q_wpl.exit = "the_crystalline"
-                                q_wpl.senders.append(NodePath("../QPanel"))
-                                giftmap_parent.add_child.call_deferred(q_wpl)
-
-                        if ap.enable_gift_maps.has("The Stellar"):
-                                var hatkirby_panel = panel_prefab.instantiate()
-                                hatkirby_panel.name = "HatkirbyPanel"
-                                hatkirby_panel.answer = "hatkirby"
-                                hatkirby_panel.position = Vector3(33.5, -230, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../HatkirbyPanel"))
-                                giftmap_parent.add_child.call_deferred(hatkirby_panel)
-
-                                var kirby_panel = panel_prefab.instantiate()
-                                kirby_panel.name = "KirbyPanel"
-                                kirby_panel.answer = "kirby"
-                                kirby_panel.position = Vector3(33.5, -240, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../KirbyPanel"))
-                                giftmap_parent.add_child.call_deferred(kirby_panel)
-
-                                var star_panel = panel_prefab.instantiate()
-                                star_panel.name = "StarPanel"
-                                star_panel.answer = "star"
-                                star_panel.position = Vector3(33.5, -250, 5.5)
-                                giftmap_panel.proxies.append(NodePath("../StarPanel"))
-                                giftmap_parent.add_child.call_deferred(star_panel)
-
-                                var stellar_wpl = wpl_prefab.instantiate()
-                                stellar_wpl.name = "StellarWpl"
-                                stellar_wpl.exit = "the_stellar"
-                                stellar_wpl.senders.append(NodePath("../HatkirbyPanel"))
-                                stellar_wpl.senders.append(NodePath("../KirbyPanel"))
-                                stellar_wpl.senders.append(NodePath("../StarPanel"))
-                                stellar_wpl.complete_at = 1
-                                giftmap_parent.add_child.call_deferred(stellar_wpl)
-
-                        giftmap_parent.add_child.call_deferred(giftmap_panel)
-
-                        var giftmap_tpl = tpl_prefab.instantiate()
-                        giftmap_tpl.name = "PanelTeleporter"
-                        giftmap_tpl.teleport_point = Vector3(33.5, 1, 5.5)
-                        giftmap_tpl.teleport_rotate = Vector3(-45, 0, 0)
-                        giftmap_tpl.target_path = giftmap_panel
-                        giftmap_tpl.senders.append(
-                                NodePath("/root/scene/Components/Listeners/unlockReaderListenerDoubles")
-                        )
-                        giftmap_parent.add_child.call_deferred(giftmap_tpl)
-
-        # Add the strict purple ending validation.
-        if global.map == "the_sun_temple" and ap.strict_purple_ending:
-                var panel_prefab = preload("res://objects/nodes/panel.tscn")
-                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-                var reverse_prefab = preload("res://objects/nodes/listeners/reversingListener.tscn")
-
-                var previous_panel = null
-                var next_y = -100
-                var words = ["quick", "brown", "fox", "jumps", "over", "the", "lazy", "dog"]
-                for word in words:
-                        var panel = panel_prefab.instantiate()
-                        panel.position = Vector3(0, next_y, 0)
-                        next_y -= 10
-                        panel.clue = word
-                        panel.symbol = ""
-                        panel.answer = word
-                        panel.name = "EndCheck_%s" % word
-
-                        var tpl = tpl_prefab.instantiate()
-                        tpl.teleport_point = Vector3(0, 1, 0)
-                        tpl.teleport_rotate = Vector3(-45, 180, 0)
-                        tpl.target_path = panel
-                        tpl.name = "Teleport"
-
-                        if previous_panel == null:
-                                tpl.senders.append(NodePath("/root/scene/Panels/End/panel_24"))
-                        else:
-                                tpl.senders.append(NodePath("../../%s" % previous_panel.name))
-
-                        var reversing = reverse_prefab.instantiate()
-                        reversing.senders.append(NodePath(".."))
-                        reversing.name = "Reversing"
-                        tpl.senders.append(NodePath("../Reversing"))
-
-                        panel.add_child.call_deferred(tpl)
-                        panel.add_child.call_deferred(reversing)
-                        get_parent().get_node("Panels").add_child.call_deferred(panel)
-
-                        previous_panel = panel
-
-                # Duplicate the doors that usually wait on EQUINOX. We can't set the senders
-                # here for some reason so we actually set them in the door ready function.
-                var endplat = get_node("/root/scene/Components/Doors/EndPlatform")
-                var endplat2 = endplat.duplicate()
-                endplat2.name = "spe_EndPlatform"
-                endplat.get_parent().add_child.call_deferred(endplat2)
-                endplat.queue_free()
-
-                var entry2 = get_node("/root/scene/Components/Doors/entry_2")
-                var entry22 = entry2.duplicate()
-                entry22.name = "spe_entry_2"
-                entry2.get_parent().add_child.call_deferred(entry22)
-                entry2.queue_free()
-
-        # Add the strict cyan ending validation.
-        if global.map == "the_parthenon" and ap.strict_cyan_ending:
-                var panel_prefab = preload("res://objects/nodes/panel.tscn")
-                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-                var reverse_prefab = preload("res://objects/nodes/listeners/reversingListener.tscn")
-
-                var previous_panel = null
-                var next_y = -100
-                var words = ["quick", "brown", "fox", "jumps", "over", "the", "lazy", "dog"]
-                for word in words:
-                        var panel = panel_prefab.instantiate()
-                        panel.position = Vector3(0, next_y, 0)
-                        next_y -= 10
-                        panel.clue = word
-                        panel.symbol = "."
-                        panel.answer = "%s%s" % [word, word]
-                        panel.name = "EndCheck_%s" % word
-
-                        var tpl = tpl_prefab.instantiate()
-                        tpl.teleport_point = Vector3(0, 1, -11)
-                        tpl.teleport_rotate = Vector3(-45, 0, 0)
-                        tpl.target_path = panel
-                        tpl.name = "Teleport"
-
-                        if previous_panel == null:
-                                tpl.senderGroup.append(NodePath("/root/scene/Panels/Rulers"))
-                        else:
-                                tpl.senders.append(NodePath("../../%s" % previous_panel.name))
-
-                        var reversing = reverse_prefab.instantiate()
-                        reversing.senders.append(NodePath(".."))
-                        reversing.name = "Reversing"
-                        tpl.senders.append(NodePath("../Reversing"))
-
-                        panel.add_child.call_deferred(tpl)
-                        panel.add_child.call_deferred(reversing)
-                        get_parent().get_node("Panels").add_child.call_deferred(panel)
-
-                        previous_panel = panel
-
-                # Duplicate the door that usually waits on the rulers. We can't set the
-                # senders here for some reason so we actually set them in the door ready
-                # function.
-                var entry1 = get_node("/root/scene/Components/Doors/entry_1")
-                var entry12 = entry1.duplicate()
-                entry12.name = "spe_entry_1"
-                entry1.get_parent().add_child.call_deferred(entry12)
-                entry1.queue_free()
-
-        # Move the Plaza RTE trigger outside of the turtle.
-        if global.map == "the_plaza":
-                var rte_trigger = get_node("/root/scene/Components/Warps/triggerArea")
-                rte_trigger.position.z = 0
-
-        # Add the mastery to Icarus.
-        if global.map == "icarus" and ap.enable_icarus:
-                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
-                var saver_prefab = preload("res://objects/nodes/saver.tscn")
-                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-
-                var mastery = collectable_prefab.instantiate()
-                mastery.name = "collectable"
-                mastery.position = Vector3(0, -2000, 0)
-                mastery.unlock_type = "smiley"
-                mastery.material_override = load("res://assets/materials/gold.material")
-                get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
-
-                var tpl = tpl_prefab.instantiate()
-                tpl.teleport_point = Vector3(56.25, 0, -5.5)
-                tpl.teleport_rotate = Vector3(0, 0, 0)
-                tpl.target_path = mastery
-                tpl.name = "Teleport"
-                tpl.senderGroup.append(NodePath("/root/scene/Panels"))
-                tpl.nested = true
-                mastery.add_child.call_deferred(tpl)
-
-                var saver = saver_prefab.instantiate()
-                saver.name = "saver_collectables"
-                saver.type = "collectables"
-                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
-                get_node("/root/scene").add_child.call_deferred(saver)
-
-        # Add the mastery to The Advanced.
-        if global.map == "the_advanced":
-                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
-                var saver_prefab = preload("res://objects/nodes/saver.tscn")
-                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-
-                var mastery = collectable_prefab.instantiate()
-                mastery.name = "collectable"
-                mastery.position = Vector3(0, -200, -5)
-                mastery.unlock_type = "smiley"
-                mastery.material_override = load("res://assets/materials/gold.material")
-                get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
-
-                var tpl = tpl_prefab.instantiate()
-                tpl.teleport_point = Vector3(0, 2, -5)
-                tpl.teleport_rotate = Vector3(0, 0, 0)
-                tpl.target_path = mastery
-                tpl.name = "Teleport"
-                tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_29"))
-                tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_30"))
-                tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_31"))
-                mastery.add_child.call_deferred(tpl)
-
-                var saver = saver_prefab.instantiate()
-                saver.name = "saver_collectables"
-                saver.type = "collectables"
-                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
-                get_node("/root/scene").add_child.call_deferred(saver)
-
-        # Add the mastery to The Charismatic.
-        if global.map == "the_charismatic":
-                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
-                var saver_prefab = preload("res://objects/nodes/saver.tscn")
-
-                var mastery = collectable_prefab.instantiate()
-                mastery.name = "collectable"
-                mastery.position = Vector3(-17, 2, -29)
-                mastery.rotation_degrees = Vector3(0, 45, 0)
-                mastery.unlock_type = "smiley"
-                mastery.material_override = load("res://assets/materials/gold.material")
-                get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
-
-                var saver = saver_prefab.instantiate()
-                saver.name = "saver_collectables"
-                saver.type = "collectables"
-                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
-                get_node("/root/scene").add_child.call_deferred(saver)
-
-        # Add the mastery to The Crystalline.
-        if global.map == "the_crystalline":
-                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
-                var saver_prefab = preload("res://objects/nodes/saver.tscn")
-                var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
-
-                var mastery = collectable_prefab.instantiate()
-                mastery.name = "collectable"
-                mastery.position = Vector3(0, 13, 37)
-                mastery.unlock_type = "smiley"
-                mastery.material_override = load("res://assets/materials/gold.material")
-                get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
-
-                var tpl = tpl_prefab.instantiate()
-                tpl.teleport_point = Vector3(0, 11.5, -20)
-                tpl.teleport_rotate = Vector3(0, 0, 180)
-                tpl.target_path = mastery
-                tpl.name = "Teleport"
-                tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_3"))
-                mastery.add_child.call_deferred(tpl)
-
-                var saver = saver_prefab.instantiate()
-                saver.name = "saver_collectables"
-                saver.type = "collectables"
-                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
-                get_node("/root/scene").add_child.call_deferred(saver)
-
-        # Add the mastery to The Stellar.
-        if global.map == "the_stellar":
-                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
-                var saver_prefab = preload("res://objects/nodes/saver.tscn")
-
-                var collectables = Node.new()
-                collectables.name = "Collectables"
-
-                var mastery = collectable_prefab.instantiate()
-                mastery.name = "collectable"
-                mastery.position = Vector3(2, 2, -31)
-                mastery.rotation_degrees = Vector3(0, 90, 0)
-                mastery.unlock_type = "smiley"
-                mastery.material_override = load("res://assets/materials/gold.material")
-                collectables.add_child.call_deferred(mastery)
-                get_node("/root/scene/Components").add_child.call_deferred(collectables)
-
-                var saver = saver_prefab.instantiate()
-                saver.name = "saver_collectables"
-                saver.type = "collectables"
-                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
-                get_node("/root/scene").add_child.call_deferred(saver)
+        # Run map-specific initialization.
+        var map_script = ap.get_map_script(global.map)
+        if map_script != null:
+                map_script.on_map_load(get_tree().get_root())
 
         ap.update_job_well_done_sign()
 
@@ -430,9 +36,12 @@ func _ready():
                         continue
 
                 if (
-                        door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY
-                        or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING
-                        or door.get_type() == gamedata.SCRIPT_proto.DoorType.CONTROL_CENTER_COLOR
+                        not (door.has_legacy_location() and door.get_legacy_location())
+                        and (
+                                door.get_type() == gamedata.SCRIPT_proto.DoorType.ITEM_ONLY
+                                or door.get_type() == gamedata.SCRIPT_proto.DoorType.GALLERY_PAINTING
+                                or door.get_type() == gamedata.SCRIPT_proto.DoorType.CONTROL_CENTER_COLOR
+                        )
                 ):
                         continue
 
@@ -568,22 +177,5 @@ func _ready():
         ap.stop_batching_locations()
 
 
-func _set_up_invis_wall(x, y, z, sx, sy, sz):
-        var prefab = preload("res://objects/nodes/block.tscn")
-        var newwall = prefab.instantiate()
-        newwall.position.x = x
-        newwall.position.y = y
-        newwall.position.z = z
-        newwall.scale.x = sz
-        newwall.scale.y = sy
-        newwall.scale.z = sx
-        newwall.set_surface_override_material(0, preload("res://assets/materials/blackMatte.material"))
-        newwall.visibility_range_end = 3
-        newwall.visibility_range_end_margin = 1
-        newwall.visibility_range_fade_mode = RenderingServer.VISIBILITY_RANGE_FADE_SELF
-        newwall.skeleton = ".."
-        get_parent().add_child.call_deferred(newwall)
-
-
 func _process(_dt):
         compass.update_rotation(global_rotation.y)