1 files changed, 27 insertions, 8 deletions

@@ -14,6 +14,8 @@ var letter_id_by_ap_id = {}
 var symbol_item_ids = []
 var anti_trap_ids = {}
 var location_name_by_id = {}
+var ending_display_name_by_name = {}
+var port_id_by_ap_id = {}
 
 var kSYMBOL_ITEMS
 
@@ -71,7 +73,13 @@ func load(data_bytes):
 
                 if door.has_ap_id():
                         door_id_by_ap_id[door.get_ap_id()] = door.get_id()
-                        location_name_by_id[door.get_ap_id()] = _get_door_location_name(door)
+
+                        if (
+                                door.get_type() == SCRIPT_proto.DoorType.STANDARD
+                                or door.get_type() == SCRIPT_proto.DoorType.LOCATION_ONLY
+                                or door.get_type() == SCRIPT_proto.DoorType.GRAVESTONE
+                        ):
+                                location_name_by_id[door.get_ap_id()] = _get_door_location_name(door)
 
         for painting in objects.get_paintings():
                 var room = objects.get_rooms()[painting.get_room_id()]
@@ -92,6 +100,9 @@ func load(data_bytes):
                 var map_data = port_id_by_map_node_path[map.get_name()]
                 map_data[port.get_path()] = port.get_id()
 
+                if port.has_ap_id():
+                        port_id_by_ap_id[port.get_ap_id()] = port.get_id()
+
         for progressive in objects.get_progressives():
                 progressive_id_by_ap_id[progressive.get_ap_id()] = progressive.get_id()
 
@@ -103,7 +114,9 @@ func load(data_bytes):
                 location_name_by_id[mastery.get_ap_id()] = _get_mastery_location_name(mastery)
 
         for ending in objects.get_endings():
-                location_name_by_id[ending.get_ap_id()] = _get_ending_location_name(ending)
+                var location_name = _get_ending_location_name(ending)
+                location_name_by_id[ending.get_ap_id()] = location_name
+                ending_display_name_by_name[ending.get_name()] = location_name
 
         for keyholder in objects.get_keyholders():
                 if keyholder.has_key():
@@ -163,8 +176,7 @@ func get_door_ap_id(door_id):
 
 func get_door_map_name(door_id):
         var door = objects.get_doors()[door_id]
-        var room = objects.get_rooms()[door.get_room_id()]
-        var map = objects.get_maps()[room.get_map_id()]
+        var map = objects.get_maps()[door.get_map_id()]
         return map.get_name()
 
 
@@ -213,7 +225,11 @@ func _get_generated_door_location_name(door):
         if door.get_type() != SCRIPT_proto.DoorType.STANDARD:
                 return null
 
-        if door.get_keyholders().size() > 0 or door.get_endings().size() > 0 or door.has_complete_at():
+        if (
+                door.get_keyholders().size() > 0
+                or (door.has_white_ending() and door.get_white_ending())
+                or door.has_complete_at()
+        ):
                 return null
 
         if door.get_panels().size() > 4:
@@ -224,8 +240,11 @@ func _get_generated_door_location_name(door):
                 var panel = objects.get_panels()[panel_id.get_panel()]
                 var panel_room = objects.get_rooms()[panel.get_room_id()]
                 # It's okay if panel_display_name is not present because then it's coalesced with other unnamed areas.
-                if not map_areas.has(panel_room.get_panel_display_name()):
-                        map_areas.append(panel_room.get_panel_display_name())
+                var panel_display_name = ""
+                if panel_room.has_panel_display_name():
+                        panel_display_name = panel_room.get_panel_display_name()
+                if not map_areas.has(panel_display_name):
+                        map_areas.append(panel_display_name)
 
         if map_areas.size() > 1:
                 return null
@@ -261,7 +280,7 @@ func _get_generated_door_location_name(door):
 
 
 func _get_letter_location_name(letter):
-        var letter_level = 2 if letter.get_level2() else 1
+        var letter_level = 2 if (letter.has_level2() and letter.get_level2()) else 1
         var letter_name = "%s%d" % [letter.get_key().to_upper(), letter_level]
         return "%s - %s" % [_get_room_object_map_name(letter), letter_name]