Доработка. Кнопка показа схемы и снятие выбора прибора

# Conflicts:
#	scenes/pribor-prd-k/pribor-prd-k.tscn
#	scenes/pribor-prd-n/pribor-prd-n.tscn
#	scenes/pribor-prd-v/pribor-prd-v.tscn
#	scenes/контроль/контроль.tscn

README.md

@@ -36,3 +36,4 @@
 - После клонирования запустить скрипт `git-hooks-config.sh`
 - В среде **Windows** запуск скрипта `git-hooks-config.sh` производить из оболочки `git bash`
 - Нужно обновить `settings.json`
+- поиск циклических зависимостей (не реализованно)

config/setting_prd_control.json

@@ -0,0 +1,219 @@
+{
+  "device_constants": {
+    "PRD_N": {
+      "constants": {
+        "POWER_UKP_1": 31,
+        "POWER_UKP_2": 63,
+        "DKM_BIT_2": 1,
+        "DKM_BIT_3": 2,
+        "BASE_ADDR_EMS_G": 288,
+        "ADDR_UG_LITERA_1": 262,
+        "ADDR_UG_LITERA_2": 264,
+        "ADDR_UG_LITERA_3": 266,
+        "TEMP_THRESHOLD": 70,
+        "POWER_THRESHOLD": 40,
+        "RAY_DOU_NUM": 3,
+        "ATT_UM_2": 2,
+        "ATT_UM_3": 3,
+        "POWER_UM": 100,
+        "TIMER_DELAY": 10.0,
+        "STATE_MASHINE_TIMER": 0.3
+      },
+      "pribor_config": {
+        "1н": {"angle": 0.0, "sectors": [4, 8]},
+        "2н": {"angle": 90.0, "sectors": [7, 11]},
+        "3н": {"angle": 180.0, "sectors": [6, 10]},
+        "4н": {"angle": 270.0, "sectors": [5, 9]}
+      },
+      "fs_params": {
+        "2": {"freq": 932.0, "width": 100.0},
+        "3": {"freq": 1157.0, "width": 100.0}
+      },
+      "start_litera": 2,
+      "progress_max": 20
+    },
+    "PRD_V": {
+      "constants": {
+        "POWER_UKP_1": 31,
+        "POWER_UKP_2": 63,
+        "DKM_BIT_4": 3,
+        "DKM_BIT_5": 4,
+        "BASE_ADDR_EMS_G": 288,
+        "ADDR_UG_LITERA_1": 262,
+        "ADDR_UG_LITERA_2": 264,
+        "ADDR_UG_LITERA_3": 266,
+        "TEMP_THRESHOLD": 70,
+        "POWER_THRESHOLD": 40,
+        "RAY_DOU_NUM": 3,
+        "ATT_UM_4": 2,
+        "ATT_UM_5": 3,
+        "POWER_UM": 100,
+        "TIMER_DELAY": 10.0,
+        "STATE_MASHINE_TIMER": 0.3
+      },
+      "pribor_config": {
+        "1в": {"angle": 0.0, "sectors": [12, 16]},
+        "2в": {"angle": 90.0, "sectors": [15, 19]},
+        "3в": {"angle": 180.0, "sectors": [14, 18]},
+        "4в": {"angle": 270.0, "sectors": [13, 17]}
+      },
+      "fs_params": {
+        "4": {"freq": 1227.0, "width": 100.0},
+        "5": {"freq": 1575.0, "width": 110.0}
+      },
+      "start_litera": 4,
+      "progress_max": 20
+    },
+    "PRD_K": {
+      "constants": {
+        "POWER_UKP_1": 31,
+        "POWER_UKP_2": 63,
+        "DKM_BIT_1": 0,
+        "DKM_BIT_6": 5,
+        "DKM_BIT_7": 6,
+        "BASE_ADDR_EMS_G": 288,
+        "ADDR_UG_LITERA_1": 262,
+        "ADDR_UG_LITERA_2": 264,
+        "ADDR_UG_LITERA_3": 266,
+        "TEMP_THRESHOLD": 40,
+        "POWER_THRESHOLD": 40,
+        "RAY_DOU_NUM": 3,
+        "ATT_UM_1": 0,
+        "ATT_UM_6": 3,
+        "ATT_UM_7": 2,
+        "POWER_UM": 100,
+        "TIMER_DELAY": 10.0,
+        "STATE_MASHINE_TIMER": 0.3
+      },
+      "pribor_config": {
+        "1к": {"angle": 0.0, "sectors": [0, 20, 24]},
+        "2к": {"angle": 90.0, "sectors": [3, 23, 27]},
+        "3к": {"angle": 180.0, "sectors": [2, 22, 26]},
+        "4к": {"angle": 270.0, "sectors": [1, 21, 25]}
+      },
+      "fs_params": {
+        "1": {"freq": 450.0, "width": 80.0},
+        "6": {"freq": 2450.0, "width": 110.0},
+        "7": {"freq": 4750.0, "width": 110.0}
+      },
+      "start_litera": 1,
+      "progress_max": 30
+    }
+  },
+  "base_configs": {
+    "block_ip": {
+      "maa2000_1": [0, false],
+      "maa2000_2": [1, false],
+      "ip9_50_1": [2, false],
+      "ip9_50_2": [3, false],
+      "ip12_50_1": [4, false],
+      "ip5_25": [7, false]
+    },
+    "block_kasseta": {
+      "yau07": false,
+      "ems": false,
+      "ug": false,
+      "ukp1": false,
+      "ukp2": false
+    }
+  },
+  "device_configs": {
+    "PRD_N": {
+      "block_ip": "base",
+      "block_kasseta": "base",
+      "control_results": {
+        "block_ip": false,
+        "temperature": true,
+        "dkm_2": false,
+        "dkm_3": false,
+        "dou_2": false,
+        "dou_3": false,
+        "fs_2": 0,
+        "fs_3": 0
+      }
+    },
+    "PRD_V": {
+      "block_ip": "base",
+      "block_kasseta": "base",
+      "control_results": {
+        "block_ip": false,
+        "temperature": true,
+        "dkm_4": false,
+        "dkm_5": false,
+        "dou_4": false,
+        "dou_5": false,
+        "fs_4": 0,
+        "fs_5": 0
+      }
+    },
+    "PRD_K": {
+      "block_ip": {
+        "maa2000_1": [0, false],
+        "maa2000_2": [1, false],
+        "ip9_50_1": [2, false],
+        "ip9_50_2": [3, false],
+        "ip12_50_1": [4, false],
+        "ip9_50_3": [5, false],
+        "ip12_50_2": [6, false],
+        "ip5_25": [7, false]
+      },
+      "block_kasseta": "base",
+      "control_results": {
+        "block_ip": false,
+        "temperature": true,
+        "dkm_1": false,
+        "dkm_6": false,
+        "dkm_7": false,
+        "dou_6": false,
+        "dou_7": false,
+        "fs_1": 0,
+        "fs_6": 0,
+        "fs_7": 0
+      }
+    }
+  },
+  "ray_types": ["RAY_m5", "RAY_5", "RAY_15", "RAY_25", "RAY_35", "RAY_45"],
+  "data_indices": {
+    "STATUS_BOARD": 0,
+    "IN_BLANK_PRD": 1,
+    "IN_IMPULS_PRD": 7,
+    "OUT_BLANK_PRD": 13,
+    "OUT_IMPULS_PRD": 19,
+    "DRY_CONTACT": 27,
+    "DKM": 28,
+    "POWER_UKP_1": 31,
+    "TEMPERATURE_UKP_1": 47,
+    "POWER_UKP_2": 63,
+    "TEMPERATURE_UKP_2": 79
+  },
+  "fs_keys": {
+    "1": "fs_1",
+    "2": "fs_2",
+    "3": "fs_3",
+    "4": "fs_4",
+    "5": "fs_5",
+    "6": "fs_6",
+    "7": "fs_7"
+  },
+  "temperature_constants": {
+    "CONST_MIN_TEMP": -25,
+    "MAXIMUM_CODE_ADC": 3796,
+    "MINIMUM_CODE_AD": 2660,
+    "TEMPERATURE_UKP_1": 47,
+    "TEMPERATURE_UKP_2": 79
+  },
+  "ems_input_bits_config": {
+    "PRD_N": {"bit1": 9, "bit2": 10},
+    "PRD_V": {"bit1": 11, "bit2": 12},
+    "PRD_K": {"bit1": 13, "bit2": 14, "bit_lit": 8}
+  },
+  "fs_rules":[
+    {"key": "fs_1", "min": 0, "max": 4},
+    {"key": "fs_2", "min": 4, "max": 8},
+    {"key": "fs_3", "min": 8, "max": 12},
+    {"key": "fs_4", "min": 12, "max": 16},
+    {"key": "fs_5", "min": 16, "max": 20},
+    {"key": "fs_6", "min": 20, "max": 24},
+    {"key": "fs_7", "min": 24, "max": 27}
+  ]
+}

