7 files changed, 139 insertions, 1 deletions

@@ -71,6 +71,10 @@ class Lingo2World(World):
         self.port_pairings = {}
 
     def create_regions(self):
+        if hasattr(self.multiworld, "re_gen_passthrough") and "Lingo 2" in self.multiworld.re_gen_passthrough:
+            self.player_logic.rte_mapping = [self.world.static_logic.map_id_by_name[map_name]
+                                             for map_name in self.multiworld.re_gen_passthrough["Lingo 2"]["rte"]]
+
         create_regions(self)
 
     def connect_entrances(self):
@@ -16,6 +16,7 @@ var anti_trap_ids = {}
 var location_name_by_id = {}
 var ending_display_name_by_name = {}
 var port_id_by_ap_id = {}
+var map_id_by_rte_ap_id = {}
 
 var kSYMBOL_ITEMS
 
@@ -57,6 +58,9 @@ func load(data_bytes):
         for map in objects.get_maps():
                 map_id_by_name[map.get_name()] = map.get_id()
 
+                if map.has_rte_ap_id():
+                        map_id_by_rte_ap_id[map.get_rte_ap_id()] = map.get_id()
+
         for door in objects.get_doors():
                 var map = objects.get_maps()[door.get_map_id()]
 
@@ -300,3 +304,7 @@ func _get_keyholder_location_name(keyholder):
                 "%s - %s Keyholder"
                 % [_get_room_object_location_prefix(keyholder), keyholder.get_key().to_upper()]
         )
+
+
+func vec3d_to_vector3(input) -> Vector3:
+        return Vector3(input.get_x(), input.get_y(), input.get_z())
@@ -46,6 +46,10 @@ const kCYAN_DOOR_BEHAVIOR_H2 = 0
 const kCYAN_DOOR_BEHAVIOR_DOUBLE_LETTER = 1
 const kCYAN_DOOR_BEHAVIOR_ITEM = 2
 
+const kFAST_TRAVEL_ACCESS_VANILLA = 0
+const kFAST_TRAVEL_ACCESS_UNLOCKED = 1
+const kFAST_TRAVEL_ACCESS_ITEMS = 2
+
 const kEndingNameByVictoryValue = {
         0: "GRAY",
         1: "PURPLE",
@@ -69,9 +73,11 @@ var daedalus_roof_access = false
 var enable_gift_maps = []
 var enable_icarus = false
 var endings_requirement = 0
+var fast_travel_access = 0
 var keyholder_sanity = false
 var masteries_requirement = 0
 var port_pairings = {}
+var rte_mapping = []
 var shuffle_control_center_colors = false
 var shuffle_doors = false
 var shuffle_gallery_paintings = false
@@ -269,6 +275,13 @@ func _process_item(item, amount):
         if item_id == gamedata.objects.get_special_ids()["Numbers"] and global.map == "the_fuzzy":
                 global.allow_numbers = true
 
+        if gamedata.map_id_by_rte_ap_id.has(item_id):
+                var rteInner = get_tree().get_root().get_node_or_null(
+                        "scene/player/pause_menu/menu/return/rteInner"
+                )
+                if rteInner != null:
+                        rteInner.refreshButtons()
+
         # Show a message about the item if it's new.
         if int(item["index"]) > _last_new_item:
                 _last_new_item = int(item["index"])
@@ -469,6 +482,7 @@ func _client_connected(slot_data):
         enable_gift_maps = slot_data.get("enable_gift_maps", [])
         enable_icarus = bool(slot_data.get("enable_icarus", false))
         endings_requirement = int(slot_data.get("endings_requirement", 0))
+        fast_travel_access = int(slot_data.get("fast_travel_access", 0))
         keyholder_sanity = bool(slot_data.get("keyholder_sanity", false))
         masteries_requirement = int(slot_data.get("masteries_requirement", 0))
         shuffle_control_center_colors = bool(slot_data.get("shuffle_control_center_colors", false))
@@ -496,6 +510,10 @@ func _client_connected(slot_data):
                                 raw_pp[p1]
                         )]
 
+        rte_mapping.clear()
+        if slot_data.has("rte"):
+                rte_mapping = slot_data.get("rte")
+
         # Set up item locks.
         _item_locks = {}
 
@@ -74,6 +74,28 @@ func on_map_load(root):
                 old_door.queue_free()
                 root.get_node("/root/scene/Components/Doors").add_child.call_deferred(new_door)
 
+        # Display White Ending requirements.
+        var ending_count = 0
+        var mastery_count = 0
+        for key in unlocks.data:
+                if unlocks.data[key] == "unlocked":
+                        if key.ends_with("_ending"):
+                                ending_count += 1
+                        elif key.ends_with("_mastery"):
+                                mastery_count += 1
+
+        var sign_prefab = preload("res://objects/nodes/sign.tscn")
+        var sign1 = sign_prefab.instantiate()
+        sign1.position = Vector3(87.5, 5, -42.01)
+        sign1.text = "Endings: %d/%d" % [ending_count, ap.endings_requirement]
+        root.get_node("/root/scene").add_child.call_deferred(sign1)
+
+        var sign2 = sign_prefab.instantiate()
+        sign2.position = Vector3(87.5, 5, -15.99)
+        sign2.rotation_degrees.y = 180
+        sign2.text = "Masteries: %d/%d" % [mastery_count, ap.masteries_requirement]
+        root.get_node("/root/scene").add_child.call_deferred(sign2)
+
 
 func _set_up_mastery_listener(root, name):
         var prefab = preload("res://objects/nodes/listeners/unlockReaderListener.tscn")
