diff --git a/BUK-M2/Nasal/damage.nas b/BUK-M2/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/BUK-M2/Nasal/damage.nas +++ b/BUK-M2/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/BUK-M2/Nasal/guided-missiles.nas b/BUK-M2/Nasal/guided-missiles.nas index 1a3d1cd..f6e5c96 100644 --- a/BUK-M2/Nasal/guided-missiles.nas +++ b/BUK-M2/Nasal/guided-missiles.nas @@ -945,7 +945,6 @@ var AIM = { if (tacview.starttime) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write("0,Event=Destroyed|"~me.tacviewID~"\n"); tacview.write("-"~me.tacviewID~"\n"); thread.unlock(tacview.mutexWrite); } diff --git a/Frigate/Nasal/damage.nas b/Frigate/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/Frigate/Nasal/damage.nas +++ b/Frigate/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/MIM-104D/Nasal/damage.nas b/MIM-104D/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/MIM-104D/Nasal/damage.nas +++ b/MIM-104D/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/MIM-104D/Nasal/guided-missiles.nas b/MIM-104D/Nasal/guided-missiles.nas index 1a3d1cd..f6e5c96 100644 --- a/MIM-104D/Nasal/guided-missiles.nas +++ b/MIM-104D/Nasal/guided-missiles.nas @@ -945,7 +945,6 @@ var AIM = { if (tacview.starttime) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write("0,Event=Destroyed|"~me.tacviewID~"\n"); tacview.write("-"~me.tacviewID~"\n"); thread.unlock(tacview.mutexWrite); } diff --git a/S-200/Nasal/damage.nas b/S-200/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/S-200/Nasal/damage.nas +++ b/S-200/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/S-300/Nasal/damage.nas b/S-300/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/S-300/Nasal/damage.nas +++ b/S-300/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/S-75/Nasal/damage.nas b/S-75/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/S-75/Nasal/damage.nas +++ b/S-75/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/S-75/Nasal/guided-missiles.nas b/S-75/Nasal/guided-missiles.nas index 1a3d1cd..f6e5c96 100644 --- a/S-75/Nasal/guided-missiles.nas +++ b/S-75/Nasal/guided-missiles.nas @@ -945,7 +945,6 @@ var AIM = { if (tacview.starttime) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write("0,Event=Destroyed|"~me.tacviewID~"\n"); tacview.write("-"~me.tacviewID~"\n"); thread.unlock(tacview.mutexWrite); } diff --git a/SA-3/Nasal/damage.nas b/SA-3/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/SA-3/Nasal/damage.nas +++ b/SA-3/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/SA-3/Nasal/guided-missiles.nas b/SA-3/Nasal/guided-missiles.nas index 1a3d1cd..f6e5c96 100644 --- a/SA-3/Nasal/guided-missiles.nas +++ b/SA-3/Nasal/guided-missiles.nas @@ -945,7 +945,6 @@ var AIM = { if (tacview.starttime) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write("0,Event=Destroyed|"~me.tacviewID~"\n"); tacview.write("-"~me.tacviewID~"\n"); thread.unlock(tacview.mutexWrite); } diff --git a/SA-6/Nasal/damage.nas b/SA-6/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/SA-6/Nasal/damage.nas +++ b/SA-6/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/SA-6/Nasal/guided-missiles.nas b/SA-6/Nasal/guided-missiles.nas index 1a3d1cd..f6e5c96 100644 --- a/SA-6/Nasal/guided-missiles.nas +++ b/SA-6/Nasal/guided-missiles.nas @@ -945,7 +945,6 @@ var AIM = { if (tacview.starttime) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write("0,Event=Destroyed|"~me.tacviewID~"\n"); tacview.write("-"~me.tacviewID~"\n"); thread.unlock(tacview.mutexWrite); } diff --git a/ZSU-23/Nasal/damage.nas b/ZSU-23/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/ZSU-23/Nasal/damage.nas +++ b/ZSU-23/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/depot/Nasal/damage.nas b/depot/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/depot/Nasal/damage.nas +++ b/depot/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/fleet/Nasal/damage.nas b/fleet/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/fleet/Nasal/damage.nas +++ b/fleet/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/gci-radar/Nasal/damage.nas b/gci-radar/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/gci-radar/Nasal/damage.nas +++ b/gci-radar/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/groundtarget/Nasal/damage.nas b/groundtarget/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/groundtarget/Nasal/damage.nas +++ b/groundtarget/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/missile-frigate/Nasal/damage.nas b/missile-frigate/Nasal/damage.nas index f853c2c..c39f956 100644 --- a/missile-frigate/Nasal/damage.nas +++ b/missile-frigate/Nasal/damage.nas @@ -212,7 +212,7 @@ var radar_signatures = { var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var lastSeenTacObject = {};# tacID: last time seen +var lastSeenTacObject = {};# tacID: last time seen weapon/flare var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -340,10 +340,7 @@ var DamageRecipient = } else { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~tacID~"|\n"); - #tacview.write("0,Event=Destroyed|"~tacID~"|\n"); - #tacview.write("-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } } @@ -382,19 +379,19 @@ var DamageRecipient = if (tacview_supported and (getprop("sim/multiplay/txhost") != "mpserver.opredflag.com" or m28_auto)) { # Record armament flightpath in tacview if (tacview.starttime) { - var tacID = left(md5(notification.Callsign~notification.UniqueIdentity),6); + var tacID = left(md5(notification.Callsign~notification.UniqueIdentity~typ[4]),6); var elapsed = getprop("sim/time/elapsed-sec"); lastSeenTacObject[tacID] = elapsed; if (notification.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = typ[4]=="pilot"?"Parachutist":typ[4]; var extra = typp=="Parachutist"?"|0|0|0":""; var extra2 = typ[2]==0?",Type=Weapon+Missile":",Type=Weapon+Bomb"; - extra2 = typ[4]=="Flare"?",Type=Flare":extra2; + extra2 = typp=="Flare"?",Type=Flare":extra2; extra2 = typp=="Parachutist"?"":extra2; var color = radarOn or CWIOn?",Color=Red":",Color=Yellow"; thread.lock(tacview.mutexWrite); @@ -1068,7 +1065,7 @@ var recordOwnFlare = func (msg) { if (msg.Kind == DESTROY) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(tacID~",Visible=0\n-"~tacID~"\n"); + tacview.write("-"~tacID~"\n"); thread.unlock(tacview.mutexWrite); } else { var typp = "Flare"; @@ -1447,8 +1444,7 @@ var processCallsigns = func () { if (elapsed - lastSeenTacObject[key] > 30) { thread.lock(tacview.mutexWrite); tacview.write("#" ~ (systime() - tacview.starttime)~"\n"); - tacview.write(key ~ ",Visible=0"~"\n"); - tacview.write("0,Event=LeftArea|"~key~"|\n"); + tacview.write("-"~key~"\n"); thread.unlock(tacview.mutexWrite); } else { new_lastSeenTacObject[key] = lastSeenTacObject[key]; diff --git a/oprf-versions.json b/oprf-versions.json index ccd40a5..14a1bfd 100644 --- a/oprf-versions.json +++ b/oprf-versions.json @@ -59,81 +59,81 @@ ], "missile-code": [ { - "version": "1.1.5", + "version": "1.1.6", "path": "BUK-M2/Nasal/guided-missiles.nas" }, { - "version": "1.1.5", + "version": "1.1.6", "path": "MIM-104D/Nasal/guided-missiles.nas" }, { - "version": "1.1.5", + "version": "1.1.6", "path": "S-75/Nasal/guided-missiles.nas" }, { - "version": "1.1.5", + "version": "1.1.6", "path": "SA-3/Nasal/guided-missiles.nas" }, { - "version": "1.1.5", + "version": "1.1.6", "path": "SA-6/Nasal/guided-missiles.nas" } ], "damage": [ { - "version": "1.4.8", + "version": "1.4.10", "path": "BUK-M2/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "depot/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "fleet/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "Frigate/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "gci-radar/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "groundtarget/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "MIM-104D/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "missile-frigate/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "S-200/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "S-300/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "S-75/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "SA-3/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "SA-6/Nasal/damage.nas" }, { - "version": "1.4.8", + "version": "1.4.10", "path": "ZSU-23/Nasal/damage.nas" } ],