diff --git a/BUK-M2/Nasal/damage.nas b/BUK-M2/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/BUK-M2/Nasal/damage.nas +++ b/BUK-M2/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/Frigate/Nasal/damage.nas b/Frigate/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/Frigate/Nasal/damage.nas +++ b/Frigate/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/MIM-104D/Nasal/damage.nas b/MIM-104D/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/MIM-104D/Nasal/damage.nas +++ b/MIM-104D/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/S-200/Nasal/damage.nas b/S-200/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/S-200/Nasal/damage.nas +++ b/S-200/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/S-300/Nasal/damage.nas b/S-300/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/S-300/Nasal/damage.nas +++ b/S-300/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/S-75/Nasal/damage.nas b/S-75/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/S-75/Nasal/damage.nas +++ b/S-75/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/SA-3/Nasal/damage.nas b/SA-3/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/SA-3/Nasal/damage.nas +++ b/SA-3/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/SA-6/Nasal/damage.nas b/SA-6/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/SA-6/Nasal/damage.nas +++ b/SA-6/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/ZSU-23/Nasal/damage.nas b/ZSU-23/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/ZSU-23/Nasal/damage.nas +++ b/ZSU-23/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/depot/Nasal/damage.nas b/depot/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/depot/Nasal/damage.nas +++ b/depot/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/fleet/Nasal/damage.nas b/fleet/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/fleet/Nasal/damage.nas +++ b/fleet/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/gci-radar/Nasal/damage.nas b/gci-radar/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/gci-radar/Nasal/damage.nas +++ b/gci-radar/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/groundtarget/Nasal/damage.nas b/groundtarget/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/groundtarget/Nasal/damage.nas +++ b/groundtarget/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/missile-frigate/Nasal/damage.nas b/missile-frigate/Nasal/damage.nas index cdb47db..09e0e91 100644 --- a/missile-frigate/Nasal/damage.nas +++ b/missile-frigate/Nasal/damage.nas @@ -60,7 +60,7 @@ var shells = { "DEFA 554": [14,0.060], # 30x113mm Mirage, 220g "20mm APDS": [15,0.030], # CIWS "LAU-10": [16,0.500], # 127mm, ~4-7kg warhead - # Max id is 41 + # Max id is 39 }; # lbs of warheads is explosive+fragmentation+fuse, so total warhead mass. @@ -467,7 +467,7 @@ var DamageRecipient = if (notification.RemoteCallsign == callsign and getprop("payload/armament/msg") == 1) { #damage enabled and were getting hit - if (notification.SecondaryKind < 0 and hitable_by_cannon) { + if (notification.SecondaryKind < 0 and notification.SecondaryKind >= -40 and hitable_by_cannon) { # cannon hit if (m28_auto) mig28.engagedBy(notification.Callsign, 0); var probability = id2shell[-1*notification.SecondaryKind-1][1]; diff --git a/oprf-versions.json b/oprf-versions.json index d3f56f2..ee7346c 100644 --- a/oprf-versions.json +++ b/oprf-versions.json @@ -81,59 +81,59 @@ ], "damage": [ { - "version": "1.4.3", + "version": "1.4.4", "path": "BUK-M2/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "depot/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "fleet/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "Frigate/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "gci-radar/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "groundtarget/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "MIM-104D/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "missile-frigate/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "S-200/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "S-300/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "S-75/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "SA-3/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "SA-6/Nasal/damage.nas" }, { - "version": "1.4.3", + "version": "1.4.4", "path": "ZSU-23/Nasal/damage.nas" } ],