From 54292b276038e55fb787eda1e793b27d1b772250 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Wed, 5 Mar 2025 15:23:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=9F=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F=D1=86=D0=B8=D0=B8?= =?UTF-8?q?,=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=87=D1=82=D0=B5=D0=BD=D0=B8=D1=8F=20setting.g?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/prd.gd | 2 +- scripts/settings.gd | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/prd.gd b/scripts/prd.gd index 4328ada..789e366 100644 --- a/scripts/prd.gd +++ b/scripts/prd.gd @@ -164,5 +164,5 @@ func update_fs_state(ecms): var fs_state = 2 if fs.modulation: fs_state = 3 - if dev_mode != fs_state: + if (dev_mode != fs_state) or (fs_state == 3): fs.emit_signal('update_modulation') diff --git a/scripts/settings.gd b/scripts/settings.gd index 1ce3165..eff466a 100644 --- a/scripts/settings.gd +++ b/scripts/settings.gd @@ -60,8 +60,11 @@ func _ready() -> void: if not json_data.has(key): continue UnitProfiles[key][1] = json_data[key][0] for i in len(json_data[key]) - 1: - if json_data[key][1][i+1].is_valid_int(): - UnitProfiles[key][2][i] = int(json_data[key][i+1]) + if typeof(json_data[key][i+1]) == TYPE_STRING: + if json_data[key][i+1].is_valid_int(): + UnitProfiles[key][2][i] = int(json_data[key][i+1]) + else: + UnitProfiles[key][2][i] = json_data[key][i+1] else: UnitProfiles[key][2][i] = json_data[key][i+1] log.info('Модуль настроек готов')