From 163273096c9e06cc37962df7ef00fb7be0b91d38 Mon Sep 17 00:00:00 2001 From: ttrebuchon Date: Sat, 10 Jun 2023 18:08:29 -0400 Subject: [PATCH 1/3] Set life0 based on itself, rather than off of life --- Moose Development/Moose/Ops/OpsGroup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index e780835fd..b1ad4ca69 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -980,7 +980,7 @@ function OPSGROUP:GetLifePoints(Element) for _,element in pairs(self.elements) do local l,l0=self:GetLifePoints(element) life=life+l - life0=life+l0 + life0=life0+l0 end end From 0f33603ecc626ece61ec9ac775920f5de8763442 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 11 Jun 2023 22:45:59 +0200 Subject: [PATCH 2/3] AUFTRAG - Changed ingress waypoint of CASENHANCED --- Moose Development/Moose/Ops/Auftrag.lua | 2 +- Moose Development/Moose/Ops/OpsGroup.lua | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua index 7d5d821cc..cb1bda5be 100644 --- a/Moose Development/Moose/Ops/Auftrag.lua +++ b/Moose Development/Moose/Ops/Auftrag.lua @@ -1444,7 +1444,7 @@ function AUFTRAG:NewCASENHANCED(CasZone, Altitude, Speed, RangeMax, NoEngageZone mission.optionROE=ENUMS.ROE.OpenFire mission.optionROT=ENUMS.ROT.EvadeFire - mission.missionFraction=1.0 + mission.missionFraction=0.5 mission.missionSpeed=Speed and UTILS.KnotsToKmph(Speed) or nil mission.missionAltitude=Altitude and UTILS.FeetToMeters(Altitude) or nil diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index e780835fd..33ba0cf9d 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -5943,13 +5943,12 @@ function OPSGROUP:RouteToMission(mission, delay) -- Random coordinate. waypointcoord=targetzone:GetRandomCoordinate(nil , nil, surfacetypes) - else --- -- Default case --- - waypointcoord=mission:GetMissionWaypointCoord(self.group, randomradius, surfacetypes) + waypointcoord=mission:GetMissionWaypointCoord(self.group, randomradius, surfacetypes) end -- Add enroute tasks. @@ -6039,7 +6038,7 @@ function OPSGROUP:RouteToMission(mission, delay) local d=currentcoord:Get2DDistance(waypointcoord) -- Debug info. - self:T(self.lid..string.format("Distance to ingress waypoint=%.1f m", d)) + self:T(self.lid..string.format("Distance to ingress waypoint=%.1f m", d)) -- Add mission execution (ingress) waypoint. local waypoint=nil --#OPSGROUP.Waypoint From 6a58748cd10c855b089f9bcf14c639a116d91f12 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 12 Jun 2023 06:27:52 +0200 Subject: [PATCH 3/3] Airbase (#1954) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * #UTILS * Sinai TIme * fix * Update Airbase.lua Corrected enumerator for Ben-Gurion (Ben_Gurion) * Update Airbase.lua (#1957) Deleted raj al … airbases #1955 --- Moose Development/Moose/Wrapper/Airbase.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 4aeb5b21b..2ad137c49 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -467,8 +467,8 @@ AIRBASE.TheChannel = { -- * AIRBASE.Syria.H3_Northwest -- * AIRBASE.Syria.H3_Southwest -- * AIRBASE.Syria.Kharab_Ishk --- * AIRBASE.Syria.Raj_al_Issa_East --- * AIRBASE.Syria.Raj_al_Issa_West +-- * AIRBASE.Syria.Raj_al_Issa_East (deleted by ED) +-- * AIRBASE.Syria.Raj_al_Issa_West (deleted by ED) -- * AIRBASE.Syria.Ruwayshid -- * AIRBASE.Syria.Sanliurfa -- * AIRBASE.Syria.Tal_Siman @@ -532,8 +532,8 @@ AIRBASE.Syria={ ["H3_Northwest"]="H3 Northwest", ["H3_Southwest"]="H3 Southwest", ["Kharab_Ishk"]="Kharab Ishk", - ["Raj_al_Issa_East"]="Raj al Issa East", - ["Raj_al_Issa_West"]="Raj al Issa West", + -- ["Raj_al_Issa_East"]="Raj al Issa East", + -- ["Raj_al_Issa_West"]="Raj al Issa West", ["Ruwayshid"]="Ruwayshid", ["Sanliurfa"]="Sanliurfa", ["Tal_Siman"]="Tal Siman", @@ -679,7 +679,7 @@ AIRBASE.Sinai = { ["Tel_Nof"] = "Tel Nof", ["Abu_Rudeis"] = "Abu Rudeis", ["Inshas_Airbase"] = "Inshas Airbase", - ["Ben-Gurion"] = "Ben-Gurion", + ["Ben_Gurion"] = "Ben-Gurion", ["Bir_Hasanah"] = "Bir Hasanah", ["Cairo_West"] = "Cairo West", }