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('Модуль настроек готов')