From c1e78234e5ba612712fabe4bcb7ee2257043d1e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 30 Sep 2023 00:43:26 +0000 Subject: [PATCH] Auto-Update shared Files vector is up-to-date (2.0.3) (BUK-M2/Nasal/vector.nas) vector is up-to-date (2.0.3) (depot/Nasal/vector.nas) vector is up-to-date (2.0.3) (fleet/Nasal/vector.nas) vector is up-to-date (2.0.3) (Frigate/Nasal/vector.nas) vector is up-to-date (2.0.3) (gci-radar/Nasal/vector.nas) vector is up-to-date (2.0.3) (groundtarget/Nasal/vector.nas) vector is up-to-date (2.0.3) (MIM-104D/Nasal/vector.nas) vector is up-to-date (2.0.3) (missile-frigate/Nasal/vector.nas) vector is up-to-date (2.0.3) (S-200/Nasal/vector.nas) vector is up-to-date (2.0.3) (S-300/Nasal/vector.nas) vector is up-to-date (2.0.3) (S-75/Nasal/vector.nas) vector is up-to-date (2.0.3) (SA-6/Nasal/vector.nas) vector is up-to-date (2.0.3) (ZSU-23/Nasal/vector.nas) Fetched missile-code 1.1.1->1.1.2 (BUK-M2/Nasal/guided-missiles.nas) Fetched missile-code 1.1.1->1.1.2 (MIM-104D/Nasal/guided-missiles.nas) Fetched missile-code 1.1.1->1.1.2 (S-75/Nasal/guided-missiles.nas) Fetched missile-code 1.1.1->1.1.2 (SA-6/Nasal/guided-missiles.nas) damage is up-to-date (1.3.1) (BUK-M2/Nasal/damage.nas) damage is up-to-date (1.3.1) (depot/Nasal/damage.nas) damage is up-to-date (1.3.1) (fleet/Nasal/damage.nas) damage is up-to-date (1.3.1) (Frigate/Nasal/damage.nas) damage is up-to-date (1.3.1) (gci-radar/Nasal/damage.nas) damage is up-to-date (1.3.1) (groundtarget/Nasal/damage.nas) damage is up-to-date (1.3.1) (MIM-104D/Nasal/damage.nas) damage is up-to-date (1.3.1) (missile-frigate/Nasal/damage.nas) damage is up-to-date (1.3.1) (S-200/Nasal/damage.nas) damage is up-to-date (1.3.1) (S-300/Nasal/damage.nas) damage is up-to-date (1.3.1) (S-75/Nasal/damage.nas) damage is up-to-date (1.3.1) (SA-6/Nasal/damage.nas) damage is up-to-date (1.3.1) (ZSU-23/Nasal/damage.nas) datalink is up-to-date (1.1.0) (BUK-M2/Nasal/datalink.nas) datalink is up-to-date (1.1.0) (fleet/Nasal/datalink.nas) datalink is up-to-date (1.1.0) (MIM-104D/Nasal/datalink.nas) datalink is up-to-date (1.1.0) (missile-frigate/Nasal/datalink.nas) datalink is up-to-date (1.1.0) (S-200/Nasal/datalink.nas) datalink is up-to-date (1.1.0) (S-300/Nasal/datalink.nas) datalink is up-to-date (1.1.0) (S-75/Nasal/datalink.nas) datalink is up-to-date (1.1.0) (SA-6/Nasal/datalink.nas) datalink is up-to-date (1.1.0) (ZSU-23/Nasal/datalink.nas) armament-notification is up-to-date (1.1.0) (BUK-M2/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (depot/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (fleet/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (Frigate/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (gci-radar/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (groundtarget/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (MIM-104D/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (missile-frigate/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (S-200/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (S-300/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (S-75/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (SA-6/Nasal/ArmamentNotification.nas) armament-notification is up-to-date (1.1.0) (ZSU-23/Nasal/ArmamentNotification.nas) geo-bridged-transmitter is up-to-date (1.0.1) (BUK-M2/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (depot/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (fleet/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (Frigate/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (gci-radar/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (groundtarget/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (MIM-104D/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (missile-frigate/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (S-200/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (S-300/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (S-75/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (SA-6/Nasal/GeoBridgedTransmitter.nas) geo-bridged-transmitter is up-to-date (1.0.1) (ZSU-23/Nasal/GeoBridgedTransmitter.nas) asset-fire-control is up-to-date (1.0.0) (BUK-M2/Nasal/fire-control.nas) asset-fire-control is up-to-date (1.0.0) (MIM-104D/Nasal/fire-control.nas) asset-fire-control is up-to-date (1.0.0) (S-75/Nasal/fire-control.nas) asset-fire-control is up-to-date (1.0.0) (SA-6/Nasal/fire-control.nas) asset-radar-logic is up-to-date (1.1.0) (BUK-M2/Nasal/radar-logic.nas) asset-radar-logic is up-to-date (1.1.0) (MIM-104D/Nasal/radar-logic.nas) asset-radar-logic is up-to-date (1.1.0) (S-75/Nasal/radar-logic.nas) asset-radar-logic is up-to-date (1.1.0) (SA-6/Nasal/radar-logic.nas) asset-radar-logic is up-to-date (1.1.0) (gci-radar/Nasal/radar-logic.nas) --- BUK-M2/Nasal/guided-missiles.nas | 10 +++++----- MIM-104D/Nasal/guided-missiles.nas | 10 +++++----- S-75/Nasal/guided-missiles.nas | 10 +++++----- SA-6/Nasal/guided-missiles.nas | 10 +++++----- oprf-versions.json | 8 ++++---- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/BUK-M2/Nasal/guided-missiles.nas b/BUK-M2/Nasal/guided-missiles.nas index 0c83c1d..534b8fa 100644 --- a/BUK-M2/Nasal/guided-missiles.nas +++ b/BUK-M2/Nasal/guided-missiles.nas @@ -536,7 +536,7 @@ var AIM = { m.vector_thrust = 0; } if (m.flareResistance == nil or !m.gnd_launch) { - m.flareResistance = 0.85; + m.flareResistance = 0.80; } if (m.chaffResistance == nil or !m.gnd_launch) { m.chaffResistance = 0.85; @@ -3321,8 +3321,8 @@ var AIM = { # target has released a new flare, lets check if it fools us me.flareTime = me.life_time; me.flareLast = me.flareNumber; - me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180; - me.flareLock = rand() < (1-me.flareResistance + ((1-me.flareResistance) * 0.5 * me.aspectDeg));# 50% extra chance to be fooled if front aspect + me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180;# 0 = viewing engine, 1 = front + me.flareLock = rand() < (1-me.flareResistance); if (me.flareLock) { # fooled by the flare me.printStats(me.type~": Missile locked on flare from "~me.callsign); @@ -3357,7 +3357,7 @@ var AIM = { me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180;# 0 = viewing engine, 1 = front me.redux = me.guidance == "semi-radar" or me.guidance == "command" or me.guidance == "tvm"?(me.gnd_launch?0.5:0.75):1; me.chaffChance = (1-me.chaffResistance)*me.redux; - me.chaffLock = rand() < (me.chaffChance - (me.chaffChance * 0.5 * me.aspectDeg));# 50% less chance to be fooled if front aspect + me.chaffLock = rand() < (me.chaffChance - (me.chaffChance * 0.70 * me.aspectDeg));# 70% less chance to be fooled if front aspect if (me.chaffLock) { me.printStats(me.type~": Missile locked on chaff from "~me.callsign); @@ -3514,7 +3514,7 @@ var AIM = { # To make sure deviation_deg is updated in midflight function. me.FOV_check(me.hdg, me.pitch, me.curr_deviation_h, me.curr_deviation_e, me.max_seeker_dev, me.myMath); } - if (me.chaffLock and (me.guidance == "command" or me.guidance == "semi-radar" or me.guidance == "tvm") and (me.life_time - me.chaffLockTime) > (me.gnd_launch?4:6)) { + if (me.chaffLock and (me.guidance == "command" or me.guidance == "semi-radar" or me.guidance == "tvm") and (me.life_time - me.chaffLockTime) > (me.gnd_launch?4:8)) { me.chaffLock = 0; me.printStats(me.type~": Chaff dissipated, regained track."); } diff --git a/MIM-104D/Nasal/guided-missiles.nas b/MIM-104D/Nasal/guided-missiles.nas index 0c83c1d..534b8fa 100644 --- a/MIM-104D/Nasal/guided-missiles.nas +++ b/MIM-104D/Nasal/guided-missiles.nas @@ -536,7 +536,7 @@ var AIM = { m.vector_thrust = 0; } if (m.flareResistance == nil or !m.gnd_launch) { - m.flareResistance = 0.85; + m.flareResistance = 0.80; } if (m.chaffResistance == nil or !m.gnd_launch) { m.chaffResistance = 0.85; @@ -3321,8 +3321,8 @@ var AIM = { # target has released a new flare, lets check if it fools us me.flareTime = me.life_time; me.flareLast = me.flareNumber; - me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180; - me.flareLock = rand() < (1-me.flareResistance + ((1-me.flareResistance) * 0.5 * me.aspectDeg));# 50% extra chance to be fooled if front aspect + me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180;# 0 = viewing engine, 1 = front + me.flareLock = rand() < (1-me.flareResistance); if (me.flareLock) { # fooled by the flare me.printStats(me.type~": Missile locked on flare from "~me.callsign); @@ -3357,7 +3357,7 @@ var AIM = { me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180;# 0 = viewing engine, 1 = front me.redux = me.guidance == "semi-radar" or me.guidance == "command" or me.guidance == "tvm"?(me.gnd_launch?0.5:0.75):1; me.chaffChance = (1-me.chaffResistance)*me.redux; - me.chaffLock = rand() < (me.chaffChance - (me.chaffChance * 0.5 * me.aspectDeg));# 50% less chance to be fooled if front aspect + me.chaffLock = rand() < (me.chaffChance - (me.chaffChance * 0.70 * me.aspectDeg));# 70% less chance to be fooled if front aspect if (me.chaffLock) { me.printStats(me.type~": Missile locked on chaff from "~me.callsign); @@ -3514,7 +3514,7 @@ var AIM = { # To make sure deviation_deg is updated in midflight function. me.FOV_check(me.hdg, me.pitch, me.curr_deviation_h, me.curr_deviation_e, me.max_seeker_dev, me.myMath); } - if (me.chaffLock and (me.guidance == "command" or me.guidance == "semi-radar" or me.guidance == "tvm") and (me.life_time - me.chaffLockTime) > (me.gnd_launch?4:6)) { + if (me.chaffLock and (me.guidance == "command" or me.guidance == "semi-radar" or me.guidance == "tvm") and (me.life_time - me.chaffLockTime) > (me.gnd_launch?4:8)) { me.chaffLock = 0; me.printStats(me.type~": Chaff dissipated, regained track."); } diff --git a/S-75/Nasal/guided-missiles.nas b/S-75/Nasal/guided-missiles.nas index 0c83c1d..534b8fa 100644 --- a/S-75/Nasal/guided-missiles.nas +++ b/S-75/Nasal/guided-missiles.nas @@ -536,7 +536,7 @@ var AIM = { m.vector_thrust = 0; } if (m.flareResistance == nil or !m.gnd_launch) { - m.flareResistance = 0.85; + m.flareResistance = 0.80; } if (m.chaffResistance == nil or !m.gnd_launch) { m.chaffResistance = 0.85; @@ -3321,8 +3321,8 @@ var AIM = { # target has released a new flare, lets check if it fools us me.flareTime = me.life_time; me.flareLast = me.flareNumber; - me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180; - me.flareLock = rand() < (1-me.flareResistance + ((1-me.flareResistance) * 0.5 * me.aspectDeg));# 50% extra chance to be fooled if front aspect + me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180;# 0 = viewing engine, 1 = front + me.flareLock = rand() < (1-me.flareResistance); if (me.flareLock) { # fooled by the flare me.printStats(me.type~": Missile locked on flare from "~me.callsign); @@ -3357,7 +3357,7 @@ var AIM = { me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180;# 0 = viewing engine, 1 = front me.redux = me.guidance == "semi-radar" or me.guidance == "command" or me.guidance == "tvm"?(me.gnd_launch?0.5:0.75):1; me.chaffChance = (1-me.chaffResistance)*me.redux; - me.chaffLock = rand() < (me.chaffChance - (me.chaffChance * 0.5 * me.aspectDeg));# 50% less chance to be fooled if front aspect + me.chaffLock = rand() < (me.chaffChance - (me.chaffChance * 0.70 * me.aspectDeg));# 70% less chance to be fooled if front aspect if (me.chaffLock) { me.printStats(me.type~": Missile locked on chaff from "~me.callsign); @@ -3514,7 +3514,7 @@ var AIM = { # To make sure deviation_deg is updated in midflight function. me.FOV_check(me.hdg, me.pitch, me.curr_deviation_h, me.curr_deviation_e, me.max_seeker_dev, me.myMath); } - if (me.chaffLock and (me.guidance == "command" or me.guidance == "semi-radar" or me.guidance == "tvm") and (me.life_time - me.chaffLockTime) > (me.gnd_launch?4:6)) { + if (me.chaffLock and (me.guidance == "command" or me.guidance == "semi-radar" or me.guidance == "tvm") and (me.life_time - me.chaffLockTime) > (me.gnd_launch?4:8)) { me.chaffLock = 0; me.printStats(me.type~": Chaff dissipated, regained track."); } diff --git a/SA-6/Nasal/guided-missiles.nas b/SA-6/Nasal/guided-missiles.nas index 0c83c1d..534b8fa 100644 --- a/SA-6/Nasal/guided-missiles.nas +++ b/SA-6/Nasal/guided-missiles.nas @@ -536,7 +536,7 @@ var AIM = { m.vector_thrust = 0; } if (m.flareResistance == nil or !m.gnd_launch) { - m.flareResistance = 0.85; + m.flareResistance = 0.80; } if (m.chaffResistance == nil or !m.gnd_launch) { m.chaffResistance = 0.85; @@ -3321,8 +3321,8 @@ var AIM = { # target has released a new flare, lets check if it fools us me.flareTime = me.life_time; me.flareLast = me.flareNumber; - me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180; - me.flareLock = rand() < (1-me.flareResistance + ((1-me.flareResistance) * 0.5 * me.aspectDeg));# 50% extra chance to be fooled if front aspect + me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180;# 0 = viewing engine, 1 = front + me.flareLock = rand() < (1-me.flareResistance); if (me.flareLock) { # fooled by the flare me.printStats(me.type~": Missile locked on flare from "~me.callsign); @@ -3357,7 +3357,7 @@ var AIM = { me.aspectDeg = me.aspectToExhaust(me.coord, me.Tgt) / 180;# 0 = viewing engine, 1 = front me.redux = me.guidance == "semi-radar" or me.guidance == "command" or me.guidance == "tvm"?(me.gnd_launch?0.5:0.75):1; me.chaffChance = (1-me.chaffResistance)*me.redux; - me.chaffLock = rand() < (me.chaffChance - (me.chaffChance * 0.5 * me.aspectDeg));# 50% less chance to be fooled if front aspect + me.chaffLock = rand() < (me.chaffChance - (me.chaffChance * 0.70 * me.aspectDeg));# 70% less chance to be fooled if front aspect if (me.chaffLock) { me.printStats(me.type~": Missile locked on chaff from "~me.callsign); @@ -3514,7 +3514,7 @@ var AIM = { # To make sure deviation_deg is updated in midflight function. me.FOV_check(me.hdg, me.pitch, me.curr_deviation_h, me.curr_deviation_e, me.max_seeker_dev, me.myMath); } - if (me.chaffLock and (me.guidance == "command" or me.guidance == "semi-radar" or me.guidance == "tvm") and (me.life_time - me.chaffLockTime) > (me.gnd_launch?4:6)) { + if (me.chaffLock and (me.guidance == "command" or me.guidance == "semi-radar" or me.guidance == "tvm") and (me.life_time - me.chaffLockTime) > (me.gnd_launch?4:8)) { me.chaffLock = 0; me.printStats(me.type~": Chaff dissipated, regained track."); } diff --git a/oprf-versions.json b/oprf-versions.json index 17ed2ca..b529e0b 100644 --- a/oprf-versions.json +++ b/oprf-versions.json @@ -55,19 +55,19 @@ ], "missile-code": [ { - "version": "1.1.1", + "version": "1.1.2", "path": "BUK-M2/Nasal/guided-missiles.nas" }, { - "version": "1.1.1", + "version": "1.1.2", "path": "MIM-104D/Nasal/guided-missiles.nas" }, { - "version": "1.1.1", + "version": "1.1.2", "path": "S-75/Nasal/guided-missiles.nas" }, { - "version": "1.1.1", + "version": "1.1.2", "path": "SA-6/Nasal/guided-missiles.nas" } ],