diff --git a/BUK-M2/Nasal/damage.nas b/BUK-M2/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/BUK-M2/Nasal/damage.nas +++ b/BUK-M2/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/Frigate/Nasal/damage.nas b/Frigate/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/Frigate/Nasal/damage.nas +++ b/Frigate/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/MIM-104D/Nasal/damage.nas b/MIM-104D/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/MIM-104D/Nasal/damage.nas +++ b/MIM-104D/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/S-200/Nasal/damage.nas b/S-200/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/S-200/Nasal/damage.nas +++ b/S-200/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/S-300/Nasal/damage.nas b/S-300/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/S-300/Nasal/damage.nas +++ b/S-300/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/S-75/Nasal/damage.nas b/S-75/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/S-75/Nasal/damage.nas +++ b/S-75/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/SA-6/Nasal/damage.nas b/SA-6/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/SA-6/Nasal/damage.nas +++ b/SA-6/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/ZSU-23/Nasal/damage.nas b/ZSU-23/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/ZSU-23/Nasal/damage.nas +++ b/ZSU-23/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/depot/Nasal/damage.nas b/depot/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/depot/Nasal/damage.nas +++ b/depot/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/fleet/Nasal/damage.nas b/fleet/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/fleet/Nasal/damage.nas +++ b/fleet/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/gci-radar/Nasal/damage.nas b/gci-radar/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/gci-radar/Nasal/damage.nas +++ b/gci-radar/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/groundtarget/Nasal/damage.nas b/groundtarget/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/groundtarget/Nasal/damage.nas +++ b/groundtarget/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/missile-frigate/Nasal/damage.nas b/missile-frigate/Nasal/damage.nas index 297eb6d..cdb47db 100644 --- a/missile-frigate/Nasal/damage.nas +++ b/missile-frigate/Nasal/damage.nas @@ -167,6 +167,7 @@ var warheads = { "5V28V": [97, 478.00,0,0],# Missile used with S-200D/SA-5 "AIM-9X": [98, 20.80,0,0], "R-23R": [99, 55.00,0,0],# mig23 fox 1 + "5V27": [100, 150.00,0,0],# Missile used with SA-3/S-125 # Max id is 180 }; @@ -195,7 +196,7 @@ var radar_signatures = { "E-8R": AIR_RADAR, "EC-137D": AIR_RADAR, "Mig-28": AIR_RADAR, - "SA-6": "gnd-06",#Air radar tone chosen so that there is at least some lock tone until asset-specific is created + "SA-6": "gnd-06", "s-200": "gnd-05", "ZSU-23-4M": "gnd-23", "S-75": "gnd-02", @@ -204,13 +205,14 @@ var radar_signatures = { "MIM104D": "gnd-p2", "missile_frigate": "gnd-nk", "fleet": "gnd-nk", + "SA-3": "gnd-p2", }; var id2warhead = []; var launched = {};# callsign: elapsed-sec var approached = {};# callsign: uniqueID -var heavy_smoke = [61,62,63,65,92,96,97]; +var heavy_smoke = [61,62,63,65,92,96,97,100]; var k = keys(warheads); @@ -417,8 +419,8 @@ var DamageRecipient = #printf("Missile Approach Warning from %03d degrees.", bearing); damageLog.push(sprintf("Missile Approach Warning from %03d degrees from %s.", bearing, notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning from %03d degrees.", bearing), 1,0.5,0);# temporary till someone models a RWR in RIO seat - } else { - #printf("Missile Approach Warning"); + } elsif (CWIOn) { + #printf("Missile Approach Warning (semi-active)."); damageLog.push(sprintf("Missile Approach Warning from %s.", notification.Callsign)); if (rwr_to_screen) screen.log.write(sprintf("Missile Approach Warning (semi-active)."), 1,0.5,0);# temporary till someone models a RWR in RIO seat } diff --git a/oprf-versions.json b/oprf-versions.json index 8b27d0e..b545dea 100644 --- a/oprf-versions.json +++ b/oprf-versions.json @@ -73,55 +73,55 @@ ], "damage": [ { - "version": "1.3.2", + "version": "1.4.3", "path": "BUK-M2/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "depot/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "fleet/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "Frigate/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "gci-radar/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "groundtarget/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "MIM-104D/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "missile-frigate/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "S-200/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "S-300/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "S-75/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "SA-6/Nasal/damage.nas" }, { - "version": "1.3.2", + "version": "1.4.3", "path": "ZSU-23/Nasal/damage.nas" } ],