diff --git a/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua b/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua index 4b0801681..7371ef1bc 100644 --- a/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua +++ b/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua @@ -875,8 +875,8 @@ do -- ZONE_CAPTURE_COALITION end -- Get red and blue unit sets. - local unitsetRed=self:GetScannedSetUnit():FilterCoalitions(coalition.side.RED):FilterActive(true):FilterOnce() - local unitsetBlu=self:GetScannedSetUnit():FilterCoalitions(coalition.side.BLUE):FilterActive(true):FilterOnce() + local unitsetRed=self:GetScannedSetUnit():FilterCoalitions("red"):FilterActive(true):FilterOnce() + local unitsetBlu=self:GetScannedSetUnit():FilterCoalitions("blue"):FilterActive(true):FilterOnce() -- Count number of units. local nRed=unitsetRed:Count() diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index a1b5f4866..16329abd8 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -515,7 +515,7 @@ _ATIS={} --- ATIS class version. -- @field #string version -ATIS.version="0.6.1" +ATIS.version="0.6.2" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO list @@ -1000,7 +1000,9 @@ function ATIS:onafterStatus(From, Event, To) local relayunitstatus="N/A" if self.relayunitname then local ru=UNIT:FindByName(self.relayunitname) - relayunitstatus=tostring(ru:IsAlive()) + if ru then + relayunitstatus=tostring(ru:IsAlive()) + end end -- Info text. diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 28eaff805..86a62afb7 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -2136,8 +2136,10 @@ do -- Patrol methods -- @param #table ZoneList Table of zones. -- @param #number Speed Speed in km/h the group moves at. -- @param #string Formation (Optional) Formation the group should use. + -- @param #number DelayMin Delay in seconds before the group progresses to the next route point. Default 1 sec. + -- @param #number DelayMax Max. delay in seconds. Actual delay is randomly chosen between DelayMin and DelayMax. Default equal to DelayMin. -- @return #CONTROLLABLE - function CONTROLLABLE:PatrolZones( ZoneList, Speed, Formation ) + function CONTROLLABLE:PatrolZones( ZoneList, Speed, Formation, DelayMin, DelayMax ) if not type( ZoneList ) == "table" then ZoneList = { ZoneList } @@ -2148,14 +2150,18 @@ do -- Patrol methods if not self:IsInstanceOf( "GROUP" ) then PatrolGroup = self:GetGroup() -- Wrapper.Group#GROUP end + + DelayMin=DelayMin or 1 + if not DelayMax or DelayMax