velelepie/uarep-ctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'lepshiy-master'

Browse Source 
# Conflicts:
#	scenes/frame-ecm-list/frm-ecm-list.gd
#	scripts/signaller.gd
This commit is contained in:
sasha80
2025-02-03 11:44:38 +03:00
parent d6a8769bb1 9137845ac2
commit 5a8a08b69d
32 changed files with 779 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/interfer.gd
View File

@@ -265,7 +265,6 @@ func interfer_create(interfer_name, ecms, param, kni, id, dict, source_interfer)
signaller.emit_signal('interfer_new', ecm)
if interfer_name == 'off':
signaller.emit_signal('interfer_off', ecm, ecms, thrs)
push_id(ecm.ispp)
thrs.erase(ispp)
ecm.tick_tx = Time.get_ticks_msec()
@@ -278,7 +277,6 @@ func send_ecm(ecm, unit):
func on_interfer_off_all(unit, ecms):
for ecm in ecms.values():
ecm.krp = INTERFER_OFF
push_id(ecm.ispp)
send_ecm(ecm, unit)
signaller.emit_signal('interfer_off',ecm, ecms, thrs)
@@ -289,7 +287,6 @@ func on_threats_lost(th, ecms, unit):
var ecm_id = key
var ecm = ecms[ecm_id]
ecm.krp = INTERFER_OFF
push_id(ecm.ispp)
send_ecm(ecm, unit)
signaller.emit_signal('interfer_off',ecm, ecms, thrs)