From 797cf68fc2163c3996c44fdfc5fc9f6b6c6b6dd3 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sun, 5 Oct 2025 13:10:07 -0400 Subject: Fix various minor client bugs This is what we get for not running in the editor for a while! --- apworld/client/gamedata.gd | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'apworld/client/gamedata.gd') diff --git a/apworld/client/gamedata.gd b/apworld/client/gamedata.gd index 334d42a..9305003 100644 --- a/apworld/client/gamedata.gd +++ b/apworld/client/gamedata.gd @@ -72,7 +72,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()] @@ -166,8 +172,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() @@ -227,8 +232,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 @@ -264,7 +272,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] -- cgit 1.4.1