Settings show current crosshair settings

scenes/game_world/crosshair.gd

@@ -7,8 +7,8 @@ var enable_outline := true
 var dot_enable := false
 
 var dot_size := 6.0
-var global_outline_width := 2.0
+var global_outline_width := 1.0
-var global_crosshair_thickness := 4.0
+var global_crosshair_thickness := 2.0
 var global_crosshair_length := 12.0
 var global_crosshair_gap := 5.0
 
@@ -34,20 +34,20 @@ func _on_options_refresh_crosshair():
 	queue_redraw()
 
 func load_save():
-	if DataManager.get_data("Outline") != null:
-		enable_outline = DataManager.get_data("Outline")
 	if DataManager.get_data("Dot") != null:
 		dot_enable = DataManager.get_data("Dot")
 	if DataManager.get_data("DotSize") != null:
 		dot_size = DataManager.get_data("DotSize")
-	if DataManager.get_data("OutlineSize") != null:
-		global_outline_width = DataManager.get_data("OutlineSize")
-	if DataManager.get_data("CrosshairHeight") != null:
-		global_crosshair_thickness = DataManager.get_data("CrosshairThickness")
 	if DataManager.get_data("CrosshairLength") != null:
 		global_crosshair_length = DataManager.get_data("CrosshairLength")
+	if DataManager.get_data("CrosshairThickness") != null:
+		global_crosshair_thickness = DataManager.get_data("CrosshairThickness")
 	if DataManager.get_data("CrosshairGap") != null:
 		global_crosshair_gap = DataManager.get_data("CrosshairGap")
+	if DataManager.get_data("Outline") != null:
+		enable_outline = DataManager.get_data("Outline")
+	if DataManager.get_data("OutlineSize") != null:
+		global_outline_width = DataManager.get_data("OutlineSize")
 	if DataManager.get_data("CrosshairColor") != null:
 		global_color = Global.string_to_color(DataManager.get_data("CrosshairColor"))
 	if DataManager.get_data("OutlineColor") != null:

scenes/main_menu/settings.tscn

@@ -137,6 +137,7 @@ layout_mode = 2
 size_flags_horizontal = 3
 
 [node name="Crosshair" type="Control" parent="HBoxContainer/Control2"]
+visible = false
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -205,21 +206,21 @@ has_checkbox = false
 layout_mode = 2
 label_text = "Thickness"
 max_value = 10.0
-value = 3.0
+value = 10.0
 has_checkbox = false
 
 [node name="Gap" parent="HBoxContainer/Control2/Crosshair/MarginContainer/VBoxContainer/CrosshairSettings" instance=ExtResource("6_bpfs5")]
 layout_mode = 2
 label_text = "Gap"
 max_value = 25.0
-value = 10.0
+value = 25.0
 has_checkbox = false
 
 [node name="Outline" parent="HBoxContainer/Control2/Crosshair/MarginContainer/VBoxContainer/CrosshairSettings" instance=ExtResource("6_bpfs5")]
 layout_mode = 2
 label_text = "Outline"
 max_value = 10.0
-value = 2.0
+value = 10.0
 
 [node name="Color" type="HBoxContainer" parent="HBoxContainer/Control2/Crosshair/MarginContainer/VBoxContainer/CrosshairSettings"]
 layout_mode = 2

scenes/main_menu/settings/slider_setting.gd

@@ -40,6 +40,7 @@ signal toggle_checkbox(value)
 @export var checkbox_value := true:
 	set(value):
 		checkbox_value = value
+		$CheckBox.button_pressed = value
 
 @onready var slider = $Slider
 
@@ -51,5 +52,3 @@ func _on_slider_value_changed(new_value):
 
 func _on_check_box_toggled(button_pressed):
 	toggle_checkbox.emit(button_pressed)
-
-

scenes/main_menu/settings_crosshair.gd

@@ -17,14 +17,6 @@ func _ready():
 	file_import.visible = false
 	load_saved()
 
-func _on_crosshair_color_color_changed(color):
-	DataManager.save_data("CrosshairColor", str(color))
-	emit_signal("refresh_crosshair")
-
-func _on_outline_color_color_changed(color):
-	DataManager.save_data("OutlineColor", str(color))
-	emit_signal("refresh_crosshair")
-
 func _on_export_pressed():
 	if OS.has_feature("web"):
 		DataManager.save_all_data_to_file_web()
@@ -69,6 +61,12 @@ func _on_outline_change_value(value):
 func _on_gap_change_value(value):
 	change_value("CrosshairGap", float(value))
 
+func _on_crosshair_color_color_changed(color):
+	change_value("CrosshairColor", str(color))
+
+func _on_outline_color_color_changed(color):
+	change_value("OutlineColor", str(color))
+	
 func change_value(key, value):
 	DataManager.save_data(key, value)
 	emit_signal("refresh_crosshair")
@@ -82,17 +80,30 @@ func file_parser(args):
 	DataManager.load_all_data_from_param(args[0])
 
 func load_saved():
-	var all_persist_groups = get_tree().get_nodes_in_group("Persist")
+	if DataManager.get_data("Dot") != null:
-	for persist_group in all_persist_groups:
+		$MarginContainer/VBoxContainer/CrosshairSettings/Dot.checkbox_value \
-		match persist_group.get_class():
+			= DataManager.get_data("Dot")
-			"CheckButton":
+	if DataManager.get_data("DotSize") != null:
-				if DataManager.get_data(persist_group.name) != null:
+		$MarginContainer/VBoxContainer/CrosshairSettings/Dot.value \
-					persist_group.set_pressed(DataManager.get_data(persist_group.name))
+			= DataManager.get_data("DotSize")
-			"LineEdit":
+	if DataManager.get_data("CrosshairLength") != null:
-				if DataManager.get_data(persist_group.name) != null:
+		$MarginContainer/VBoxContainer/CrosshairSettings/Length.value \
-					persist_group.text = str((DataManager.get_data(persist_group.name)))
+			= DataManager.get_data("CrosshairLength")
-			"ColorPickerButton":
+	if DataManager.get_data("CrosshairThickness") != null:
-				if DataManager.get_data(persist_group.name) != null:
+		$MarginContainer/VBoxContainer/CrosshairSettings/Thickness.value \
-					persist_group.color = Global.string_to_color(DataManager.get_data(persist_group.name)) 
+			= DataManager.get_data("CrosshairThickness")
-			_:
+	if DataManager.get_data("CrosshairGap") != null:
-				print("Not loaded")
+		$MarginContainer/VBoxContainer/CrosshairSettings/Gap.value \
+			= DataManager.get_data("CrosshairGap")
+	if DataManager.get_data("Outline") != null:
+		$MarginContainer/VBoxContainer/CrosshairSettings/Outline.checkbox_value \
+			= DataManager.get_data("Outline")
+	if DataManager.get_data("OutlineSize") != null:
+		$MarginContainer/VBoxContainer/CrosshairSettings/Outline.value \
+			= DataManager.get_data("OutlineSize")
+	if DataManager.get_data("CrosshairColor") != null:
+		$MarginContainer/VBoxContainer/CrosshairSettings/Color/CrosshairColor.color \
+			= Global.string_to_color(DataManager.get_data("CrosshairColor"))
+	if DataManager.get_data("OutlineColor") != null:
+		$MarginContainer/VBoxContainer/CrosshairSettings/OutlineColor/OutlineColor.color \
+			= Global.string_to_color(DataManager.get_data("OutlineColor"))