diff options
Diffstat (limited to 'client/menu')
| -rw-r--r-- | client/menu/menu.gd | 4 | ||||
| -rw-r--r-- | client/menu/setup.gd | 2 | ||||
| -rw-r--r-- | client/menu/warning_popup.tscn | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/client/menu/menu.gd b/client/menu/menu.gd index d2da3529..6dd48fca 100644 --- a/client/menu/menu.gd +++ b/client/menu/menu.gd @@ -51,13 +51,13 @@ func menu_anim_cover(_state: bool): pass var popup: Menu = null -func submenu(path: String, data = null): +func submenu(path: String, data_ = null): var prev_focus = Global.focused_node if popup != null: return _disable_recursive(self, true) await menu_anim_cover(true) popup = load(path).instantiate() - popup.data = data + popup.data = data_ add_child(popup) print("Submenu opened ", path) await submenu_close diff --git a/client/menu/setup.gd b/client/menu/setup.gd index 6e901b9c..470b0839 100644 --- a/client/menu/setup.gd +++ b/client/menu/setup.gd @@ -54,7 +54,7 @@ func _process(delta): func check(): if username.text == "": return "Username cannot be empty" var n = username.text.to_lower() - if n.begins_with("f") and n.ends_with("miller"): return "You are not Frank Miller" + if n.begins_with("f") and n.ends_with("miller"): return "You cannot choose that name.\n(It's too close to your boss')" if character == -1: return "You must select a hairstyle" return null diff --git a/client/menu/warning_popup.tscn b/client/menu/warning_popup.tscn index 784011b3..4fd2fbba 100644 --- a/client/menu/warning_popup.tscn +++ b/client/menu/warning_popup.tscn @@ -37,6 +37,7 @@ theme_override_constants/separation = 16 [node name="Message" type="Label" parent="CenterContainer/Panel/MarginContainer/VBoxContainer"] layout_mode = 2 text = "You must fill out all requested fields." +horizontal_alignment = 1 [node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/Panel/MarginContainer/VBoxContainer"] layout_mode = 2 |