From 1c361226240182db6f72f26c6fe0f0de65456239 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Mon, 8 Sep 2025 14:39:50 -0400 Subject: [Client] Prevent text client on connection screen --- client/Archipelago/manager.gd | 6 ++++++ client/Archipelago/pauseMenu.gd | 6 ++++++ client/Archipelago/textclient.gd | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/client/Archipelago/manager.gd b/client/Archipelago/manager.gd index a709277..cd0654f 100644 --- a/client/Archipelago/manager.gd +++ b/client/Archipelago/manager.gd @@ -128,6 +128,10 @@ func saveLocaldata(): func connectToServer(): _last_new_item = -1 + _batch_locations = false + _held_locations = [] + _held_location_scouts = [] + _location_scouts = {} _letters_setup = false _held_letters = {} @@ -396,6 +400,8 @@ func _client_connected(slot_data): _item_locks[door] = [door_group.get_ap_id(), 1] # Create a reverse item locks map for processing items. + _inverse_item_locks = {} + for door_id in _item_locks.keys(): var lock = _item_locks.get(door_id) diff --git a/client/Archipelago/pauseMenu.gd b/client/Archipelago/pauseMenu.gd index 6c013a5..5da114a 100644 --- a/client/Archipelago/pauseMenu.gd +++ b/client/Archipelago/pauseMenu.gd @@ -4,3 +4,9 @@ extends "res://scripts/ui/pauseMenu.gd" func _pause_game(): global.get_node("Textclient").dismiss() super._pause_game() + + +func _main_menu(): + global.loaded = false + global.get_node("Archipelago").disconnect_from_ap() + super._main_menu() diff --git a/client/Archipelago/textclient.gd b/client/Archipelago/textclient.gd index 4b03151..85cc6d2 100644 --- a/client/Archipelago/textclient.gd +++ b/client/Archipelago/textclient.gd @@ -50,7 +50,7 @@ func _ready(): func _input(event): - if event is InputEventKey and event.pressed: + if global.loaded and event is InputEventKey and event.pressed: if event.keycode == KEY_TAB and !Input.is_key_pressed(KEY_SHIFT): if !get_tree().paused: is_open = true -- cgit 1.4.1