@@ -13,6 +13,8 @@ func _ready():
 
         var ap = global.get_node("Archipelago")
         var gamedata = global.get_node("Gamedata")
+        var map_id = gamedata.map_id_by_name.get(global.map)
+        var map_data = gamedata.objects.get_maps()[map_id]
 
         compass = global.get_node("Compass")
         compass.visible = ap.show_compass
@@ -26,8 +28,33 @@ func _ready():
 
         ap.update_job_well_done_sign()
 
+        # Set up the RTE trigger, if there is one.
+        if map_data.has_rte_trigger_pos():
+                var oneShotListener_prefab = preload("res://objects/nodes/listeners/oneShotListener.tscn")
+                var triggerArea_prefab = preload("res://objects/nodes/triggerArea.tscn")
+                var unlockSetterListener_prefab = preload(
+                        "res://objects/nodes/listeners/unlockSetterListener.tscn"
+                )
+
+                var triggerArea = triggerArea_prefab.instantiate()
+                triggerArea.name = "rte_triggerArea"
+                triggerArea.position = gamedata.vec3d_to_vector3(map_data.get_rte_trigger_pos())
+                triggerArea.scale = gamedata.vec3d_to_vector3(map_data.get_rte_trigger_scale())
+                get_parent().add_child.call_deferred(triggerArea)
+
+                var osl = oneShotListener_prefab.instantiate()
+                osl.name = "rte_osl"
+                osl.senders.append(NodePath("/root/scene/rte_triggerArea"))
+                get_parent().add_child.call_deferred(osl)
+
+                var usl = unlockSetterListener_prefab.instantiate()
+                usl.name = "rte_usl"
+                usl.key = "rte_%s" % global.map
+                usl.value = "unlocked"
+                usl.senders.append(NodePath("/root/scene/rte_osl"))
+                get_parent().add_child.call_deferred(usl)
+
         # Set up door locations.
-        var map_id = gamedata.map_id_by_name.get(global.map)
         for door in gamedata.objects.get_doors():
                 if door.get_map_id() != map_id:
                         continue
@@ -1,5 +1,7 @@
 extends "res://scripts/ui/rteMenu.gd"
 
+var buttons = []
+
 
 func _readier():
         var ap = global.get_node("Archipelago")
@@ -8,5 +10,58 @@ func _readier():
                 get_node("rte_daedalus").show()
 
                 switcher.preload_map("res://objects/scenes/daedalus.tscn")
+        elif !ap.rte_mapping.is_empty():
+                buttons = [$rte_the_plaza, $rte_the_gallery, $rte_daedalus, $rte_control_center]
+                for i in range(4):
+                        buttons[i].name = "button_%d" % i
+                for i in range(4):
+                        _setupButton(buttons[i], ap.rte_mapping[i])
+
+                refreshButtons()
         else:
                 super()._readier()
+
+
+func _setupButton(button, map_name):
+        switcher.preload_map("res://objects/scenes/%s.tscn" % map_name)
+
+        button.hide()
+        button.text = map_name.replace("_", " ")
+        button.name = "rte_%s" % map_name
+        button.autowrap_mode = TextServer.AUTOWRAP_WORD
+
+        var ap = global.get_node("Archipelago")
+        if (
+                ap.fast_travel_access == ap.kFAST_TRAVEL_ACCESS_VANILLA
+                and !unlocks.data.has("rte_%s" % map_name)
+        ):
+                unlocks.data["rte_%s" % map_name] = ""
+
+
+func refreshButtons():
+        var ap = global.get_node("Archipelago")
+        if ap.rte_mapping.is_empty():
+                return
+
+        for i in range(4):
+                if _shouldShowButton(ap.rte_mapping[i]):
+                        buttons[i].show()
+                else:
+                        buttons[i].hide()
+
+
+func _shouldShowButton(map_name):
+        var ap = global.get_node("Archipelago")
+
+        if ap.fast_travel_access == ap.kFAST_TRAVEL_ACCESS_VANILLA:
+                return unlocks.data["rte_%s" % map_name] == "unlocked"
+        elif ap.fast_travel_access == ap.kFAST_TRAVEL_ACCESS_UNLOCKED:
+                return true
+        elif ap.fast_travel_access == ap.kFAST_TRAVEL_ACCESS_ITEMS:
+                var gamedata = global.get_node("Gamedata")
+                var map_id = gamedata.map_id_by_name[map_name]
+                var rte_ap_id = gamedata.objects.get_maps()[map_id].get_rte_ap_id()
+
+                return ap.client.hasItem(rte_ap_id)
+
+        return false
@@ -44,6 +44,10 @@ class Tracker:
                                               for k, t in Lingo2Options.type_hints.items()})
 
         self.world.generate_early()
+
+        self.world.player_logic.rte_mapping = [self.world.static_logic.map_id_by_name[map_name]
+                                               for map_name in slot_data.get("rte", [])]
+
         self.world.create_regions()
 
         if self.world.options.shuffle_worldports: