diff --git a/scenes/работа/работа.gd b/scenes/работа/работа.gd index 1ebab63..bd6e549 100644 --- a/scenes/работа/работа.gd +++ b/scenes/работа/работа.gd @@ -161,8 +161,8 @@ func map_threat_to_bip(th: threats.Threat, bip: Control): sector_key = key break if sector_key!= null: - radius_internal = prd.FS_FREQ[sector_key][2] - radius_outter = prd.FS_FREQ[sector_key][3] + radius_internal = fs_band[sector_key][0] + radius_outter = fs_band[sector_key][1] freq_low = prd.FS_FREQ[sector_key][0] freq_high = prd.FS_FREQ[sector_key][1] bip.position = tools.pos_calc( @@ -462,7 +462,7 @@ func set_ecm_btns_state(value: bool): func get_fs_param(index: int) -> Array: - var freq = (prd.FS_FREQ[index / 4][4]) + var freq = (prd.FS_FREQ[index / 4][2]) var sector = (prd.FS_SECTORS[index % 4][0] + prd.FS_SECTORS[index % 4][1])/2 - 45.0 if sector < 0: sector += 360.0 diff --git a/scripts/prd.gd b/scripts/prd.gd index e0debe1..69dedf2 100644 --- a/scripts/prd.gd +++ b/scripts/prd.gd @@ -30,13 +30,13 @@ const FS_SECTORS: Dictionary = { 1: [270.0, 360.0] } const FS_FREQ: Dictionary = { - 0: [390.0, 800.0, 200.0, 250.0, 433.0], - 1: [800.0, 1065.0, 250.0, 300.0, 860.0], - 2: [1065.0, 1210.0, 300.0, 350.0, 1137.0], - 3: [1150.0, 1490.0, 350.0, 400.0, 1227.0], - 4: [1490.0, 2000.0, 400.0, 450.0, 1575.0], - 5: [2000.0, 3500.0, 450.0, 500.0, 2450.0], - 6: [3500.0, 6000.0, 500.0, 550.0, 5800.0] } + 0: [390.0, 800.0, 433.0], + 1: [800.0, 1065.0, 860.0], + 2: [1065.0, 1210.0, 1137.0], + 3: [1150.0, 1490.0, 1227.0], + 4: [1490.0, 2000.0, 1575.0], + 5: [2000.0, 3500.0, 2450.0], + 6: [3500.0, 6000.0, 5800.0] } ## Названия приборов ПРД const PRD_NAMES: Array = [