data/АФСП-РТР.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://vdhmga62vjsj"
-path="res://.godot/imported/АФСП-РТР.png-0b840f65d8791cdd41736204e8128ac9.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://data/АФСП-РТР.png"
-dest_files=["res://.godot/imported/АФСП-РТР.png-0b840f65d8791cdd41736204e8128ac9.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

data/Структура1.wmf.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bj6gixv60xcrq"
-path="res://.godot/imported/Структура1.wmf.png-3f3bea77b2575bb24d8ebb8779214cf5.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://data/Структура1.wmf.png"
-dest_files=["res://.godot/imported/Структура1.wmf.png-3f3bea77b2575bb24d8ebb8779214cf5.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

data/У-РЭП-РПД-В.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://b2vf7en1jj8dv"
-path="res://.godot/imported/У-РЭП-РПД-В.png-16e53650006353b1f4857905926a9d2e.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://data/У-РЭП-РПД-В.png"
-dest_files=["res://.godot/imported/У-РЭП-РПД-В.png-16e53650006353b1f4857905926a9d2e.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

data/У-РЭП-РПД-К.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://dm350ta8noa0v"
-path="res://.godot/imported/У-РЭП-РПД-К.png-382bf7e19c5207a25529ff47820a3140.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://data/У-РЭП-РПД-К.png"
-dest_files=["res://.godot/imported/У-РЭП-РПД-К.png-382bf7e19c5207a25529ff47820a3140.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

data/У-РЭП-РПД-Н.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bktiige0i2lhl"
-path="res://.godot/imported/У-РЭП-РПД-Н.png-1812f48d3e2d228cc07e3a1f352eee1f.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://data/У-РЭП-РПД-Н.png"
-dest_files=["res://.godot/imported/У-РЭП-РПД-Н.png-1812f48d3e2d228cc07e3a1f352eee1f.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

data/У-УФ.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://u7h3l0jjrsnp"
-path="res://.godot/imported/У-УФ.png-e70ef42c717c17d1d5bd404916252ea3.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://data/У-УФ.png"
-dest_files=["res://.godot/imported/У-УФ.png-e70ef42c717c17d1d5bd404916252ea3.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

data/У-ЭП.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://c3cyog3gy24ft"
-path="res://.godot/imported/У-ЭП.png-5de01103a8e9a06ea0e900facdc90d4d.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://data/У-ЭП.png"
-dest_files=["res://.godot/imported/У-ЭП.png-5de01103a8e9a06ea0e900facdc90d4d.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

data/УА-РЭП.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://cllxcfa130vqu"
-path="res://.godot/imported/УА-РЭП.png-2578a93f5ba5f7909945125656980bd6.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://data/УА-РЭП.png"
-dest_files=["res://.godot/imported/УА-РЭП.png-2578a93f5ba5f7909945125656980bd6.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

scenes/frame-ecm-list/scroll-ecm-list.gd

@@ -8,7 +8,7 @@ const TableHeader  = preload('res://table/header.tscn')    ## Ячейка за
 const TABLE_HEADER       = [ TableHeader,   TableHeader,     TableHeader ,     TableHeader ]   ## Описание ряда заголовка.
 const TABLE_ROW          = [ CellLineEdit,  CellLineEdit,    CellLineEdit ,    CellLineEdit ]  ## Описание ряда.
 const TABLE_HEADERS_TEXT = ['№',       'Название',  'Пеленг',  'Состояние'  ]         ## Заголовки таблицы.
-const TABLE_COLUMN_SIZE  = [ 65,            100,          95,          185  ]              ## Ширины колонок.
+const TABLE_COLUMN_SIZE  = [ 65,            100,             90,             170  ]              ## Ширины колонок.
 
 ## Состояние выполнения сеанса помехи
 const INTERFER_STATE = {

scenes/tabs-switch/lbl_ready.gd.uid

@@ -1 +1 @@
-uid://b5ykwyk5vpi6
+uid://b5ykwyk5vpi6

scenes/tabs-switch/тренаж_режим.gd

@@ -1,11 +1,11 @@
-extends Button
-
-func _ready():
-    connect("toggled", Callable(self, "_on_button_toggled"))
-
-
-func _on_button_toggled(mode: bool):
-    if mode:
-        tooltip_text = "Режим \"Тренаж\" задействован\nТекущее состояние: включено"
-    else:
-        tooltip_text = "Задейстовать режим \"Тренаж\"\nТекущее состояние: отключено"
+extends Button
+
+func _ready():
+    connect("toggled", Callable(self, "_on_button_toggled"))
+
+
+func _on_button_toggled(mode: bool):
+    if mode:
+        tooltip_text = "Режим \"Тренаж\" задействован\nТекущее состояние: включено"
+    else:
+        tooltip_text = "Задейстовать режим \"Тренаж\"\nТекущее состояние: отключено"

scenes/tabs-switch/тренаж_режим.gd.uid

@@ -1 +1 @@
-uid://roajn6c6wvc1
+uid://roajn6c6wvc1

scenes/tilemap/23900.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cj1f2uy6qfvki"
-path="res://.godot/imported/23900.png-d040ccca5d0a90ed3fecc02e14cd833c.ctex"
+path="res://.godot/imported/23900.png-aba6c607cdfb6350afef981f7b82f108.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/23900.png"
-dest_files=["res://.godot/imported/23900.png-d040ccca5d0a90ed3fecc02e14cd833c.ctex"]
+source_file="res://scenes/tilemap/23900.png"
+dest_files=["res://.godot/imported/23900.png-aba6c607cdfb6350afef981f7b82f108.ctex"]
 
 [params]
 

scenes/tilemap/dot.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cgqo5gucd2be0"
-path="res://.godot/imported/dot.png-5d2b863cff34eea0d0b20ed5476ff90e.ctex"
+path="res://.godot/imported/dot.png-e35f44878005aaa12b3432f2608ddde5.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/dot.png"
-dest_files=["res://.godot/imported/dot.png-5d2b863cff34eea0d0b20ed5476ff90e.ctex"]
+source_file="res://scenes/tilemap/dot.png"
+dest_files=["res://.godot/imported/dot.png-e35f44878005aaa12b3432f2608ddde5.ctex"]
 
 [params]
 

scenes/tilemap/threat.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://mobingoxskg1"
-path="res://.godot/imported/threat.png-1a67637e693cb1772ca6118255edb5e4.ctex"
+path="res://.godot/imported/threat.png-602b9c318dc5f1342d23490e047ca526.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/threat.png"
-dest_files=["res://.godot/imported/threat.png-1a67637e693cb1772ca6118255edb5e4.ctex"]
+source_file="res://scenes/tilemap/threat.png"
+dest_files=["res://.godot/imported/threat.png-602b9c318dc5f1342d23490e047ca526.ctex"]
 
 [params]
 

scenes/tilemap/tilemap.gd

@@ -717,7 +717,7 @@ func set_coordinates(lon: float, lat: float, course: float) -> void:
         add_mark_from_lon_lat(ship_id, lon, lat, ship_instance, 0.0)
     else:
         _marks[ship_id].position = lonlat_to_world(lon, lat)
-        ship_instance.rotation_degrees = fmod(course, 360.0)
+        ship_instance.rotation_degrees = fmod(270.0 + course, 360.0)
     queue_redraw()
 
 
@@ -727,7 +727,7 @@ func blend_mask(val: bool) -> void:
 
 
 func update_coordinates_label(lon: float, lat: float) -> void:
-    coordinates_label = 'Координаты: NS: %f, EW: %f' % [lat, lon]
+    coordinates_label = 'Координаты: NS:%f, EW:%f' % [lat, lon]
     signaller.emit_signal('update_coordinates_map', coordinates_label)
 
 

scenes/контроль/control_prd.gd

@@ -0,0 +1,80 @@
+extends Button
+
+var base_style: StyleBoxFlat
+var tween
+var pulsing: bool = false
+var original_text: String
+
+
+func _ready():
+    original_text = text
+    _setup_styles()
+    _setup_signals()
+
+
+func _setup_styles() -> void:
+    if get("theme_override_styles/disabled") == null:
+        base_style = StyleBoxFlat.new()
+        base_style.border_color = Color(1.0, 0.5, 0.0)
+        base_style.border_width_top = 4
+        base_style.border_width_bottom = 4
+        base_style.border_width_left = 4
+        base_style.border_width_right = 4
+        base_style.bg_color = Color(0.2, 0.2, 0.2)
+        set("theme_override_styles/disabled", base_style)
+    else:
+        base_style = get("theme_override_styles/disabled")
+    set("theme_override_colors/font_disabled_color", Color(1.0, 1.0, 1.0))
+
+
+func _setup_signals() -> void:
+    connect("pressed", Callable(self, "_on_pressed"))
+    
+    if not signaller:
+        return
+    var signals_to_connect := ["режим_работа", "режим_журнал", "режим_эмс", "режим_настройки", "режим_контроль"]
+    for signal_name in signals_to_connect:
+        if signaller.has_signal(signal_name):
+            signaller.connect(signal_name, Callable(self, "_on_status_change"))
+
+
+func _on_pressed():
+    disabled = true
+    text = "Идет выполнение контроля"
+    _start_pulse()
+
+
+func _start_pulse():
+    if pulsing:
+        return
+    pulsing = true
+    tween = create_tween()
+    tween.set_loops()
+    var color1 = Color(1.0, 0.5, 0.0) # оранжевый
+    var color2 = Color(0.4, 0.4, 0.4) # серый
+    tween.tween_property(base_style, "border_color", color2, 0.5)\
+        .set_trans(Tween.TRANS_SINE)\
+        .set_ease(Tween.EASE_IN_OUT)
+    tween.tween_property(base_style, "border_color", color1, 0.5)\
+        .set_trans(Tween.TRANS_SINE)\
+        .set_ease(Tween.EASE_IN_OUT)
+
+
+func _stop_pulse():
+    if tween:
+        tween.kill()
+        tween = null
+    base_style.border_color = Color(1.0, 0.5, 0.0)
+    pulsing = false
+    disabled = false
+    text = original_text
+    tooltip_text = ''
+
+
+func _on_status_change():
+    _stop_pulse()
+
+
+func _exit_tree() -> void:
+    if tween:
+        tween.kill()

scenes/контроль/control_prd.gd.uid

@@ -0,0 +1 @@
+uid://xjs7owe2iexn

scenes/контроль/блок-к.tscn

@@ -0,0 +1,410 @@
+[gd_scene load_steps=15 format=3 uid="uid://ffi1njkjceb5"]
+
+[ext_resource type="Texture2D" uid="uid://c6nve6f8sfyj2" path="res://data/состояние-исправности-0.png" id="1_uojqc"]
+[ext_resource type="Texture2D" uid="uid://dnreyfh3cd1k2" path="res://data/состояние-исправности-1.png" id="2_a8ar3"]
+[ext_resource type="Texture2D" uid="uid://c6booa8753u5t" path="res://data/состояние-исправности-2.png" id="3_xwd13"]
+[ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="4_eobkx"]
+[ext_resource type="Texture2D" uid="uid://00871pb6moln" path="res://data/прогресс-фон-1.png" id="5_mg57e"]
+[ext_resource type="Texture2D" uid="uid://c1k856fxhrjnh" path="res://data/прогресс-заполнение-1.png" id="6_of7rd"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_3nd2u"]
+
+[sub_resource type="GDScript" id="GDScript_oj3k3"]
+script/source = "@tool
+class_name blok_v extends PanelContainer
+
+@export var textures: Array
+@export var animation_duration: float = 1.5
+signal pressed(control: PanelContainer)
+
+
+## Значения уровней
+@export var value0: Array:
+    set(v):
+        value0.assign(v)
+        var items: Array = get_level_nodes()
+        var count: int = min(items.size(), v.size())
+        for i in count:
+            set_value0_animated(items[i], v[i])
+
+
+## Значение уровня
+@export var value1: float:
+    set(v):
+        value1 = v
+        if not is_inside_tree():
+            return
+        $margin/vbox/grid1/level7.value = v
+        $margin/vbox/grid1/level7.tint_progress = Color.RED if v >= 50 else Color.GOLD if v >= 40 else Color.WHITE
+
+
+@export var min_value0: float:
+    set(v):
+        min_value0 = v
+        var items: = get_level_nodes()
+        set_group_param(items, 'min_value', v)
+
+
+@export var min_value1: float:
+    set(v):
+        min_value1 = v
+        if not is_inside_tree():
+            return
+        $margin/vbox/grid1/level7.min_value = v
+
+
+@export var max_value0: float:
+    set(v):
+        max_value0 = v
+        var items: = get_level_nodes()
+        set_group_param(items, 'max_value', v)
+
+
+@export var max_value1: float:
+    set(v):
+        max_value1 = v
+        if not is_inside_tree():
+            return
+        $margin/vbox/grid1/level7.max_value = v
+
+
+@export var step0: float:
+    set(v):
+        step0 = v
+        var items: = get_level_nodes()
+        set_group_param(items, 'step', v)
+
+
+@export var step1: float:
+    set(v):
+        step1 = v
+        if not is_inside_tree():
+            return
+        $margin/vbox/grid1/level7.step = v
+
+
+@export var value_name0: String:
+    set(v):
+        value_name0 = v
+        var items: Array = get_name_nodes()
+        set_group_param(items, 'text', v)
+
+
+@export var value_name1: String:
+    set(v):
+        value_name1 = v
+        if not is_inside_tree():
+            return
+        $margin/vbox/grid2/lbl7.text = v
+
+
+@export var fname: String:
+    set(v):
+        fname = v
+        if not is_inside_tree():
+            return
+        $margin/vbox/grid0/fname.text = v
+
+
+@export var rname: String:
+    set(v):
+        rname = v
+        if not is_inside_tree():
+            return
+        $margin/vbox/grid0/rname.text = v
+
+
+@export var state: int:
+    set(v):
+        state = tools.clip_value(v, 0, textures.size() - 1)
+        if not is_inside_tree():
+            return
+        $margin/vbox/grid0/state.texture = textures[state]
+
+
+@export var alignment: int:
+    set(v):
+        alignment = v
+        if is_inside_tree():
+            $margin/vbox.alignment = v
+
+
+@export var value0_info: String:
+    set(v):
+        value0_info = v
+
+
+@export var value1_info: String:
+    set(v):
+        value1_info = v
+
+
+func _on_button_pressed(): emit_signal('pressed', self)
+func set_value0(value: Array): value0.assign(value)
+func _enter_tree() -> void: call_deferred('_enter_tree_defered')
+
+
+func _ready():
+    var items: Array = get_level_nodes()
+    for item in items:
+        item.connect('value_changed', on_level_changed.bind(item, value0_info))
+        on_level_changed(item.value, item, value0_info)
+    var level7: = $margin/vbox/grid1/level7
+    level7.connect('value_changed', on_level_changed.bind(level7, value1_info))
+    on_level_changed(level7.value, level7, value1_info)
+
+
+func on_level_changed(_val: float, item: TextureProgressBar, info: String):
+    item.tooltip_text = '%s\\nТекущее: %0.2f\\nДиапазон: %0.2f…%0.2f' % [info, item.value, item.min_value, item.max_value]
+
+
+func set_group_param(items: Array, param: StringName, v) -> void:
+    if not is_inside_tree():
+        return
+    if not get_tree():
+        return
+    for i in items.size():
+        items[i].set(param, v)
+
+
+func set_value0_by_index(index: int, value: float) -> void:
+    var items: Array = get_level_nodes()
+    items[index].value = value
+
+
+func _enter_tree_defered():
+    var items: Array = get_level_nodes()
+    var count: int = min(items.size(), value0.size())
+    for i in count:
+        items[i].min_value = min_value0
+        items[i].max_value = 1400  # max_value0: TODO для отладки
+        items[i].step = step0
+    items = get_name_nodes()
+    set_group_param(items, 'text', value_name0)
+    if is_inside_tree():
+        $margin/vbox/grid1/level7.value = value1
+        $margin/vbox/grid1/level7.min_value = min_value1
+        $margin/vbox/grid1/level7.max_value = max_value1
+        $margin/vbox/grid1/level7.step = step1
+        $margin/vbox/grid2/lbl7.text = value_name1
+        $margin/vbox.alignment = alignment
+        $margin/vbox/grid0/rname.text = rname
+        $margin/vbox/grid0/fname.text = fname
+        $margin/vbox/grid0/state.texture = textures[state]
+
+
+func get_level_nodes() -> Array:
+    if not is_inside_tree():
+        return []
+    if not get_tree():
+        return []
+    return [$margin/vbox/grid1/level1]
+
+
+func get_name_nodes() -> Array:
+    if not is_inside_tree():
+        return []
+    if not get_tree():
+        return []
+    return [$margin/vbox/grid2/lbl1]
+
+
+func set_value0_animated(target_node, target_value: float) -> void:
+    var tween: Tween = create_tween()
+    tween.set_ease(Tween.EASE_OUT)
+    tween.set_trans(Tween.TRANS_QUINT)
+    tween.tween_property(target_node, 'value', target_value, animation_duration)
+"
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_rceim"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_8yvwo"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_6qu57"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_mlxje"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_3dspb"]
+
+[sub_resource type="GDScript" id="GDScript_45hqb"]
+script/source = "@tool
+
+extends MarginContainer
+
+
+func _enter_tree() -> void:
+    margins = [8, 8, 8, 8]
+
+
+@export var margins: Array:
+    set(vals):
+        add_theme_constant_override('margin_top',    vals[0])
+        add_theme_constant_override('margin_left',   vals[1])
+        add_theme_constant_override('margin_bottom', vals[2])
+        add_theme_constant_override('margin_right',  vals[3])
+    get:
+        var vals = [0, 0, 0, 0]
+        vals[0] = get_theme_constant('margin_top')
+        vals[1] = get_theme_constant('margin_left')
+        vals[2] = get_theme_constant('margin_bottom')
+        vals[3] = get_theme_constant('margin_right')
+        return vals
+"
+
+[node name="блок-к" type="PanelContainer"]
+editor_description = "Элемент замены из ЗИП"
+offset_right = 160.0
+offset_bottom = 88.0
+theme_override_styles/panel = SubResource("StyleBoxEmpty_3nd2u")
+script = SubResource("GDScript_oj3k3")
+textures = [ExtResource("1_uojqc"), ExtResource("2_a8ar3"), ExtResource("3_xwd13")]
+value0 = [20.0, 30.0, 40.0, 50.0, 60.0, 70.0]
+value1 = -40.0
+min_value1 = -40.0
+max_value0 = 1400.0
+max_value1 = 55.0
+step0 = 1.0
+step1 = 1.0
+value_name0 = "P,%"
+value_name1 = "°C"
+fname = "Блок В"
+rname = "A1"
+
+[node name="button" type="Button" parent="."]
+layout_mode = 2
+theme_override_styles/focus = SubResource("StyleBoxEmpty_rceim")
+theme_override_styles/disabled = SubResource("StyleBoxEmpty_8yvwo")
+theme_override_styles/hover = SubResource("StyleBoxEmpty_6qu57")
+theme_override_styles/pressed = SubResource("StyleBoxEmpty_mlxje")
+theme_override_styles/normal = SubResource("StyleBoxEmpty_3dspb")
+
+[node name="rect" type="NinePatchRect" parent="."]
+layout_mode = 2
+texture = ExtResource("4_eobkx")
+draw_center = false
+region_rect = Rect2(0, 0, 63, 63)
+patch_margin_left = 17
+patch_margin_top = 17
+patch_margin_right = 17
+patch_margin_bottom = 15
+
+[node name="margin" type="MarginContainer" parent="."]
+layout_mode = 2
+theme_override_constants/margin_left = 8
+theme_override_constants/margin_top = 8
+theme_override_constants/margin_right = 8
+theme_override_constants/margin_bottom = 8
+script = SubResource("GDScript_45hqb")
+margins = [8, 8, 8, 8]
+
+[node name="vbox" type="VBoxContainer" parent="margin"]
+layout_mode = 2
+
+[node name="grid0" type="GridContainer" parent="margin/vbox"]
+layout_mode = 2
+columns = 3
+
+[node name="state" type="TextureRect" parent="margin/vbox/grid0"]
+custom_minimum_size = Vector2(24, 24)
+layout_mode = 2
+size_flags_horizontal = 2
+size_flags_vertical = 6
+texture = ExtResource("1_uojqc")
+expand_mode = 1
+
+[node name="fname" type="Label" parent="margin/vbox/grid0"]
+self_modulate = Color(1, 1, 1, 0.627451)
+custom_minimum_size = Vector2(0, 20)
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+theme_override_font_sizes/font_size = 17
+text = "Блок В"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="rname" type="Label" parent="margin/vbox/grid0"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 6
+theme_override_font_sizes/font_size = 18
+text = "A1"
+horizontal_alignment = 2
+vertical_alignment = 1
+
+[node name="grid1" type="GridContainer" parent="margin/vbox"]
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 3
+columns = 7
+
+[node name="level1" type="TextureProgressBar" parent="margin/vbox/grid1" groups=["уровни"]]
+custom_minimum_size = Vector2(30, 0)
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: 0.00
+Диапазон: 0.00…1400.00"
+mouse_filter = 0
+max_value = 1400.0
+fill_mode = 3
+nine_patch_stretch = true
+stretch_margin_left = 8
+stretch_margin_top = 8
+stretch_margin_right = 8
+stretch_margin_bottom = 8
+texture_under = ExtResource("5_mg57e")
+texture_progress = ExtResource("6_of7rd")
+tint_under = Color(1, 1, 1, 0.419608)
+tint_progress = Color(0.890196, 0.486275, 0.196078, 1)
+
+[node name="level7" type="TextureProgressBar" parent="margin/vbox/grid1"]
+custom_minimum_size = Vector2(30, 0)
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+tooltip_text = "
+Текущее: -40.00
+Диапазон: -40.00…60.00"
+mouse_filter = 0
+min_value = -40.0
+max_value = 55.0
+value = -40.0
+fill_mode = 3
+nine_patch_stretch = true
+stretch_margin_left = 8
+stretch_margin_top = 8
+stretch_margin_right = 8
+stretch_margin_bottom = 8
+texture_under = ExtResource("5_mg57e")
+texture_progress = ExtResource("6_of7rd")
+tint_under = Color(0.890196, 0.486275, 0.196078, 1)
+tint_over = Color(0.890196, 0.486275, 0.196078, 1)
+
+[node name="grid2" type="GridContainer" parent="margin/vbox"]
+clip_contents = true
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
+columns = 7
+
+[node name="lbl1" type="Label" parent="margin/vbox/grid2" groups=["названия"]]
+clip_contents = true
+custom_minimum_size = Vector2(30, 0)
+layout_mode = 2
+size_flags_horizontal = 3
+theme_override_font_sizes/font_size = 8
+text = "P,%"
+horizontal_alignment = 1
+
+[node name="lbl7" type="Label" parent="margin/vbox/grid2"]
+clip_contents = true
+custom_minimum_size = Vector2(30, 0)
+layout_mode = 2
+size_flags_horizontal = 3
+theme_override_font_sizes/font_size = 8
+text = "°C"
+horizontal_alignment = 1
+
+[connection signal="pressed" from="button" to="." method="_on_button_pressed"]

scenes/контроль/кнопка-прибора.gd

@@ -18,8 +18,8 @@ func _exit_tree() -> void:
 
 func _on_settings_changed():
     if not is_inside_tree(): return
-    var white_color = ProjectSettings.get_setting('Схема прибора. Белый цвет', Color.LIGHT_GRAY)
-    var black_color = ProjectSettings.get_setting('Схема прибора. Чёрный цвет', Color.BLACK)
+    var white_color = ProjectSettings.get_setting('Схема прибора. Белый цвет', Color.DIM_GRAY)
+    var black_color = ProjectSettings.get_setting('Схема прибора. Чёрный цвет', Color.CORAL)
     $pic_functional.material.set('shader_parameter/white', white_color)
     $pic_functional.material.set('shader_parameter/black', black_color)
 

scenes/контроль/контроль.tscn

@@ -62,6 +62,7 @@ func on_serv_changed(u, pribor_node, _pribor_meta): pribor_node.state = int(u.se
 func on_mode_changed():
     clean_pribor_items()
     reset_pribor_buttons()
+    $chk_show_functional.disabled = true
 
 
 func reset_pribor_buttons():
@@ -165,6 +166,20 @@ func on_update_uf_serviceability(uf_serviceaability: bool, uf_pribor: Node)-> vo
 func _on_chk_show_functional_toggled(toggled_on: bool) -> void:
     if cur_pribor_node:
         cur_pribor_node.show_functional = toggled_on
+
+
+func _on_gui_input(event: InputEvent) -> void:
+    if event is InputEventMouseButton and event.pressed and event.button_index == MOUSE_BUTTON_LEFT:
+        if cur_pribor_node:
+            cur_pribor_node.show_functional = false
+        var pribor_buttons := get_tree().get_nodes_in_group('pribor_buttons')
+        for node in pribor_buttons:
+            node.button_pressed = false
+        clean_pribor_items()
+        cur_pribor_node = null
+        $chk_show_functional.button_pressed = false
+        $chk_show_functional.disabled = true
+        $lbl_header.text = \"\"
 "
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_foasq"]
@@ -437,6 +452,14 @@ offset_bottom = 830.0
 scale = Vector2(0.97094, 0.97094)
 texture = ExtResource("9_qe1go")
 
+[node name="connect_pribor2" type="AnimatedSprite2D" parent="pribor_prd_n_1"]
+light_mask = 3
+position = Vector2(35, -10)
+scale = Vector2(0.625, 0.625)
+sprite_frames = SubResource("SpriteFrames_foasq")
+frame_progress = 0.72355
+script = ExtResource("11_u7tym")
+
 [node name="pribor_uf" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0
@@ -546,16 +569,6 @@ patch_margin_top = 16
 patch_margin_right = 16
 patch_margin_bottom = 16
 
-[node name="label2" type="Label" parent="pribor_rtr"]
-layout_mode = 0
-offset_left = 12.0
-offset_top = -54.0
-offset_right = 95.0
-offset_bottom = -35.0
-text = "РТР"
-horizontal_alignment = 1
-vertical_alignment = 1
-
 [node name="connect_pribor" type="AnimatedSprite2D" parent="pribor_rtr"]
 light_mask = 3
 position = Vector2(55, -15)
@@ -623,17 +636,6 @@ patch_margin_top = 16
 patch_margin_right = 16
 patch_margin_bottom = 16
 
-[node name="label2" type="Label" parent="pribor_afsp_1"]
-layout_mode = 0
-offset_left = 165.0
-offset_top = -245.0
-offset_right = 262.0
-offset_bottom = -225.0
-scale = Vector2(5, 5)
-text = "АФСП 1"
-horizontal_alignment = 1
-vertical_alignment = 1
-
 [node name="connect_pribor" type="AnimatedSprite2D" parent="pribor_afsp_1"]
 light_mask = 3
 position = Vector2(415, -40)
@@ -702,17 +704,6 @@ patch_margin_top = 16
 patch_margin_right = 16
 patch_margin_bottom = 16
 
-[node name="label2" type="Label" parent="pribor_afsp_2"]
-layout_mode = 0
-offset_left = 200.0
-offset_top = -240.0
-offset_right = 297.0
-offset_bottom = -220.0
-scale = Vector2(5, 5)
-text = "АФСП 2"
-horizontal_alignment = 1
-vertical_alignment = 1
-
 [node name="connect_pribor" type="AnimatedSprite2D" parent="pribor_afsp_2"]
 light_mask = 3
 position = Vector2(425, -40)
@@ -927,6 +918,14 @@ offset_bottom = 676.0
 scale = Vector2(0.96888, 0.96888)
 texture = ExtResource("9_qe1go")
 
+[node name="connect_pribor2" type="AnimatedSprite2D" parent="pribor_prd_n_2"]
+light_mask = 3
+position = Vector2(35, -10)
+scale = Vector2(0.625, 0.625)
+sprite_frames = SubResource("SpriteFrames_foasq")
+frame_progress = 0.72355
+script = ExtResource("11_u7tym")
+
 [node name="pribor_prd_k_2" type="TextureButton" parent="." groups=["pribor_buttons"]]
 editor_description = "Кнопка для выбора прибора."
 layout_mode = 0

scenes/настройки/настройки.tscn

@@ -9,6 +9,7 @@ script/source = "class_name configure extends Panel
 const TableHeader = preload('res://table/header.tscn')
 const TableToggle = preload('res://table/settings-toggle.tscn')
 const TableEdit   = preload('res://table/ячейка-2.tscn')
+const TableColor = preload('res://table/color-picker.tscn')
 
 const ALIGNMENT = [HORIZONTAL_ALIGNMENT_CENTER, HORIZONTAL_ALIGNMENT_CENTER]
 const HEADER_ROW = [TableHeader, TableHeader]
@@ -66,7 +67,9 @@ const SETTING_TABLE = [
     ['Период опроса состояния АФСП, секунды', TableEdit, TableEdit, 'Время в секундах' ],
     ['уарэп-трасса', TableEdit, TableEdit, 'IP-адрес для связи с Трассой [<адрес этого узла>, <адрес удалённого узла>, <порт этого узла>, <порт удалённого узла>]'],
     ['Включить работу по своим целям',   TableEdit, TableToggle, 'Разрешает работу в секторе со своей целью'],
-    ['Список своих протоколов', TableEdit, TableEdit, 'Список протоколов целей, по которым запрещено работать' ], ]
+    ['Список своих протоколов', TableEdit, TableEdit, 'Список протоколов целей, по которым запрещено работать' ], 
+    ['Схема прибора. Белый цвет', TableEdit, TableColor, 'Настройка отображаемого цвета фона' ], 
+    ['Схема прибора. Чёрный цвет', TableEdit, TableColor, 'Настройка отображаемого цвета схемы' ], ]
 
 const EXTERNAL_CU = 16  ## Внешнее целеуказание
 const TRASSA = 17

scenes/работа/работа.tscn

@@ -306,36 +306,36 @@ vertical_alignment = 1
 
 [node name="coordinates_map" type="Label" parent="."]
 layout_mode = 0
-offset_left = 654.0
-offset_top = -23.0
-offset_right = 766.0
-offset_bottom = -4.0
+offset_left = 660.0
+offset_top = -24.0
+offset_right = 772.0
+offset_bottom = -5.0
 text = "Координаты:"
 
 [node name="scale_map" type="Label" parent="."]
 layout_mode = 0
-offset_left = 1009.0
-offset_top = -23.0
-offset_right = 1119.0
-offset_bottom = -2.0
+offset_left = 1003.0
+offset_top = -24.0
+offset_right = 1113.0
+offset_bottom = -3.0
 text = "Масштаб:"
 
 [node name="zoom_plus" type="Button" parent="."]
 layout_mode = 0
-offset_left = 952.0
-offset_top = 43.0
-offset_right = 984.0
-offset_bottom = 75.0
+offset_left = 1056.0
+offset_top = 230.0
+offset_right = 1088.0
+offset_bottom = 262.0
 theme_override_fonts/font = SubResource("SystemFont_5ffal")
 theme_override_font_sizes/font_size = 20
 text = "+"
 
 [node name="zoom_minus" type="Button" parent="."]
 layout_mode = 0
-offset_left = 952.0
-offset_top = 84.0
-offset_right = 984.0
-offset_bottom = 116.0
+offset_left = 1056.0
+offset_top = 270.0
+offset_right = 1088.0
+offset_bottom = 302.0
 theme_override_font_sizes/font_size = 20
 text = "−"
 
@@ -383,8 +383,8 @@ texture_normal = ExtResource("14_ggrwd")
 [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"]
 [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"]
 [connection signal="button_down" from="zoom_plus" to="tilemap" method="_on_zoom_plus_button_down"]
-[connection signal="button_up" from="zoom_plus" to="tilemap" method="_on_zoom_button_up"]
 [connection signal="button_up" from="zoom_plus" to="tilemap" method="_on_zoom_plus_button_up"]
+[connection signal="button_up" from="zoom_plus" to="tilemap" method="_on_zoom_button_up"]
 [connection signal="button_down" from="zoom_minus" to="tilemap" method="_on_zoom_minus_button_down"]
 [connection signal="button_up" from="zoom_minus" to="tilemap" method="_on_zoom_button_up"]
 [connection signal="pressed" from="btn_all_work" to="." method="_on_btn_all_work_pressed"]

scenes/эмс2/454.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://073el51yholj"
-path="res://.godot/imported/454.png-c132d7ef2b8e83240b42cc8ee25bc3a1.ctex"
+path="res://.godot/imported/454.png-0786f89bab034f96d995fbcf0a2cf120.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/454.png"
-dest_files=["res://.godot/imported/454.png-c132d7ef2b8e83240b42cc8ee25bc3a1.ctex"]
+source_file="res://scenes/эмс2/454.png"
+dest_files=["res://.godot/imported/454.png-0786f89bab034f96d995fbcf0a2cf120.ctex"]
 
 [params]
 

scenes/эмс2/OP-63.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://0w6q4vfst0ry"
-path="res://.godot/imported/OP-63.png-2a0f3c88de1eabad7f9bd75309301148.ctex"
+path="res://.godot/imported/OP-63.png-5da3f06f893690e242765af13436cb44.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/OP-63.png"
-dest_files=["res://.godot/imported/OP-63.png-2a0f3c88de1eabad7f9bd75309301148.ctex"]
+source_file="res://scenes/эмс2/OP-63.png"
+dest_files=["res://.godot/imported/OP-63.png-5da3f06f893690e242765af13436cb44.ctex"]
 
 [params]
 

scenes/эмс2/img4302.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bj7vjj0ltgq4u"
-path="res://.godot/imported/img4302.png-5eee23c9a44f99f969e357ae92f76b5e.ctex"
+path="res://.godot/imported/img4302.png-6e80975f597e730b9472afc977ec1c0d.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/img4302.png"
-dest_files=["res://.godot/imported/img4302.png-5eee23c9a44f99f969e357ae92f76b5e.ctex"]
+source_file="res://scenes/эмс2/img4302.png"
+dest_files=["res://.godot/imported/img4302.png-6e80975f597e730b9472afc977ec1c0d.ctex"]
 
 [params]
 

scenes/эмс2/imgOP-63.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dr3oxsnnuss40"
-path="res://.godot/imported/imgOP-63.png-97d3c8a1732b09b40fca161db2399e48.ctex"
+path="res://.godot/imported/imgOP-63.png-7f3bef0f8f72c875930fdbef72a924bc.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/imgOP-63.png"
-dest_files=["res://.godot/imported/imgOP-63.png-97d3c8a1732b09b40fca161db2399e48.ctex"]
+source_file="res://scenes/эмс2/imgOP-63.png"
+dest_files=["res://.godot/imported/imgOP-63.png-7f3bef0f8f72c875930fdbef72a924bc.ctex"]
 
 [params]
 

scenes/эмс2/imgМР231-3.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b2h1wrwovp1ht"
-path="res://.godot/imported/imgМР231-3.png-2e9e8021860e06d999269b0da844b898.ctex"
+path="res://.godot/imported/imgМР231-3.png-3e0e88cc9ef1d9dae96d8042c6fec0ae.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/imgМР231-3.png"
-dest_files=["res://.godot/imported/imgМР231-3.png-2e9e8021860e06d999269b0da844b898.ctex"]
+source_file="res://scenes/эмс2/imgМР231-3.png"
+dest_files=["res://.godot/imported/imgМР231-3.png-3e0e88cc9ef1d9dae96d8042c6fec0ae.ctex"]
 
 [params]
 

scenes/эмс2/imgМР231S.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://ck1b62i5g1p2o"
-path="res://.godot/imported/imgМР231S.png-29aa3bce331505e885dab3f71211ec02.ctex"
+path="res://.godot/imported/imgМР231S.png-bad9289239cf8c4455c78ee3ef400439.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/imgМР231S.png"
-dest_files=["res://.godot/imported/imgМР231S.png-29aa3bce331505e885dab3f71211ec02.ctex"]
+source_file="res://scenes/эмс2/imgМР231S.png"
+dest_files=["res://.godot/imported/imgМР231S.png-bad9289239cf8c4455c78ee3ef400439.ctex"]
 
 [params]
 

scenes/эмс2/imgП454К.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dl2tpjbjnglwb"
-path="res://.godot/imported/imgП454К.png-f119c55f48c069f28a248543d6233e18.ctex"
+path="res://.godot/imported/imgП454К.png-c58afb0d1917ecf5b7e4704f8016735f.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/imgП454К.png"
-dest_files=["res://.godot/imported/imgП454К.png-f119c55f48c069f28a248543d6233e18.ctex"]
+source_file="res://scenes/эмс2/imgП454К.png"
+dest_files=["res://.godot/imported/imgП454К.png-c58afb0d1917ecf5b7e4704f8016735f.ctex"]
 
 [params]
 

scenes/эмс2/imgЦИВС.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c7femlgfmjcgg"
-path="res://.godot/imported/imgЦИВС.png-3c5c201e9af19a5d6a4fe30a3db2704c.ctex"
+path="res://.godot/imported/imgЦИВС.png-2088b7ce536067882af032da1969e382.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/imgЦИВС.png"
-dest_files=["res://.godot/imported/imgЦИВС.png-3c5c201e9af19a5d6a4fe30a3db2704c.ctex"]
+source_file="res://scenes/эмс2/imgЦИВС.png"
+dest_files=["res://.godot/imported/imgЦИВС.png-2088b7ce536067882af032da1969e382.ctex"]
 
 [params]
 

scenes/эмс2/ГО.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cckk3jk5r32bh"
-path="res://.godot/imported/ГО.png-9297e1095c75a909727604be6351081c.ctex"
+path="res://.godot/imported/ГО.png-0c35310fad9991f16e2c7944cb0aa27d.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/ГО.png"
-dest_files=["res://.godot/imported/ГО.png-9297e1095c75a909727604be6351081c.ctex"]
+source_file="res://scenes/эмс2/ГО.png"
+dest_files=["res://.godot/imported/ГО.png-0c35310fad9991f16e2c7944cb0aa27d.ctex"]
 
 [params]
 

scenes/эмс2/Излучение.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bw2sx5d0mcu53"
-path="res://.godot/imported/Излучение.png-4142b1103fbee10e1f5d4abd96665a2d.ctex"
+path="res://.godot/imported/Излучение.png-5b4f1b0941f14dd39256508d964cdf77.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Излучение.png"
-dest_files=["res://.godot/imported/Излучение.png-4142b1103fbee10e1f5d4abd96665a2d.ctex"]
+source_file="res://scenes/эмс2/Излучение.png"
+dest_files=["res://.godot/imported/Излучение.png-5b4f1b0941f14dd39256508d964cdf77.ctex"]
 
 [params]
 

scenes/эмс2/Квадрат марс 454.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://d3qui21aom1ac"
-path="res://.godot/imported/Квадрат марс 454.png-71c12351dd76fee789faa5f1bec80a92.ctex"
+path="res://.godot/imported/Квадрат марс 454.png-b95a5e87a8b4c7dfab2ab9770eb24a67.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Квадрат марс 454.png"
-dest_files=["res://.godot/imported/Квадрат марс 454.png-71c12351dd76fee789faa5f1bec80a92.ctex"]
+source_file="res://scenes/эмс2/Квадрат марс 454.png"
+dest_files=["res://.godot/imported/Квадрат марс 454.png-b95a5e87a8b4c7dfab2ab9770eb24a67.ctex"]
 
 [params]
 

scenes/эмс2/Квадрат марс ГО.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://36xjgea2n22q"
-path="res://.godot/imported/Квадрат марс ГО.png-5d4c0f8027b34cc4827e93cb818e657d.ctex"
+path="res://.godot/imported/Квадрат марс ГО.png-23e7d814e3ad954b038d9b389d1b919d.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Квадрат марс ГО.png"
-dest_files=["res://.godot/imported/Квадрат марс ГО.png-5d4c0f8027b34cc4827e93cb818e657d.ctex"]
+source_file="res://scenes/эмс2/Квадрат марс ГО.png"
+dest_files=["res://.godot/imported/Квадрат марс ГО.png-23e7d814e3ad954b038d9b389d1b919d.ctex"]
 
 [params]
 

scenes/эмс2/Квадрат марс ОР-63.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cxrggrvx6l22q"
-path="res://.godot/imported/Квадрат марс ОР-63.png-0767a2291d864f6db6e1ba2eba47f7e0.ctex"
+path="res://.godot/imported/Квадрат марс ОР-63.png-8ecb8e9158c9d033961932059e47bb41.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Квадрат марс ОР-63.png"
-dest_files=["res://.godot/imported/Квадрат марс ОР-63.png-0767a2291d864f6db6e1ba2eba47f7e0.ctex"]
+source_file="res://scenes/эмс2/Квадрат марс ОР-63.png"
+dest_files=["res://.godot/imported/Квадрат марс ОР-63.png-8ecb8e9158c9d033961932059e47bb41.ctex"]
 
 [params]
 

scenes/эмс2/Квадрат марс РЛС1.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://by6a12oahbg82"
-path="res://.godot/imported/Квадрат марс РЛС1.png-2fdc69adb1baf39adbd31a6940e7edc8.ctex"
+path="res://.godot/imported/Квадрат марс РЛС1.png-afcb4ef535f04c85a70508ec79f2ca49.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Квадрат марс РЛС1.png"
-dest_files=["res://.godot/imported/Квадрат марс РЛС1.png-2fdc69adb1baf39adbd31a6940e7edc8.ctex"]
+source_file="res://scenes/эмс2/Квадрат марс РЛС1.png"
+dest_files=["res://.godot/imported/Квадрат марс РЛС1.png-afcb4ef535f04c85a70508ec79f2ca49.ctex"]
 
 [params]
 

scenes/эмс2/Квадрат марс РЛС2.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dwgqofj6yae1v"
-path="res://.godot/imported/Квадрат марс РЛС2.png-97d339b659985176e1bf5b3d9396e56e.ctex"
+path="res://.godot/imported/Квадрат марс РЛС2.png-4c3b92bbc046e136790faf34578d04e4.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Квадрат марс РЛС2.png"
-dest_files=["res://.godot/imported/Квадрат марс РЛС2.png-97d339b659985176e1bf5b3d9396e56e.ctex"]
+source_file="res://scenes/эмс2/Квадрат марс РЛС2.png"
+dest_files=["res://.godot/imported/Квадрат марс РЛС2.png-4c3b92bbc046e136790faf34578d04e4.ctex"]
 
 [params]
 

scenes/эмс2/Квадрат марс с трубкой.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dsuiytxdnole7"
-path="res://.godot/imported/Квадрат марс с трубкой.png-f03adfaac6e005dc959ba6a51eca1870.ctex"
+path="res://.godot/imported/Квадрат марс с трубкой.png-615c0815d4f723fbf95570d0bda9905c.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Квадрат марс с трубкой.png"
-dest_files=["res://.godot/imported/Квадрат марс с трубкой.png-f03adfaac6e005dc959ba6a51eca1870.ctex"]
+source_file="res://scenes/эмс2/Квадрат марс с трубкой.png"
+dest_files=["res://.godot/imported/Квадрат марс с трубкой.png-615c0815d4f723fbf95570d0bda9905c.ctex"]
 
 [params]
 

scenes/эмс2/Квадрат салатный 454.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b1kuhj03yigih"
-path="res://.godot/imported/Квадрат салатный 454.png-b5a52cf636708f88d5000751acdbc349.ctex"
+path="res://.godot/imported/Квадрат салатный 454.png-e5160944883f38443834881280210fbb.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Квадрат салатный 454.png"
-dest_files=["res://.godot/imported/Квадрат салатный 454.png-b5a52cf636708f88d5000751acdbc349.ctex"]
+source_file="res://scenes/эмс2/Квадрат салатный 454.png"
+dest_files=["res://.godot/imported/Квадрат салатный 454.png-e5160944883f38443834881280210fbb.ctex"]
 
 [params]
 

scenes/эмс2/Квадрат салатный ГО.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cyb60nh23ys6k"
-path="res://.godot/imported/Квадрат салатный ГО.png-26dbf19de4d1cc7ea13fcbb63ea990a2.ctex"
+path="res://.godot/imported/Квадрат салатный ГО.png-2d7ca17d2db7cbf24be68cf04fe1ab8d.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Квадрат салатный ГО.png"
-dest_files=["res://.godot/imported/Квадрат салатный ГО.png-26dbf19de4d1cc7ea13fcbb63ea990a2.ctex"]
+source_file="res://scenes/эмс2/Квадрат салатный ГО.png"
+dest_files=["res://.godot/imported/Квадрат салатный ГО.png-2d7ca17d2db7cbf24be68cf04fe1ab8d.ctex"]
 
 [params]
 

scenes/эмс2/Квадрат салатный ОР-63.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://d3v1r4r62na8"
-path="res://.godot/imported/Квадрат салатный ОР-63.png-7972d0fb6bd0e9b8772b01ce12d8ddec.ctex"
+path="res://.godot/imported/Квадрат салатный ОР-63.png-d4e729338a9598106bf86dd54b628302.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Квадрат салатный ОР-63.png"
-dest_files=["res://.godot/imported/Квадрат салатный ОР-63.png-7972d0fb6bd0e9b8772b01ce12d8ddec.ctex"]
+source_file="res://scenes/эмс2/Квадрат салатный ОР-63.png"
+dest_files=["res://.godot/imported/Квадрат салатный ОР-63.png-d4e729338a9598106bf86dd54b628302.ctex"]
 
 [params]
 

scenes/эмс2/Квадрат салатный РЛС1.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://ddm55bo28sxcs"
-path="res://.godot/imported/Квадрат салатный РЛС1.png-25515f6d11c8ad1cdcb538334e983dfb.ctex"
+path="res://.godot/imported/Квадрат салатный РЛС1.png-4ef0fdea9acb1266f7ae514ab0ba0e5b.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Квадрат салатный РЛС1.png"
-dest_files=["res://.godot/imported/Квадрат салатный РЛС1.png-25515f6d11c8ad1cdcb538334e983dfb.ctex"]
+source_file="res://scenes/эмс2/Квадрат салатный РЛС1.png"
+dest_files=["res://.godot/imported/Квадрат салатный РЛС1.png-4ef0fdea9acb1266f7ae514ab0ba0e5b.ctex"]
 
 [params]
 

scenes/эмс2/Квадрат салатный РЛС2.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dneqjcul4ipub"
-path="res://.godot/imported/Квадрат салатный РЛС2.png-603f91d45a0b3f844ece171f2660fcb6.ctex"
+path="res://.godot/imported/Квадрат салатный РЛС2.png-6f204becbb933eb3257ab57b1e48e989.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://data/Квадрат салатный РЛС2.png"
-dest_files=["res://.godot/imported/Квадрат салатный РЛС2.png-603f91d45a0b3f844ece171f2660fcb6.ctex"]
+source_file="res://scenes/эмс2/Квадрат салатный РЛС2.png"
+dest_files=["res://.godot/imported/Квадрат салатный РЛС2.png-6f204becbb933eb3257ab57b1e48e989.ctex"]
 
 [params]