Fix various minor client bugs

This is what we get for not running in the editor for a while!

4 files changed, 19 insertions, 18 deletions

@@ -158,11 +158,7 @@ func _on_web_socket_server_message_received(_peer_id: int, packet: String) -> vo
                 elif cmd == "LocationInfo":
                         for loc in message["locations"]:
                                 location_scout_received.emit(
-                                        int(loc["id"]),
-                                        loc["item"],
-                                        loc["player"],
-                                        int(loc["flags"]),
-                                        int(loc["for_self"])
+                                        int(loc["id"]), loc["item"], loc["player"], int(loc["flags"]), int(loc["self"])
                                 )
 
                 elif cmd == "AccessibleLocations":
@@ -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]
 
@@ -31,6 +31,7 @@ func _ready():
                 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
                 ):
                         continue
 
@@ -100,7 +100,7 @@ func _ready():
         server_box.offset_top = 295.0
         server_box.offset_right = 1144.0
         server_box.offset_bottom = 445.0
-        server_box.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
+        server_box.alignment = HORIZONTAL_ALIGNMENT_CENTER
         server_box.caret_blink = true
         panel.add_child(server_box)
 
@@ -110,7 +110,7 @@ func _ready():
         player_box.offset_top = 477.0
         player_box.offset_right = 1144.0
         player_box.offset_bottom = 627.0
-        player_box.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
+        player_box.alignment = HORIZONTAL_ALIGNMENT_CENTER
         player_box.caret_blink = true
         panel.add_child(player_box)
 
@@ -120,20 +120,16 @@ func _ready():
         password_box.offset_top = 659.0
         password_box.offset_right = 1144.0
         password_box.offset_bottom = 809.0
-        password_box.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
+        password_box.alignment = HORIZONTAL_ALIGNMENT_CENTER
         password_box.caret_blink = true
         panel.add_child(password_box)
 
         var accept_dialog = AcceptDialog.new()
         accept_dialog.name = "AcceptDialog"
-        accept_dialog.offset_right = 83.0
-        accept_dialog.offset_bottom = 58.0
         panel.add_child(accept_dialog)
 
         var version_mismatch = ConfirmationDialog.new()
         version_mismatch.name = "VersionMismatch"
-        version_mismatch.offset_right = 83.0
-        version_mismatch.offset_bottom = 58.0
         panel.add_child(version_mismatch)
 
         var connection_history = MenuButton.new()