2 files changed, 116 insertions, 1 deletions

@@ -64,6 +64,7 @@ var apworld_version = [0, 0, 0]
 var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2
 var daedalus_roof_access = false
 var enable_gift_maps = []
+var enable_icarus = false
 var keyholder_sanity = false
 var port_pairings = {}
 var shuffle_control_center_colors = false
@@ -441,6 +442,7 @@ func _client_connected(slot_data):
         cyan_door_behavior = int(slot_data.get("cyan_door_behavior", 0))
         daedalus_roof_access = bool(slot_data.get("daedalus_roof_access", false))
         enable_gift_maps = slot_data.get("enable_gift_maps", [])
+        enable_icarus = bool(slot_data.get("enable_icarus", false))
         keyholder_sanity = bool(slot_data.get("keyholder_sanity", false))
         shuffle_control_center_colors = bool(slot_data.get("shuffle_control_center_colors", false))
         shuffle_doors = bool(slot_data.get("shuffle_doors", false))
@@ -78,6 +78,7 @@ func _ready():
                 # 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()
@@ -93,7 +94,7 @@ func _ready():
 
                         var giftmap_panel = panel_prefab.instantiate()
                         giftmap_panel.name = "Panel"
-                        giftmap_panel.position = Vector3(33.5, 1, 5.5)
+                        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
@@ -112,8 +113,46 @@ func _ready():
                                 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)
+
                         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")
@@ -222,6 +261,34 @@ func _ready():
                 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")
@@ -251,6 +318,52 @@ func _ready():
                 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)
+
         ap.update_job_well_done_sign()
 
         # Set up door locations.