Рефактор.

addons/godot-logger/scripts/logger_output.gd

@@ -38,7 +38,7 @@ func get_color(level: int) -> Color:
 
 ## Установить журнал событий.
 func set_logger(logger: Logger) -> void:
-    assert(is_instance_valid(logger), "Invalid Logger.")
+    tools.allways(is_instance_valid(logger), 'Invalid Logger.')
     if not is_instance_valid(logger) or is_same(_logger, logger):
         return
 
@@ -58,20 +58,20 @@ func get_logger() -> Logger:
 func format(message: Dictionary) -> String:
     return format_text.format(
         {
-            "year": "%02d" % message["year"],
+            'year': '%04d' % message['year'],
-            "month": "%02d" % message["month"],
+            'month': '%02d' % message['month'],
-            "day": "%02d" % message["day"],
+            'day': '%02d' % message['day'],
-            "hour": "%02d" % message["hour"],
+            'hour': '%02d' % message['hour'],
-            "minute": "%02d" % message["minute"],
+            'minute': '%02d' % message['minute'],
-            "second": "%02d" % message["second"],
+            'second': '%02d' % message['second'],
-            "level": message["level_name"],
+            'level': message['level_name'],
-            "text": message["text"],
+            'text': message['text'],
         }
     )
 
 ## Обработать сообщение.
 func handle_message(message: Dictionary) -> void:
-    push_color(get_color(message["level"]))
+    push_color(get_color(message['level']))
-    append_text(format(message) + "\n")
+    append_text(format(message) + '\n')
     pop()
     handled.emit()

project.godot

@@ -39,9 +39,9 @@ config/settings_path="user://settings.json"
 [autoload]
 
 commit="*res://scripts/commit.gd"
+tools="*res://scripts/tools.gd"
 log="*res://addons/godot-logger/scripts/logger.gd"
 unit="*res://scripts/unit.gd"
-tools="*res://scripts/tools.gd"
 signaller="*res://scripts/signaller.gd"
 settings="*res://scripts/settings.gd"
 network="*res://scripts/network.gd"

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

@@ -196,28 +196,27 @@ func map_threat_to_bip(th: threats.Threat, bip: Control) -> bool:
 func on_threat_update(th):
     var bip = get_node('%d' % th.id)
     bip.update(th.tick_rx)
-    var rc = map_threat_to_bip(th, bip)
+    bip.visible = map_threat_to_bip(th, bip)
-    bip.visible = rc
 
 
 ## Обработчик выбора помехи для цели.
 func on_interfer_new(ecm):
-    if interfer.thrs.has(ecm.ispp):
+    if not interfer.thrs.has(ecm.ispp): return
-        var th_id = interfer.thrs[ecm.ispp]
+    var th_id = interfer.thrs[ecm.ispp]
-        var bip = get_node('%d' % th_id)
+    var bip = get_node('%d' % th_id)
-        if bip != null:
+    if bip != null:
-            if ecm.krp!= interfer.INTERFER_OFF:
+        if ecm.krp!= interfer.INTERFER_OFF:
-                bip.set_track_visible(true)
+            bip.set_track_visible(true)
-                if ecm.svk == 1:
+            if ecm.svk == 1:
-                    bip.set_ecm_visible(true)
+                bip.set_ecm_visible(true)
-                else: bip.set_ecm_visible(false)
+            else: bip.set_ecm_visible(false)
-            else:
-                bip.set_ecm_visible(false)
-                bip.set_track_visible(false)
         else:
-            interfer.thrs.erase(ecm.ispp)
+            bip.set_ecm_visible(false)
-            set_fs_color(ecm)
+            bip.set_track_visible(false)
-            update_fs_colors()
+    else:
+        interfer.thrs.erase(ecm.ispp)
+        set_fs_color(ecm)
+        update_fs_colors()
     set_fs_color(ecm)
 
 

scripts/threats.gd

@@ -84,7 +84,7 @@ func on_timer_aoa_update(threats:Dictionary, tmr):
     tmr.start(1.0)
 
 ## отправляет словарь целей в юнит, для запаковки и отправки в 5П28.
-func on_get_threats(unit, threats): unit.pack_threats(threats)
+func on_get_threats(unit_instance, threats): unit_instance.pack_threats(threats)
 
 ## Снимает выделение с цели, если нажать по отметке цели.
 func on_rto_threat_unsel(th_id, threats): threats[th_id].selected = false