diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index 7c18a4222..bc2bb0cd0 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -181,7 +181,7 @@ do -- SET_BASE return false end end - -- No condition was true. + -- No condition was false. return true end diff --git a/Moose Development/Moose/Ops/CSAR.lua b/Moose Development/Moose/Ops/CSAR.lua index 32d6144a9..c26965a22 100644 --- a/Moose Development/Moose/Ops/CSAR.lua +++ b/Moose Development/Moose/Ops/CSAR.lua @@ -2374,7 +2374,7 @@ function CSAR:onafterStart(From, Event, To) self:HandleEvent(EVENTS.PilotDead, self._EventHandler) if self.UserSetGroup then - self.PilotGroups = self.UserSetGroup + self.allheligroupset = self.UserSetGroup elseif self.allowbronco then local prefixes = self.csarPrefix or {} self.allheligroupset = SET_GROUP:New():FilterCoalitions(self.coalitiontxt):FilterPrefixes(prefixes):FilterStart() diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua index 65e7edb52..b213d9ed8 100644 --- a/Moose Development/Moose/Wrapper/Group.lua +++ b/Moose Development/Moose/Wrapper/Group.lua @@ -367,7 +367,7 @@ function GROUP:GetDCSObject() return DCSGroup end - self:E(string.format("ERROR: Could not get DCS group object of group %s because DCS object could not be found!", tostring(self.GroupName))) + --self:T2(string.format("ERROR: Could not get DCS group object of group %s because DCS object could not be found!", tostring(self.GroupName))) return nil end @@ -1010,6 +1010,20 @@ function GROUP:Activate(delay) return self end +--- Deactivates an activated GROUP. +-- @param #GROUP self +-- @param #number delay Delay in seconds, before the group is activated. +-- @return #GROUP self +function GROUP:Deactivate(delay) + --self:F2( { self.GroupName } ) + if delay and delay>0 then + self:ScheduleOnce(delay, GROUP.Deactivate, self) + else + trigger.action.deactivateGroup( self:GetDCSObject() ) + end + return self +end + --- Gets the type name of the group. -- @param #GROUP self