From e52341a9bc80e9ee74557d81d9c813fd3e91d71a Mon Sep 17 00:00:00 2001
From: sasha80 <sasha@mail.ru>
Date: Fri, 16 May 2025 14:39:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scenes/настройки/настройки.gd | 22 ++++++++++++----------
 scripts/tools.gd              |  6 +++---
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/scenes/настройки/настройки.gd b/scenes/настройки/настройки.gd
index 2c0d0e9..75d749a 100644
--- a/scenes/настройки/настройки.gd
+++ b/scenes/настройки/настройки.gd
@@ -99,7 +99,7 @@ func on_checkbutton_pressed(i_row: int):
 
 func parse_cmd_line_args(settings_data: Dictionary):
     var args = OS.get_cmdline_args()
-    for i in args.size():
+    for i in range(0, args.size(), 2):
         var key: String = args[i]
         key = key.lstrip('\'').rstrip('\'').lstrip('\"').rstrip('\"')
         if not settings_data.has(key):
@@ -129,15 +129,9 @@ func parse_cmd_line_args(settings_data: Dictionary):
                 else:
                     val0s[j] = val
 
-
-func setting_tab():
-    $heard_table.set_header(HEADER_ROW)
-    $heard_table.set_header_text(HEADER_ROW_TEXT)
-    $heard_table.set_columns_min_size([600, 950])
-    $heard_table.set_columns_alignments(ALIGNMENT)
-    var settings_data = {}  # Загружаем настройки из файла
+func load_settings(settings_data: Dictionary):
     var file = FileAccess.open(settings.settings_file, FileAccess.READ)
-    var abs_path = ProjectSettings.globalize_path(settings.settings_file)
+    var abs_path = ProjectSettings.globalize_path(settings.settings_file,)
     if file:
         var read = file.get_as_text()
         file.close()
@@ -149,6 +143,14 @@ func setting_tab():
     else:
         log.warning('Файл \"%s\" не найден, будут использованы настройки по умолчанию' % abs_path)
 
+
+func setting_tab():
+    $heard_table.set_header(HEADER_ROW)
+    $heard_table.set_header_text(HEADER_ROW_TEXT)
+    $heard_table.set_columns_min_size([600, 950])
+    $heard_table.set_columns_alignments(ALIGNMENT)
+    var settings_data = {}  # Загружаем настройки из файла
+    load_settings(settings_data)
     parse_cmd_line_args(settings_data)
 
     for i in SETTING_TABLE.size():
@@ -183,7 +185,7 @@ func setting_tab():
             var unit_data = settings.UnitProfiles[parameter]
             var profiles = $scroll_set/table.get_node2(1, i)
             var joined_data = ''
-            for j in range(unit_data[2].size()):
+            for j in unit_data[2].size():
                 joined_data += str(unit_data[2][j])
                 if j < unit_data[2].size() - 1:
                     joined_data += ','
diff --git a/scripts/tools.gd b/scripts/tools.gd
index 8330cd5..dca07aa 100644
--- a/scripts/tools.gd
+++ b/scripts/tools.gd
@@ -35,7 +35,7 @@ func allways(val: bool, msg: String = '<не указано>'):
     get_tree().quit(Error.FAILED)
 
 
-func _check_index(obj, index) -> bool:
+func check_index(obj, index) -> bool:
     if obj is Dictionary:
         if obj.has(index):
             return true
@@ -59,11 +59,11 @@ func get_value_by_path(obj, paths: Array, ret_val: Array):
     var index = paths.pop_at(0)
     ret_val[1] = false
     if paths.size():
-        if _check_index(obj, index):
+        if check_index(obj, index):
             ret_val[2] += 1
             get_value_by_path(obj[index], paths, ret_val)
     else:
-        if _check_index(obj, index):
+        if check_index(obj, index):
             ret_val[0] = obj[index]
             ret_val[1] = true