From f32094aa43aa939ab8c7b1f326e0ed157a4e51f4 Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 12 Aug 2019 22:55:56 +0200 Subject: [PATCH 1/5] up --- Moose Development/Moose/Ops/RecoveryTanker.lua | 7 +++++++ Moose Development/Moose/Ops/RescueHelo.lua | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/Moose Development/Moose/Ops/RecoveryTanker.lua b/Moose Development/Moose/Ops/RecoveryTanker.lua index e77f91ad2..a3af32cb9 100644 --- a/Moose Development/Moose/Ops/RecoveryTanker.lua +++ b/Moose Development/Moose/Ops/RecoveryTanker.lua @@ -418,6 +418,13 @@ function RECOVERYTANKER:New(carrierunit, tankergroupname) -- @param #RECOVERYTANKER self -- @param #number delay Delay in seconds. + --- On after "Start" event function. Called when FSM is started. + -- @function [parent=#RECOVERYTANKER] OnAfterStart + -- @param #RECOVERYTANKER self + -- @param #string From From state. + -- @param #string Event Event. + -- @param #string To To state. + --- Triggers the FSM event "RefuelStart" when the tanker starts refueling another aircraft. -- @function [parent=#RECOVERYTANKER] RefuelStart diff --git a/Moose Development/Moose/Ops/RescueHelo.lua b/Moose Development/Moose/Ops/RescueHelo.lua index d033713b5..350722c50 100644 --- a/Moose Development/Moose/Ops/RescueHelo.lua +++ b/Moose Development/Moose/Ops/RescueHelo.lua @@ -346,6 +346,12 @@ function RESCUEHELO:New(carrierunit, helogroupname) -- @param #RESCUEHELO self -- @param #number delay Delay in seconds. + --- On after "Start" event function. Called when FSM is started. + -- @function [parent=#RESCUEHELO] OnAfterStart + -- @param #RECOVERYTANKER self + -- @param #string From From state. + -- @param #string Event Event. + -- @param #string To To state. --- Triggers the FSM event "Rescue" that sends the helo on a rescue mission to a specifc coordinate. -- @function [parent=#RESCUEHELO] Rescue From 28a23c21f458b1ce9a07a684c2c5732f1b111f34 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 14 Aug 2019 00:35:54 +0200 Subject: [PATCH 2/5] Update Airboss.lua --- Moose Development/Moose/Ops/Airboss.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 181b4ff08..079536a50 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -5973,7 +5973,7 @@ function AIRBOSS:_ScanCarrierZone() local awacs2marshal = isawacs and self.awacs:IsReturning() and self.awacs.airbase:GetName()==self.airbase:GetName() and knownflight.flag==-100 and self.awacs.recovery==true -- Put flight into Marshal. - local putintomarshal=closein>UTILS.NMToMeters(5) and knownflight.flag==-100 and iscarriersquad and istanker==false and isawacs==false + local putintomarshal=closein>UTILS.NMToMeters(5) and knownflight.flag==-100 and iscarriersquad and (not istanker) and (not isawacs) -- Send AI flight to marshal stack if group closes in more than 5 and has initial flag value. if putintomarshal or tanker2marshal or awacs2marshal then From e8a7def26e8c45937108fe36ec9c50da83175969 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 14 Aug 2019 21:51:55 +0200 Subject: [PATCH 3/5] Update Airboss.lua --- Moose Development/Moose/Ops/Airboss.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 079536a50..960ea2510 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -12737,7 +12737,7 @@ function AIRBOSS:_Debrief(playerData) table.insert(self.playerscores[playerData.name], mygrade) -- Trigger grading event. - self:LSOGrade(playerdata, mygrade) + self:LSOGrade(playerData, mygrade) -- LSO grade: (OK) 3.0 PT - LURIM local text=string.format("%s %.1f PT - %s", grade, Points, analysis) From 23497dddd44b9cf91d35b6a117d0f6e163bb6b13 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 14 Aug 2019 22:32:45 +0200 Subject: [PATCH 4/5] ARTY v1.1.3 Unfixed workaround for wrong markpoint coordinates. Was fixed in DCS 2.5.5.34644 --- Moose Development/Moose/Functional/Artillery.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Functional/Artillery.lua b/Moose Development/Moose/Functional/Artillery.lua index e5d30114c..dac84c96d 100644 --- a/Moose Development/Moose/Functional/Artillery.lua +++ b/Moose Development/Moose/Functional/Artillery.lua @@ -695,7 +695,7 @@ ARTY.id="ARTY | " --- Arty script version. -- @field #string version -ARTY.version="1.1.2" +ARTY.version="1.1.3" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -2474,9 +2474,10 @@ function ARTY:_OnEventMarkChange(Event) if Event.text~=nil and Event.text:lower():find("arty") then -- Convert (wrong x-->z, z-->x) vec3 - -- TODO: This needs to be "fixed", once DCS gives the correct numbers for x and z. - -- local vec3={y=Event.pos.y, x=Event.pos.x, z=Event.pos.z} - local vec3={y=Event.pos.y, x=Event.pos.z, z=Event.pos.x} + -- DONE: This needs to be "fixed", once DCS gives the correct numbers for x and z. + -- Was fixed in DCS 2.5.5.34644! + local vec3={y=Event.pos.y, x=Event.pos.x, z=Event.pos.z} + --local vec3={y=Event.pos.y, x=Event.pos.z, z=Event.pos.x} -- Get coordinate from vec3. local _coord=COORDINATE:NewFromVec3(vec3) From 97e1a65b522cc4ff7604ba5019201aa624ba5ced Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 14 Aug 2019 22:36:39 +0200 Subject: [PATCH 5/5] WAREHOUSE v0.9.6 - respawn after destroyed keeps assets --- Moose Development/Moose/Functional/Warehouse.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index 087852348..cc03d7b1b 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -1749,7 +1749,7 @@ _WAREHOUSEDB = { --- Warehouse class version. -- @field #string version -WAREHOUSE.version="0.9.5" +WAREHOUSE.version="0.9.6" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO: Warehouse todo list.