From ae96a8aa978fcb26f03bbc5244e205d29f1b4c26 Mon Sep 17 00:00:00 2001
From: MaD_CaT <madcat90@list.ru>
Date: Thu, 13 Nov 2025 14:06:32 +0300
Subject: [PATCH] =?UTF-8?q?[PATCH]=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=A1=D1=87=D1=91=D1=82=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BA=20=D0=BE=D0=BF=D0=B0=D1=81=D0=BD=D1=8B=D1=85=20=D1=86?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=B9=20=D0=BD=D0=B5=20=D1=81=D1=87=D0=B8?=
 =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82=20=D1=81=D0=B2=D0=BE=D0=B8,=20=D0=B5?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B8=20=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=82=D1=8C=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D1=81=D0=B2=D0=BE=D0=B8=D0=BC=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scenes/работа/работа.gd | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/scenes/работа/работа.gd b/scenes/работа/работа.gd
index 138a110e..f0934ec8 100644
--- a/scenes/работа/работа.gd
+++ b/scenes/работа/работа.gd
@@ -31,7 +31,8 @@ var strob_band_begin: float             ## Ширина строба в моме
 var strob_dir_begin: float              ## Направление антенны в момент начала перетаскивания.
 var strob_width_begin: float            ## Ширина строба по углу в момент начала перетаскивания.
 var view_mode: MapViewMode              ## Режим отображения карты
-var thrs_dict: Dictionary      ## Ссылка на словарь целей
+var thrs_dict: Dictionary               ## Ссылка на словарь целей
+var gos_flag = true                     ## Флаг работать по своим целям
 var color_ecm: Color
 var color_select: Color
 var color_emit: Color
@@ -92,6 +93,7 @@ func on_enter_tree() -> void: call_deferred('on_button_strobe_pressed')
 
 
 func on_settings_changed():
+    gos_flag = ProjectSettings.get_setting('application/config/Включить работу по своим целям', true)
     color_emit = ProjectSettings.get_setting('application/interfer/emit_color', Color(0.58, 0.47, 0.51, 1.0))
     color_ecm = ProjectSettings.get_setting('application/interfer/interfer_color', Color(0.58, 0.47, 0.51, 1.0))
     color_select = ProjectSettings.get_setting('application/interfer/select_color', Color(1.0, 1.0, 1.0, 1.0))
@@ -109,9 +111,7 @@ func on_settings_changed():
 
 ## Обработчик сигнала изменения списка целей.
 func on_threats_resized(ths: Dictionary):
-    $count_all_pad/count_all.text = '%02d' % ths.size()
-    var c: int = ths.values().filter(func(th: threats.Threat): return th.proto != '').size()
-    $count_danger_pad/count_danger.text = '%02d' % c
+    count_threats(ths)
     thrs_dict = ths
 
 
@@ -624,6 +624,14 @@ func _on_btn_all_work_pressed() -> void:
 
 
 func on_th_aoa_update(ths):
+    count_threats(ths)
+    
+
+func count_threats(ths):
     $count_all_pad/count_all.text = '%02d' % ths.size()
-    var c: int = ths.values().filter(func(th: threats.Threat): return th.proto != '').size()
+    var c: int = 0
+    if gos_flag:
+        c = ths.values().filter(func(th: threats.Threat): return th.proto != '').size()
+    else:
+        c = ths.values().filter(func(th: threats.Threat): return ((th.proto != '') and th.proto not in interfer.gos_protocols)).size()
     $count_danger_pad/count_danger.text = '%02d' % c