From c87e91d8452c29aab7da4e37ba84241a0d3d6dc4 Mon Sep 17 00:00:00 2001 From: Mike Young <117502908+DarthZyll@users.noreply.github.com> Date: Sat, 1 Jun 2024 01:32:20 -0400 Subject: [PATCH 1/2] Update Set.lua: added handler for EVENTS.PlayerLeaveUnit in SET_GROUP:FilterStart() (#2134) Ops.CSAR was throwing the following errors constantly when a player would leave the CSAR helo: GROUP05000.GetDCSObject((ERROR: Could not get DCS group object of group Archer-1 because DCS object could not be found!)) This was because the SET_GROUP FilterStart on allheligroupset was not handling the scenario when a player left w/o a death. --- Moose Development/Moose/Core/Set.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index ce3a11827..a401b6f3f 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -1516,6 +1516,7 @@ do self:HandleEvent( EVENTS.Dead, self._EventOnDeadOrCrash ) self:HandleEvent( EVENTS.Crash, self._EventOnDeadOrCrash ) self:HandleEvent( EVENTS.RemoveUnit, self._EventOnDeadOrCrash ) + self:HandleEvent( EVENTS.PlayerLeaveUnit, self._EventOnDeadOrCrash ) if self.Filter.Zones then self.ZoneTimer = TIMER:New(self._ContinousZoneFilter,self) local timing = self.ZoneTimerInterval or 30 From 333ed629bbe6121b868b36fcf4ab4244de125f27 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Fri, 7 Jun 2024 16:03:45 +0200 Subject: [PATCH 2/2] Adding Kiowa support in CSAR und CTLD --- Moose Development/Moose/Ops/CSAR.lua | 3 ++- Moose Development/Moose/Ops/CTLD.lua | 3 ++- Moose Development/Moose/Utilities/Utils.lua | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Ops/CSAR.lua b/Moose Development/Moose/Ops/CSAR.lua index e21824e7e..9867523e5 100644 --- a/Moose Development/Moose/Ops/CSAR.lua +++ b/Moose Development/Moose/Ops/CSAR.lua @@ -292,10 +292,11 @@ CSAR.AircraftType["AH-64D_BLK_II"] = 2 CSAR.AircraftType["Bronco-OV-10A"] = 2 CSAR.AircraftType["MH-60R"] = 10 CSAR.AircraftType["OH-6A"] = 2 +CSAR.AircraftType["OH-58D"] = 2 --- CSAR class version. -- @field #string version -CSAR.version="1.0.23" +CSAR.version="1.0.24" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- ToDo list diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua index 507fe0675..da51b1e5a 100644 --- a/Moose Development/Moose/Ops/CTLD.lua +++ b/Moose Development/Moose/Ops/CTLD.lua @@ -1250,11 +1250,12 @@ CTLD.UnitTypeCapabilities = { ["AH-64D_BLK_II"] = {type="AH-64D_BLK_II", crates=false, troops=true, cratelimit = 0, trooplimit = 2, length = 17, cargoweightlimit = 200}, -- 2 ppl **outside** the helo ["Bronco-OV-10A"] = {type="Bronco-OV-10A", crates= false, troops=true, cratelimit = 0, trooplimit = 5, length = 13, cargoweightlimit = 1450}, ["OH-6A"] = {type="OH-6A", crates=false, troops=true, cratelimit = 0, trooplimit = 4, length = 7, cargoweightlimit = 550}, + ["OH-58D"] = {type="OH-58D", crates=false, troops=false, cratelimit = 0, trooplimit = 0, length = 14, cargoweightlimit = 400}, } --- CTLD class version. -- @field #string version -CTLD.version="1.0.53" +CTLD.version="1.0.54" --- Instantiate a new CTLD. -- @param #CTLD self diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index 14c513a40..0b26f377d 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -2249,6 +2249,11 @@ function UTILS.IsLoadingDoorOpen( unit_name ) return true end + if type_name == " OH-58D" and (unit:getDrawArgumentValue(35) > 0 or unit:getDrawArgumentValue(421) == -1) then + BASE:T(unit_name .. " cargo door is open") + return true + end + return false end -- nil