diff options
Diffstat (limited to 'client/menu')
| -rw-r--r-- | client/menu/character_menu.gd | 21 | ||||
| -rw-r--r-- | client/menu/main_menu.gd | 18 |
2 files changed, 21 insertions, 18 deletions
diff --git a/client/menu/character_menu.gd b/client/menu/character_menu.gd index e63243e1..f4b878be 100644 --- a/client/menu/character_menu.gd +++ b/client/menu/character_menu.gd @@ -18,25 +18,22 @@ extends Control @onready var character: Character = $Character @onready var num_hairstyles := character.hairstyles.keys().size() -var hairstyle := 0 - func _ready(): - $VBoxContainer/top_panel/a/username.text = Global.username - -func _notification(what): - if what == NOTIFICATION_PREDELETE: - Global.save_profile() + $VBoxContainer/top_panel/a/username.text = Global.settings["username"] + character.select_hairstyle(Global.settings["character"]) func _on_back_pressed(): $SceneTransition.transition_to("res://menu/main_menu.tscn") func _on_username_text_changed(new_text): - Global.username = new_text + Global.settings["username"] = new_text func _on_character_back_pressed(): - hairstyle = (hairstyle - 1) % num_hairstyles - character.select_hairstyle(hairstyle) + Global.settings["character"] = (Global.settings["character"] - 1) % num_hairstyles + character.select_hairstyle(Global.settings["character"]) + Global.save_profile() func _on_character_forward_pressed(): - hairstyle = (hairstyle + 1) % num_hairstyles - character.select_hairstyle(hairstyle) + Global.settings["character"] = (Global.settings["character"] + 1) % num_hairstyles + character.select_hairstyle(Global.settings["character"]) + Global.save_profile() diff --git a/client/menu/main_menu.gd b/client/menu/main_menu.gd index 99fe1858..31ca5462 100644 --- a/client/menu/main_menu.gd +++ b/client/menu/main_menu.gd @@ -16,22 +16,28 @@ # extends Control +@onready var transition = $SceneTransition @onready var quick_connect = $side/margin/options/quick_connect @onready var quit_button = $side/margin/options/quit +@onready var connect_uri = $side/margin/options/connect/uri func _ready(): quick_connect.grab_focus() if OS.has_feature("web"): quit_button.hide() + connect_uri.text = Global.settings["last_server_url"] func _on_quit_pressed(): - $SceneTransition.quit() + transition.quit() func _on_credits_pressed(): - $SceneTransition.transition_to("res://menu/credits_menu.tscn") + transition.transition_to("res://menu/credits_menu.tscn") func _on_connect_pressed(): - connect_to($side/margin/options/connect/uri.text) + var url = $side/margin/options/connect/uri.text + Global.settings["last_server_url"] = url + Global.save_profile() + connect_to(url) func _on_quick_connect_pressed(): if OS.has_feature("JavaScript"): @@ -46,10 +52,10 @@ func _on_quick_connect_pressed(): func connect_to(url): print("Connecting to %s" % url) Global.server_url = url - $SceneTransition.transition_to("res://game.tscn") + transition.transition_to("res://game.tscn") func _on_change_character_pressed(): - $SceneTransition.transition_to("res://menu/character_menu.tscn") + transition.transition_to("res://menu/character_menu.tscn") func _on_settings_pressed(): - $SceneTransition.transition_to("res://menu/settings_menu.tscn") + transition.transition_to("res://menu/settings_menu.tscn") |