From 65f9db8efa7e82bdcb33643d3d94a95bf512b759 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Tue, 17 Oct 2023 11:05:09 +0200 Subject: [PATCH 01/51] #MSRS * Added loading of a config file --- Moose Development/Moose/Core/Message.lua | 38 +-- Moose Development/Moose/Ops/ATIS.lua | 4 +- Moose Development/Moose/Sound/SRS.lua | 334 +++++++++++++++++--- Moose Development/Moose/Utilities/Utils.lua | 6 +- 4 files changed, 307 insertions(+), 75 deletions(-) diff --git a/Moose Development/Moose/Core/Message.lua b/Moose Development/Moose/Core/Message.lua index 764f33602..005850ec1 100644 --- a/Moose Development/Moose/Core/Message.lua +++ b/Moose Development/Moose/Core/Message.lua @@ -480,21 +480,24 @@ _MESSAGESRS = {} -- MESSAGE:New("Test message!",15,"SPAWN"):ToSRS() -- function MESSAGE.SetMSRS(PathToSRS,Port,PathToCredentials,Frequency,Modulation,Gender,Culture,Voice,Coalition,Volume,Label,Coordinate) - local path = PathToSRS or "C:\\Program Files\\DCS-SimpleRadio-Standalone" - _MESSAGESRS.MSRS = MSRS:New(path,Frequency,Modulation,Volume) + _MESSAGESRS.MSRS = MSRS:New(PathToSRS,Frequency,Modulation,Volume) _MESSAGESRS.MSRS:SetCoalition(Coalition) _MESSAGESRS.MSRS:SetCoordinate(Coordinate) _MESSAGESRS.MSRS:SetCulture(Culture) - _MESSAGESRS.MSRS:SetFrequencies(Frequency) + _MESSAGESRS.Culture = Culture + --_MESSAGESRS.MSRS:SetFrequencies(Frequency) _MESSAGESRS.MSRS:SetGender(Gender) + _MESSAGESRS.Gender = Gender _MESSAGESRS.MSRS:SetGoogle(PathToCredentials) _MESSAGESRS.MSRS:SetLabel(Label or "MESSAGE") - _MESSAGESRS.MSRS:SetModulations(Modulation) - _MESSAGESRS.MSRS:SetPath(PathToSRS) + --_MESSAGESRS.MSRS:SetModulations(Modulation) + --_MESSAGESRS.MSRS:SetPath(PathToSRS) _MESSAGESRS.MSRS:SetPort(Port) - _MESSAGESRS.MSRS:SetVolume(Volume) + -- _MESSAGESRS.MSRS:SetVolume(Volume) _MESSAGESRS.MSRS:SetVoice(Voice) + _MESSAGESRS.Voice = Voice _MESSAGESRS.SRSQ = MSRSQUEUE:New(Label or "MESSAGE") + env.info(_MESSAGESRS.MSRS.provider,false) end --- Sends a message via SRS. @@ -517,26 +520,8 @@ end -- function MESSAGE:ToSRS(frequency,modulation,gender,culture,voice,coalition,volume,coordinate) if _MESSAGESRS.SRSQ then - _MESSAGESRS.MSRS:SetLabel(self.MessageCategory or _MESSAGESRS.MSRS.Label or "MESSAGE") - if gender then - _MESSAGESRS.MSRS:SetGender(gender) - end - if coalition then - _MESSAGESRS.MSRS:SetCoalition(coalition) - end - if culture then - _MESSAGESRS.MSRS:SetCulture(culture) - end - if volume then - _MESSAGESRS.MSRS:SetVolume(volume) - end - if coordinate then - _MESSAGESRS.MSRS:SetCoordinate(coordinate) - end - if voice then - _MESSAGESRS.MSRS:SetVoice(voice) - end - _MESSAGESRS.SRSQ:NewTransmission(self.MessageText,nil,_MESSAGESRS.MSRS,nil,1,nil,nil,nil,frequency,modulation) + _MESSAGESRS.MSRS:SetVoice(voice or _MESSAGESRS.Voice) + _MESSAGESRS.SRSQ:NewTransmission(self.MessageText,nil,_MESSAGESRS.MSRS,nil,nil,nil,nil,nil,frequency,modulation,gender or _MESSAGESRS.Gender,culture or _MESSAGESRS.Culture,voice or _MESSAGESRS.Voice,volume,self.MessageCategory) end return self end @@ -606,4 +591,3 @@ function MESSAGE:ToSRSAll(frequency,modulation,gender,culture,voice,volume,coord self:ToSRS(frequency,modulation,gender,culture,voice,coalition.side.NEUTRAL,volume,coordinate) return self end - diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index 8f110b07f..94bd002fc 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -1524,7 +1524,7 @@ end -- @param #string GoogleKey Path to Google JSON-Key. -- @return #ATIS self function ATIS:SetSRS(PathToSRS, Gender, Culture, Voice, Port, GoogleKey) - if PathToSRS then + if PathToSRS or MSRS.path then self.useSRS=true self.msrs=MSRS:New(PathToSRS, self.frequency, self.modulation) self.msrs:SetGender(Gender) @@ -1555,7 +1555,7 @@ end --- Get the coalition of the associated airbase. -- @param #ATIS self --- @return #number Coalition of the associcated airbase. +-- @return #number Coalition of the associated airbase. function ATIS:GetCoalition() local coal = self.airbase and self.airbase:GetCoalition() or nil return coal diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 28b871633..13550da54 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -41,12 +41,15 @@ -- @field #number volume Volume between 0 (min) and 1 (max). Default 1. -- @field #string culture Culture. Default "en-GB". -- @field #string gender Gender. Default "female". --- @field #string voice Specifc voce. +-- @field #string voice Specific voce. -- @field Core.Point#COORDINATE coordinate Coordinate from where the transmission is send. -- @field #string path Path to the SRS exe. This includes the final slash "/". -- @field #string google Full path google credentials JSON file, e.g. "C:\Users\username\Downloads\service-account-file.json". -- @field #string Label Label showing up on the SRS radio overlay. Default is "ROBOT". No spaces allowed. -- @field #table AltBackend Table containing functions and variables to enable an alternate backend to transmit to SRS. +-- @field #string ConfigFileName Name of the standard config file +-- @field #string ConfigFilePath Path to the standard config file +-- @field #boolean ConfigLoaded -- @extends Core.Base#BASE --- *It is a very sad thing that nowadays there is so little useless information.* - Oscar Wilde @@ -185,11 +188,14 @@ MSRS = { coordinate = nil, Label = "ROBOT", AltBackend = nil, + ConfigFileName = "Moose_MSRS.lua", + ConfigFilePath = "Config\\", + ConfigLoaded = false, } --- MSRS class version. -- @field #string version -MSRS.version="0.1.3" +MSRS.version="0.1.4" --- Voices -- @type MSRS.Voices @@ -292,6 +298,37 @@ MSRS.Voices = { }, } +--- +-- @type MSRS.ProviderOptions +-- @field #string key +-- @field #string secret +-- @field #string region +-- @field #string defaultVoice +-- @field #string voice + +--- GRPC options +-- @type MSRS.GRPCOptions +-- @field #string plaintext +-- @field #string srsClientName +-- @field #table position +-- @field #string coalition +-- @field #MSRS.ProviderOptions gcloud +-- @field #MSRS.ProviderOptions win +-- @field #MSRS.ProviderOptions azure +-- @field #MSRS.ProviderOptions aws +-- @field #string DefaultProvider + +MSRS.GRPCOptions = {} -- #MSRS.GRPCOptions +MSRS.GRPCOptions.gcloud = {} -- #MSRS.ProviderOptions +MSRS.GRPCOptions.win = {} -- #MSRS.ProviderOptions +MSRS.GRPCOptions.azure = {} -- #MSRS.ProviderOptions +MSRS.GRPCOptions.aws = {} -- #MSRS.ProviderOptions + +MSRS.GRPCOptions.win.defaultVoice = "Hedda" +MSRS.GRPCOptions.win.voice = "Hedda" + +MSRS.GRPCOptions.DefaultProvider = "win" + ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO list ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -299,6 +336,8 @@ MSRS.Voices = { -- TODO: Add functions to remove freqs and modulations. -- DONE: Add coordinate. -- DONE: Add google. +-- DONE: Add gRPC google options +-- DONE: Add loading default config file ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- Constructor @@ -328,25 +367,49 @@ function MSRS:New(PathToSRS, Frequency, Modulation, Volume, AltBackend) -- Add parameters to vars so alternate backends can use them if applicable Backend.Vars = Backend.Vars or {} - Backend.Vars.PathToSRS = UTILS.DeepCopy(PathToSRS) -- DeepCopy probably unecessary + Backend.Vars.PathToSRS = PathToSRS Backend.Vars.Frequency = UTILS.DeepCopy(Frequency) Backend.Vars.Modulation = UTILS.DeepCopy(Modulation) - Backend.Vars.Volume = UTILS.DeepCopy(Volume) -- DeepCopy probably unecessary + Backend.Vars.Volume = Volume Backend.Functions = Backend.Functions or {} return self:_NewAltBackend(Backend) end - -- If no AltBackend table, the proceed with default initialization - self:SetPath(PathToSRS) - self:SetPort() - self:SetFrequencies(Frequency) - self:SetModulations(Modulation) - self:SetGender() - self:SetCoalition() - self:SetLabel() - self:SetVolume() + local success = self:LoadConfigFile(nil,nil,self.ConfigLoaded) + + if (not success) and (not self.ConfigLoaded) then + + -- If no AltBackend table, the proceed with default initialisation + self:SetPath(PathToSRS) + self:SetPort() + self:SetFrequencies(Frequency) + self:SetModulations(Modulation) + self:SetGender() + self:SetCoalition() + self:SetLabel() + self:SetVolume(Volume) + + else + + -- there might be some overwrites from :New() + + if PathToSRS then + self:SetPath(PathToSRS) + end + + if Frequency then + self:SetFrequencies(Frequency) + self:SetModulations(Modulation) + end + + if Volume then + self:SetVolume(Volume) + end + + end + self.lid = string.format("%s-%s | ", self.name, self.version) if not io or not os then @@ -366,24 +429,25 @@ end -- @return #MSRS self function MSRS:SetPath(Path) - if Path==nil then + if Path==nil and not self.path then self:E("ERROR: No path to SRS directory specified!") return nil end - -- Set path. - self.path=Path - - -- Remove (back)slashes. - local n=1 ; local nmax=1000 - while (self.path:sub(-1)=="/" or self.path:sub(-1)==[[\]]) and n<=nmax do - self.path=self.path:sub(1,#self.path-1) - n=n+1 + if Path then + -- Set path. + self.path=Path + + -- Remove (back)slashes. + local n=1 ; local nmax=1000 + while (self.path:sub(-1)=="/" or self.path:sub(-1)==[[\]]) and n<=nmax do + self.path=self.path:sub(1,#self.path-1) + n=n+1 + end + + -- Debug output. + self:I(string.format("SRS path=%s", self:GetPath())) end - - -- Debug output. - self:T(string.format("SRS path=%s", self:GetPath())) - return self end @@ -579,6 +643,10 @@ function MSRS:SetVoice(Voice) self.voice=Voice + --local defaultprovider = self.provider or self.GRPCOptions.DefaultProvider or MSRS.GRPCOptions.DefaultProvider or "win" + + --self.GRPCOptions[defaultprovider].voice = Voice + return self end @@ -589,6 +657,8 @@ end function MSRS:SetDefaultVoice(Voice) self.defaultVoice=Voice + local provider = self.provider or self.GRPCOptions.DefaultProvider or MSRS.GRPCOptions.DefaultProvider or "win" + self.GRPCOptions[provider].defaultVoice = Voice return self end @@ -606,13 +676,20 @@ end --- Use google text-to-speech. -- @param #MSRS self --- @param #string PathToCredentials Full path to the google credentials JSON file, e.g. "C:\Users\username\Downloads\service-account-file.json". +-- @param #string PathToCredentials Full path to the google credentials JSON file, e.g. "C:\Users\username\Downloads\service-account-file.json". Can also be the Google API key. -- @return #MSRS self function MSRS:SetGoogle(PathToCredentials) - - self.google=PathToCredentials - self.APIKey=PathToCredentials - self.provider = "gcloud" + + if PathToCredentials then + + self.google=PathToCredentials + self.APIKey=PathToCredentials + self.provider = "gcloud" + + self.GRPCOptions.DefaultProvider = "gcloud" + self.GRPCOptions.gcloud.key = PathToCredentials + + end return self end @@ -622,10 +699,12 @@ end -- @param #string APIKey API Key, usually a string of length 40 with characters and numbers. -- @return #MSRS self function MSRS:SetGoogleAPIKey(APIKey) - - self.APIKey=APIKey - self.provider = "gcloud" - + if APIKey then + self.APIKey=APIKey + self.provider = "gcloud" + self.GRPCOptions.DefaultProvider = "gcloud" + self.GRPCOptions.gcloud.key = APIKey + end return self end @@ -1041,6 +1120,171 @@ function MSRS:_GetCommand(freqs, modus, coal, gender, voice, culture, volume, sp return command end +--- Get central SRS configuration to be able to play tts over SRS radio using the `DCS-SR-ExternalAudio.exe`. +-- @param #MSRS self +-- @param #string Path Path to config file, defaults to "C:\Users\\Saved Games\DCS\Config" +-- @param #string Filename File to load, defaults to "Moose_MSRS.lua" +-- @param #boolean ConfigLoaded - if true, skip the loading +-- @return #boolean success +-- @usage +-- 0) Benefits: Centralize configuration of SRS, keep paths and keys out of the mission source code, making it safer and easier to move missions to/between servers, +-- and also make config easier to use in the code. +-- 1) Create a config file named "Moose_MSRS.lua" at this location "C:\Users\\Saved Games\DCS\Config" (or wherever your Saved Games folder resides). +-- 2) The file needs the following structure: +-- +-- -- Moose MSRS default Config +-- MSRS_Config = { +-- Path = "C:\\Program Files\\DCS-SimpleRadio-Standalone", -- adjust as needed +-- Port = 5002, -- adjust as needed +-- Frequency = {127,243}, -- must be a table, 1..n entries! +-- Modulation = {0,0}, -- must be a table, 1..n entries, one for each frequency! +-- Volume = 1.0, +-- Coalition = 0, -- 0 = Neutral, 1 = Red, 2 = Blue +-- Coordinate = {0,0,0}, -- x,y,alt - optional +-- Culture = "en-GB", +-- Gender = "male", +-- Google = "C:\\Program Files\\DCS-SimpleRadio-Standalone\\yourfilename.json", -- path to google json key file - optional +-- Label = "MSRS", +-- Voice = "Microsoft Hazel Desktop", +-- -- gRPC (optional) +-- GRPC = { -- see https://github.com/DCS-gRPC/rust-server +-- coalition = "blue", -- blue, red, neutral +-- DefaultProvider = "gcloud", -- win, gcloud, aws, or azure, some of the values below depend on your cloud provider +-- gcloud = { +-- key = "", -- for gRPC Google API key +-- --secret = "", -- needed for aws +-- --region = "",-- needed for aws +-- defaultVoice = MSRS.Voices.Google.Standard.en_GB_Standard_F, +-- }, +-- win = { +-- defaultVoice = "Hazel", +-- }, +-- } +-- } +-- +-- 3) Load the config into the MSRS raw class before you do anything else: +-- +-- MSRS.LoadConfigFile() -- Note the "." here +-- +-- This will populate variables for the MSRS raw class and all instances you create with e.g. `mysrs = MSRS:New()` +-- Optionally you can also load this per **single instance** if so needed, i.e. +-- +-- mysrs:LoadConfig(Path,Filename) +-- +-- 4) Use the config in your code like so, variable names are basically the same as in the config file, but all lower case, examples: +-- +-- -- Needed once only +-- MESSAGE.SetMSRS(MSRS.path,nil,MSRS.google,243,radio.modulation.AM,nil,nil, +-- MSRS.Voices.Google.Standard.de_DE_Standard_B,coalition.side.BLUE) +-- +-- -- later on in your code +-- +-- MESSAGE:New("Test message!",15,"SPAWN"):ToSRS(243,radio.modulation.AM,nil,nil,MSRS.Voices.Google.Standard.fr_FR_Standard_C) +-- +-- -- Create new ATIS as usual +-- atis=ATIS:New(AIRBASE.Caucasus.Batumi, 123, radio.modulation.AM) +-- atis:SetSRS(nil,nil,nil,MSRS.Voices.Google.Standard.en_US_Standard_H) +-- --Start ATIS +-- atis:Start() +function MSRS:LoadConfigFile(Path,Filename,ConfigLoaded) + + local path = Path or lfs.writedir()..MSRS.ConfigFilePath + local file = Filename or MSRS.ConfigFileName or "Moose_MSRS.lua" + + if UTILS.CheckFileExists(path,file) and not ConfigLoaded then + assert(loadfile(path..file))() + -- now we should have a global var MSRS_Config + if MSRS_Config then + --[[ + -- Moose MSRS default Config + MSRS_Config = { + Path = "C:\\Program Files\\DCS-SimpleRadio-Standalone", -- adjust as needed + Port = 5002, -- adjust as needed + Frequency = {127,243}, -- must be a table, 1..n entries! + Modulation = {0,0}, -- must be a table, 1..n entries, one for each frequency! + Volume = 1.0, + Coalition = 0, -- 0 = Neutral, 1 = Red, 2 = Blue + Coordinate = {0,0,0}, -- x,y,alt - optional + Culture = "en-GB", + Gender = "male", + Google = "C:\\Program Files\\DCS-SimpleRadio-Standalone\\yourfilename.json", -- path to google json key file - optional + Label = "MSRS", + Voice = "Microsoft Hazel Desktop", + -- gRPC (optional) + GRPC = { -- see https://github.com/DCS-gRPC/rust-server + coalition = "blue", -- blue, red, neutral + DefaultProvider = "gcloud", -- win, gcloud, aws, or azure, some of the values below depend on your cloud provider + gcloud = { + key = "", -- for gRPC Google API key + --secret = "", -- needed for aws + --region = "",-- needed for aws + defaultVoice = MSRS.Voices.Google.Standard.en_GB_Standard_F, + }, + win = { + defaultVoice = "Hazel", + }, + } + } + --]] + if self then + self.path = MSRS_Config.Path or "C:\\Program Files\\DCS-SimpleRadio-Standalone" + self.port = MSRS_Config.Port or 5002 + self.frequencies = MSRS_Config.Frequency or {127,243} + self.modulations = MSRS_Config.Modulation or {0,0} + self.coalition = MSRS_Config.Coalition or 0 + if MSRS_Config.Coordinate then + self.coordinate = COORDINATE:New( MSRS_Config.Coordinate[1],MSRS_Config.Coordinate[2],MSRS_Config.Coordinate[3]) + end + self.culture = MSRS_Config.Culture or "en-GB" + self.gender = MSRS_Config.Gender or "male" + self.google = MSRS_Config.Google + self.Label = MSRS_Config.Label or "MSRS" + self.voice = MSRS_Config.Voice or MSRS.Voices.Microsoft.Hazel + if MSRS_Config.GRPC then + self.provider = MSRS_Config.GRPC.DefaultProvider + if MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider] then + self.APIKey = MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].key + self.defaultVoice = MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].defaultVoice + self.region = MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].secret + self.secret = MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].region + end + end + self.ConfigLoaded = true + else + MSRS.path = MSRS_Config.Path or "C:\\Program Files\\DCS-SimpleRadio-Standalone" + MSRS.port = MSRS_Config.Port or 5002 + MSRS.frequencies = MSRS_Config.Frequency or {127,243} + MSRS.modulations = MSRS_Config.Modulation or {0,0} + MSRS.coalition = MSRS_Config.Coalition or 0 + if MSRS_Config.Coordinate then + MSRS.coordinate = COORDINATE:New( MSRS_Config.Coordinate[1],MSRS_Config.Coordinate[2],MSRS_Config.Coordinate[3]) + end + MSRS.culture = MSRS_Config.Culture or "en-GB" + MSRS.gender = MSRS_Config.Gender or "male" + MSRS.google = MSRS_Config.Google + MSRS.Label = MSRS_Config.Label or "MSRS" + MSRS.voice = MSRS_Config.Voice or MSRS.Voices.Microsoft.Hazel + if MSRS_Config.GRPC then + MSRS.provider = MSRS_Config.GRPC.DefaultProvider + if MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider] then + MSRS.APIKey = MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].key + MSRS.defaultVoice = MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].defaultVoice + MSRS.region = MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].secret + MSRS.secret = MSRS_Config.GRPC[MSRS_Config.GRPC.DefaultProvider].region + end + end + MSRS.ConfigLoaded = true + end + end + env.info("MSRS - Sucessfully loaded default configuration from disk!",false) + else + env.info("MSRS - Cannot load default configuration from disk!",false) + return false + end + + return true +end + ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- MSRS DCS-gRPC alternate backend ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -1303,7 +1547,7 @@ MSRS_BACKEND_DCSGRPC.Functions._DCSgRPCtts = function (self, Text, Plaintext, Fr BASE:T("MSRS_BACKEND_DCSGRPC:_DCSgRPCtts()") BASE:T({Text, Plaintext, Frequencies, Voice, Label}) - local options = {} + local options = self.ProviderOptions or MSRS.ProviderOptions or {} -- #MSRS.GRPCOptions local ssml = Text or '' local XmitFrequencies = Frequencies or self.Frequency @@ -1315,7 +1559,7 @@ MSRS_BACKEND_DCSGRPC.Functions._DCSgRPCtts = function (self, Text, Plaintext, Fr options.srsClientName = Label or self.Label options.position = {} if self.coordinate then - options.position.lat, options.position.lat, options.position.alt = self:_GetLatLongAlt(self.coordinate) + options.position.lat, options.position.lon, options.position.alt = self:_GetLatLongAlt(self.coordinate) end options.position.lat = options.position.lat or 0.0 @@ -1327,19 +1571,23 @@ MSRS_BACKEND_DCSGRPC.Functions._DCSgRPCtts = function (self, Text, Plaintext, Fr elseif UTILS.GetCoalitionName(self.coalition) == 'Red' then options.coalition = 'red' end - - options[self.provider] = {} + + local provider = self.provider or self.GRPCOptions.DefaultProvider or MSRS.GRPCOptions.DefaultProvider + + options.provider = {} + + options.provider[provider] = {} if self.APIKey then - options[self.provider].key = self.APIKey + options.provider[provider].key = self.APIKey end if self.defaultVoice then - options[self.provider].voice = self.defaultVoice + options.provider[provider].defaultVoice = self.defaultVoice end if self.voice then - options[self.provider].voice = Voice or self.voice + options.provider[provider].voice = Voice or self.voice or self.defaultVoice elseif ssml then -- DCS-gRPC doesn't directly support language/gender, but can use SSML -- Only use if a voice isn't explicitly set @@ -1365,7 +1613,7 @@ MSRS_BACKEND_DCSGRPC.Functions._DCSgRPCtts = function (self, Text, Plaintext, Fr BASE:T("GRPC.tts") BASE:T(ssml) BASE:T(freq) - BASE:T(options) + BASE:T({options}) GRPC.tts(ssml, freq, options) end diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index a2caa7871..9fc3dd055 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -224,7 +224,7 @@ UTILS = { -- @return #boolean UTILS.IsInstanceOf = function( object, className ) -- Is className NOT a string ? - if not type( className ) == 'string' then + if type( className ) ~= 'string' then -- Is className a Moose class ? if type( className ) == 'table' and className.IsInstanceOf ~= nil then @@ -406,7 +406,7 @@ function UTILS._OneLineSerialize(tbl) elseif type(val) == 'nil' then -- won't ever happen, right? tbl_str[#tbl_str + 1] = 'nil, ' elseif type(val) == 'table' then - --tbl_str[#tbl_str + 1] = UTILS._OneLineSerialize(val) + --tbl_str[#tbl_str + 1] = UTILS.TableShow(tbl,loc,indent,tableshow_tbls) --tbl_str[#tbl_str + 1] = ', ' --I think this is right, I just added it else --log:warn('Unable to serialize value type $1 at index $2', mist.utils.basicSerialize(type(val)), tostring(ind)) @@ -2421,7 +2421,7 @@ function UTILS.CheckFileExists(Path,Filename) -- Check io module is available. if not io then - BASE:E("ERROR: io not desanitized. Can't save current state.") + BASE:E("ERROR: io not desanitized.") return false end From a7f01eb04a82d5d99542f2689a15558fc8932316 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Tue, 17 Oct 2023 16:02:01 +0200 Subject: [PATCH 02/51] #ZONE and #SET_ZONE watch trigger --- Moose Development/Moose/Core/Set.lua | 155 +++++++++++++++++++++++++- Moose Development/Moose/Core/Zone.lua | 150 +++++++++++++++++++++++++ 2 files changed, 304 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index dac994af1..9bb465922 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -5842,6 +5842,7 @@ do -- SET_ZONE }, FilterMeta = { }, + Checktime = 5, } --- Creates a new SET_ZONE object, building a set of zones. @@ -6182,7 +6183,159 @@ do -- SET_ZONE return zmin, dmin end - + + --- Set the check time for SET_ZONE:Trigger() + -- @param #SET_ZONE self + -- @param #number seconds Check every seconds for objects entering or leaving the zone. Defaults to 5 secs. + -- @return #SET_ZONE self + function SET_ZONE:SetCheckTime(seconds) + self.Checktime = seconds or 5 + return self + end + + --- Start watching if the Object or Objects move into or out of our set of zones. + -- @param #SET_ZONE self + -- @param Wrappe.Controllable#CONTROLLABLE Objects Object or Objects to watch, can be of type UNIT, GROUP, CLIENT, or SET\_UNIT, SET\_GROUP, SET\_CLIENT + -- @return #SET_ZONE self + -- @usage + -- -- Create a new zone and start watching it every 5 secs for a certain GROUP entering or leaving + -- local triggerzone = ZONE:New("ZonetoWatch"):Trigger(GROUP:FindByName("Aerial-1")) + -- + -- -- function to handle FSM event "EnteredZone" + -- function triggerzone:OnAfterEnteredZone(From,Event,To,Group) + -- MESSAGE:New("Group has entered zone!",15):ToAll() + -- end + -- + -- -- function to handle FSM event "LeftZone" + -- function triggerzone:OnAfterLeftZone(From,Event,To,Group) + -- MESSAGE:New("Group has left zone!",15):ToAll() + -- end + -- + -- -- Stop watching the zone + -- triggerzone:TriggerStop() + function SET_ZONE:Trigger(Objects) + --self:I("Added Set_Zone Trigger") + self:AddTransition("*","TriggerStart","TriggerRunning") + self:AddTransition("*","EnteredZone","*") + self:AddTransition("*","LeftZone","*") + self:AddTransition("*","TriggerRunCheck","*") + self:AddTransition("*","TriggerStop","TriggerStopped") + self:TriggerStart() + self.checkobjects = Objects + if UTILS.IsInstanceOf(Objects,"SET_BASE") then + self.objectset = Objects.Set + else + self.objectset = {Objects} + end + self:_TriggerCheck(true) + self:__TriggerRunCheck(self.Checktime) + return self + + ------------------------ + --- Pseudo Functions --- + ------------------------ + + --- Triggers the FSM event "TriggerStop". Stops the SET_ZONE Trigger. + -- @function [parent=#SET_ZONE] TriggerStop + -- @param #SET_ZONE self + + --- Triggers the FSM event "TriggerStop" after a delay. + -- @function [parent=#SET_ZONE] __TriggerStop + -- @param #SET_ZONE self + -- @param #number delay Delay in seconds. + + --- On After "EnteredZone" event. An observed object has entered the zone. + -- @function [parent=#SET_ZONE] OnAfterEnteredZone + -- @param #SET_ZONE self + -- @param #string From From state. + -- @param #string Event Event. + -- @param #string To To state. + -- @param Wrapper.Controllable#CONTROLLABLE Controllable The controllable entering the zone. + -- @param Core.Zone#ZONE_BASE Zone The zone entered. + + --- On After "LeftZone" event. An observed object has left the zone. + -- @function [parent=#SET_ZONE] OnAfterLeftZone + -- @param #SET_ZONE self + -- @param #string From From state. + -- @param #string Event Event. + -- @param #string To To state. + -- @param Wrapper.Controllable#CONTROLLABLE Controllable The controllable leaving the zone. + -- @param Core.Zone#ZONE_BASE Zone The zone left. + end + + --- (Internal) Check the assigned objects for being in/out of the zone + -- @param #SET_ZONE self + -- @param #boolean fromstart If true, do the init of the objects + -- @return #SET_ZONE self + function SET_ZONE:_TriggerCheck(fromstart) + --self:I("_TriggerCheck | FromStart = "..tostring(fromstart)) + if fromstart then + for _,_object in pairs(self.objectset) do + local obj = _object -- Wrapper.Controllable#CONTROLLABLE + if obj and obj:IsAlive() then + for _,_zone in pairs(self.Set) do + if not obj.TriggerInZone then obj.TriggerInZone = {} end + if _zone:IsCoordinateInZone(obj:GetCoordinate()) then + obj.TriggerInZone[_zone.ZoneName] = true + else + obj.TriggerInZone[_zone.ZoneName] = false + end + --self:I("Object "..obj:GetName().." is in zone = "..tostring(obj.TriggerInZone[_zone.ZoneName])) + end + end + end + else + for _,_object in pairs(self.objectset) do + local obj = _object -- Wrapper.Controllable#CONTROLLABLE + if obj and obj:IsAlive() then + for _,_zone in pairs(self.Set) do + -- Check for pop-up objects + if not obj.TriggerInZone then + -- has not been tagged previously - wasn't in set! + obj.TriggerInZone = {} + end + if not obj.TriggerInZone[_zone.ZoneName] then + -- has not been tagged previously - wasn't in set! + obj.TriggerInZone[_zone.ZoneName] = false + end + -- is obj in zone? + local inzone = _zone:IsCoordinateInZone(obj:GetCoordinate()) + --self:I("Object "..obj:GetName().." is in zone: "..tostring(inzone)) + if inzone and not obj.TriggerInZone[_zone.ZoneName] then + -- wasn't in zone before + --self:I("Newly entered") + self:__EnteredZone(0.5,obj,_zone) + obj.TriggerInZone[_zone.ZoneName] = true + elseif (not inzone) and obj.TriggerInZone[_zone.ZoneName] then + -- has left the zone + --self:I("Newly left") + self:__LeftZone(0.5,obj,_zone) + obj.TriggerInZone[_zone.ZoneName] = false + else + --self:I("Not left or not entered, or something went wrong!") + end + end + end + end + end + return self + end + + --- (Internal) Check the assigned objects for being in/out of the zone + -- @param #SET_ZONE self + -- @param #string From + -- @param #string Event + -- @param #string to + -- @return #SET_ZONE self + function SET_ZONE:onafterTriggerRunCheck(From,Event,To) + --self:I("onafterTriggerRunCheck") + --self:I({From, Event, To}) + if self:GetState() ~= "TriggerStopped" then + self:_TriggerCheck() + self:__TriggerRunCheck(self.Checktime) + end + return self + end end do -- SET_ZONE_GOAL diff --git a/Moose Development/Moose/Core/Zone.lua b/Moose Development/Moose/Core/Zone.lua index a6c975b79..68fd3fa42 100644 --- a/Moose Development/Moose/Core/Zone.lua +++ b/Moose Development/Moose/Core/Zone.lua @@ -64,6 +64,7 @@ -- @field #number ZoneID ID of zone. Only zones defined in the ME have an ID! -- @field #table Table of any trigger zone properties from the ME. The key is the Name of the property, and the value is the property's Value. -- @field #number Surface Type of surface. Only determined at the center of the zone! +-- @field #number Checktime Check every Checktime seconds, used for ZONE:Trigger() -- @extends Core.Fsm#FSM @@ -122,6 +123,7 @@ ZONE_BASE = { ZoneID=nil, Properties={}, Surface=nil, + Checktime = 5, } --- The ZONE_BASE.BoundingSquare @@ -557,6 +559,154 @@ function ZONE_BASE:GetZoneMaybe() end end +--- Set the check time for ZONE:Trigger() +-- @param #ZONE_BASE self +-- @param #number seconds Check every seconds for objects entering or leaving the zone. Defaults to 5 secs. +-- @return #ZONE_BASE self +function ZONE_BASE:SetCheckTime(seconds) + self.Checktime = seconds or 5 + return self +end + +--- Start watching if the Object or Objects move into or out of a zone. +-- @param #ZONE_BASE self +-- @param Wrappe.Controllable#CONTROLLABLE Objects Object or Objects to watch, can be of type UNIT, GROUP, CLIENT, or SET\_UNIT, SET\_GROUP, SET\_CLIENT +-- @return #ZONE_BASE self +-- @usage +-- -- Create a new zone and start watching it every 5 secs for a certain GROUP entering or leaving +-- local triggerzone = ZONE:New("ZonetoWatch"):Trigger(GROUP:FindByName("Aerial-1")) +-- +-- -- function to handle FSM event "EnteredZone" +-- function triggerzone:OnAfterEnteredZone(From,Event,To,Group) +-- MESSAGE:New("Group has entered zone!",15):ToAll() +-- end +-- +-- -- function to handle FSM event "LeftZone" +-- function triggerzone:OnAfterLeftZone(From,Event,To,Group) +-- MESSAGE:New("Group has left zone!",15):ToAll() +-- end +-- +-- -- Stop watching the zone after 1 hour +-- triggerzone:__TriggerStop(3600) +function ZONE_BASE:Trigger(Objects) + --self:I("Added Zone Trigger") + self:SetStartState("TriggerStopped") + self:AddTransition("TriggerStopped","TriggerStart","TriggerRunning") + self:AddTransition("*","EnteredZone","*") + self:AddTransition("*","LeftZone","*") + self:AddTransition("*","TriggerRunCheck","*") + self:AddTransition("*","TriggerStop","TriggerStopped") + self:TriggerStart() + self.checkobjects = Objects + if UTILS.IsInstanceOf(Objects,"SET_BASE") then + self.objectset = Objects.Set + else + self.objectset = {Objects} + end + self:_TriggerCheck(true) + self:__TriggerRunCheck(self.Checktime) + return self + + ------------------------ + --- Pseudo Functions --- + ------------------------ + + --- Triggers the FSM event "TriggerStop". Stops the ZONE_BASE Trigger. + -- @function [parent=#ZONE_BASE] TriggerStop + -- @param #ZONE_BASE self + + --- Triggers the FSM event "TriggerStop" after a delay. + -- @function [parent=#ZONE_BASE] __TriggerStop + -- @param #ZONE_BASE self + -- @param #number delay Delay in seconds. + + --- On After "EnteredZone" event. An observed object has entered the zone. + -- @function [parent=#ZONE_BASE] OnAfterEnteredZone + -- @param #ZONE_BASE self + -- @param #string From From state. + -- @param #string Event Event. + -- @param #string To To state. + -- @param Wrapper.Controllable#CONTROLLABLE Controllable The controllable entering the zone. + + --- On After "LeftZone" event. An observed object has left the zone. + -- @function [parent=#ZONE_BASE] OnAfterLeftZone + -- @param #ZONE_BASE self + -- @param #string From From state. + -- @param #string Event Event. + -- @param #string To To state. + -- @param Wrapper.Controllable#CONTROLLABLE Controllable The controllable leaving the zone. +end + +--- (Internal) Check the assigned objects for being in/out of the zone +-- @param #ZONE_BASE self +-- @param #boolean fromstart If true, do the init of the objects +-- @return #ZONE_BASE self +function ZONE_BASE:_TriggerCheck(fromstart) + --self:I("_TriggerCheck | FromStart = "..tostring(fromstart)) + local objectset = self.objectset or {} + if fromstart then + -- just earmark everyone in/out + for _,_object in pairs(objectset) do + local obj = _object -- Wrapper.Controllable#CONTROLLABLE + if not obj.TriggerInZone then obj.TriggerInZone = {} end + if obj and obj:IsAlive() and self:IsCoordinateInZone(obj:GetCoordinate()) then + obj.TriggerInZone[self.ZoneName] = true + else + obj.TriggerInZone[self.ZoneName] = false + end + --self:I("Object "..obj:GetName().." is in zone = "..tostring(obj.TriggerInZone[self.ZoneName])) + end + else + -- Check for changes + for _,_object in pairs(objectset) do + local obj = _object -- Wrapper.Controllable#CONTROLLABLE + if obj and obj:IsAlive() then + if not obj.TriggerInZone then + -- has not been tagged previously - wasn't in set! + obj.TriggerInZone = {} + end + if not obj.TriggerInZone[self.ZoneName] then + -- has not been tagged previously - wasn't in set! + obj.TriggerInZone[self.ZoneName] = false + end + -- is obj in zone? + local inzone = self:IsCoordinateInZone(obj:GetCoordinate()) + --self:I("Object "..obj:GetName().." is in zone: "..tostring(inzone)) + if inzone and not obj.TriggerInZone[self.ZoneName] then + -- wasn't in zone before + --self:I("Newly entered") + self:__EnteredZone(0.5,obj) + obj.TriggerInZone[self.ZoneName] = true + elseif (not inzone) and obj.TriggerInZone[self.ZoneName] then + -- has left the zone + --self:I("Newly left") + self:__LeftZone(0.5,obj) + obj.TriggerInZone[self.ZoneName] = false + else + --self:I("Not left or not entered, or something went wrong!") + end + end + end + end + return self +end + +--- (Internal) Check the assigned objects for being in/out of the zone +-- @param #ZONE_BASE self +-- @param #string From +-- @param #string Event +-- @param #string to +-- @return #ZONE_BASE self +function ZONE_BASE:onafterTriggerRunCheck(From,Event,To) + if self:GetState() ~= "TriggerStopped" then + self:_TriggerCheck() + self:__TriggerRunCheck(self.Checktime) + end + return self +end + + + --- Returns the Value of the zone with the given PropertyName, or nil if no matching property exists. -- @param #ZONE_BASE self -- @param #string PropertyName The name of a the TriggerZone Property to be retrieved. From f6b5c69d4e204275385af66123e4602c224571d9 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Tue, 17 Oct 2023 16:58:14 +0200 Subject: [PATCH 03/51] #Triggers - docu changes --- Moose Development/Moose/Core/Set.lua | 41 +++++++++++++++++---------- Moose Development/Moose/Core/Zone.lua | 6 ++-- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index 9bb465922..00bc8edf1 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -6198,21 +6198,32 @@ do -- SET_ZONE -- @param Wrappe.Controllable#CONTROLLABLE Objects Object or Objects to watch, can be of type UNIT, GROUP, CLIENT, or SET\_UNIT, SET\_GROUP, SET\_CLIENT -- @return #SET_ZONE self -- @usage - -- -- Create a new zone and start watching it every 5 secs for a certain GROUP entering or leaving - -- local triggerzone = ZONE:New("ZonetoWatch"):Trigger(GROUP:FindByName("Aerial-1")) - -- - -- -- function to handle FSM event "EnteredZone" - -- function triggerzone:OnAfterEnteredZone(From,Event,To,Group) - -- MESSAGE:New("Group has entered zone!",15):ToAll() - -- end - -- - -- -- function to handle FSM event "LeftZone" - -- function triggerzone:OnAfterLeftZone(From,Event,To,Group) - -- MESSAGE:New("Group has left zone!",15):ToAll() - -- end - -- - -- -- Stop watching the zone - -- triggerzone:TriggerStop() + -- -- Create a SET_GROUP and a SET_ZONE for this: + -- + -- local groupset = SET_GROUP:New():FilterPrefixes("Aerial"):FilterStart() + -- + -- -- Trigger will check each zone of the SET_ZONE every 5 secs for objects entering or leaving from the groupset + -- local zoneset = SET_ZONE:New():FilterPrefixes("Target Zone"):FilterOnce():Trigger(groupset) + -- + -- -- Draw zones on map so we see what's going on + -- zoneset:ForEachZone( + -- function(zone) + -- zone:DrawZone(-1, {0,1,0}, Alpha, FillColor, FillAlpha, 4, ReadOnly) + -- end + -- ) + -- + -- -- This FSM function will be called for entering objects + -- function zoneset:OnAfterEnteredZone(From,Event,To,Controllable,Zone) + -- MESSAGE:New("Group "..Controllable:GetName() .. " entered zone "..Zone:GetName(),10,"Set Trigger"):ToAll() + -- end + -- + -- -- This FSM function will be called for leaving objects + -- function zoneset:OnAfterLeftZone(From,Event,To,Controllable,Zone) + -- MESSAGE:New("Group "..Controllable:GetName() .. " left zone "..Zone:GetName(),10,"Set Trigger"):ToAll() + -- end + -- + -- -- Stop watching after 1 hour + -- zoneset:__TriggerStop(3600) function SET_ZONE:Trigger(Objects) --self:I("Added Set_Zone Trigger") self:AddTransition("*","TriggerStart","TriggerRunning") diff --git a/Moose Development/Moose/Core/Zone.lua b/Moose Development/Moose/Core/Zone.lua index 68fd3fa42..e4fb13558 100644 --- a/Moose Development/Moose/Core/Zone.lua +++ b/Moose Development/Moose/Core/Zone.lua @@ -573,15 +573,15 @@ end -- @param Wrappe.Controllable#CONTROLLABLE Objects Object or Objects to watch, can be of type UNIT, GROUP, CLIENT, or SET\_UNIT, SET\_GROUP, SET\_CLIENT -- @return #ZONE_BASE self -- @usage --- -- Create a new zone and start watching it every 5 secs for a certain GROUP entering or leaving +-- -- Create a new zone and start watching it every 5 secs for a defined GROUP entering or leaving -- local triggerzone = ZONE:New("ZonetoWatch"):Trigger(GROUP:FindByName("Aerial-1")) -- --- -- function to handle FSM event "EnteredZone" +-- -- This FSM function will be called when the group enters the zone -- function triggerzone:OnAfterEnteredZone(From,Event,To,Group) -- MESSAGE:New("Group has entered zone!",15):ToAll() -- end -- --- -- function to handle FSM event "LeftZone" +-- -- This FSM function will be called when the group leaves the zone -- function triggerzone:OnAfterLeftZone(From,Event,To,Group) -- MESSAGE:New("Group has left zone!",15):ToAll() -- end From 75558078ee41354009751cbc9adcfcf000e06446 Mon Sep 17 00:00:00 2001 From: Rolf Geuenich Date: Thu, 19 Oct 2023 11:11:23 +0200 Subject: [PATCH 04/51] Cleanup and extension for GitHub Action Workflow build and act --- .gitignore | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fe5b6b4f8..0578aa593 100644 --- a/.gitignore +++ b/.gitignore @@ -220,11 +220,10 @@ pip-log.txt _gsdata_/ #GITHUB -.gitattributes -.gitignore Moose Test Missions/MOOSE_Test_Template.miz Moose Development/Moose/.vscode/launch.json MooseCodeWS.code-workspace -.gitignore -.gitignore -/.gitignore + +# Excludes for act (https://github.com/nektos/act) +.secrets +.env From 0658f6dc2b7f99f998fd7161c1ebcf8a31edee66 Mon Sep 17 00:00:00 2001 From: Rolf Geuenich Date: Thu, 19 Oct 2023 11:39:07 +0200 Subject: [PATCH 05/51] Align Moose_Create.lua with the develop branch Needed for later build system enhancements --- Moose Setup/Moose_Create.lua | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/Moose Setup/Moose_Create.lua b/Moose Setup/Moose_Create.lua index 42a3213aa..4b3e635ec 100644 --- a/Moose Setup/Moose_Create.lua +++ b/Moose Setup/Moose_Create.lua @@ -5,19 +5,32 @@ local MooseCommitHash = arg[2] local MooseDevelopmentPath = arg[3] local MooseSetupPath = arg[4] local MooseTargetPath = arg[5] +local isWindows = arg[6] +if not isWindows then + isWindows = 0 +end print( "Moose (D)ynamic (S)tatic : " .. MooseDynamicStatic ) print( "Commit Hash ID : " .. MooseCommitHash ) print( "Moose development path : " .. MooseDevelopmentPath ) print( "Moose setup path : " .. MooseSetupPath ) print( "Moose target path : " .. MooseTargetPath ) +print( "isWindows : " .. isWindows) + +function PathConvert(splatnixPath) + if isWindows == 0 then + return splatnixPath + end + return splatnixPath:gsub("/", "\\") +end + local MooseModulesFilePath = MooseDevelopmentPath .. "/Modules.lua" local LoaderFilePath = MooseTargetPath .. "/Moose.lua" print( "Reading Moose source list : " .. MooseModulesFilePath ) - -local LoaderFile = io.open( LoaderFilePath, "w" ) +print("Opening Loaderfile " .. PathConvert(LoaderFilePath)) +local LoaderFile = assert(io.open( PathConvert(LoaderFilePath), "w+" )) if MooseDynamicStatic == "S" then LoaderFile:write( "env.info( '*** MOOSE GITHUB Commit Hash ID: " .. MooseCommitHash .. " ***' )\n" ) @@ -31,13 +44,14 @@ if MooseDynamicStatic == "S" then MooseLoaderPath = MooseSetupPath .. "/Moose Templates/Moose_Static_Loader.lua" end -local MooseLoader = io.open( MooseLoaderPath, "r" ) + +local MooseLoader = assert(io.open( PathConvert(MooseLoaderPath), "r" )) local MooseLoaderText = MooseLoader:read( "*a" ) MooseLoader:close() LoaderFile:write( MooseLoaderText ) -local MooseSourcesFile = io.open( MooseModulesFilePath, "r" ) +local MooseSourcesFile = assert(io.open( PathConvert(MooseModulesFilePath), "r" )) local MooseSource = MooseSourcesFile:read("*l") while( MooseSource ) do @@ -50,7 +64,7 @@ while( MooseSource ) do end if MooseDynamicStatic == "S" then print( "Load static: " .. MooseFilePath ) - local MooseSourceFile = io.open( MooseFilePath, "r" ) + local MooseSourceFile = assert(io.open( PathConvert(MooseFilePath), "r" )) local MooseSourceFileText = MooseSourceFile:read( "*a" ) MooseSourceFile:close() @@ -72,3 +86,8 @@ LoaderFile:write( "env.info( '*** MOOSE INCLUDE END *** ' )\n" ) MooseSourcesFile:close() LoaderFile:close() + +print("Moose include generation complete.") +if MooseDynamicStatic == "D" then + print("To enable dynamic moose loading, add a soft or hard link from \"\\Scripts\\Moose\" to the \"Moose Development\\Moose\" subdirectory of the Moose_Framework repository.") +end From 7c8cca7f5676b4c6f2c065a8cdbdc82e01b9baf3 Mon Sep 17 00:00:00 2001 From: Rolf Geuenich Date: Thu, 19 Oct 2023 13:59:33 +0200 Subject: [PATCH 06/51] Added new build system with GitHub Action Workflows --- .github/workflows/build-docs.yml | 147 +++++++++++++++++++++++++++ .github/workflows/build-includes.yml | 140 +++++++++++++++++++++++++ Moose Development/Moose/Modules.lua | 8 +- Moose Setup/Moose_Create.lua | 2 + 4 files changed, 293 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/build-docs.yml create mode 100644 .github/workflows/build-includes.yml diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml new file mode 100644 index 000000000..b0a111c82 --- /dev/null +++ b/.github/workflows/build-docs.yml @@ -0,0 +1,147 @@ +name: Moose-Docs + +on: + push: + branches: + - master + - develop + +jobs: + Build: + runs-on: ubuntu-latest + + steps: + - name: Extract branch name + shell: bash + run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + id: extract_branch + + - name: Build informations + run: | + echo "Triggered by: ${{ github.event_name }}" + echo "Running on: ${{ runner.os }}" + echo "Ref: ${{ github.ref }}" + echo "Branch name: ${{ steps.extract_branch.outputs.branch }}" + echo "Repository: ${{ github.repository }}" + echo "Commit-Id: ${{ github.sha }}" + echo "Owner: ${{ github.repository_owner }}" + echo "FORCE_PUSH: ${{ env.FORCE_PUSH }}" + + ######################################################################### + # Prepare build environment + ######################################################################### + - name: Check out repository code + uses: actions/checkout@v4 + + - name: Prepare build output folders + run: | + mkdir -p build/tools + mkdir -p build/doc + + - name: Checkout FlightControls modified luadocumentor + uses: actions/checkout@v4 + with: + repository: Applevangelist/luadocumentor + path: './build/tools/luadocumentor' + ref: 'patch-1' + token: ${{ secrets.BOT_TOKEN }} + + - name: Update apt-get (needed for act docker image) + run: | + sudo apt-get -qq update + + - name: Install tree + run: | + sudo apt-get -qq install tree + + ######################################################################### + # Install all prerequisites for LuaDocumentor + ######################################################################### + - name: Install Lua + run: | + sudo apt-get -qq install lua5.1 + + - name: Install LuaRocks + run: | + sudo apt-get -qq install luarocks -y + + - name: Install markdown (prereq for LuaDocumentor) + run: | + sudo luarocks install markdown 0.32-2 + + - name: Install penlight (prereq for LuaDocumentor) + run: | + sudo luarocks install penlight 1.11.0-1 + + - name: Install metalua-compiler (prereq for LuaDocumentor) + run: | + sudo luarocks install metalua-compiler 0.7.3-1 + + - name: Install metalua-parser (prereq for LuaDocumentor) + run: | + sudo luarocks install metalua-parser 0.7.3-2 + + - name: Install checks (prereq for LuaDocumentor) + run: | + sudo luarocks install checks + + ######################################################################### + # Run LuaDocumentor + ######################################################################### + - name: Run LuaDocumentor + run: | + lua luadocumentor.lua -d ${{ github.workspace }}/build/doc "${{ github.workspace }}/Moose Development/Moose" + working-directory: ${{ github.workspace }}/build/tools/luadocumentor + + ######################################################################### + # Push to MOOSE_DOCS + ######################################################################### + - name: Set docs repo for branch + shell: bash + id: set_doc_repo + run: | + if [[ $GITHUB_REF == 'refs/heads/master' ]]; then + echo "docrepo=MOOSE_DOCS" >> "$GITHUB_OUTPUT" + else + echo "docrepo=MOOSE_DOCS_DEVELOP" >> "$GITHUB_OUTPUT" + fi + + - name: Checkout ${{ steps.set_doc_repo.outputs.docrepo }} to folder MOOSE_DOCS + uses: actions/checkout@v4 + with: + repository: ${{ github.repository_owner }}/${{ steps.set_doc_repo.outputs.docrepo }} + path: './build/MOOSE_DOCS' + fetch-depth: 0 + ref: 'master' + token: ${{ secrets.BOT_TOKEN }} + + - name: Delete folder to remove deleted files + run: | + rm -rf ./build/MOOSE_DOCS/Documentation/ + + - name: Create target folder + run: mkdir -p build/MOOSE_DOCS/Documentation + + - name: Copy build result to MOOSE_DOCS + run: | + cp ./build/doc/*.html ./build/MOOSE_DOCS/Documentation/ + + - name: Push result to docs repository (skipped by act) + if: ${{ env.FORCE_PUSH == 'true' }} + run: | + git config user.name "kaltokri" + git config user.email "rolf.geuenich@gmail.com" + git add . + git commit --allow-empty -m "Auto commit by GitHub Actions Workflow" + git push --set-upstream origin master + + working-directory: ${{ github.workspace }}/build/MOOSE_DOCS + + ######################################################################### + # Show the results + ######################################################################### + - name: List files in the repository + run: | + tree ${{ github.workspace }}/build + + - run: echo "This job's status is ${{ job.status }}." diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml new file mode 100644 index 000000000..d8536f66a --- /dev/null +++ b/.github/workflows/build-includes.yml @@ -0,0 +1,140 @@ +name: Moose-Includes + +on: + push: + branches: + - master + - develop + +jobs: + Build: + runs-on: ubuntu-latest + + steps: + - name: Extract branch name + shell: bash + run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + id: extract_branch + + - name: Build informations + run: | + echo "Triggered by: ${{ github.event_name }}" + echo "Running on: ${{ runner.os }}" + echo "Ref: ${{ github.ref }}" + echo "Branch name: ${{ steps.extract_branch.outputs.branch }}" + echo "Repository: ${{ github.repository }}" + echo "Commit-Id: ${{ github.sha }}" + echo "FORCE_PUSH: ${{ env.FORCE_PUSH }}" + + ######################################################################### + # Prepare build environment + ######################################################################### + - name: Check out repository code + uses: actions/checkout@v4 + + - name: Prepare build output folders + run: | + mkdir -p build/result/Moose_Include_Dynamic + mkdir -p build/result/Moose_Include_Static + + - name: Update apt-get (needed for act docker image) + run: | + sudo apt-get -qq update + + - name: Install tree + run: | + sudo apt-get -qq install tree + + ######################################################################### + # Install all prerequisites + ######################################################################### + - name: Install Lua 5.3 + run: | + sudo apt-get -qq install lua5.3 -y + - name: Check Lua version + run: | + lua -v + + - name: Install LuaRocks + run: | + sudo apt-get -qq install luarocks -y + - name: Check LuaRocks version + run: | + luarocks --version + + - name: Install Lua 5.3 Dev for prerequisites for LuaSrcDiet + run: | + sudo apt-get -qq install liblua5.3-dev -y + + - name: Install LuaSrcDiet + run: | + sudo luarocks install luasrcdiet + + - name: Install LuaCheck + run: | + sudo luarocks install luacheck + + ######################################################################### + # Build Include files + ######################################################################### + - name: Build Include Static + run: | + export COMMIT_TIME=$(git show -s --format=%cd ${{ github.sha }} --date=iso-strict) + lua5.3 "./Moose Setup/Moose_Create.lua" S "$COMMIT_TIME-${{ github.sha }}" "./Moose Development/Moose" "./Moose Setup" "./build/result/Moose_Include_Static" + + - name: Build Includes Dynamic + run: | + export COMMIT_TIME=$(git show -s --format=%cd ${{ github.sha }} --date=iso-strict) + lua5.3 "./Moose Setup/Moose_Create.lua" D "$COMMIT_TIME-${{ github.sha }}" "./Moose Development/Moose" "./Moose Setup" "./build/result/Moose_Include_Dynamic" + + - name: Run LuaSrcDiet + run: | + luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua + + ######################################################################### + # Run LuaCheck + ######################################################################### + - name: Run LuaCheck + if: ${{ env.SKIP_LUACHECK != 'true' }} + continue-on-error: true + run: | + luacheck --std=lua51c --config=.luacheckrc -gurasqq "Moose Development/Moose" + + ######################################################################### + # Push to MOOSE_INCLUDE + ######################################################################### + - name: Checkout MOOSE_INCLUDE + uses: actions/checkout@v4 + with: + repository: kaltokri/MOOSE_INCLUDE + path: './build/MOOSE_INCLUDE' + fetch-depth: 0 + ref: ${{ steps.extract_branch.outputs.branch }} + token: ${{ secrets.BOT_TOKEN }} + + - name: Create target folder (needed if checkout is deactivated) + run: mkdir -p build/MOOSE_INCLUDE + + - name: Copy build reseult to MOOSE_INCLUDE + run: | + cp -r ./build/result/* ./build/MOOSE_INCLUDE/ + + - name: Push result to MOOSE_INCLUDE repository (skipped by act) + if: ${{ env.FORCE_PUSH == 'true' }} + run: | + git config user.name "MooseBotter" + git config user.email "moosebotter@tniedermeier.com" + git add . + git commit --allow-empty -m "Auto commit by GitHub Actions Workflow" + git push --set-upstream origin ${{ steps.extract_branch.outputs.branch }} + + working-directory: ${{ github.workspace }}/build/MOOSE_INCLUDE + + ######################################################################### + # Show the results + ######################################################################### + - name: List files in the repository + run: | + tree ${{ github.workspace }}/build + + - run: echo "This job's status is ${{ job.status }}." diff --git a/Moose Development/Moose/Modules.lua b/Moose Development/Moose/Modules.lua index 55a7860cd..bdc145ff2 100644 --- a/Moose Development/Moose/Modules.lua +++ b/Moose Development/Moose/Modules.lua @@ -98,9 +98,9 @@ __Moose.Include( 'Scripts/Moose/AI/AI_A2G_CAS.lua' ) __Moose.Include( 'Scripts/Moose/AI/AI_A2G_SEAD.lua' ) __Moose.Include( 'Scripts/Moose/AI/AI_A2G_Dispatcher.lua' ) __Moose.Include( 'Scripts/Moose/AI/AI_Patrol.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Cap.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Cas.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Bai.lua' ) +__Moose.Include( 'Scripts/Moose/AI/AI_CAP.lua' ) +__Moose.Include( 'Scripts/Moose/AI/AI_CAS.lua' ) +__Moose.Include( 'Scripts/Moose/AI/AI_BAI.lua' ) __Moose.Include( 'Scripts/Moose/AI/AI_Formation.lua' ) __Moose.Include( 'Scripts/Moose/AI/AI_Escort.lua' ) __Moose.Include( 'Scripts/Moose/AI/AI_Escort_Request.lua' ) @@ -139,7 +139,7 @@ __Moose.Include( 'Scripts/Moose/Tasking/Task_A2G_Dispatcher.lua' ) __Moose.Include( 'Scripts/Moose/Tasking/Task_A2G.lua' ) __Moose.Include( 'Scripts/Moose/Tasking/Task_A2A_Dispatcher.lua' ) __Moose.Include( 'Scripts/Moose/Tasking/Task_A2A.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo.lua' ) +__Moose.Include( 'Scripts/Moose/Tasking/Task_CARGO.lua' ) __Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_Transport.lua' ) __Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_CSAR.lua' ) __Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_Dispatcher.lua' ) diff --git a/Moose Setup/Moose_Create.lua b/Moose Setup/Moose_Create.lua index 4b3e635ec..0bfde46ac 100644 --- a/Moose Setup/Moose_Create.lua +++ b/Moose Setup/Moose_Create.lua @@ -55,6 +55,8 @@ local MooseSourcesFile = assert(io.open( PathConvert(MooseModulesFilePath), "r" local MooseSource = MooseSourcesFile:read("*l") while( MooseSource ) do + -- Remove Windows line endings. Can occur when using act + MooseSource = string.gsub(MooseSource, "\r", "") if MooseSource ~= "" then MooseSource = string.match( MooseSource, "Scripts/Moose/(.+)'" ) From 49fd78abe7a3e7ba5ade72663811ecfc97f91fb5 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 19 Oct 2023 15:22:10 +0200 Subject: [PATCH 07/51] #SRS * Typo --- Moose Development/Moose/Sound/SRS.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 13550da54..70dd2adb6 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -94,7 +94,7 @@ -- ## Set Google -- -- Use Google's text-to-speech engine with the @{#MSRS.SetGoogle} function, e.g. ':SetGoogle()'. --- By enabling this it also allows you to utilize SSML in your text for added flexibilty. +-- By enabling this it also allows you to utilize SSML in your text for added flexibility. -- For more information on setting up a cloud account, visit: https://cloud.google.com/text-to-speech -- Google's supported SSML reference: https://cloud.google.com/text-to-speech/docs/ssml -- From 2dd2e593e8351ce13d10cf2e8a7b78f28b65a801 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:48:50 +0200 Subject: [PATCH 08/51] Update README.md (#2017) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aec3cbd3a..7205da476 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build status](https://ci.appveyor.com/api/projects/status/1y8nfmx7lwsn33tt?svg=true)](https://ci.appveyor.com/project/Applevangelist/MOOSE) +[![Moose-Includes](https://github.com/FlightControl-Master/MOOSE/actions/workflows/build-includes.yml/badge.svg?branch=master)](https://github.com/FlightControl-Master/MOOSE/actions/workflows/build-includes.yml) # MOOSE framework From f0a37172b97ecfd11d6027a703acb49d711d3a73 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:14:59 +0200 Subject: [PATCH 09/51] Update build-includes.yml (#2018) --- .github/workflows/build-includes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index d8536f66a..1ba61a9a6 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -24,7 +24,7 @@ jobs: echo "Branch name: ${{ steps.extract_branch.outputs.branch }}" echo "Repository: ${{ github.repository }}" echo "Commit-Id: ${{ github.sha }}" - echo "FORCE_PUSH: ${{ env.FORCE_PUSH }}" + echo "FORCE_PUSH: ${{ vars.FORCE_PUSH }}" ######################################################################### # Prepare build environment From 015af9774c73f491a021666b35b4d5664e080bb6 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:17:48 +0200 Subject: [PATCH 10/51] Update build-includes.yml --- .github/workflows/build-includes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index 1ba61a9a6..06c64e7b7 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -120,7 +120,7 @@ jobs: cp -r ./build/result/* ./build/MOOSE_INCLUDE/ - name: Push result to MOOSE_INCLUDE repository (skipped by act) - if: ${{ env.FORCE_PUSH == 'true' }} + if: ${{ vars.FORCE_PUSH == 'true' }} run: | git config user.name "MooseBotter" git config user.email "moosebotter@tniedermeier.com" From d4a46606fd705eb5aa53bbece788626aa3eb3470 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Thu, 19 Oct 2023 18:16:45 +0200 Subject: [PATCH 11/51] Switched from env.FORCE_PUSH to vars.FORCE_PUSH --- .github/workflows/build-docs.yml | 6 +++--- .github/workflows/build-includes.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index b0a111c82..e8cd1d248 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -25,7 +25,7 @@ jobs: echo "Repository: ${{ github.repository }}" echo "Commit-Id: ${{ github.sha }}" echo "Owner: ${{ github.repository_owner }}" - echo "FORCE_PUSH: ${{ env.FORCE_PUSH }}" + echo "FORCE_PUSH: ${{ vars.FORCE_PUSH }}" ######################################################################### # Prepare build environment @@ -126,8 +126,8 @@ jobs: run: | cp ./build/doc/*.html ./build/MOOSE_DOCS/Documentation/ - - name: Push result to docs repository (skipped by act) - if: ${{ env.FORCE_PUSH == 'true' }} + - name: Push result to docs repository + if: ${{ vars.FORCE_PUSH == 'true' }} run: | git config user.name "kaltokri" git config user.email "rolf.geuenich@gmail.com" diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index 06c64e7b7..ef9e7f6ce 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -95,7 +95,7 @@ jobs: # Run LuaCheck ######################################################################### - name: Run LuaCheck - if: ${{ env.SKIP_LUACHECK != 'true' }} + if: ${{ vars.SKIP_LUACHECK != true }} continue-on-error: true run: | luacheck --std=lua51c --config=.luacheckrc -gurasqq "Moose Development/Moose" @@ -119,7 +119,7 @@ jobs: run: | cp -r ./build/result/* ./build/MOOSE_INCLUDE/ - - name: Push result to MOOSE_INCLUDE repository (skipped by act) + - name: Push result to MOOSE_INCLUDE repository if: ${{ vars.FORCE_PUSH == 'true' }} run: | git config user.name "MooseBotter" From dc54cc82af60874b3dd30fae3967ab728836826e Mon Sep 17 00:00:00 2001 From: kaltokri Date: Thu, 19 Oct 2023 18:24:46 +0200 Subject: [PATCH 12/51] Fixed wrong repository owner --- .github/workflows/build-includes.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index ef9e7f6ce..ec11f6e0b 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -24,6 +24,7 @@ jobs: echo "Branch name: ${{ steps.extract_branch.outputs.branch }}" echo "Repository: ${{ github.repository }}" echo "Commit-Id: ${{ github.sha }}" + echo "Owner: ${{ github.repository_owner }}" echo "FORCE_PUSH: ${{ vars.FORCE_PUSH }}" ######################################################################### @@ -106,7 +107,7 @@ jobs: - name: Checkout MOOSE_INCLUDE uses: actions/checkout@v4 with: - repository: kaltokri/MOOSE_INCLUDE + repository: ${{ github.repository_owner }}/MOOSE_INCLUDE path: './build/MOOSE_INCLUDE' fetch-depth: 0 ref: ${{ steps.extract_branch.outputs.branch }} From 722c33df6246fe32a73f28a6b0054d934f3193bb Mon Sep 17 00:00:00 2001 From: kaltokri Date: Thu, 19 Oct 2023 18:53:52 +0200 Subject: [PATCH 13/51] Fixed wrong git config entries in build-docs.yml --- .github/workflows/build-docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index e8cd1d248..0fdd08f6e 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -129,8 +129,8 @@ jobs: - name: Push result to docs repository if: ${{ vars.FORCE_PUSH == 'true' }} run: | - git config user.name "kaltokri" - git config user.email "rolf.geuenich@gmail.com" + git config user.name "MooseBotter" + git config user.email "moosebotter@tniedermeier.com" git add . git commit --allow-empty -m "Auto commit by GitHub Actions Workflow" git push --set-upstream origin master From 10dffb068951e3cabb44850d7df4710b9de86401 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Fri, 20 Oct 2023 09:58:35 +0200 Subject: [PATCH 14/51] Changed mail from MooseBotter --- .github/workflows/build-docs.yml | 2 +- .github/workflows/build-includes.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 0fdd08f6e..7d4f074b9 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -130,7 +130,7 @@ jobs: if: ${{ vars.FORCE_PUSH == 'true' }} run: | git config user.name "MooseBotter" - git config user.email "moosebotter@tniedermeier.com" + git config user.email "MooseBotter@users.noreply.github.com" git add . git commit --allow-empty -m "Auto commit by GitHub Actions Workflow" git push --set-upstream origin master diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index ec11f6e0b..04def15d3 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -124,7 +124,7 @@ jobs: if: ${{ vars.FORCE_PUSH == 'true' }} run: | git config user.name "MooseBotter" - git config user.email "moosebotter@tniedermeier.com" + git config user.email "MooseBotter@users.noreply.github.com" git add . git commit --allow-empty -m "Auto commit by GitHub Actions Workflow" git push --set-upstream origin ${{ steps.extract_branch.outputs.branch }} From 4d9197b3cc443fe9d74553b79716797cdc42a995 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Fri, 20 Oct 2023 16:13:30 +0200 Subject: [PATCH 15/51] First version of the new GitHub pages --- .github/workflows/gh-pages.yml | 69 ++++++++++++++++++++++++++++ docs/.gitignore | 11 +++++ docs/Dockerfile | 12 +++++ docs/Gemfile | 7 +++ docs/LICENSE | 21 +++++++++ docs/_config.yml | 34 ++++++++++++++ docs/_sass/color_schemes/moose.scss | 5 ++ docs/docker-compose.yml | 13 ++++++ docs/favicon.ico | Bin 0 -> 32988 bytes docs/index.md | 68 +++++++++++++++++++++++++++ docs/just-the-docs.gemspec | 26 +++++++++++ docs/repositories.md | 43 +++++++++++++++++ 12 files changed, 309 insertions(+) create mode 100644 .github/workflows/gh-pages.yml create mode 100644 docs/.gitignore create mode 100644 docs/Dockerfile create mode 100644 docs/Gemfile create mode 100644 docs/LICENSE create mode 100644 docs/_config.yml create mode 100644 docs/_sass/color_schemes/moose.scss create mode 100644 docs/docker-compose.yml create mode 100644 docs/favicon.ico create mode 100644 docs/index.md create mode 100644 docs/just-the-docs.gemspec create mode 100644 docs/repositories.md diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml new file mode 100644 index 000000000..b4faa62c8 --- /dev/null +++ b/.github/workflows/gh-pages.yml @@ -0,0 +1,69 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# Sample workflow for building and deploying a Jekyll site to GitHub Pages +name: Deploy Jekyll site to Pages + +on: + push: + branches: ["master"] + paths: + - 'docs/**' + - '.github/workflows/pages.yml' + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow one concurrent deployment +concurrency: + group: "pages" + cancel-in-progress: true + +jobs: + # Build job + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.1' # Not needed with a .ruby-version file + bundler-cache: true # runs 'bundle install' and caches installed gems automatically + cache-version: 0 # Increment this number if you need to re-download cached gems + working-directory: docs/ + - name: Setup Pages + id: pages + uses: actions/configure-pages@v3 + - name: Build with Jekyll + # Outputs to the './_site' directory by default + run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" + env: + JEKYLL_ENV: production + working-directory: docs/ + - name: Upload artifact + # Automatically uploads an artifact from the './_site' directory by default + uses: actions/upload-pages-artifact@v1 + with: + path: docs/_site/ + + # Deployment job + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: build + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v1 diff --git a/docs/.gitignore b/docs/.gitignore new file mode 100644 index 000000000..44a974e25 --- /dev/null +++ b/docs/.gitignore @@ -0,0 +1,11 @@ +# Copied from https://github.com/github/gitignore/blob/main/Jekyll.gitignore +# Ignore metadata generated by Jekyll +_site/ +.sass-cache/ +.jekyll-cache/ +.jekyll-metadata + +# Ignore folders generated by Bundler +.bundle/ +vendor/ +Gemfile.lock diff --git a/docs/Dockerfile b/docs/Dockerfile new file mode 100644 index 000000000..a499513b2 --- /dev/null +++ b/docs/Dockerfile @@ -0,0 +1,12 @@ +FROM ruby:2.7 + +ENV LC_ALL C.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US.UTF-8 + +WORKDIR /usr/src/app + +COPY Gemfile just-the-docs.gemspec ./ +RUN gem install bundler && bundle install + +EXPOSE 4000 diff --git a/docs/Gemfile b/docs/Gemfile new file mode 100644 index 000000000..c6d33204b --- /dev/null +++ b/docs/Gemfile @@ -0,0 +1,7 @@ +source "https://rubygems.org" +gem "github-pages", group: :jekyll_plugins +gem "jekyll" +gem "json" +gem "just-the-docs" + +gem "webrick", group: :development diff --git a/docs/LICENSE b/docs/LICENSE new file mode 100644 index 000000000..7d510d02f --- /dev/null +++ b/docs/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 just-the-docs + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/docs/_config.yml b/docs/_config.yml new file mode 100644 index 000000000..c557105bd --- /dev/null +++ b/docs/_config.yml @@ -0,0 +1,34 @@ +repository: FlightControl-Master/MOOSE +title: MOOSE +description: MOOSE is a Mission Object Oriented Scripting Environment for mission designers in DCS World +theme: just-the-docs +color_scheme: moose + +gh_edit_link: false +gh_edit_link_text: "Edit this page on GitHub" +gh_edit_repository: https://github.com/FlightControl-Master/MOOSE +gh_edit_branch: master +gh_edit_source: docs +gh_edit_view_mode: edit + +callouts_level: quiet # or loud +callouts: + highlight: + color: grey-dk + important: + title: Important + color: red + new: + title: New + color: grey-lt + note: + title: Note + color: green + warning: + title: Warning + color: yellow +callouts_opacity: 0.4 + +aux_links: + GitHub: https://github.com/FlightControl-Master/MOOSE + Discord: https://discord.gg/aQtjcR94Qf diff --git a/docs/_sass/color_schemes/moose.scss b/docs/_sass/color_schemes/moose.scss new file mode 100644 index 000000000..12e58bad8 --- /dev/null +++ b/docs/_sass/color_schemes/moose.scss @@ -0,0 +1,5 @@ +@import "./color_schemes/dark"; + +$green-300: #0d441b; +$red-300: #440d0d; +$grey-dk-300: #adadad; diff --git a/docs/docker-compose.yml b/docs/docker-compose.yml new file mode 100644 index 000000000..6901f39a7 --- /dev/null +++ b/docs/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.5" + +services: + jekyll: + build: + context: ./ + ports: + - 4000:4000 + volumes: + - .:/usr/src/app + stdin_open: true + tty: true + command: bundle exec jekyll serve -H 0.0.0.0 -t --force_polling diff --git a/docs/favicon.ico b/docs/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..9d06e6489c2c339737f4499730bd09d02021f98e GIT binary patch literal 32988 zcmeHPYit}>6`n#`ihw2+2ofQ{P=U-lZ4jcZio>H&nzr7V*|8nRZBn37)5P9+?AmT# zYgCF#DbODXwNj<x7T(YJF$KFzHx4tOn28d zkS1=`M{E}f9O-(1SR~SYQ+E%VSdHrU? z_+i2@R-iqkUuGD;S#KE4=mRoi04Lk!5CjAPK|l}?1Ox#=KoAfF1OY)n5D)|e0YN|z z5CjAPL4XKUT2oC0+q=JLdIt)YKUlJT#WFl?cMsZK&|t@LaYx=vxdqc3h@VBv-_(c` zWySk6x~6^wJGFMPI@0dE>HUcI&UfZ*zmiXSZX>OJ3Bl`sZT`o+}eo4*>1vuQu=sW(=9Ru*G# zoVH;5gWASM<=M8Mde<7OMq^LgO7MA&XvjC$np)k+cHTP^_J{g$?&5@P&-0m&k5BZP z^l^Vsw@=J3fzS7&yrT6&tDiV4_G3MX${oa7QMUYSRJV9NItLp0*0@bMC$&1xOJ8$6 zit16Ten!T>j@(8VaGq%WVE+o@QS0PAO~eNUs_bX2IwNi=jx{e$zm-OVj*rSmi(fGF^_I2VBt=s9PyN5b9l6yLR?O5kD zn*Va_=hI^;*w5#FXaRdc_2xyRaX8oQXWmPnSkJbFv@c!z-97)yxNB^div6Mg;eH7A zf&U+NYx|`X1Ox#=KoAfF1OY)n5D)|e0YN|z5CjAPK|l}?1Ox#=U@0NM-w9~KxfZAV zP5?lVLl6)I&S?Y=w6rY4yQme#4c(W#mWmFxWG}ARfj4Gno+{dIu4MZE9B)hS9kNoJ zYUzRZPv+5N@4itxy%+EJA2|4t>_wVx$PC_z_tKA*ll~Khg!ed4yt{v*YzMz8*}?re zyZb6l%TmET7cK8$)wxTZ=(tnOuHPP()2L6QUb4NuC_U>1Gw4${4=B~OTNO?BW$LeK zD(!RsQ=mF`sN)^|N_Fm3YQrv+JCs_#Lsjj}^swda*7W#h;yThzwD+oNGOh5w_XXO| z`my#tg?cq_x~nuj%e)zQ)Q|TImiJ;*e%a}HFTPJ49dk0__lZT@KU^^VgTUnI(Y9VS zj&{n!J8S%!4Zr0K?w*026HaCZH2YqEARrzW(K~J64t~uS(hx@F+XMIxU;! zV&r2!@n?R*gWv5<0yAO*Tqgfv^?Xp@iej;@x87*HW-}0`H-Y=NxtuuQ5CA=4+_u_pEPVjks zzi9fqIQPQ2X?o*jD|ny27cJvFMjZdz!%pAwij!WAchJq4JKvsa?^nbTJpWd(-A|S6 zo=?1jxgYk$GsAm$=J5=;x0lSGkL4{lRk4EVsFMz#@qEJDr<|X@F)CNrR**J{cd&Z-J#Dp6$-FD}Q}Wnp{G6TGv< zq<71abz3eiS$^+GGJT3JiSEnd7UFx+FO0SIb_^k=()aS__Elp^^s_vhXT=PX zh_9HZU7%^IiLGx(uJlY8?`*saIn{2)krl|gR@1OV-tcF&>6?g!+@I<8Vj^WRzner1 z7RFA9hmN5><^;cGyhb|2HTS5m-4o_uh(QE<@h;h~_`s zno2MqW3Iwn6E^&kxesHoyyZQ0(8*o|{;A_#J0C&5m0>^V`8{=W7I^@_pS|O)niu3g z%YM-L$GVO2+DylG9nXH0?ZlWena||ySI6G^_z!gjZ^5`d6y~*vd52HhqeHTnZsgkz05eC_UBCR=PH|hLzFk`T7S%kgN&Uq&a>QG;2ePr#XLlH zA-1=?-;;lsYoeVweVC)#L4L$eKQz+We`%aIug9>@p*CilIe!&$_I$$s&?s`F=sCIm z&SvH^#EmW9tcfc-b_ z!9`hBO!tb3Wcp84Co_vR`FDDK%$u1jPIT`4EBxiHq_5yNT26HIAHv#@8+U@2idN4y zw!>fkVm#S9jy;+0avgww`vKdz*Tp@GvgP*kdT#w2;QII-?8`jKHMMN}H&EVRzI@v% zwPy2$*hAp{;ZI1Pv)rq>kAZ#xui-=Qr9Y)_d*ufI9kbZqpwH($9>X{Gyo-CN&^KJC z54Udpc(~psQd@Xm_s4$cC4awh+xr<86m9Q8-s6$GKE0A_AJ*+h^LFa1h#mG)K6t)} zwW61HDXbrPEA?2_3XaTd*r_U!eNyg&z}N5Rx}P`wZ%w!L{{ee{`+@D#+;7I(cl&fl z-~N%L|LjDv@A2W*ZHYO_@>dWL1Ox#=KoAfF1OY)n5D)|e0YN|z5CjAPK|l}?1Ox#= hKoAfF1OY)n5D)|e0YN|z5CjAPK|l}?1kNu6{tcov*Gd2Y literal 0 HcmV?d00001 diff --git a/docs/index.md b/docs/index.md new file mode 100644 index 000000000..bd3525f15 --- /dev/null +++ b/docs/index.md @@ -0,0 +1,68 @@ +--- +title: Overview +nav_order: 1 +layout: home +--- + +[![Moose-Includes](https://github.com/FlightControl-Master/MOOSE/actions/workflows/build-includes.yml/badge.svg?branch=master)](https://github.com/FlightControl-Master/MOOSE/actions/workflows/build-includes.yml)   +[![Moose-Docs](https://github.com/FlightControl-Master/MOOSE/actions/workflows/build-docs.yml/badge.svg?branch=master)](https://github.com/FlightControl-Master/MOOSE/actions/workflows/build-docs.yml) + +# MOOSE framework + +MOOSE is a **M**ission **O**bject **O**riented **S**cripting **E**nvironment for mission designers in [DCS World]. +It allows to quickly setup complex missions using pre-scripted scenarios using the available classes within the MOOSE Framework. +MOOSE is written in [Lua] which is a small and fast programming language, which is embedded in [DCS World]. + +## Goal of MOOSE + +The goal of MOOSE is to allow mission designers to enhance their scripting with mission orchestration objects, +which can be instantiated from defined classes within the framework. This will allow to write mission scripts with +minimal code embedded. Of course, the richness of the framework will determine the richness of the misson scenarios. +The MOOSE is a service that is produced while being consumed. It will evolve further as more classes are developed +for the framework and as more users are using it. +MOOSE is not a one-man show, it is a collaborative effort and meant to evolve within a growing community around the framework. +Within the community, key users will start supporting, documenting, explaining and even creating new classes for the framework. +It is the ambition to grow this framework as a de-facto standard for mission designers to use. + +## Two branches - Choose wisely + +In [DCS World] there is a `Stable` version and an `OpenBeta`. New features are released to the `OpenBeta` first and applied to `Stable` later. +People who choose to use `OpenBeta` can use the newest featuest and module, but accept the risk of bugs and unstable updates. +In MOOSE there is a `master` branch, which is comparable to the `Stable` version. +And there is the `development` branch, which is more like the `OpenBeta`. +New modules (called classes in [Lua], like [OPS.Auftrag]) will only available in the `development` branch. + +Releases are the most stable approach to use MOOSE. +From time to time the current state of the `master` branch is used to create release. +A release gets a spefific version number and will not be changed later on. + +## Documentation + +Documentation on the MOOSE class hierarchy will be automatically generated from [LuaDoc] comments inside of the source code of MOOOSE. +You can find the results on these websites: + +- Stable `master` branch: +- `develop` branch: + +## YouTube Tutorials + +There are different tutorial playlists available on YouTube: + +- AnyTimeBaby (Pene) has kindly created a [tutorial series for MOOSE](https://youtube.com/playlist?list=PLLkY2GByvtC2ME0Q9wrKRDE6qnXJYV3iT) + with various videos that you can watch. +- FlightControl (initiator of the project) has created a lot of [videos](https://www.youtube.com/@flightcontrol5350/featured) on how to use MOOSE. + They are a little bit outdated, but they still contain a lot of valuable information. + +## MOOSE on Discord + +MOOSE has a living community of users, beta testers and contributors. +The gathering point is a service provided by [Discord]. +If you want to join this community, just click the link below and you'll be on board in no time. + +- [Moose for DCS Discord server](https://discord.gg/aQtjcR94Qf) + +[DCS World]: https://www.digitalcombatsimulator.com/de/ +[Lua]: https://www.lua.org/ +[LuaDoc]: https://keplerproject.github.io/luadoc/ +[Ops.Auftrag]: https://flightcontrol-master.github.io/MOOSE_DOCS_DEVELOP/Documentation/Ops.Auftrag.html +[Discord]: https://discord.com/ diff --git a/docs/just-the-docs.gemspec b/docs/just-the-docs.gemspec new file mode 100644 index 000000000..851ac0aba --- /dev/null +++ b/docs/just-the-docs.gemspec @@ -0,0 +1,26 @@ +# coding: utf-8 + +Gem::Specification.new do |spec| + spec.name = "just-the-docs" + spec.version = "0.4.1" + spec.authors = ["Patrick Marsceill", "Matthew Wang"] + spec.email = ["patrick.marsceill@gmail.com", "matt@matthewwang.me"] + + spec.summary = %q{A modern, highly customizable, and responsive Jekyll theme for documentation with built-in search.} + spec.homepage = "https://github.com/just-the-docs/just-the-docs" + spec.license = "MIT" + spec.metadata = { + "bug_tracker_uri" => "https://github.com/just-the-docs/just-the-docs/issues", + "changelog_uri" => "https://github.com/just-the-docs/just-the-docs/blob/main/CHANGELOG.md", + "documentation_uri" => "https://just-the-docs.github.io/just-the-docs/", + "source_code_uri" => "https://github.com/just-the-docs/just-the-docs", + } + + spec.files = `git ls-files -z ':!:*.jpg' ':!:*.png'`.split("\x0").select { |f| f.match(%r{^(assets|bin|_layouts|_includes|lib|Rakefile|_sass|LICENSE|README|CHANGELOG|favicon)}i) } + spec.executables << 'just-the-docs' + + spec.add_development_dependency "bundler", ">= 2.3.5" + spec.add_runtime_dependency "jekyll", ">= 3.8.5" + spec.add_runtime_dependency "jekyll-seo-tag", ">= 2.0" + spec.add_runtime_dependency "rake", ">= 12.3.1" +end diff --git a/docs/repositories.md b/docs/repositories.md new file mode 100644 index 000000000..f7e89b744 --- /dev/null +++ b/docs/repositories.md @@ -0,0 +1,43 @@ +--- +title: Repositories +nav_order: 2 +--- + +# MOOSE Repositories + +The underlying picture documents the different repositories in the MOOSE framework. +The white ones are edited and are the source of the framework. +The red ones contain generated artefacts. See further the explanation for each repository. + +![Graphic](https://raw.githubusercontent.com/FlightControl-Master/MOOSE_DOCS/master/Configuration/Master.png) + +## [MOOSE](https://github.com/FlightControl-Master/MOOSE) - For development and static documentation + +This repository contains the source lua code of the MOOSE framework. +Also the source files for this documentation are included in this repository. + +## [MOOSE_INCLUDE](https://github.com/FlightControl-Master/MOOSE_INCLUDE) - For users (provides generated files) + +This repository contains the `Moose.lua` and `Moose\_.lua` file to be included within your missions. +Note that the `Moose\_.lua` is technically the same as `Moose.lua`, but without any commentary or unnecessary whitespace in it. +You only need to load **one** of those files at the beginning of your mission. + +## [MOOSE_DOCS](https://github.com/FlightControl-Master/MOOSE_DOCS) - Only to generate documentation website + +This repository contains the generated documentation and pictures and other references. +The generated documentation is reflected in html and is published at: +- Stable `master` branch: +- `develop` branch: + +## [MOOSE_MISSIONS](https://github.com/FlightControl-Master/MOOSE_MISSIONS) - For users (provides demo missions) + +This repository contains all the demonstration missions in packed format (*.miz), +and can be used without any further setup in DCS WORLD. + +## [MOOSE_MISSIONS_DYNAMIC](https://github.com/FlightControl-Master/MOOSE_MISSIONS_DYNAMIC) - Outdated + +This repository will be removed in future. + +## [MOOSE_MISSIONS_UNPACKED](https://github.com/FlightControl-Master/MOOSE_MISSIONS_UNPACKED) - Outdated + +This repository will be removed in future. From df6d968ebec7257616a6b4e771a8f59b54c6d7f6 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Fri, 20 Oct 2023 18:44:24 +0200 Subject: [PATCH 16/51] #CONTROLLABLE * Added `CommandSetUnlimitedFuel()` * Added `TaskStrafing()` --- .../Moose/Wrapper/Controllable.lua | 64 ++++++++++++++++++- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 4012528ca..9c9a68d58 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -62,6 +62,7 @@ -- * @{#CONTROLLABLE.TaskLandAtZone}: (AIR) Land the controllable at a @{Core.Zone#ZONE_RADIUS). -- * @{#CONTROLLABLE.TaskOrbitCircle}: (AIR) Orbit at the current position of the first unit of the controllable at a specified altitude. -- * @{#CONTROLLABLE.TaskOrbitCircleAtVec2}: (AIR) Orbit at a specified position at a specified altitude during a specified duration with a specified speed. +-- * @{#CONTROLLABLE.TaskStrafing}: (AIR) Strafe a point Vec2 with onboard weapons. -- * @{#CONTROLLABLE.TaskRefueling}: (AIR) Refueling from the nearest tanker. No parameters. -- * @{#CONTROLLABLE.TaskRecoveryTanker}: (AIR) Set group to act as recovery tanker for a naval group. -- * @{#CONTROLLABLE.TaskRoute}: (AIR + GROUND) Return a Mission task to follow a given route defined by Points. @@ -909,6 +910,30 @@ function CONTROLLABLE:CommandEPLRS( SwitchOnOff, Delay ) return self end +--- Set unlimited fuel. See [DCS command Unlimited Fuel](https://wiki.hoggitworld.com/view/DCS_command_setUnlimitedFuel). +-- @param #CONTROLLABLE self +-- @param #boolean OnOff Set unlimited fuel on = true or off = false. +-- @param #number Delay (Optional) Set the option only after x seconds. +-- @return #CONTROLLABLE self +function CONTROLLABLE:CommandSetUnlimitedFuel(OnOff, Delay) + + local CommandSetFuel = { + id = 'SetUnlimitedFuel', + params = { + value = OnOff + } +} + + if Delay and Delay > 0 then + SCHEDULER:New( nil, self.CommandSetUnlimitedFuel, { self, OnOff }, Delay ) + else + self:SetCommand( CommandSetFuel ) + end + + return self +end + + --- Set radio frequency. See [DCS command EPLRS](https://wiki.hoggitworld.com/view/DCS_command_setFrequency) -- @param #CONTROLLABLE self -- @param #number Frequency Radio frequency in MHz. @@ -1073,6 +1098,42 @@ function CONTROLLABLE:TaskBombing( Vec2, GroupAttack, WeaponExpend, AttackQty, D return DCSTask end +--- (AIR) Strafe the point on the ground. +-- @param #CONTROLLABLE self +-- @param DCS#Vec2 Vec2 2D-coordinates of the point to deliver strafing at. +-- @param #number AttackQty (optional) This parameter limits maximal quantity of attack. The aircraft/controllable will not make more attack than allowed even if the target controllable not destroyed and the aircraft/controllable still have ammo. If not defined the aircraft/controllable will attack target until it will be destroyed or until the aircraft/controllable will run out of ammo. +-- @param #number Length (optional) Length of the strafing area. +-- @param #number WeaponType (optional) The WeaponType. WeaponType is a number associated with a [corresponding weapons flags](https://wiki.hoggitworld.com/view/DCS_enum_weapon_flag) +-- @param DCS#AI.Task.WeaponExpend WeaponExpend (optional) Determines how much ammunition will be released at each attack. If parameter is not defined the unit / controllable will choose expend on its own discretion, e.g. AI.Task.WeaponExpend.ALL. +-- @param DCS#Azimuth Direction (optional) Desired ingress direction from the target to the attacking aircraft. Controllable/aircraft will make its attacks from the direction. Of course if there is no way to attack from the direction due the terrain controllable/aircraft will choose another direction. +-- @param #boolean GroupAttack (optional) If true, all units in the group will attack the Unit when found. +-- @return DCS#Task The DCS task structure. +-- @usage +-- local attacker = GROUP:FindByName("Aerial-1") +-- local attackVec2 = ZONE:New("Strafe Attack"):GetVec2() +-- -- Attack with any cannons = 805306368, 4 runs, strafe a field of 200 meters +-- local task = attacker:TaskStrafing(attackVec2,4,200,805306368,AI.Task.WeaponExpend.ALL) +-- attacker:SetTask(task,2) +function CONTROLLABLE:TaskStrafing( Vec2, AttackQty, Length, WeaponType, WeaponExpend, Direction, GroupAttack ) + + local DCSTask = { + id = 'Strafing', + params = { + point = Vec2, -- req + weaponType = WeaponType or 1073741822, + expend = WeaponExpend or "Auto", + attackQty = AttackQty or 1, -- req + attackQtyLimit = AttackQty >1 and true or false, + direction = Direction and math.rad(Direction) or 0, + directionEnabled = Direction and true or false, + groupAttack = GroupAttack or false, + length = Length, + } +} + + return DCSTask +end + --- (AIR) Attacking the map object (building, structure, etc). -- @param #CONTROLLABLE self -- @param DCS#Vec2 Vec2 2D-coordinates of the point to deliver weapon at. @@ -1094,7 +1155,6 @@ function CONTROLLABLE:TaskAttackMapObject( Vec2, GroupAttack, WeaponExpend, Atta groupAttack = GroupAttack or false, expend = WeaponExpend or "Auto", attackQtyLimit = AttackQty and true or false, - attackQty = AttackQty, directionEnabled = Direction and true or false, direction = Direction and math.rad(Direction) or 0, altitudeEnabled = Altitude and true or false, @@ -2167,7 +2227,7 @@ do -- Patrol methods -- @return #CONTROLLABLE function CONTROLLABLE:PatrolZones( ZoneList, Speed, Formation, DelayMin, DelayMax ) - if not type( ZoneList ) == "table" then + if type( ZoneList ) ~= "table" then ZoneList = { ZoneList } end From 038b89776d2ed84d15b6b47c7a6b9e543c6d09e2 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Fri, 20 Oct 2023 22:45:52 +0200 Subject: [PATCH 17/51] Added replacement of head tag again --- .github/workflows/build-docs.yml | 12 ++++++++++++ Moose Development/docs-header.html | 5 +++++ Moose Development/docs-header.py | 26 ++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 Moose Development/docs-header.html create mode 100644 Moose Development/docs-header.py diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 7d4f074b9..c31b19a21 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -93,6 +93,18 @@ jobs: lua luadocumentor.lua -d ${{ github.workspace }}/build/doc "${{ github.workspace }}/Moose Development/Moose" working-directory: ${{ github.workspace }}/build/tools/luadocumentor + ######################################################################### + # Replace tag + ######################################################################### + - name: Replace head tag + run: | + python3 "${{ github.workspace }}/Moose Development/docs-header.py" + working-directory: ${{ github.workspace }}/build/doc + + - name: Check replacement of head tag + run: | + head -10 ${{ github.workspace }}/build/doc/AI.AI_A2A_Cap.html + ######################################################################### # Push to MOOSE_DOCS ######################################################################### diff --git a/Moose Development/docs-header.html b/Moose Development/docs-header.html new file mode 100644 index 000000000..e6613e196 --- /dev/null +++ b/Moose Development/docs-header.html @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Moose Development/docs-header.py b/Moose Development/docs-header.py new file mode 100644 index 000000000..72dfc6f28 --- /dev/null +++ b/Moose Development/docs-header.py @@ -0,0 +1,26 @@ +# import required module +from pathlib import Path +import os + +# assign directory +directory = '.' + +print( "Replacing head tag in all html files" ) + +# Read template file +with open( os.path.dirname(__file__) + '/docs-header.html', 'r') as file: + newhead = file.read() + +# iterate over files in +# that directory +files = Path(directory).glob('*.html') +for file in files: + # print(file) + with open(file, 'r') as fileread: + filedata = fileread.read() + # Replace the target string + filedata = filedata.replace( '', newhead ) + + # Write the file out again + with open(file, 'w') as filewrite: + filewrite.write(filedata) From 456c002c3cc59293c68b4532fb8b3086f52cd5e6 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Fri, 20 Oct 2023 23:36:27 +0200 Subject: [PATCH 18/51] Fix for missing w3.css in DOCS repo --- .github/workflows/build-docs.yml | 2 +- Moose Development/docs-header.html | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index c31b19a21..4a7bc1f8c 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -136,7 +136,7 @@ jobs: - name: Copy build result to MOOSE_DOCS run: | - cp ./build/doc/*.html ./build/MOOSE_DOCS/Documentation/ + cp ./build/doc/*.* ./build/MOOSE_DOCS/Documentation/ - name: Push result to docs repository if: ${{ vars.FORCE_PUSH == 'true' }} diff --git a/Moose Development/docs-header.html b/Moose Development/docs-header.html index e6613e196..e559ffff1 100644 --- a/Moose Development/docs-header.html +++ b/Moose Development/docs-header.html @@ -1,5 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file From ab068670cc1d2970437bcf974f23ddef00a8219b Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sat, 21 Oct 2023 12:43:20 +0200 Subject: [PATCH 19/51] #RECOVERYTANKER * Added option to set unlimited fuel --- .../Moose/Ops/RecoveryTanker.lua | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/RecoveryTanker.lua b/Moose Development/Moose/Ops/RecoveryTanker.lua index 0489ccb3d..a4c00cfea 100644 --- a/Moose Development/Moose/Ops/RecoveryTanker.lua +++ b/Moose Development/Moose/Ops/RecoveryTanker.lua @@ -63,6 +63,7 @@ -- @field #boolean eplrs If true, enable data link, e.g. if used as AWACS. -- @field #boolean recovery If true, tanker will recover using the AIRBOSS marshal pattern. -- @field #number terminaltype Terminal type of used parking spots on airbases. +-- @field #boolean unlimitedfuel If true, the tanker will have unlimited fuel. -- @extends Core.Fsm#FSM --- Recovery Tanker. @@ -300,6 +301,7 @@ RECOVERYTANKER = { eplrs = nil, recovery = nil, terminaltype = nil, + unlimitedfuel = false, } --- Unique ID (global). @@ -308,7 +310,7 @@ _RECOVERYTANKERID=0 --- Class version. -- @field #string version -RECOVERYTANKER.version="1.0.9" +RECOVERYTANKER.version="1.0.10" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO list @@ -326,6 +328,7 @@ RECOVERYTANKER.version="1.0.9" -- DONE: Set AA TACAN. -- DONE: Add refueling event/state. -- DONE: Possibility to add already present/spawned aircraft, e.g. for warehouse. +-- DONE: Add unlimited fuel ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- Constructor @@ -550,6 +553,15 @@ end -- User functions ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +--- Set the tanker to have unlimited fuel. +-- @param #RECOVERYTANKER self +-- @param #boolean OnOff If true, the tanker will have unlimited fuel. +-- @return #RECOVERYTANKER self +function RECOVERYTANKER:SetUnlimitedFuel(OnOff) + self.unlimitedfuel = OnOff + return self +end + --- Set the speed the tanker flys in its orbit pattern. -- @param #RECOVERYTANKER self -- @param #number speed True air speed (TAS) in knots. Default 274 knots, which results in ~250 KIAS. @@ -899,6 +911,14 @@ function RECOVERYTANKER:onafterStart(From, Event, To) -- Spawn tanker. We need to introduce an alias in case this class is used twice. This would confuse the spawn routine. local Spawn=SPAWN:NewWithAlias(self.tankergroupname, self.alias) + if self.unlimitedfuel then + Spawn:OnSpawnGroup( + function (grp) + grp:CommandSetUnlimitedFuel(self.unlimitedfuel) + end + ) + end + -- Set radio frequency and modulation. Spawn:InitRadioCommsOnOff(true) Spawn:InitRadioFrequency(self.RadioFreq) From f28f807ee7db9dbfa595251422afca98e65516b9 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Tue, 24 Oct 2023 13:45:15 +0200 Subject: [PATCH 20/51] #EASYGCICAP * Closer turning cap routes --- Moose Development/Moose/Ops/AirWing.lua | 48 +++++++++-- Moose Development/Moose/Ops/Auftrag.lua | 93 +++++++++++++++++++-- Moose Development/Moose/Ops/Cohort.lua | 5 +- Moose Development/Moose/Ops/EasyGCICAP.lua | 36 ++++++-- Moose Development/Moose/Ops/FlightGroup.lua | 3 + Moose Development/Moose/Ops/Legion.lua | 12 +-- Moose Development/Moose/Ops/OpsGroup.lua | 20 +++++ 7 files changed, 191 insertions(+), 26 deletions(-) diff --git a/Moose Development/Moose/Ops/AirWing.lua b/Moose Development/Moose/Ops/AirWing.lua index ed166e23d..9d918e5d9 100644 --- a/Moose Development/Moose/Ops/AirWing.lua +++ b/Moose Development/Moose/Ops/AirWing.lua @@ -54,7 +54,9 @@ -- @field #string takeoffType Take of type. -- @field #boolean despawnAfterLanding Aircraft are despawned after landing. -- @field #boolean despawnAfterHolding Aircraft are despawned after holding. --- +-- @field #boolean capOptionPatrolRaceTrack Use closer patrol race track or standard orbit auftrag. +-- @field #number capFormation If capOptionPatrolRaceTrack is true, set the formation, also. +-- -- @extends Ops.Legion#LEGION --- *I fly because it releases my mind from the tyranny of petty things.* -- Antoine de Saint-Exupery @@ -128,6 +130,8 @@ AIRWING = { pointsAWACS = {}, pointsRecon = {}, markpoints = false, + capOptionPatrolRaceTrack = false, + capFormation = nil, } --- Payload data. @@ -179,7 +183,7 @@ AIRWING = { --- AIRWING class version. -- @field #string version -AIRWING.version="0.9.3" +AIRWING.version="0.9.4" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- ToDo list @@ -699,6 +703,24 @@ function AIRWING:SetNumberCAP(n) return self end +--- Set CAP flight formation. +-- @param #AIRWING self +-- @param #number Formation Formation to take, e.g. ENUMS.Formation.FixedWing.Trail.Close, also see [Hoggit Wiki](https://wiki.hoggitworld.com/view/DCS_option_formation). +-- @return #AIRWING self +function AIRWING:SetCAPFormation(Formation) + self.capFormation = Formation + return self +end + +--- Set CAP close race track.We'll utilize the AUFTRAG PatrolRaceTrack instead of a standard race track orbit task. +-- @param #AIRWING self +-- @param #boolean OnOff If true, switch this on, else switch off. Off by default. +-- @return #AIRWING self +function AIRWING:SetCapCloseRaceTrack(OnOff) + self.capOptionPatrolRaceTrack = OnOff + return self +end + --- Set number of TANKER flights with Boom constantly in the air. -- @param #AIRWING self -- @param #number Nboom Number of flights. Default 1. @@ -1112,13 +1134,14 @@ end -- @return #AIRWING self function AIRWING:CheckCAP() - local Ncap=0 --self:CountMissionsInQueue({AUFTRAG.Type.GCICAP, AUFTRAG.Type.INTERCEPT}) + local Ncap=0 + -- Count CAP missions. for _,_mission in pairs(self.missionqueue) do local mission=_mission --Ops.Auftrag#AUFTRAG - if mission:IsNotOver() and mission.type==AUFTRAG.Type.GCICAP and mission.patroldata then + if mission:IsNotOver() and (mission.type==AUFTRAG.Type.GCICAP or mission.type == AUFTRAG.Type.PATROLRACETRACK) and mission.patroldata then Ncap=Ncap+1 end @@ -1130,8 +1153,18 @@ function AIRWING:CheckCAP() local altitude=patrol.altitude+1000*patrol.noccupied - local missionCAP=AUFTRAG:NewGCICAP(patrol.coord, altitude, patrol.speed, patrol.heading, patrol.leg) - + local missionCAP = nil -- Ops.Auftrag#AUFTRAG + + if self.capOptionPatrolRaceTrack then + + missionCAP=AUFTRAG:NewPATROL_RACETRACK(patrol.coord,altitude,patrol.speed,patrol.heading,patrol.leg, self.capFormation) + + else + + missionCAP=AUFTRAG:NewGCICAP(patrol.coord, altitude, patrol.speed, patrol.heading, patrol.leg) + + end + missionCAP.patroldata=patrol patrol.noccupied=patrol.noccupied+1 @@ -1150,7 +1183,7 @@ end -- @return #AIRWING self function AIRWING:CheckRECON() - local Ncap=0 --self:CountMissionsInQueue({AUFTRAG.Type.GCICAP, AUFTRAG.Type.INTERCEPT}) + local Ncap=0 -- Count CAP missions. for _,_mission in pairs(self.missionqueue) do @@ -1278,7 +1311,6 @@ function AIRWING:CheckAWACS() end - for i=1,self.nflightsAWACS-N do local patrol=self:_GetPatrolData(self.pointsAWACS) diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua index c70ce6377..a1d234fbe 100644 --- a/Moose Development/Moose/Ops/Auftrag.lua +++ b/Moose Development/Moose/Ops/Auftrag.lua @@ -443,6 +443,7 @@ _AUFTRAGSNR=0 -- @field #string REARMING Rearming mission. -- @field #string CAPTUREZONE Capture zone mission. -- @field #string NOTHING Nothing. +-- @field #string PATROLRACETRACK Patrol Racetrack. AUFTRAG.Type={ ANTISHIP="Anti Ship", AWACS="AWACS", @@ -484,10 +485,10 @@ AUFTRAG.Type={ RELOCATECOHORT="Relocate Cohort", AIRDEFENSE="Air Defence", EWR="Early Warning Radar", - --RECOVERYTANKER="Recovery Tanker", REARMING="Rearming", CAPTUREZONE="Capture Zone", NOTHING="Nothing", + PATROLRACETRACK="Patrol Racetrack", } --- Special task description. @@ -511,6 +512,7 @@ AUFTRAG.Type={ -- @field #string REARMING Rearming. -- @field #string CAPTUREZONE Capture OPS zone. -- @field #string NOTHING Nothing. +-- @field #string PATROLRACETRACK Patrol Racetrack. AUFTRAG.SpecialTask={ FORMATION="Formation", PATROLZONE="PatrolZone", @@ -532,6 +534,7 @@ AUFTRAG.SpecialTask={ REARMING="Rearming", CAPTUREZONE="Capture Zone", NOTHING="Nothing", + PATROLRACETRACK="Patrol Racetrack", } --- Mission status. @@ -652,7 +655,7 @@ AUFTRAG.Category={ --- AUFTRAG class version. -- @field #string version -AUFTRAG.version="1.2.0" +AUFTRAG.version="1.2.1" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO list @@ -1017,7 +1020,7 @@ end -- @param #number Altitude Hover altitude in feet AGL. Default is 50 feet above ground. -- @param #number Time Time in seconds to hold the hover. Default 300 seconds. -- @param #number Speed Speed in knots to fly to the target coordinate. Default 150kn. --- @param #number MissionAlt Altitide to fly towards the mission in feet AGL. Default 1000ft. +-- @param #number MissionAlt Altitude to fly towards the mission in feet AGL. Default 1000ft. -- @return #AUFTRAG self function AUFTRAG:NewHOVER(Coordinate, Altitude, Time, Speed, MissionAlt) @@ -1049,6 +1052,58 @@ function AUFTRAG:NewHOVER(Coordinate, Altitude, Time, Speed, MissionAlt) return mission end +--- **[AIR]** Create an enhanced orbit race track mission. Planes will keep closer to the track. +-- @param #AUFTRAG self +-- @param Core.Point#COORDINATE Coordinate Where to start the race track. +-- @param #number Altitude (Optional) Altitude in feet. Defaults to 20,000ft. +-- @param #number Speed (Optional) Speed in knots. Defaults to 300kn. +-- @param #number Heading (Optional) Heading in degrees, 0 to 360. Defaults to 90 degree (East). +-- @param #number Leg (Optional) Leg of the race track in NM. Defaults to 10nm. +-- @param #number Formation (Optional) Formation to take, e.g. ENUMS.Formation.FixedWing.Trail.Close, also see [Hoggit Wiki](https://wiki.hoggitworld.com/view/DCS_option_formation). +-- @return #AUFTRAG self +function AUFTRAG:NewPATROL_RACETRACK(Coordinate,Altitude,Speed,Heading,Leg,Formation) + + local mission = AUFTRAG:New(AUFTRAG.Type.PATROLRACETRACK) + + -- Target. + mission:_TargetFromObject(Coordinate) + + -- Set Altitude. + if Altitude then + mission.TrackAltitude=UTILS.FeetToMeters(Altitude) + else + mission.TrackAltitude=UTILS.FeetToMeters(20000) + end + + -- Points + mission.TrackPoint1 = Coordinate + + local leg = UTILS.NMToMeters(Leg) or UTILS.NMToMeters(10) + + local heading = Heading or 90 + + if heading < 0 or heading > 360 then heading = 90 end + + mission.TrackPoint2 = Coordinate:Translate(leg,heading,true) + + -- Orbit speed in m/s TAS. + mission.TrackSpeed = UTILS.IasToTas(UTILS.KnotsToKmph(Speed or 300), mission.TrackAltitude) + + -- Mission speed in km/h and altitude + mission.missionSpeed = UTILS.KnotsToKmph(Speed or 300) + mission.missionAltitude = mission.TrackAltitude * 0.9 + mission.missionTask=ENUMS.MissionTask.CAP + mission.optionROE=ENUMS.ROE.ReturnFire + mission.optionROT=ENUMS.ROT.PassiveDefense + + mission.categories={AUFTRAG.Category.AIRCRAFT} + + mission.DCStask=mission:GetDCSMissionTask() + + return mission +end + + --- **[AIR]** Create an ORBIT mission, which can be either a circular orbit or a race-track pattern. -- @param #AUFTRAG self -- @param Core.Point#COORDINATE Coordinate Where to orbit. @@ -1181,7 +1236,7 @@ function AUFTRAG:NewORBIT_GROUP(Group, Altitude, Speed, Leg, Heading, OffsetVec2 end ---- **[AIR]** Create a Ground Controlled CAP (GCICAP) mission. Flights with this task are considered for A2A INTERCEPT missions by the CHIEF class. They will perform a compat air patrol but not engage by +--- **[AIR]** Create a Ground Controlled CAP (GCICAP) mission. Flights with this task are considered for A2A INTERCEPT missions by the CHIEF class. They will perform a combat air patrol but not engage by -- themselfs. They wait for the CHIEF to tell them whom to engage. -- @param #AUFTRAG self -- @param Core.Point#COORDINATE Coordinate Where to orbit. @@ -2688,6 +2743,8 @@ function AUFTRAG:NewAUTO(EngageGroup) mission=AUFTRAG:NewTANKER(Coordinate,Altitude,Speed,Heading,Leg,RefuelSystem) elseif auftrag==AUFTRAG.Type.TROOPTRANSPORT then mission=AUFTRAG:NewTROOPTRANSPORT(TransportGroupSet,DropoffCoordinate,PickupCoordinate) + elseif auftrag==AUFTRAG.Type.PATROLRACETRACK then + mission=AUFTRAG:NewPATROL_RACETRACK(Coordinate,Altitude,Speed,Heading,Leg,Formation) else end @@ -6343,8 +6400,32 @@ function AUFTRAG:GetDCSMissionTask() DCStask.params=param - table.insert(DCStasks, DCStask) + table.insert(DCStasks, DCStask) + + elseif self.type==AUFTRAG.Type.PATROLRACETRACK then + --------------------- + -- Enhanced Orbit Racetrack -- + --------------------- + + local DCStask={} + DCStask.id=AUFTRAG.SpecialTask.PATROLRACETRACK + + local param={} + -- ONTROLLABLE:PatrolRaceTrack(Point1, Point2, Altitude, Speed, Formation, Delay) + + param.TrackAltitude = self.TrackAltitude + param.TrackSpeed = self.TrackSpeed + param.TrackPoint1 = self.TrackPoint1 + param.TrackPoint2 = self.TrackPoint2 + param.missionSpeed = self.missionSpeed + param.missionAltitude = self.missionAltitude + param.TrackFormation = self.TrackFormation + + DCStask.params=param + + table.insert(DCStasks, DCStask) + elseif self.type==AUFTRAG.Type.HOVER then --------------------- @@ -6619,6 +6700,8 @@ function AUFTRAG:GetMissionTaskforMissionType(MissionType) mtask=ENUMS.MissionTask.NOTHING elseif MissionType==AUFTRAG.Type.HOVER then mtask=ENUMS.MissionTask.NOTHING + elseif MissionType==AUFTRAG.Type.PATROLRACETRACK then + mtask=ENUMS.MissionTask.CAP end return mtask diff --git a/Moose Development/Moose/Ops/Cohort.lua b/Moose Development/Moose/Ops/Cohort.lua index 5ab2e97da..5ed60451c 100644 --- a/Moose Development/Moose/Ops/Cohort.lua +++ b/Moose Development/Moose/Ops/Cohort.lua @@ -75,7 +75,7 @@ COHORT = { livery = nil, skill = nil, legion = nil, - Ngroups = nil, + --Ngroups = nil, Ngroups = 0, engageRange = nil, tacanChannel = {}, @@ -1098,7 +1098,7 @@ function COHORT:RecruitAssets(MissionType, Npayloads) -- Assets on mission NOTHING are considered. table.insert(assets, asset) - elseif self.legion:IsAssetOnMission(asset, AUFTRAG.Type.GCICAP) and MissionType==AUFTRAG.Type.INTERCEPT then + elseif self.legion:IsAssetOnMission(asset, {AUFTRAG.Type.GCICAP, AUFTRAG.Type.PATROLRACETRACK}) and MissionType==AUFTRAG.Type.INTERCEPT then -- Check if the payload of this asset is compatible with the mission. -- Note: we do not check the payload as an asset that is on a GCICAP mission should be able to do an INTERCEPT as well! @@ -1595,4 +1595,3 @@ end ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - diff --git a/Moose Development/Moose/Ops/EasyGCICAP.lua b/Moose Development/Moose/Ops/EasyGCICAP.lua index 248318fe7..0633f8b23 100644 --- a/Moose Development/Moose/Ops/EasyGCICAP.lua +++ b/Moose Development/Moose/Ops/EasyGCICAP.lua @@ -64,6 +64,7 @@ -- @field Core.Set#SET_ZONE NoGoZoneSet -- @field #boolean Monitor -- @field #boolean TankerInvisible +-- @field #number CapFormation -- @extends Core.Fsm#FSM --- *“Airspeed, altitude, and brains. Two are always needed to successfully complete the flight.”* -- Unknown. @@ -207,6 +208,7 @@ EASYGCICAP = { NoGoZoneSet = nil, Monitor = false, TankerInvisible = true, + CapFormation = nil, } --- Internal Squadron data type @@ -242,7 +244,7 @@ EASYGCICAP = { --- EASYGCICAP class version. -- @field #string version -EASYGCICAP.version="0.0.8" +EASYGCICAP.version="0.0.9" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO list @@ -289,6 +291,7 @@ function EASYGCICAP:New(Alias, AirbaseName, Coalition, EWRName) self.repeatsonfailure = 3 self.Monitor = false self.TankerInvisible = true + self.CapFormation = ENUMS.Formation.FixedWing.FingerFour.Group -- Set some string id for output to DCS.log file. self.lid=string.format("EASYGCICAP %s | ", self.alias) @@ -313,6 +316,14 @@ end -- Functions ------------------------------------------------------------------------- +--- Set CAP formation. +-- @param #EASYGCICAP self +-- @param #number Formation Formation to fly, defaults to ENUMS.Formation.FixedWing.FingerFour.Group +-- @return #EASYGCICAP self +function EASYGCICAP:SetCAPFormation(Formation) + self.CapFormation = Formation + return self +end --- Set Tanker and AWACS to be invisible to enemy AI eyes -- @param #EASYGCICAP self @@ -476,6 +487,8 @@ end function EASYGCICAP:_AddAirwing(Airbasename, Alias) self:T(self.lid.."_AddAirwing "..Airbasename) + local CapFormation = self.CapFormation + -- Create Airwing local CAP_Wing = AIRWING:New(Airbasename,Alias) CAP_Wing:SetVerbosityLevel(3) @@ -484,11 +497,15 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias) CAP_Wing:SetAirbase(AIRBASE:FindByName(Airbasename)) CAP_Wing:SetRespawnAfterDestroyed() CAP_Wing:SetNumberCAP(self.capgrouping) + CAP_Wing:SetCapCloseRaceTrack(true) + if CapFormation then + CAP_Wing:SetCAPFormation(CapFormation) + end if #self.ManagedTK > 0 then CAP_Wing:SetNumberTankerBoom(1) CAP_Wing:SetNumberTankerProbe(1) end - if #self.ManagedAW > 0 then + if #self.ManagedEWR > 0 then CAP_Wing:SetNumberAWACS(1) end if #self.ManagedREC > 0 then @@ -515,6 +532,9 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias) flightgroup:SetDetection(true) flightgroup:SetEngageDetectedOn(self.engagerange,{"Air"},self.GoZoneSet,self.NoGoZoneSet) flightgroup:SetOutOfAAMRTB() + if CapFormation then + flightgroup:GetGroup():SetOption(AI.Option.Air.id.FORMATION,CapFormation) + end end if Mission.type == AUFTRAG.Type.TANKER or Mission.type == AUFTRAG.Type.AWACS or Mission.type == AUFTRAG.Type.RECON then if TankerInvisible then @@ -888,7 +908,7 @@ function EASYGCICAP:_AddSquadron(TemplateName, SquadName, AirbaseName, AirFrames self:T(self.lid.."_AddSquadron "..SquadName) -- Add Squadrons local Squadron_One = SQUADRON:New(TemplateName,AirFrames,SquadName) - Squadron_One:AddMissionCapability({AUFTRAG.Type.CAP, AUFTRAG.Type.GCICAP, AUFTRAG.Type.INTERCEPT, AUFTRAG.Type.ALERT5}) + Squadron_One:AddMissionCapability({AUFTRAG.Type.CAP, AUFTRAG.Type.GCICAP, AUFTRAG.Type.INTERCEPT, AUFTRAG.Type.PATROLRACETRACK, AUFTRAG.Type.ALERT5}) --Squadron_One:SetFuelLowRefuel(true) Squadron_One:SetFuelLowThreshold(0.3) Squadron_One:SetTurnoverTime(10,20) @@ -900,7 +920,7 @@ function EASYGCICAP:_AddSquadron(TemplateName, SquadName, AirbaseName, AirFrames local wing = self.wings[AirbaseName][1] -- Ops.AirWing#AIRWING wing:AddSquadron(Squadron_One) - wing:NewPayload(TemplateName,-1,{AUFTRAG.Type.CAP, AUFTRAG.Type.GCICAP, AUFTRAG.Type.INTERCEPT, AUFTRAG.Type.ALERT5},75) + wing:NewPayload(TemplateName,-1,{AUFTRAG.Type.CAP, AUFTRAG.Type.GCICAP, AUFTRAG.Type.INTERCEPT, AUFTRAG.Type.PATROLRACETRACK, AUFTRAG.Type.ALERT5},75) return self end @@ -1234,12 +1254,16 @@ function EASYGCICAP:onafterStatus(From,Event,To) local capmission = 0 local interceptmission = 0 local reconmission = 0 + local awacsmission = 0 + local tankermission = 0 for _,_wing in pairs(self.wings) do local count = _wing[1]:CountAssetsOnMission(MissionTypes,Cohort) local count2 = _wing[1]:CountAssets(true,MissionTypes,Attributes) - capmission = capmission + _wing[1]:CountMissionsInQueue({AUFTRAG.Type.GCICAP}) + capmission = capmission + _wing[1]:CountMissionsInQueue({AUFTRAG.Type.GCICAP,AUFTRAG.Type.PATROLRACETRACK}) interceptmission = interceptmission + _wing[1]:CountMissionsInQueue({AUFTRAG.Type.INTERCEPT}) reconmission = reconmission + _wing[1]:CountMissionsInQueue({AUFTRAG.Type.RECON}) + awacsmission = awacsmission + _wing[1]:CountMissionsInQueue({AUFTRAG.Type.AWACS}) + tankermission = tankermission + _wing[1]:CountMissionsInQueue({AUFTRAG.Type.TANKER}) assets = assets + count instock = instock + count2 end @@ -1251,6 +1275,8 @@ function EASYGCICAP:onafterStatus(From,Event,To) text = text.."\nMissions: "..capmission+interceptmission text = text.."\n - CAP: "..capmission text = text.."\n - Intercept: "..interceptmission + text = text.."\n - AWACS: "..awacsmission + text = text.."\n - TANKER: "..tankermission text = text.."\n - Recon: "..reconmission MESSAGE:New(text,15,"GCICAP"):ToAll():ToLogIf(self.debug) end diff --git a/Moose Development/Moose/Ops/FlightGroup.lua b/Moose Development/Moose/Ops/FlightGroup.lua index 5800625df..1bbd1c8bb 100644 --- a/Moose Development/Moose/Ops/FlightGroup.lua +++ b/Moose Development/Moose/Ops/FlightGroup.lua @@ -2605,6 +2605,9 @@ function FLIGHTGROUP:onbeforeUpdateRoute(From, Event, To, n, N) elseif task.dcstask.id==AUFTRAG.SpecialTask.RECON then -- For recon missions, we need to allow the update as we insert new waypoints. self:T2(self.lid.."Allowing update route for Task: ReconMission") + elseif task.dcstask.id==AUFTRAG.SpecialTask.PATROLRACETRACK then + -- For recon missions, we need to allow the update as we insert new waypoints. + self:T2(self.lid.."Allowing update route for Task: Patrol Race Track") elseif task.dcstask.id==AUFTRAG.SpecialTask.HOVER then -- For recon missions, we need to allow the update as we insert new waypoints. self:T2(self.lid.."Allowing update route for Task: Hover") diff --git a/Moose Development/Moose/Ops/Legion.lua b/Moose Development/Moose/Ops/Legion.lua index 7405fc02a..0f6535e99 100644 --- a/Moose Development/Moose/Ops/Legion.lua +++ b/Moose Development/Moose/Ops/Legion.lua @@ -965,7 +965,7 @@ function LEGION:onafterMissionRequest(From, Event, To, Mission, Assets) local pause=false -- Check if mission is INTERCEPT and asset is currently on GCI mission. If so, GCI is paused. - if currM.type==AUFTRAG.Type.GCICAP and Mission.type==AUFTRAG.Type.INTERCEPT then + if (currM.type==AUFTRAG.Type.GCICAP or currM.type==AUFTRAG.Type.PATROLRACETRACK) and Mission.type==AUFTRAG.Type.INTERCEPT then pause=true elseif (currM.type==AUFTRAG.Type.ONGUARD or currM.type==AUFTRAG.Type.PATROLZONE) and (Mission.type==AUFTRAG.Type.ARTY or Mission.type==AUFTRAG.Type.GROUNDATTACK) then pause=true @@ -1445,7 +1445,7 @@ end -- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The asset that returned. function LEGION:onafterLegionAssetReturned(From, Event, To, Cohort, Asset) -- Debug message. - self:I(self.lid..string.format("Asset %s from Cohort %s returned! asset.assignment=\"%s\"", Asset.spawngroupname, Cohort.name, tostring(Asset.assignment))) + self:T(self.lid..string.format("Asset %s from Cohort %s returned! asset.assignment=\"%s\"", Asset.spawngroupname, Cohort.name, tostring(Asset.assignment))) -- Stop flightgroup. if Asset.flightgroup and not Asset.flightgroup:IsStopped() then @@ -2557,9 +2557,10 @@ function LEGION._CohortCan(Cohort, MissionType, Categories, Attributes, Properti -- Distance to target. local TargetDistance=TargetVec2 and UTILS.VecDist2D(TargetVec2, cohort.legion:GetVec2()) or 0 - + -- Is in range? local Rmax=cohort:GetMissionRange(WeaponTypes) + local RangeMax = RangeMax or 0 local InRange=(RangeMax and math.max(RangeMax, Rmax) or Rmax) >= TargetDistance return InRange @@ -2610,6 +2611,7 @@ function LEGION._CohortCan(Cohort, MissionType, Categories, Attributes, Properti -- Is capable of the mission type? local can=AUFTRAG.CheckMissionCapability(MissionType, Cohort.missiontypes) + if can then can=CheckCategory(Cohort) else @@ -2687,7 +2689,7 @@ function LEGION._CohortCan(Cohort, MissionType, Categories, Attributes, Properti return nil end ---- Recruit assets from Cohorts for the given parameters. **NOTE** that we set the `asset.isReserved=true` flag so it cant be recruited by anyone else. +--- Recruit assets from Cohorts for the given parameters. **NOTE** that we set the `asset.isReserved=true` flag so it cannot be recruited by anyone else. -- @param #table Cohorts Cohorts included. -- @param #string MissionTypeRecruit Mission type for recruiting the cohort assets. -- @param #string MissionTypeOpt Mission type for which the assets are optimized. Default is the same as `MissionTypeRecruit`. @@ -3181,7 +3183,7 @@ function LEGION.CalculateAssetMissionScore(asset, MissionType, TargetVec2, Inclu if currmission.type==AUFTRAG.Type.ALERT5 and currmission.alert5MissionType==MissionType then -- Prefer assets that are on ALERT5 for this mission type. score=score+25 - elseif currmission.type==AUFTRAG.Type.GCICAP and MissionType==AUFTRAG.Type.INTERCEPT then + elseif (currmission.type==AUFTRAG.Type.GCICAP or currmission.type==AUFTRAG.Type.PATROLRACETRACK) and MissionType==AUFTRAG.Type.INTERCEPT then -- Prefer assets that are on GCICAP to perform INTERCEPTS. We set this even higher than alert5 because they are already in the air. score=score+35 elseif (currmission.type==AUFTRAG.Type.ONGUARD or currmission.type==AUFTRAG.Type.PATROLZONE) and (MissionType==AUFTRAG.Type.ARTY or MissionType==AUFTRAG.Type.GROUNDATTACK) then diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index ba562e542..0ba09f730 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -4463,6 +4463,26 @@ function OPSGROUP:_UpdateTask(Task, Mission) if target then self:EngageTarget(target, speed, Task.dcstask.params.formation) end + + elseif Task.dcstask.id==AUFTRAG.SpecialTask.PATROLRACETRACK then + + --- + -- Task "Patrol Race Track" Mission. + --- + + if self.isFlightgroup then + self:T("We are Special Auftrag Patrol Race Track, starting now ...") + --self:I({Task.dcstask.params}) + --[[ + Task.dcstask.params.TrackAltitude = self.TrackAltitude + Task.dcstask.params.TrackSpeed = self.TrackSpeed + Task.dcstask.params.TrackPoint1 = self.TrackPoint1 + Task.dcstask.params.TrackPoint2 = self.TrackPoint2 + Task.dcstask.params.TrackFormation = self.TrackFormation + --]] + local aircraft = self:GetGroup() + aircraft:PatrolRaceTrack(Task.dcstask.params.TrackPoint1,Task.dcstask.params.TrackPoint2,Task.dcstask.params.TrackAltitude,Task.dcstask.params.TrackSpeed,Task.dcstask.params.TrackFormation,1) + end elseif Task.dcstask.id==AUFTRAG.SpecialTask.HOVER then From 4e5b483cc0441efe74363d8278cd1ee93b4ee168 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Tue, 24 Oct 2023 13:45:43 +0200 Subject: [PATCH 21/51] #CONTROLLABLE * Added PatrolRaceTrack --- Moose Development/Moose/DCS.lua | 147 ++++++++++-------- .../Moose/Functional/Warehouse.lua | 32 ++-- .../Moose/Wrapper/Controllable.lua | 48 ++++++ 3 files changed, 155 insertions(+), 72 deletions(-) diff --git a/Moose Development/Moose/DCS.lua b/Moose Development/Moose/DCS.lua index 267b2f4e2..26a0a99e7 100644 --- a/Moose Development/Moose/DCS.lua +++ b/Moose Development/Moose/DCS.lua @@ -135,6 +135,22 @@ do -- env end -- env +do -- radio + + ---@type radio + -- @field #radio.modulation modulation + + --- + -- @type radio.modulation + -- @field AM + -- @field FM + + radio = {} + radio.modulation = {} + radio.modulation.AM = 0 + radio.modulation.FM = 1 + +end do -- timer @@ -329,11 +345,11 @@ end -- country do -- Command - --- @type Command + -- @type Command -- @field #string id -- @field #Command.params params - --- @type Command.params + -- @type Command.params end -- Command @@ -374,7 +390,7 @@ end -- coalition do -- Types - --- @type Desc + -- @type Desc -- @field #number speedMax0 Max speed in meters/second at zero altitude. -- @field #number massEmpty Empty mass in kg. -- @field #number tankerType Type of refueling system: 0=boom, 1=probe. @@ -471,16 +487,16 @@ do -- Types -- @type AttributeNameArray -- @list <#AttributeName> - --- @type Zone + -- @type Zone -- @field DCSVec3#Vec3 point -- @field #number radius Zone = {} - --- @type ModelTime + -- @type ModelTime -- @extends #number - --- @type Time + -- @type Time -- @extends #number --- A task descriptor (internal structure for DCS World). See [https://wiki.hoggitworld.com/view/Category:Tasks](https://wiki.hoggitworld.com/view/Category:Tasks). @@ -489,7 +505,7 @@ do -- Types -- @field #string id -- @field #Task.param param - --- @type Task.param + -- @type Task.param --- List of @{#Task} -- @type TaskArray @@ -536,7 +552,7 @@ do -- Object -- @field SCENERY -- @field CARGO - --- @type Object.Desc + -- @type Object.Desc -- @extends #Desc -- @field #number life initial life level -- @field #Box3 box bounding box of collision geometry @@ -1085,7 +1101,7 @@ end -- Controller do -- Unit - --- @type Unit + -- @type Unit -- @extends #CoalitionObject -- @field ID Identifier of an unit. It assigned to an unit by the Mission Editor automatically. -- @field #Unit.Category Category @@ -1200,15 +1216,18 @@ do -- Unit -- @field #Distance detectionDistanceHRM detection distance for RCS=1m^2 in high-resolution mapping mode, nil if radar has no HRM -- @field #Unit.Radar.detectionDistanceAir detectionDistanceAir detection distance for RCS=1m^2 airborne target, nil if radar doesn't support air search - --- @type Unit.Radar.detectionDistanceAir + --- A radar. + -- @type Unit.Radar.detectionDistanceAir -- @field #Unit.Radar.detectionDistanceAir.upperHemisphere upperHemisphere -- @field #Unit.Radar.detectionDistanceAir.lowerHemisphere lowerHemisphere - --- @type Unit.Radar.detectionDistanceAir.upperHemisphere + --- A radar. + -- @type Unit.Radar.detectionDistanceAir.upperHemisphere -- @field #Distance headOn -- @field #Distance tailOn - --- @type Unit.Radar.detectionDistanceAir.lowerHemisphere + --- A radar. + -- @type Unit.Radar.detectionDistanceAir.lowerHemisphere -- @field #Distance headOn -- @field #Distance tailOn @@ -1510,22 +1529,26 @@ do -- AI -- @field IR_POINTER -- @field LASER - --- @type AI.Task.WaypointType + --- + -- @type AI.Task.WaypointType -- @field TAKEOFF -- @field TAKEOFF_PARKING -- @field TURNING_POINT -- @field TAKEOFF_PARKING_HOT -- @field LAND - --- @type AI.Task.TurnMethod + --- + -- @type AI.Task.TurnMethod -- @field FLY_OVER_POINT -- @field FIN_POINT - --- @type AI.Task.AltitudeType + --- + -- @type AI.Task.AltitudeType -- @field BARO -- @field RADIO - --- @type AI.Task.VehicleFormation + --- + -- @type AI.Task.VehicleFormation -- @field OFF_ROAD -- @field ON_ROAD -- @field RANK @@ -1535,27 +1558,30 @@ do -- AI -- @field ECHELON_LEFT -- @field ECHELON_RIGHT - --- @type AI.Option + --- + -- @type AI.Option -- @field #AI.Option.Air Air -- @field #AI.Option.Ground Ground -- @field #AI.Option.Naval Naval - --- @type AI.Option.Air + --- + -- @type AI.Option.Air -- @field #AI.Option.Air.id id -- @field #AI.Option.Air.val val - --- @type AI.Option.Ground + --- + -- @type AI.Option.Ground -- @field #AI.Option.Ground.id id -- @field #AI.Option.Ground.val val -- @field #AI.Option.Ground.mid mid -- @field #AI.Option.Ground.mval mval -- - --- @type AI.Option.Naval + -- @type AI.Option.Naval -- @field #AI.Option.Naval.id id -- @field #AI.Option.Naval.val val - - --- @type AI.Option.Air.id + --- + -- @type AI.Option.Air.id -- @field NO_OPTION -- @field ROE -- @field REACTION_ON_THREAT @@ -1577,73 +1603,61 @@ do -- AI -- @field OPTION_RADIO_USAGE_KILL -- @field JETT_TANKS_IF_EMPTY -- @field FORCED_ATTACK - - --- @type AI.Option.Air.id.FORMATION - -- @field LINE_ABREAST - -- @field TRAIL - -- @field WEDGE - -- @field ECHELON_RIGHT - -- @field ECHELON_LEFT - -- @field FINGER_FOUR - -- @field SPREAD_FOUR - -- @field WW2_BOMBER_ELEMENT - -- @field WW2_BOMBER_ELEMENT_HEIGHT - -- @field WW2_FIGHTER_VIC - -- @field HEL_WEDGE - -- @field HEL_ECHELON - -- @field HEL_FRONT - -- @field HEL_COLUMN - -- @field COMBAT_BOX - -- @field JAVELIN_DOWN - - --- @type AI.Option.Air.val + --- + -- @type AI.Option.Air.val -- @field #AI.Option.Air.val.ROE ROE -- @field #AI.Option.Air.val.REACTION_ON_THREAT REACTION_ON_THREAT -- @field #AI.Option.Air.val.RADAR_USING RADAR_USING -- @field #AI.Option.Air.val.FLARE_USING FLARE_USING - --- @type AI.Option.Air.val.ROE + --- + -- @type AI.Option.Air.val.ROE -- @field WEAPON_FREE -- @field OPEN_FIRE_WEAPON_FREE -- @field OPEN_FIRE -- @field RETURN_FIRE -- @field WEAPON_HOLD - - --- @type AI.Option.Air.val.REACTION_ON_THREAT + + --- + -- @type AI.Option.Air.val.REACTION_ON_THREAT -- @field NO_REACTION -- @field PASSIVE_DEFENCE -- @field EVADE_FIRE -- @field BYPASS_AND_ESCAPE -- @field ALLOW_ABORT_MISSION - --- @type AI.Option.Air.val.RADAR_USING + --- + -- @type AI.Option.Air.val.RADAR_USING -- @field NEVER -- @field FOR_ATTACK_ONLY -- @field FOR_SEARCH_IF_REQUIRED -- @field FOR_CONTINUOUS_SEARCH - --- @type AI.Option.Air.val.FLARE_USING + --- + -- @type AI.Option.Air.val.FLARE_USING -- @field NEVER -- @field AGAINST_FIRED_MISSILE -- @field WHEN_FLYING_IN_SAM_WEZ -- @field WHEN_FLYING_NEAR_ENEMIES - - --- @type AI.Option.Air.val.ECM_USING + + --- + -- @type AI.Option.Air.val.ECM_USING -- @field NEVER_USE -- @field USE_IF_ONLY_LOCK_BY_RADAR -- @field USE_IF_DETECTED_LOCK_BY_RADAR -- @field ALWAYS_USE - - --- @type AI.Option.Air.val.MISSILE_ATTACK + + --- + -- @type AI.Option.Air.val.MISSILE_ATTACK -- @field MAX_RANGE -- @field NEZ_RANGE -- @field HALF_WAY_RMAX_NEZ -- @field TARGET_THREAT_EST -- @field RANDOM_RANGE - - --- @type AI.Option.Ground.id + --- + -- @type AI.Option.Ground.id -- @field NO_OPTION -- @field ROE @{#AI.Option.Ground.val.ROE} -- @field FORMATION @@ -1652,42 +1666,51 @@ do -- AI -- @field ENGAGE_AIR_WEAPONS -- @field AC_ENGAGEMENT_RANGE_RESTRICTION - --- @type AI.Option.Ground.mid -- Moose added + --- + -- @type AI.Option.Ground.mid -- Moose added -- @field RESTRICT_AAA_MIN 27 -- @field RESTRICT_AAA_MAX 29 -- @field RESTRICT_TARGETS @{#AI.Option.Ground.mval.ENGAGE_TARGETS} 28 - --- @type AI.Option.Ground.val + --- + -- @type AI.Option.Ground.val -- @field #AI.Option.Ground.val.ROE ROE -- @field #AI.Option.Ground.val.ALARM_STATE ALARM_STATE -- @field #AI.Option.Ground.val.ENGAGE_TARGETS RESTRICT_TARGETS - --- @type AI.Option.Ground.val.ROE + --- + -- @type AI.Option.Ground.val.ROE -- @field OPEN_FIRE -- @field RETURN_FIRE -- @field WEAPON_HOLD - --- @type AI.Option.Ground.mval -- Moose added + --- + -- @type AI.Option.Ground.mval -- Moose added -- @field #AI.Option.Ground.mval.ENGAGE_TARGETS ENGAGE_TARGETS - --- @type AI.Option.Ground.mval.ENGAGE_TARGETS -- Moose added + --- + -- @type AI.Option.Ground.mval.ENGAGE_TARGETS -- Moose added -- @field ANY_TARGET -- 0 -- @field AIR_UNITS_ONLY -- 1 -- @field GROUND_UNITS_ONLY -- 2 - --- @type AI.Option.Ground.val.ALARM_STATE + --- + -- @type AI.Option.Ground.val.ALARM_STATE -- @field AUTO -- @field GREEN -- @field RED - --- @type AI.Option.Naval.id + --- + -- @type AI.Option.Naval.id -- @field NO_OPTION -- @field ROE - --- @type AI.Option.Naval.val + --- + -- @type AI.Option.Naval.val -- @field #AI.Option.Naval.val.ROE ROE - --- @type AI.Option.Naval.val.ROE + --- + -- @type AI.Option.Naval.val.ROE -- @field OPEN_FIRE -- @field RETURN_FIRE -- @field WEAPON_HOLD diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index f07fb5935..97222cd6f 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -3616,9 +3616,10 @@ function WAREHOUSE:onafterStatus(From, Event, To) end -- Print queue after processing requests. - self:_PrintQueue(self.queue, "Queue waiting") - self:_PrintQueue(self.pending, "Queue pending") - + if self.verbosity > 2 then + self:_PrintQueue(self.queue, "Queue waiting") + self:_PrintQueue(self.pending, "Queue pending") + end -- Check fuel for all assets. --self:_CheckFuel() @@ -4101,9 +4102,9 @@ function WAREHOUSE:_RegisterAsset(group, ngroups, forceattribute, forcecargobay, -- Get the size of an object. local function _GetObjectSize(DCSdesc) if DCSdesc.box then - local x=DCSdesc.box.max.x+math.abs(DCSdesc.box.min.x) --length - local y=DCSdesc.box.max.y+math.abs(DCSdesc.box.min.y) --height - local z=DCSdesc.box.max.z+math.abs(DCSdesc.box.min.z) --width + local x=DCSdesc.box.max.x-DCSdesc.box.min.x --length + local y=DCSdesc.box.max.y-DCSdesc.box.min.y --height + local z=DCSdesc.box.max.z-DCSdesc.box.min.z --width return math.max(x,z), x , y, z end return 0,0,0,0 @@ -5498,8 +5499,13 @@ function WAREHOUSE:onafterAssetDead(From, Event, To, asset, request) --- -- Remove dead group from cargo group set. - request.cargogroupset:Remove(groupname, NoTriggerEvent) - self:T(self.lid..string.format("Removed selfpropelled cargo %s: ncargo=%d.", groupname, request.cargogroupset:Count())) + if request.cargogroupset then + -- cargogroupset was nil for user case. Difficult to reproduce so we add a nil check. + request.cargogroupset:Remove(groupname, NoTriggerEvent) + self:T(self.lid..string.format("Removed selfpropelled cargo %s: ncargo=%d.", groupname, request.cargogroupset:Count())) + else + self:E(self.lid..string.format("ERROR: cargogroupset is nil for request ID=%s!", tostring(request.uid))) + end else @@ -6671,7 +6677,13 @@ function WAREHOUSE:_OnEventCrashOrDead(EventData) self:Destroyed() end if self.airbase and self.airbasename and self.airbasename==EventData.IniUnitName then - self:RunwayDestroyed() + if self:IsRunwayOperational() then + -- Trigger RunwayDestroyed event (only if it is not destroyed already) + self:RunwayDestroyed() + else + -- Reset the time stamp. + self.runwaydestroyed=timer.getAbsTime() + end end end @@ -8223,7 +8235,7 @@ end -- @return #number Request ID. function WAREHOUSE:_GetIDsFromGroupName(groupname) - ---@param #string text The text to analyse. + -- @param #string text The text to analyse. local function analyse(text) -- Get rid of #0001 tail from spawn. diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 9c9a68d58..20abf3e2a 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -5329,3 +5329,51 @@ function CONTROLLABLE:TaskAerobaticsBarrelRoll(TaskAerobatics,Repeats,InitAltitu return TaskAerobatics end + +--- [Air] Make an airplane or helicopter patrol between two points in a racetrack - resulting in a much tighter track around the start and end points. +-- @param #CONTROLLABLE self +-- @param Core.Point#COORDINATE Point1 Start point. +-- @param Core.Point#COORDINATE Point2 End point. +-- @param #number Altitude (Optional) Altitude in meters. Defaults to the altitude of the coordinate. +-- @param #number Speed (Optional) Speed in kph. Defaults to 500 kph. +-- @param #number Formation (Optional) Formation to take, e.g. ENUMS.Formation.FixedWing.Trail.Close, also see [Hoggit Wiki](https://wiki.hoggitworld.com/view/DCS_option_formation). +-- @param #number Delay (Optional) Set the task after delay seconds only. +-- @return #CONTROLLABLE self +function CONTROLLABLE:PatrolRaceTrack(Point1, Point2, Altitude, Speed, Formation, Delay) + + local PatrolGroup = self -- Wrapper.Group#GROUP + + if not self:IsInstanceOf( "GROUP" ) then + PatrolGroup = self:GetGroup() -- Wrapper.Group#GROUP + end + + local delay = Delay or 1 + + self:F( { PatrolGroup = PatrolGroup:GetName() } ) + + if PatrolGroup:IsAir() then + if Formation then + PatrolGroup:SetOption(AI.Option.Air.id.FORMATION,Formation) -- https://wiki.hoggitworld.com/view/DCS_option_formation + end + + local FromCoord = PatrolGroup:GetCoordinate() + local ToCoord = Point1:GetCoordinate() + + -- Calculate the new Route + if Altitude then + FromCoord:SetAltitude(Altitude) + ToCoord:SetAltitude(Altitude) + end + + -- Create a "air waypoint", which is a "point" structure that can be given as a parameter to a Task + local Route = {} + Route[#Route + 1] = FromCoord:WaypointAir( AltType, COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, Speed, true, nil, DCSTasks, description, timeReFuAr ) + Route[#Route + 1] = ToCoord:WaypointAir( AltType, COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, Speed, true, nil, DCSTasks, description, timeReFuAr ) + + local TaskRouteToZone = PatrolGroup:TaskFunction( "CONTROLLABLE.PatrolRaceTrack", Point2, Point1, Altitude, Speed, Formation, Delay ) + PatrolGroup:SetTaskWaypoint( Route[#Route], TaskRouteToZone ) -- Set for the given Route at Waypoint 2 the TaskRouteToZone. + PatrolGroup:Route( Route, Delay ) -- Move after delay seconds to the Route. See the Route method for details. + end + + return self +end From 3fbc76e37fea27926148c80d0a858d84784d526d Mon Sep 17 00:00:00 2001 From: kaltokri Date: Tue, 24 Oct 2023 16:09:09 +0200 Subject: [PATCH 22/51] Documentation of the build system added --- .gitignore | 2 + docs/buildsystem/build-docs.md | 73 ++++++++++++++++++++++++++++++ docs/buildsystem/build-includes.md | 45 ++++++++++++++++++ docs/buildsystem/gh-pages.md | 51 +++++++++++++++++++++ docs/buildsystem/index.md | 58 ++++++++++++++++++++++++ docs/buildsystem/local-test.md | 49 ++++++++++++++++++++ 6 files changed, 278 insertions(+) create mode 100644 docs/buildsystem/build-docs.md create mode 100644 docs/buildsystem/build-includes.md create mode 100644 docs/buildsystem/gh-pages.md create mode 100644 docs/buildsystem/index.md create mode 100644 docs/buildsystem/local-test.md diff --git a/.gitignore b/.gitignore index 0578aa593..05489aa14 100644 --- a/.gitignore +++ b/.gitignore @@ -227,3 +227,5 @@ MooseCodeWS.code-workspace # Excludes for act (https://github.com/nektos/act) .secrets .env +.actrc +.vars diff --git a/docs/buildsystem/build-docs.md b/docs/buildsystem/build-docs.md new file mode 100644 index 000000000..8247e30bb --- /dev/null +++ b/docs/buildsystem/build-docs.md @@ -0,0 +1,73 @@ +--- +parent: Build system +nav_order: 2 +--- + +# Build class documentation + +The documentation of all classes are included in the code as comments. +This kind of documentation process is called [LuaDoc]. But we build the +html files for the documentation with [LuaDocumentor]. It is a tool +similar to [LuaDoc], but with some additional features the Moose team +decided to use. + +{: .important } +> The team created also some modifications, which are not part of the +> official [LuaDocumentor] tool. So we use the code in the git repository +> [Applevangelist/luadocumentor] in the branch `patch-1`. + +There are two git repositories which are used to save the generated +documentation: + +- [MOOSE_DOCS] is the repository for the `master` branch of [MOOSE] + - A configured GitHub Pages job will deploy the result to:
+ +- [MOOSE_DOCS_DEVELOP] is the repository for the `develop` branch of [MOOSE] + - A configured GitHub Pages job will deploy the result to:
+ + +Main build steps to create the class documentation are defined in [.github/workflows/build-docs.yml]: + +- Checkout of the git repository [MOOSE]. +- Create output folders. +- Checkout of the git repository [Applevangelist/luadocumentor] with + branch `patch-1` into a subdirectory. +- Update the Linux system software. +- Install needed tools: + - [tree] - A tool to output a tree view of a folder structure. + - [lua] - Package to run [Lua] scripts. This time [Lua] 5.1, + because it matches the DCS environment. + - [LuaRocks] - This is the package manager for Lua modules. + - [markdown] - Dependency for [LuaDocumentor] + - [penlight] - Dependency for [LuaDocumentor] + - [metalua-compiler] - Dependency for [LuaDocumentor] + - [metalua-parser] - Dependency for [metalua-compiler] + - [checks] - Dependency for [metalua-parser] + +- Run the build steps: + - Run `luadocumentor.lua` to create the html files. + +- Deploy build results: + - Checkout [MOOSE_DOCS] or [MOOSE_DOCS_DEVELOP] git repository in a subdirectory. + - Use the matching git repository for the branch of [MOOSE]. + - `master` -> [MOOSE_DOCS]. + - `develop` -> [MOOSE_DOCS_DEVELOP]. + - Use a `TOKEN` for checkout, so a `push` is possible later on. + - Copy build result to `MOOSE_DOCS` folder. + - Push results to the target repository. + +[tree]: https://www.cyberciti.biz/faq/linux-show-directory-structure-command-line/ +[LuaDoc]: https://keplerproject.github.io/luadoc/ +[LuaDocumentor]: https://luarocks.org/modules/luarocks/luadocumentor +[Applevangelist/luadocumentor]: https://github.com/Applevangelist/luadocumentor/tree/patch-1 +[markdown]: https://luarocks.org/modules/mpeterv/markdown +[penlight]: https://luarocks.org/modules/tieske/penlight +[metalua-compiler]: https://luarocks.org/modules/luarocks/metalua-compiler +[metalua-parser]: https://luarocks.org/modules/luarocks/metalua-parser +[checks]: https://luarocks.org/modules/fab13n/checks +[MOOSE]: https://github.com/FlightControl-Master/MOOSE +[MOOSE_DOCS]: https://github.com/FlightControl-Master/MOOSE_DOCS +[MOOSE_DOCS_DEVELOP]: https://github.com/FlightControl-Master/MOOSE_DOCS_DEVELOP +[Lua]: https://www.lua.org/ +[LuaRocks]: https://luarocks.org/ +[.github/workflows/build-docs.yml]: https://github.com/FlightControl-Master/MOOSE/blob/master/.github/workflows/build-docs.yml diff --git a/docs/buildsystem/build-includes.md b/docs/buildsystem/build-includes.md new file mode 100644 index 000000000..a3e84c38b --- /dev/null +++ b/docs/buildsystem/build-includes.md @@ -0,0 +1,45 @@ +--- +parent: Build system +nav_order: 1 +--- + +# Build include files + +Main build steps to create the include files are defined in [.github/workflows/build-includes.yml]: + +- Checkout of the git repository [MOOSE]. +- Create output folders. +- Update the Linux system software. +- Install needed tools: + - [tree] - A tool to output a tree view of a folder structure. + - [lua5.3] - Package to run [Lua] scripts. Version 5.3 is needed, because we + need liblua5.3-dev for [LuaSrcDiet]. + - [LuaRocks] - LuaRocks is the package manager for Lua modules. + - liblua5.3-dev - Header file of [Lua] needed for [LuaSrcDiet] to work. + - [LuaSrcDiet] - To compress the [Lua] code and create `Moose_.lua`. + - [LuaCheck] - This is a static code analyzer and a linter for [Lua]. + +- Run the build steps: + - Run `./Moose Setup/Moose_Create.lua` to create `Moose.lua`. + - Run `./Moose Setup/Moose_Create.lua` to create dynamic `Moose.lua` to + load individual Lua class files used by Moose developers. + - Run [LuaSrcDiet] to compress the [Lua] code and create `Moose_.lua` + - Run [LuaCheck] to find errors in the code. Warnings are ignored, because + there are a lot of warnings, which cannot be resolved by the Moose team. + +- Deploy build results: + - Checkout [MOOSE_INCLUDE] git repository in a subdirectory. + - Use the same branch used to checkout [MOOSE] git repository. + - Use a `TOKEN` for checkout, so a `push` is possible later on. + - Copy build result to `MOOSE_INCLUDE` folder + - Push results to [MOOSE_INCLUDE] repository + +[.github/workflows/build-includes.yml]: https://github.com/FlightControl-Master/MOOSE/blob/master/.github/workflows/build-includes.yml +[tree]: https://www.cyberciti.biz/faq/linux-show-directory-structure-command-line/ +[lua5.3]: https://www.lua.org/manual/5.3/ +[LuaRocks]: https://luarocks.org/ +[LuaCheck]: https://github.com/mpeterv/luacheck +[MOOSE]: https://github.com/FlightControl-Master/MOOSE +[MOOSE_INCLUDE]: https://github.com/FlightControl-Master/MOOSE_INCLUDE +[LuaSrcDiet]: https://github.com/jirutka/luasrcdiet +[Lua]: https://www.lua.org/ diff --git a/docs/buildsystem/gh-pages.md b/docs/buildsystem/gh-pages.md new file mode 100644 index 000000000..99277ed20 --- /dev/null +++ b/docs/buildsystem/gh-pages.md @@ -0,0 +1,51 @@ +--- +parent: Build system +nav_order: 3 +--- + +# Build GitHub Pages + +This documentation is created by [GitHub Pages]. The source files are +stored in the repository [MOOSE] in the subfolder `docs`. +We use [Just the Docs], which is a modern, highly customizable, and responsive +[Jekyll] theme for documentation. + +{: .note } +> The class documentation is created by its own [build] and is not the scope for this page! + +The build steps to create this documentation are defined in [.github/workflows/gh-pages.yml]. + +It is divided into two jobs: +- build: + - Only changes to in the subfolder `docs` or `gh-pages.yml` will trigger a build. + - Checkout of the git repository [MOOSE]. + - Setup [Ruby] version 3.1, which is needed by [Jekyll]. + - Run action [configure-pages]. + - Build with [Jekyll]. + - Run action [upload-pages-artifact]. +- deploy: + - Run action [deploy-pages]. + +# Preview of this documentation + +When enhancing this documentation it is very useful to see a 1on1 preview of the pages. +This can be displayed as follows: + +- You need a working installation of [Docker]. +- Go to the `docs` subfolder. +- Run `docker compose up`. +- Open a browser with the following URL: . +- After a change of the [Markdown] files, wait some seconds and press F5 in the browser. + +[GitHub Pages]: https://pages.github.com/ +[MOOSE]: https://github.com/FlightControl-Master/MOOSE +[Just the Docs]: https://github.com/just-the-docs/just-the-docs +[Jekyll]: https://jekyllrb.com/ +[Ruby]: https://www.ruby-lang.org/en/ +[build]: build-docs.md +[.github/workflows/gh-pages.yml]: https://github.com/FlightControl-Master/MOOSE/blob/master/.github/workflows/gh-pages.yml +[configure-pages]: https://github.com/actions/configure-pages/ +[upload-pages-artifact]: https://github.com/actions/upload-pages-artifact +[deploy-pages]: https://github.com/actions/deploy-pages/ +[Docker]: https://www.docker.com/ +[Markdown]: https://www.markdownguide.org/ diff --git a/docs/buildsystem/index.md b/docs/buildsystem/index.md new file mode 100644 index 000000000..1dec95fed --- /dev/null +++ b/docs/buildsystem/index.md @@ -0,0 +1,58 @@ +--- +has_children: true +nav_order: 3 +--- + +# Build system + +{: .note } +> This documentation is not needed for end users. Only the people of the +> development team, who must maintain the build system need to read this. + +In this document we want to describe our build system for MOOSE. +MOOSE consists of multiple [Lua] files. Each class is stored in its own file. +This is needed for MOOSE developers to maintain clarity. +For users this is not practical, because they want to include the whole framework +as a single file into their missions. + +Because of this the build will collect all needed files and merge them together +in one file with the name `Moose.lua`. It includes also all comments and the +class documentation. Because of this its size is about 6-7 MB. + +To reduce the size of the file and make mission files smaller, the Moose team +decided to create a version without all comments and documentation. This file +is named `Moose_.lua`. It is created by a tool with the name [LuaSrcDiet]. + +Both files will be called static includes. In other programming languages includes +are dependencies. For Moose it is easier to memorize, that these files must be +included in your mission to use Moose. It is an static approach because you need +to add it once and it is only read from inside of the mission file after that. +A dynamic approach is to load all the single class files on each mission start +from the hard disk. But this is more for advanced Moose users and Moose developers. + +## Details + +In the past [AppVeyor] was used to run the build on a Windows system. +We decided to migrate this build to [GitHub Actions]. Installation of +dependencies was not stable on Windows with [GitHub Actions]. So we switched +to Ubuntu Linux. + +### GitHub Actions yml files + +The build configuration is stored in the folder `.github/workflows`. You will find +multiple files in this directory: + +- [build-docs.yml] - Job definition to generate the class documentation +- [build-includes.yml] - Job definition to build the static includes +- [gh-pages.yml] - Job to build this documentation page + +We decided to use different files for each job for separation of duties and easier +maintenance. + +[Lua]: https://www.lua.org/ +[LuaSrcDiet]: https://github.com/jirutka/luasrcdiet +[AppVeyor]: https://www.appveyor.com/ +[GitHub Actions]: https://docs.github.com/en/actions +[build-docs.yml]: build-docs.md +[build-includes.yml]: build-includes.md +[gh-pages.yml]: gh-pages.md diff --git a/docs/buildsystem/local-test.md b/docs/buildsystem/local-test.md new file mode 100644 index 000000000..98d39fc5a --- /dev/null +++ b/docs/buildsystem/local-test.md @@ -0,0 +1,49 @@ +--- +parent: Build system +nav_order: 4 +--- + +# Run builds locally + +When creating or enhancing [GitHub Actions] builds it is a problem to test the +build. After each change you need to commit and check the build result. This +leads to a lot of unnecessary commits. + +Therefor it is needed to run the build locally on the developer PC. The tool +which enabled this is [act]. It uses [Docker] to create a build runner and +executes the [GitHub Actions] build with it. + +[act] can by installed by [Chocolatey] by this single command: `choco install act-cli`. + +We use the `Medium Docker Image` for our MOOSE builds to work properly. +Unfortunately the docker images used by [act] are not as up to date as the +images used by [GitHub Actions]. So we needed to add a build step with +`sudo apt-get -qq update`. + +The build jobs needs `TOKENS` to run properly. So you have to create a PAT +([Personal Access Token]). A classic Token with read rights is enough to run +the build, as long as don't want to push the results. + +{: .important } +> The push step is only executed if the variable `FORCE_PUSH` with value `true` is set. +> - This is only needed if the push step itself must be change and tested! +> - Add parameter `--var FORCE_PUSH=true` to your [act] commando. +> - You and your PAT needs write access to the target repos, too. + +Save your PAT in the file `.secrets` in the main folder +of the MOOSE repository. This file is added to `.gitignore`, so it is not +recognized by git for commits. Add the following line to `.secrets`: + +``` +BOT_TOKEN= +``` + +To run the builds use these commands: +- `act push -W .github/workflows/build-includes.yml` +- `act push -W .github/workflows/build-docs.yml` + +[GitHub Actions]: https://docs.github.com/en/actions +[act]: https://github.com/nektos/act +[Docker]: https://www.docker.com/ +[Chocolatey]: https://community.chocolatey.org/ +[Personal Access Token]: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens From 74d54637d587e447bc835790abf463eb260777c4 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Tue, 24 Oct 2023 18:25:02 +0200 Subject: [PATCH 23/51] #PLAYERTASK * Remove client from task, even if only player name is available --- Moose Development/Moose/Ops/PlayerTask.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Ops/PlayerTask.lua b/Moose Development/Moose/Ops/PlayerTask.lua index 15c2581ff..71a680cb4 100644 --- a/Moose Development/Moose/Ops/PlayerTask.lua +++ b/Moose Development/Moose/Ops/PlayerTask.lua @@ -21,7 +21,7 @@ -- === -- @module Ops.PlayerTask -- @image OPS_PlayerTask.jpg --- @date Last Update Sept 2023 +-- @date Last Update Oct 2023 do @@ -98,7 +98,7 @@ PLAYERTASK = { --- PLAYERTASK class version. -- @field #string version -PLAYERTASK.version="0.1.20" +PLAYERTASK.version="0.1.21" --- Generic task condition. -- @type PLAYERTASK.Condition @@ -470,10 +470,11 @@ end --- [User] Remove a client from this task -- @param #PLAYERTASK self -- @param Wrapper.Client#CLIENT Client +-- @param #string Name Name of the client -- @return #PLAYERTASK self -function PLAYERTASK:RemoveClient(Client) +function PLAYERTASK:RemoveClient(Client,Name) self:T(self.lid.."RemoveClient") - local name = Client:GetPlayerName() + local name = Name or Client:GetPlayerName() if self.Clients:HasUniqueID(name) then self.Clients:PullByID(name) if self.verbose then @@ -1551,7 +1552,7 @@ PLAYERTASKCONTROLLER.Messages = { --- PLAYERTASK class version. -- @field #string version -PLAYERTASKCONTROLLER.version="0.1.61" +PLAYERTASKCONTROLLER.version="0.1.62" --- Create and run a new TASKCONTROLLER instance. -- @param #PLAYERTASKCONTROLLER self @@ -2186,6 +2187,10 @@ function PLAYERTASKCONTROLLER:_EventHandler(EventData) task:RemoveClient(Client) --text = "Task aborted!" text = self.gettext:GetEntry("TASKABORT",self.locale) + else + task:RemoveClient(nil,EventData.IniPlayerName) + --text = "Task aborted!" + text = self.gettext:GetEntry("TASKABORT",self.locale) end else --text = "No active task!" From e48a8235602ab7528be1b15ffe6e76c5f3894d77 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Wed, 25 Oct 2023 08:46:52 +0200 Subject: [PATCH 24/51] #EASYGCICAP, CONTROLLABLE, OPSGROUP, AUFTRAG * Changed patrol race track alt to be ASL not AGL by default --- Moose Development/Moose/Ops/Auftrag.lua | 4 ++-- Moose Development/Moose/Ops/EasyGCICAP.lua | 4 ++-- Moose Development/Moose/Ops/OpsGroup.lua | 2 +- Moose Development/Moose/Wrapper/Controllable.lua | 9 ++++++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua index a1d234fbe..92511531c 100644 --- a/Moose Development/Moose/Ops/Auftrag.lua +++ b/Moose Development/Moose/Ops/Auftrag.lua @@ -1055,8 +1055,8 @@ end --- **[AIR]** Create an enhanced orbit race track mission. Planes will keep closer to the track. -- @param #AUFTRAG self -- @param Core.Point#COORDINATE Coordinate Where to start the race track. --- @param #number Altitude (Optional) Altitude in feet. Defaults to 20,000ft. --- @param #number Speed (Optional) Speed in knots. Defaults to 300kn. +-- @param #number Altitude (Optional) Altitude in feet. Defaults to 20,000ft ASL. +-- @param #number Speed (Optional) Speed in knots. Defaults to 300kn TAS. -- @param #number Heading (Optional) Heading in degrees, 0 to 360. Defaults to 90 degree (East). -- @param #number Leg (Optional) Leg of the race track in NM. Defaults to 10nm. -- @param #number Formation (Optional) Formation to take, e.g. ENUMS.Formation.FixedWing.Trail.Close, also see [Hoggit Wiki](https://wiki.hoggitworld.com/view/DCS_option_formation). diff --git a/Moose Development/Moose/Ops/EasyGCICAP.lua b/Moose Development/Moose/Ops/EasyGCICAP.lua index 0633f8b23..0d2ce7d99 100644 --- a/Moose Development/Moose/Ops/EasyGCICAP.lua +++ b/Moose Development/Moose/Ops/EasyGCICAP.lua @@ -569,8 +569,8 @@ end -- @param #EASYGCICAP self -- @param #string AirbaseName Name of the Wing's airbase -- @param Core.Point#COORDINATE Coordinate. --- @param #number Altitude Defaults to 25000 feet. --- @param #number Speed Defaults to 300 knots. +-- @param #number Altitude Defaults to 25000 feet ASL. +-- @param #number Speed Defaults to 300 knots TAS. -- @param #number Heading Defaults to 90 degrees (East). -- @param #number LegLength Defaults to 15 NM. -- @return #EASYGCICAP self diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index 0ba09f730..3ae97c282 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -4481,7 +4481,7 @@ function OPSGROUP:_UpdateTask(Task, Mission) Task.dcstask.params.TrackFormation = self.TrackFormation --]] local aircraft = self:GetGroup() - aircraft:PatrolRaceTrack(Task.dcstask.params.TrackPoint1,Task.dcstask.params.TrackPoint2,Task.dcstask.params.TrackAltitude,Task.dcstask.params.TrackSpeed,Task.dcstask.params.TrackFormation,1) + aircraft:PatrolRaceTrack(Task.dcstask.params.TrackPoint1,Task.dcstask.params.TrackPoint2,Task.dcstask.params.TrackAltitude,Task.dcstask.params.TrackSpeed,Task.dcstask.params.TrackFormation,false,1) end elseif Task.dcstask.id==AUFTRAG.SpecialTask.HOVER then diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 20abf3e2a..89e3541f8 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -5337,9 +5337,10 @@ end -- @param #number Altitude (Optional) Altitude in meters. Defaults to the altitude of the coordinate. -- @param #number Speed (Optional) Speed in kph. Defaults to 500 kph. -- @param #number Formation (Optional) Formation to take, e.g. ENUMS.Formation.FixedWing.Trail.Close, also see [Hoggit Wiki](https://wiki.hoggitworld.com/view/DCS_option_formation). +-- @param #boolean AGL (Optional) If true, set altitude to above ground level (AGL), not above sea level (ASL). -- @param #number Delay (Optional) Set the task after delay seconds only. -- @return #CONTROLLABLE self -function CONTROLLABLE:PatrolRaceTrack(Point1, Point2, Altitude, Speed, Formation, Delay) +function CONTROLLABLE:PatrolRaceTrack(Point1, Point2, Altitude, Speed, Formation, AGL, Delay) local PatrolGroup = self -- Wrapper.Group#GROUP @@ -5361,8 +5362,10 @@ function CONTROLLABLE:PatrolRaceTrack(Point1, Point2, Altitude, Speed, Formation -- Calculate the new Route if Altitude then - FromCoord:SetAltitude(Altitude) - ToCoord:SetAltitude(Altitude) + local asl = true + if AGL then asl = false end + FromCoord:SetAltitude(Altitude, asl) + ToCoord:SetAltitude(Altitude, asl) end -- Create a "air waypoint", which is a "point" structure that can be given as a parameter to a Task From 6e1dabfe9b14b33c62c082b606dd12f44a16a04e Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Wed, 25 Oct 2023 13:47:11 +0200 Subject: [PATCH 25/51] #FLIGHTCONTROL * Added option to switch subs on/off per instance --- Moose Development/Moose/Ops/FlightControl.lua | 76 +++++++++++++------ 1 file changed, 53 insertions(+), 23 deletions(-) diff --git a/Moose Development/Moose/Ops/FlightControl.lua b/Moose Development/Moose/Ops/FlightControl.lua index 54fe4ef31..905b3d3fa 100644 --- a/Moose Development/Moose/Ops/FlightControl.lua +++ b/Moose Development/Moose/Ops/FlightControl.lua @@ -4,7 +4,7 @@ -- -- * Manage aircraft departure and arrival -- * Handles AI and human players --- * Limit number of AI groups taxiing, taking off and landing simultaniously +-- * Limit number of AI groups taxiing, taking off and landing simultaneously -- * Immersive voice overs via SRS text-to-speech -- * Define holding patterns for airdromes -- @@ -61,6 +61,7 @@ -- @field #number runwaydestroyed Time stamp (abs), when runway was destroyed. If `nil`, runway is operational. -- @field #number runwayrepairtime Time in seconds until runway will be repaired after it was destroyed. Default is 3600 sec (one hour). -- @field #boolean markerParking If `true`, occupied parking spots are marked. +-- @field #boolean nosubs If `true`, SRS TTS is without subtitles. -- @extends Core.Fsm#FSM --- **Ground Control**: Airliner X, Good news, you are clear to taxi to the active. @@ -122,7 +123,7 @@ -- * `Length` is the length of the pattern. -- * `FlightLevelMin` is the lowest altitude at which aircraft can hold. -- * `FlightLevelMax` is the highest altitude at which aircraft can hold. --- * `Prio` is the priority of this holdig stacks. If multiple patterns are defined, patterns with higher prio will be filled first. +-- * `Prio` is the priority of this holding stacks. If multiple patterns are defined, patterns with higher prio will be filled first. -- -- # Parking Guard -- @@ -137,13 +138,13 @@ -- -- # Limits for Inbound and Outbound Flights -- --- You can define limits on how many aircraft are simultaniously landing and taking off. This avoids (DCS) problems where taxiing aircraft cause a "traffic jam" on the taxi way(s) +-- You can define limits on how many aircraft are simultaneously landing and taking off. This avoids (DCS) problems where taxiing aircraft cause a "traffic jam" on the taxi way(s) -- and bring the whole airbase effectively to a stand still. -- -- ## Landing Limits -- -- The number of groups getting landing clearance can be set with the @{#FLIGHTCONTROL.SetLimitLanding}(*Nlanding, Ntakeoff*) function. --- The first parameter, `Nlanding`, defines how many groups get clearance simultaniously. +-- The first parameter, `Nlanding`, defines how many groups get clearance simultaneously. -- -- The second parameter, `Ntakeoff`, sets a limit on how many flights can take off whilst inbound flights still get clearance. By default, this is set to zero because the runway can only be used for takeoff *or* -- landing. So if you have a flight taking off, inbound fights will have to wait until the runway is clear. @@ -155,7 +156,7 @@ -- ## Taxiing/Takeoff Limits -- -- The number of AI flight groups getting clearance to taxi to the runway can be set with the @{#FLIGHTCONTROL.SetLimitTaxi}(*Nlanding, Ntakeoff*) function. --- The first parameter, `Ntaxi`, defines how many groups are allowed to taxi to the runway simultaniously. Note that once the AI starts to taxi, we loose complete control over it. +-- The first parameter, `Ntaxi`, defines how many groups are allowed to taxi to the runway simultaneously. Note that once the AI starts to taxi, we loose complete control over it. -- They will follow their internal logic to get the the runway and take off. Therefore, giving clearance to taxi is equivalent to giving them clearance for takeoff. -- -- By default, the parameter only counts the number of flights taxiing *to* the runway. If you set the second parameter, `IncludeInbound`, to `true`, this will also count the flights @@ -237,9 +238,9 @@ -- atcNellis:SetParkingGuardStatic("Static Generator F Template") -- -- Set taxi speed limit to 25 knots. -- atcNellis:SetSpeedLimitTaxi(25) --- -- Set that max 3 groups are allowed to taxi simultaniously. +-- -- Set that max 3 groups are allowed to taxi simultaneously. -- atcNellis:SetLimitTaxi(3, false, 1) --- -- Set that max 2 groups are allowd to land simultaniously and unlimited number (99) groups can land, while other groups are taking off. +-- -- Set that max 2 groups are allowd to land simultaneously and unlimited number (99) groups can land, while other groups are taking off. -- atcNellis:SetLimitLanding(2, 99) -- -- Use Google for text-to-speech. -- atcNellis:SetSRSTower(nil, nil, "en-AU-Standard-A", nil, nil, "D:\\Path To Google\\GoogleCredentials.json") @@ -270,6 +271,7 @@ FLIGHTCONTROL = { Nparkingspots = nil, holdingpatterns = {}, hpcounter = 0, + nosubs = false, } --- Holding point. Contains holding stacks. @@ -327,7 +329,7 @@ FLIGHTCONTROL.FlightStatus={ --- FlightControl class version. -- @field #string version -FLIGHTCONTROL.version="0.7.3" +FLIGHTCONTROL.version="0.7.4" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO list @@ -407,6 +409,7 @@ function FLIGHTCONTROL:New(AirbaseName, Frequency, Modulation, PathToSRS, Port, self:SetFrequency(Frequency, Modulation) self:SetMarkHoldingPattern(true) self:SetRunwayRepairtime() + self.nosubs = false -- Set SRS Port self:SetSRSPort(Port or 5002) @@ -556,6 +559,22 @@ function FLIGHTCONTROL:SetVerbosity(VerbosityLevel) return self end +--- Set subtitles to appear on SRS TTS messages. +-- @param #FLIGHTCONTROL self +-- @return #FLIGHTCONTROL self +function FLIGHTCONTROL:SwitchSubtitlesOn() + self.nosubs = false + return self +end + +--- Set subtitles to appear on SRS TTS messages. +-- @param #FLIGHTCONTROL self +-- @return #FLIGHTCONTROL self +function FLIGHTCONTROL:SwitchSubtitlesOff() + self.nosubs = true + return self +end + --- Set the tower frequency. -- @param #FLIGHTCONTROL self -- @param #number Frequency Frequency in MHz. Default 305 MHz. @@ -595,7 +614,7 @@ end -- @param #string Culture Culture, e.g. "en-GB" (default). -- @param #string Voice Specific voice. Overrides `Gender` and `Culture`. -- @param #number Volume Volume. Default 1.0. --- @param #string Label Name under which SRS transmitts. +-- @param #string Label Name under which SRS transmits. -- @param #string PathToGoogleCredentials Path to google credentials json file. -- @param #number Port Server port for SRS -- @return #FLIGHTCONTROL self @@ -626,7 +645,7 @@ end -- @param #string Culture Culture, e.g. "en-GB" (default). -- @param #string Voice Specific voice. Overrides `Gender` and `Culture`. See [Google Voices](https://cloud.google.com/text-to-speech/docs/voices). -- @param #number Volume Volume. Default 1.0. --- @param #string Label Name under which SRS transmitts. Default `self.alias`. +-- @param #string Label Name under which SRS transmits. Default `self.alias`. -- @param #string PathToGoogleCredentials Path to google credentials json file. -- @return #FLIGHTCONTROL self function FLIGHTCONTROL:SetSRSTower(Gender, Culture, Voice, Volume, Label, PathToGoogleCredentials) @@ -644,7 +663,7 @@ end -- @param #string Culture Culture, e.g. "en-US" (default). -- @param #string Voice Specific voice. Overrides `Gender` and `Culture`. -- @param #number Volume Volume. Default 1.0. --- @param #string Label Name under which SRS transmitts. Default "Pilot". +-- @param #string Label Name under which SRS transmits. Default "Pilot". -- @param #string PathToGoogleCredentials Path to google credentials json file. -- @return #FLIGHTCONTROL self function FLIGHTCONTROL:SetSRSPilot(Gender, Culture, Voice, Volume, Label, PathToGoogleCredentials) @@ -657,17 +676,17 @@ function FLIGHTCONTROL:SetSRSPilot(Gender, Culture, Voice, Volume, Label, PathTo end ---- Set the number of aircraft groups, that are allowed to land simultaniously. +--- Set the number of aircraft groups, that are allowed to land simultaneously. -- Note that this restricts AI and human players. -- -- By default, up to two groups get landing clearance. They are spaced out in time, i.e. after the first one got cleared, the second has to wait a bit. -- This -- -- By default, landing clearance is only given when **no** other flight is taking off. You can adjust this for airports with more than one runway or --- in cases where simulatious takeoffs and landings are unproblematic. Note that only because there are multiple runways, it does not mean the AI uses them. +-- in cases where simultaneous takeoffs and landings are unproblematic. Note that only because there are multiple runways, it does not mean the AI uses them. -- -- @param #FLIGHTCONTROL self --- @param #number Nlanding Max number of aircraft landing simultaniously. Default 2. +-- @param #number Nlanding Max number of aircraft landing simultaneously. Default 2. -- @param #number Ntakeoff Allowed number of aircraft taking off for groups to get landing clearance. Default 0. -- @return #FLIGHTCONTROL self function FLIGHTCONTROL:SetLimitLanding(Nlanding, Ntakeoff) @@ -691,7 +710,7 @@ function FLIGHTCONTROL:SetLandingInterval(dt) end ---- Set the number of **AI** aircraft groups, that are allowed to taxi simultaniously. +--- Set the number of **AI** aircraft groups, that are allowed to taxi simultaneously. -- If the limit is reached, other AI groups not get taxi clearance to taxi to the runway. -- -- By default, this only counts the number of AI that taxi from their parking position to the runway. @@ -887,7 +906,7 @@ end -- Note that this is the time, the DCS engine uses not something we can control on a user level or we could get via scripting. -- You need to input the value. On the DCS forum it was stated that this is currently one hour. Hence this is the default value. -- @param #FLIGHTCONTROL self --- @param #number RepairTime Time in seconds until the runway is repaired. Default 3600 sec (one hour). +-- @param #number RepairTime Time in seconds until the runway is repaired. Default 3600sec (one hour). -- @return #FLIGHTCONTROL self function FLIGHTCONTROL:SetRunwayRepairtime(RepairTime) self.runwayrepairtime=RepairTime or 3600 @@ -1010,7 +1029,7 @@ function FLIGHTCONTROL:onbeforeStatusUpdate() if Tqueue>0 then -- Debug info. local text=string.format("Still got %d messages in the radio queue. Will call status again in %.1f sec", #self.msrsqueue, Tqueue) - self:I(self.lid..text) + self:T(self.lid..text) -- Call status again in dt seconds. self:__StatusUpdate(-Tqueue) @@ -2753,9 +2772,10 @@ function FLIGHTCONTROL:_PlayerInfoATIS(groupname) if flight then local text=string.format("Airbase %s ATIS:", self.airbasename) - + local srstxt = string.format("Airbase %s ", self.airbasename) if self.atis then text=text..string.format("\nATIS %.3f MHz %s", self.atis.frequency, UTILS.GetModulationName(self.atis.modulation)) + srstxt=srstxt..string.format("ATIS %.3f Megahertz %s", self.atis.frequency, UTILS.GetModulationName(self.atis.modulation)) if self.atis.towerfrequency then local tower="" for _,freq in pairs(self.atis.towerfrequency) do @@ -2779,7 +2799,17 @@ function FLIGHTCONTROL:_PlayerInfoATIS(groupname) end -- Message to flight - self:TextMessageToFlight(text, flight, 10, true) + + --self:TextMessageToFlight(text, flight, 10, true) + -- Call sign. + local callsign=self:_GetCallsignName(flight) + + -- Pilot calls inbound for landing. + local rtext=string.format("%s, %s, request ATIS frequency.", self.alias, callsign) + + -- Radio message. + self:TransmissionPilot(rtext, flight) + self:TransmissionTower(srstxt,flight,10) else self:E(self.lid..string.format("Cannot find flight group %s.", tostring(groupname))) @@ -3390,7 +3420,7 @@ function FLIGHTCONTROL:_PlayerRequestDirectLanding(groupname) if nTakeoff>self.NlandingTakeoff then -- Message text. - local text=string.format("%s, negative! We have currently traffic taking off", callsign) + local text=string.format("%s, negative! We have currently traffic taking off!", callsign) -- Send message. self:TransmissionTower(text, flight, 10) @@ -3854,7 +3884,7 @@ function FLIGHTCONTROL:_PlayerArrived(groupname) else -- Message text. - local text=string.format("%s, %s, arrived at parking position", self.alias, callsign) + local text=string.format("%s, %s, arrived at parking position.", self.alias, callsign) -- Transmit message. self:TransmissionPilot(text, flight) @@ -4277,7 +4307,7 @@ function FLIGHTCONTROL:TransmissionTower(Text, Flight, Delay) local subgroups=nil if Flight and not Flight.isAI then local playerData=Flight:_GetPlayerData() - if playerData.subtitles then + if playerData.subtitles and (not self.nosubs) then subgroups=subgroups or {} table.insert(subgroups, Flight.group) end @@ -4324,7 +4354,7 @@ function FLIGHTCONTROL:TransmissionPilot(Text, Flight, Delay) local subgroups=nil if Flight and not Flight.isAI then local playerData=Flight:_GetPlayerData() - if playerData.subtitles then + if playerData.subtitles and (not self.nosubs) then subgroups=subgroups or {} table.insert(subgroups, Flight.group) end From 788108c5b8262c9f771b728ae21728cdee86ec71 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Wed, 25 Oct 2023 15:34:06 +0200 Subject: [PATCH 26/51] Added check for dead links and fixed dead links --- .github/workflows/gh-pages.yml | 9 +++++++++ docs/_config.yml | 2 ++ docs/buildsystem/build-docs.md | 2 +- docs/buildsystem/build-includes.md | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index b4faa62c8..48870d12c 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -67,3 +67,12 @@ jobs: - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v1 + + check: + runs-on: ubuntu-latest + needs: deploy + steps: + - name: Setup Node + uses: actions/setup-node@v3 + - run: npm install linkinator + - run: npx linkinator https://flightcontrol-master.github.io/MOOSE/ --recurse diff --git a/docs/_config.yml b/docs/_config.yml index c557105bd..00c94761f 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,3 +1,5 @@ +baseurl: "" +url: "https://flightcontrol-master.github.io/MOOSE/" repository: FlightControl-Master/MOOSE title: MOOSE description: MOOSE is a Mission Object Oriented Scripting Environment for mission designers in DCS World diff --git a/docs/buildsystem/build-docs.md b/docs/buildsystem/build-docs.md index 8247e30bb..3ad52c993 100644 --- a/docs/buildsystem/build-docs.md +++ b/docs/buildsystem/build-docs.md @@ -56,7 +56,7 @@ Main build steps to create the class documentation are defined in [.github/workf - Copy build result to `MOOSE_DOCS` folder. - Push results to the target repository. -[tree]: https://www.cyberciti.biz/faq/linux-show-directory-structure-command-line/ +[tree]: https://wiki.ubuntuusers.de/tree/ [LuaDoc]: https://keplerproject.github.io/luadoc/ [LuaDocumentor]: https://luarocks.org/modules/luarocks/luadocumentor [Applevangelist/luadocumentor]: https://github.com/Applevangelist/luadocumentor/tree/patch-1 diff --git a/docs/buildsystem/build-includes.md b/docs/buildsystem/build-includes.md index a3e84c38b..bdd683a22 100644 --- a/docs/buildsystem/build-includes.md +++ b/docs/buildsystem/build-includes.md @@ -35,7 +35,7 @@ Main build steps to create the include files are defined in [.github/workflows/b - Push results to [MOOSE_INCLUDE] repository [.github/workflows/build-includes.yml]: https://github.com/FlightControl-Master/MOOSE/blob/master/.github/workflows/build-includes.yml -[tree]: https://www.cyberciti.biz/faq/linux-show-directory-structure-command-line/ +[tree]: https://wiki.ubuntuusers.de/tree/ [lua5.3]: https://www.lua.org/manual/5.3/ [LuaRocks]: https://luarocks.org/ [LuaCheck]: https://github.com/mpeterv/luacheck From 5681244941abc351db9326e1620ebb568a105d98 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Wed, 25 Oct 2023 15:45:20 +0200 Subject: [PATCH 27/51] Fix for canonical link --- docs/_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_config.yml b/docs/_config.yml index 00c94761f..f40d6a2bb 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,5 +1,5 @@ baseurl: "" -url: "https://flightcontrol-master.github.io/MOOSE/" +url: "https://flightcontrol-master.github.io" repository: FlightControl-Master/MOOSE title: MOOSE description: MOOSE is a Mission Object Oriented Scripting Environment for mission designers in DCS World From 6bf6b933cc000ccbfb7e9c212a51f340539f93fc Mon Sep 17 00:00:00 2001 From: kaltokri Date: Wed, 25 Oct 2023 15:52:11 +0200 Subject: [PATCH 28/51] Fixed last broken link --- docs/buildsystem/gh-pages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/buildsystem/gh-pages.md b/docs/buildsystem/gh-pages.md index 99277ed20..94ed78fa9 100644 --- a/docs/buildsystem/gh-pages.md +++ b/docs/buildsystem/gh-pages.md @@ -34,7 +34,7 @@ This can be displayed as follows: - You need a working installation of [Docker]. - Go to the `docs` subfolder. - Run `docker compose up`. -- Open a browser with the following URL: . +- Open a browser with the following URL: `http://127.0.0.1:4000/`. - After a change of the [Markdown] files, wait some seconds and press F5 in the browser. [GitHub Pages]: https://pages.github.com/ From 31075f7c04bc40832bdd0c6a5779ac9c4538db9c Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 26 Oct 2023 12:45:41 +0200 Subject: [PATCH 29/51] #UNIT * Typos in IsTanker, added some typenames --- Moose Development/Moose/Wrapper/Unit.lua | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 496e7cef1..0fc411ebd 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -20,8 +20,8 @@ -- @module Wrapper.Unit -- @image Wrapper_Unit.JPG - ---- @type UNIT +--- +-- @type UNIT -- @field #string ClassName Name of the class. -- @field #string UnitName Name of the unit. -- @field #string GroupName Name of the group the unit belongs to. @@ -179,9 +179,9 @@ function UNIT:GetDCSObject() return DCSUnit end - if self.DCSUnit then - return self.DCSUnit - end + --if self.DCSUnit then + --return self.DCSUnit + --end return nil end @@ -561,7 +561,7 @@ end --- Check if the unit is a tanker. Also retrieves the refuelling system (boom or probe) if applicable. -- @param #UNIT self --- @return #boolean If true, unit is refuelable (checks for the attribute "Refuelable"). +-- @return #boolean If true, unit is a tanker (checks for the attribute "Tankers"). -- @return #number Refueling system (if any): 0=boom, 1=probe. function UNIT:IsTanker() self:F2( self.UnitName ) @@ -582,7 +582,7 @@ function UNIT:IsTanker() -- Some hard coded data as this is not in the descriptors... if typename=="IL-78M" then system=1 --probe - elseif typename=="KC130" then + elseif typename=="KC130" or typename=="KC130J" then system=1 --probe elseif typename=="KC135BDA" then system=1 --probe @@ -590,6 +590,10 @@ function UNIT:IsTanker() system=1 --probe elseif typename=="S-3B Tanker" then system=1 --probe + elseif typename=="KC_10_Extender" then + system=1 --probe + elseif typename=="KC_10_Extender_D" then + system=0 --boom end end From d8c2b8b71973383999d68cf9f015d26cef810785 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Fri, 27 Oct 2023 09:09:36 +0200 Subject: [PATCH 30/51] #UTILS * Added new tanke callsigns --- Moose Development/Moose/Utilities/Utils.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index 9fc3dd055..ab607f1b7 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -100,7 +100,10 @@ CALLSIGN={ Texaco=1, Arco=2, Shell=3, - }, + Navy_One=4, + Mauler=5, + Bloodhound=6, + }, -- JTAC JTAC={ Axeman=1, From b0c8f05f3886d944c58ba57206693409be23bdcd Mon Sep 17 00:00:00 2001 From: kaltokri Date: Fri, 27 Oct 2023 17:01:51 +0200 Subject: [PATCH 31/51] Build optimization - Remove appveyor - Added docker compose for building docs locally - Added manuall run of GitHub Action builds - Added paths to trigger builds --- .appveyor/appveyor.yml | 87 ---------------------- .gitattributes | 4 + .github/workflows/build-docs.yml | 9 +++ .github/workflows/build-includes.yml | 7 ++ docker/moose-build-docs/Dockerfile | 13 ++++ docker/moose-build-docs/docker-compose.yml | 14 ++++ docker/moose-build-docs/start.sh | 24 ++++++ 7 files changed, 71 insertions(+), 87 deletions(-) delete mode 100644 .appveyor/appveyor.yml create mode 100644 docker/moose-build-docs/Dockerfile create mode 100644 docker/moose-build-docs/docker-compose.yml create mode 100644 docker/moose-build-docs/start.sh diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml deleted file mode 100644 index 2af7fd529..000000000 --- a/.appveyor/appveyor.yml +++ /dev/null @@ -1,87 +0,0 @@ -version: 2.4.a.{build} -shallow_clone: true -skip_branch_with_pr: false -skip_commits: - message: /!nobuild/ -skip_tags: false - -environment: - access_token_documentation: - secure: JVBVVL8uJUcLXN+48eRdELEeCGOGCCaMzCqutsUqNuaZ/KblG5ZTt7+LV4UKv/0f - LUAROCKS_VER: 2.4.1 - LUA_VER: 5.1.5 - LUA: lua5.3 - matrix: - - LUA_VER: 5.1.5 - -platform: - - x64 - - -init: - - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` - https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` - Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` - throw "There are newer queued builds for this pull request, failing early." } -# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - -install: - - cmd: -# Outcomment if lua environment invalidates and needs to be reinstalled, otherwise all will run from the cache. - call choco install 7zip.commandline - call choco install lua51 - call choco install luarocks - call refreshenv - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" - cmd: PATH = %PATH%;C:\ProgramData\chocolatey\lib\luarocks\luarocks-2.4.3-win32\systree\bin - cmd: set LUA_PATH = %LUA_PATH%;C:\ProgramData\chocolatey\lib\luarocks\luarocks-2.4.3-win32\systree\share\lua\5.1\?.lua;C:\ProgramData\chocolatey\lib\luarocks\luarocks-2.4.3-win32\systree\share\lua\5.1\?\init.lua - cmd: set LUA_CPATH = %LUA_CPATH%;C:\ProgramData\chocolatey\lib\luarocks\luarocks-2.4.3-win32\systree\lib\lua\5.1\?.dll - call luarocks install luasrcdiet - call luarocks install checks - call luarocks install luadocumentor - call luarocks install luacheck - - -cache: -C:\ProgramData\chocolatey\lib -C:\ProgramData\chocolatey\bin - - - -build_script: - - ps: | - if( $env:appveyor_repo_branch -eq 'master' -or $env:appveyor_repo_branch -eq 'develop' ) - { - echo "Hello World!" - $apiUrl = 'https://ci.appveyor.com/api' - $token = 'v2.6hcv3ige78kg3yvg4ge8' - $headers = @{ - "Authorization" = "Bearer $token" - "Content-type" = "application/json" - } - $RequestBody = @{ accountName = 'FlightControl-Master'; projectSlug = 'moose-include'; branch = "$env:appveyor_repo_branch"; environmentVariables = @{} } | ConvertTo-Json - # Generate the new version ... - $project = Invoke-RestMethod -method Post -Uri "$apiUrl/builds" -Headers $headers -Body $RequestBody - } - - ps: | - if( $env:appveyor_repo_branch -eq 'master' -or $env:appveyor_repo_branch -eq 'develop' ) - { - $apiUrl = 'https://ci.appveyor.com/api' - $token = 'v2.6hcv3ige78kg3yvg4ge8' - $headers = @{ - "Authorization" = "Bearer $token" - "Content-type" = "application/json" - } - $RequestBody = @{ accountName = 'FlightControl-Master'; projectSlug = 'moose-docs'; branch = "$env:appveyor_repo_branch"; environmentVariables = @{} } | ConvertTo-Json - # get project with last build details - $project = Invoke-RestMethod -method Post -Uri "$apiUrl/builds" -Headers $headers -Body $RequestBody - } - - -test: off -# test_script: -# - cmd: luacheck "Moose Development\Moose\moose.lua" "Moose Mission Setup\moose.lua" - - -on_finish: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) diff --git a/.gitattributes b/.gitattributes index bdb0cabc8..2e755a77c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,3 +15,7 @@ *.PDF diff=astextplain *.rtf diff=astextplain *.RTF diff=astextplain + +# Avoid Windows line endings on shell scripts +# Needed for dockerfile builds +*.sh text eol=lf diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 4a7bc1f8c..5769e409b 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -5,6 +5,15 @@ on: branches: - master - develop + paths: + - 'Moose Setup/**/*.lua' + - 'Moose Development/**/*.lua' + - 'Moose Development/**/*.py' + - 'Moose Development/**/*.html' + - '.github/workflows/build-docs.yml' + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: jobs: Build: diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index 04def15d3..4bd22bdbe 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -5,6 +5,13 @@ on: branches: - master - develop + paths: + - 'Moose Setup/**/*.lua' + - 'Moose Development/**/*.lua' + - '.github/workflows/build-includes.yml' + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: jobs: Build: diff --git a/docker/moose-build-docs/Dockerfile b/docker/moose-build-docs/Dockerfile new file mode 100644 index 000000000..839828c60 --- /dev/null +++ b/docker/moose-build-docs/Dockerfile @@ -0,0 +1,13 @@ +FROM nickblah/lua:5.1.5-luarocks-ubuntu + +RUN apt-get -qq update +RUN apt-get -qq install tree +RUN apt-get -qq install build-essential +RUN apt-get -qq install git +RUN luarocks install markdown 0.32-2 +RUN luarocks install penlight 1.11.0-1 +RUN luarocks install metalua-compiler 0.7.3-1 +RUN luarocks install metalua-parser 0.7.3-2 +RUN luarocks install checks +COPY start.sh /start.sh +RUN chmod +x /start.sh \ No newline at end of file diff --git a/docker/moose-build-docs/docker-compose.yml b/docker/moose-build-docs/docker-compose.yml new file mode 100644 index 000000000..8ca5680e4 --- /dev/null +++ b/docker/moose-build-docs/docker-compose.yml @@ -0,0 +1,14 @@ +version: "3.5" + +services: + lua: + image: moose/build-docs + build: + context: . + dockerfile: Dockerfile + container_name: moose-build-docs + volumes: + - ../../:/moose + stdin_open: true + tty: true + command: /bin/bash -c /start.sh diff --git a/docker/moose-build-docs/start.sh b/docker/moose-build-docs/start.sh new file mode 100644 index 000000000..4773540be --- /dev/null +++ b/docker/moose-build-docs/start.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# Prepare environment +cd /moose/ +mkdir -p build/tools +mkdir -p build/doc + +# Checkout luadocumentor +cd /moose/build/tools +if [ ! -f /moose/build/tools/luadocumentor/luadocumentor.lua ] +then + git clone --branch patch-1 --single-branch https://github.com/Applevangelist/luadocumentor.git +fi + +# Run luadocumentor +cd /moose/build/tools/luadocumentor +lua luadocumentor.lua -d /moose/build/doc '/moose/Moose Development/Moose' + +# Copy generated files in the MOOSE_DOCS repo if it is already there +if [ -d /moose/build/MOOSE_DOCS/Documentation ]; then + rm -rf /moose/build/MOOSE_DOCS/Documentation + mkdir -p /moose/build/MOOSE_DOCS/Documentation + cp /moose/build/doc/* /moose/build/MOOSE_DOCS/Documentation/ +fi From 3684a023da0e719dae4f33c76331bef802b1c398 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Fri, 27 Oct 2023 17:27:38 +0200 Subject: [PATCH 32/51] Fixed dead link --- Moose Development/Moose/Wrapper/Controllable.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 20abf3e2a..f54f0bfd8 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -99,7 +99,7 @@ -- This method can also be used to **embed a function call when a certain waypoint has been reached**. -- See below the **Tasks at Waypoints** section. -- --- Demonstration Mission: [GRP-502 - Route at waypoint to random point](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/release-2-2-pre/GRP - Group Commands/GRP-502 - Route at waypoint to random point) +-- Demonstration Mission: [GRP-502 - Route at waypoint to random point](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/GRP%20-%20Group%20Commands/GRP-502%20-%20Route%20at%20waypoint%20to%20random%20point) -- -- ## 2.5) Tasks at Waypoints -- From 764356870690c628b272c8791fe4cadb1ab3fa86 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Fri, 27 Oct 2023 17:48:41 +0200 Subject: [PATCH 33/51] Fixed dead links in documentation --- Moose Development/Moose/Wrapper/Group.lua | 4 ++-- Moose Development/Moose/Wrapper/Weapon.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua index faeb810a5..5ac314940 100644 --- a/Moose Development/Moose/Wrapper/Group.lua +++ b/Moose Development/Moose/Wrapper/Group.lua @@ -30,7 +30,7 @@ -- -- ### Contributions: -- --- * [**Entropy**](https://forums.eagle.ru/member.php?u=111471), **Afinegan**: Came up with the requirement for AIOnOff(). +-- * **Entropy**, **Afinegan**: Came up with the requirement for AIOnOff(). -- -- === -- @@ -1852,7 +1852,7 @@ function GROUP:InitModex(modex) return self end ---- Respawn the @{Wrapper.Group} at a @{Point}. +--- Respawn the @{Wrapper.Group} at a @{Core.Point}. -- The method will setup the new group template according the Init(Respawn) settings provided for the group. -- These settings can be provided by calling the relevant Init...() methods of the Group. -- diff --git a/Moose Development/Moose/Wrapper/Weapon.lua b/Moose Development/Moose/Wrapper/Weapon.lua index 3e6e98092..6f56ceb99 100644 --- a/Moose Development/Moose/Wrapper/Weapon.lua +++ b/Moose Development/Moose/Wrapper/Weapon.lua @@ -14,7 +14,7 @@ -- -- ## Example Missions: -- --- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Wrapper%20-%20Weapon). +-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/WRAPPER%20-%20Weapon). -- -- === -- From 92e2414612e2547122bc7675530302965134694d Mon Sep 17 00:00:00 2001 From: Xavier V <31315918+xvraiden@users.noreply.github.com> Date: Sun, 29 Oct 2023 12:29:01 -0400 Subject: [PATCH 34/51] Added pack crates (#2019) --- Moose Development/Moose/Ops/CTLD.lua | 51 +++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua index 8c77f8eb8..f936f2438 100644 --- a/Moose Development/Moose/Ops/CTLD.lua +++ b/Moose Development/Moose/Ops/CTLD.lua @@ -700,6 +700,7 @@ do -- -- my_ctld.useprefix = true -- (DO NOT SWITCH THIS OFF UNLESS YOU KNOW WHAT YOU ARE DOING!) Adjust **before** starting CTLD. If set to false, *all* choppers of the coalition side will be enabled for CTLD. -- my_ctld.CrateDistance = 35 -- List and Load crates in this radius only. +-- my_ctld.PackDistance = 35 -- Pack crates in this radius only -- my_ctld.dropcratesanywhere = false -- Option to allow crates to be dropped anywhere. -- my_ctld.dropAsCargoCrate = false -- Parachuted herc cargo is not unpacked automatically but placed as crate to be unpacked. Needs a cargo with the same name defined like the cargo that was dropped. -- my_ctld.maximumHoverHeight = 15 -- Hover max this high to load. @@ -1121,6 +1122,7 @@ CTLD = { Spawned_Crates = {}, -- Holds objects for crates spawned generally Spawned_Cargo = {}, -- Binds together spawned_crates and their CTLD_CARGO objects CrateDistance = 35, -- list crates in this radius + PackDistance = 35, -- pack crates in this radius debug = false, wpZones = {}, dropOffZones = {}, @@ -1341,6 +1343,7 @@ function CTLD:New(Coalition, Prefixes, Alias) -- setup self.CrateDistance = 35 -- list/load crates in this radius + self.PackDistance = 35 -- pack objects in this radius self.ExtractFactor = 3.33 -- factor for troops extraction, i.e. CrateDistance * Extractfactor self.prefixes = Prefixes or {"Cargoheli"} self.useprefix = true @@ -2260,9 +2263,10 @@ end -- @param #CTLD_CARGO Cargo -- @param #number number Number of crates to generate (for dropping) -- @param #boolean drop If true we\'re dropping from heli rather than loading. -function CTLD:_GetCrates(Group, Unit, Cargo, number, drop) +-- @param #boolean pack If true we\'re packing crates from a template rather than loading or dropping +function CTLD:_GetCrates(Group, Unit, Cargo, number, drop, pack) self:T(self.lid .. " _GetCrates") - if not drop then + if not drop and not pack then local cgoname = Cargo:GetName() -- check if we have stock local instock = Cargo:GetStock() @@ -2279,18 +2283,20 @@ function CTLD:_GetCrates(Group, Unit, Cargo, number, drop) local width = 20 local distance = nil local zone = nil - if not drop then + if not drop and not pack then inzone = self:IsUnitInZone(Unit,CTLD.CargoZoneType.LOAD) if not inzone then ---@diagnostic disable-next-line: cast-local-type inzone, ship, zone, distance, width = self:IsUnitInZone(Unit,CTLD.CargoZoneType.SHIP) end - else + elseif drop and not pack then if self.dropcratesanywhere then -- #1570 inzone = true else inzone = self:IsUnitInZone(Unit,CTLD.CargoZoneType.DROP) end + elseif pack and not drop then + inzone = true end if not inzone then @@ -3229,6 +3235,42 @@ function CTLD:_BuildCrates(Group, Unit,Engineering) return self end +--- (Internal) Function to repair nearby vehicles / FOBs +-- @param #CTLD self +-- @param Wrapper.Group#GROUP Group +-- @param Wrapper.Unit#UNIT Unit + +function CTLD:_PackCratesNearby(Group, Unit) + self:T(self.lid .. " _PackCratesNearby") + ----------------------------------------- + -- search for nearest group to player + -- determine if group is packable + -- generate crates and destroy group + ----------------------------------------- + + -- get nearby vehicles + local location = Group:GetCoordinate() -- get coordinate of group using function + local nearestGroups = SET_GROUP:New():FilterCoalitions("blue"):FilterZones({ZONE_RADIUS:New("TempZone", location:GetVec2(), self.PackDistance, false)}):FilterOnce() -- get all groups withing PackDistance from group using function + -- get template name of all vehicles in zone + + -- determine if group is packable + for _, _Group in pairs(nearestGroups.Set) do -- convert #SET_GROUP to a list of Wrapper.Group#GROUP + for _, _Template in pairs(_DATABASE.Templates.Groups) do -- iterate through the database of templates + if (string.match(_Group:GetName(), _Template.GroupName)) then -- check if the Wrapper.Group#GROUP near the player is in the list of templates by name + -- generate crates and destroy group + for _, _entry in pairs(self.Cargo_Crates) do -- iterate through #CTLD_CARGO + if (_entry.Templates[1] == _Template.GroupName) then -- check if the #CTLD_CARGO matches the template name + _Group:Destroy() -- if a match is found destroy the Wrapper.Group#GROUP near the player + self:_GetCrates(Group, Unit, _entry, nil, false, true) -- spawn the appropriate crates near the player + return self + end + end + end + end + end + return self +end + --- (Internal) Function to repair nearby vehicles / FOBs -- @param #CTLD self -- @param Wrapper.Group#GROUP Group @@ -3541,6 +3583,7 @@ function CTLD:_RefreshF10Menus() if cancrates then local loadmenu = MENU_GROUP_COMMAND:New(_group,"Load crates",topcrates, self._LoadCratesNearby, self, _group, _unit) local cratesmenu = MENU_GROUP:New(_group,"Get Crates",topcrates) + local packmenu = MENU_GROUP_COMMAND:New(_group, "Pack crates", topcrates, self._PackCratesNearby, self, _group, _unit) if self.usesubcats then local subcatmenus = {} From 51102e47ae3fb4622bdbcdce37c48237cf8be728 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sun, 29 Oct 2023 17:44:31 +0100 Subject: [PATCH 35/51] #CTLD * Adding re-packing dropped units --- Moose Development/Moose/Ops/CTLD.lua | 58 +++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua index 8c77f8eb8..d98ffc882 100644 --- a/Moose Development/Moose/Ops/CTLD.lua +++ b/Moose Development/Moose/Ops/CTLD.lua @@ -19,10 +19,12 @@ -- === -- -- ### Author: **Applevangelist** (Moose Version), ***Ciribob*** (original), Thanks to: Shadowze, Cammel (testing), bbirchnz (additional code!!) +-- ### Repack addition for crates: **Raiden** +-- -- @module Ops.CTLD -- @image OPS_CTLD.jpg --- Last Update June 2023 +-- Last Update October 2023 do @@ -700,6 +702,7 @@ do -- -- my_ctld.useprefix = true -- (DO NOT SWITCH THIS OFF UNLESS YOU KNOW WHAT YOU ARE DOING!) Adjust **before** starting CTLD. If set to false, *all* choppers of the coalition side will be enabled for CTLD. -- my_ctld.CrateDistance = 35 -- List and Load crates in this radius only. +-- my_ctld.PackDistance = 35 -- Pack crates in this radius only -- my_ctld.dropcratesanywhere = false -- Option to allow crates to be dropped anywhere. -- my_ctld.dropAsCargoCrate = false -- Parachuted herc cargo is not unpacked automatically but placed as crate to be unpacked. Needs a cargo with the same name defined like the cargo that was dropped. -- my_ctld.maximumHoverHeight = 15 -- Hover max this high to load. @@ -1121,6 +1124,7 @@ CTLD = { Spawned_Crates = {}, -- Holds objects for crates spawned generally Spawned_Cargo = {}, -- Binds together spawned_crates and their CTLD_CARGO objects CrateDistance = 35, -- list crates in this radius + PackDistance = 35, -- pack crates in this radius debug = false, wpZones = {}, dropOffZones = {}, @@ -1144,6 +1148,7 @@ CTLD = { -- DONE: List cargo in stock -- DONE: Limit of troops, crates buildable? -- DONE: Allow saving of Troops & Vehicles +-- DONE: Adding re-packing dropped units ------------------------------ --- Radio Beacons @@ -1223,7 +1228,7 @@ CTLD.UnitTypes = { --- CTLD class version. -- @field #string version -CTLD.version="1.0.40" +CTLD.version="1.0.41" --- Instantiate a new CTLD. -- @param #CTLD self @@ -1341,6 +1346,7 @@ function CTLD:New(Coalition, Prefixes, Alias) -- setup self.CrateDistance = 35 -- list/load crates in this radius + self.PackDistance = 35 -- pack objects in this radius self.ExtractFactor = 3.33 -- factor for troops extraction, i.e. CrateDistance * Extractfactor self.prefixes = Prefixes or {"Cargoheli"} self.useprefix = true @@ -2260,9 +2266,10 @@ end -- @param #CTLD_CARGO Cargo -- @param #number number Number of crates to generate (for dropping) -- @param #boolean drop If true we\'re dropping from heli rather than loading. -function CTLD:_GetCrates(Group, Unit, Cargo, number, drop) +-- @param #boolean pack If true we\'re packing crates from a template rather than loading or dropping +function CTLD:_GetCrates(Group, Unit, Cargo, number, drop, pack) self:T(self.lid .. " _GetCrates") - if not drop then + if not drop and not pack then local cgoname = Cargo:GetName() -- check if we have stock local instock = Cargo:GetStock() @@ -2279,18 +2286,20 @@ function CTLD:_GetCrates(Group, Unit, Cargo, number, drop) local width = 20 local distance = nil local zone = nil - if not drop then + if not drop and not pack then inzone = self:IsUnitInZone(Unit,CTLD.CargoZoneType.LOAD) if not inzone then ---@diagnostic disable-next-line: cast-local-type inzone, ship, zone, distance, width = self:IsUnitInZone(Unit,CTLD.CargoZoneType.SHIP) end - else + elseif drop and not pack then if self.dropcratesanywhere then -- #1570 inzone = true else inzone = self:IsUnitInZone(Unit,CTLD.CargoZoneType.DROP) end + elseif pack and not drop then + inzone = true end if not inzone then @@ -3229,6 +3238,42 @@ function CTLD:_BuildCrates(Group, Unit,Engineering) return self end +--- (Internal) Function to repair nearby vehicles / FOBs +-- @param #CTLD self +-- @param Wrapper.Group#GROUP Group +-- @param Wrapper.Unit#UNIT Unit + +function CTLD:_PackCratesNearby(Group, Unit) + self:T(self.lid .. " _PackCratesNearby") + ----------------------------------------- + -- search for nearest group to player + -- determine if group is packable + -- generate crates and destroy group + ----------------------------------------- + + -- get nearby vehicles + local location = Group:GetCoordinate() -- get coordinate of group using function + local nearestGroups = SET_GROUP:New():FilterCoalitions("blue"):FilterZones({ZONE_RADIUS:New("TempZone", location:GetVec2(), self.PackDistance, false)}):FilterOnce() -- get all groups withing PackDistance from group using function + -- get template name of all vehicles in zone + + -- determine if group is packable + for _, _Group in pairs(nearestGroups.Set) do -- convert #SET_GROUP to a list of Wrapper.Group#GROUP + for _, _Template in pairs(_DATABASE.Templates.Groups) do -- iterate through the database of templates + if (string.match(_Group:GetName(), _Template.GroupName)) then -- check if the Wrapper.Group#GROUP near the player is in the list of templates by name + -- generate crates and destroy group + for _, _entry in pairs(self.Cargo_Crates) do -- iterate through #CTLD_CARGO + if (_entry.Templates[1] == _Template.GroupName) then -- check if the #CTLD_CARGO matches the template name + _Group:Destroy() -- if a match is found destroy the Wrapper.Group#GROUP near the player + self:_GetCrates(Group, Unit, _entry, nil, false, true) -- spawn the appropriate crates near the player + return self + end + end + end + end + end + return self +end + --- (Internal) Function to repair nearby vehicles / FOBs -- @param #CTLD self -- @param Wrapper.Group#GROUP Group @@ -3541,6 +3586,7 @@ function CTLD:_RefreshF10Menus() if cancrates then local loadmenu = MENU_GROUP_COMMAND:New(_group,"Load crates",topcrates, self._LoadCratesNearby, self, _group, _unit) local cratesmenu = MENU_GROUP:New(_group,"Get Crates",topcrates) + local packmenu = MENU_GROUP_COMMAND:New(_group, "Pack crates", topcrates, self._PackCratesNearby, self, _group, _unit) if self.usesubcats then local subcatmenus = {} From 497ac367ba4c8a38bce76167382a06314d0c88b7 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sun, 29 Oct 2023 17:45:02 +0100 Subject: [PATCH 36/51] #CTLD * Adding re-packing dropped units --- Moose Development/Moose/Ops/CTLD.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua index f936f2438..d98ffc882 100644 --- a/Moose Development/Moose/Ops/CTLD.lua +++ b/Moose Development/Moose/Ops/CTLD.lua @@ -19,10 +19,12 @@ -- === -- -- ### Author: **Applevangelist** (Moose Version), ***Ciribob*** (original), Thanks to: Shadowze, Cammel (testing), bbirchnz (additional code!!) +-- ### Repack addition for crates: **Raiden** +-- -- @module Ops.CTLD -- @image OPS_CTLD.jpg --- Last Update June 2023 +-- Last Update October 2023 do @@ -1146,6 +1148,7 @@ CTLD = { -- DONE: List cargo in stock -- DONE: Limit of troops, crates buildable? -- DONE: Allow saving of Troops & Vehicles +-- DONE: Adding re-packing dropped units ------------------------------ --- Radio Beacons @@ -1225,7 +1228,7 @@ CTLD.UnitTypes = { --- CTLD class version. -- @field #string version -CTLD.version="1.0.40" +CTLD.version="1.0.41" --- Instantiate a new CTLD. -- @param #CTLD self From 5c9e3570e2dd46070a7e4ccfe80b9860d1364f28 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Sun, 29 Oct 2023 19:43:55 +0100 Subject: [PATCH 37/51] Added more docker jobs and apply same naming convention as build jobs --- .../Dockerfile | 2 +- .../docker-compose.yml | 0 .../{moose-build-docs => build-docs}/start.sh | 0 docker/build-includes/Dockerfile | 10 ++++++++++ docker/build-includes/docker-compose.yml | 14 +++++++++++++ docker/build-includes/start.sh | 20 +++++++++++++++++++ docker/gh-pages-check/Dockerfile | 4 ++++ docker/gh-pages-check/docker-compose.yml | 17 ++++++++++++++++ docker/gh-pages/Dockerfile | 12 +++++++++++ docker/gh-pages/docker-compose.yml | 14 +++++++++++++ 10 files changed, 92 insertions(+), 1 deletion(-) rename docker/{moose-build-docs => build-docs}/Dockerfile (94%) rename docker/{moose-build-docs => build-docs}/docker-compose.yml (100%) rename docker/{moose-build-docs => build-docs}/start.sh (100%) create mode 100644 docker/build-includes/Dockerfile create mode 100644 docker/build-includes/docker-compose.yml create mode 100644 docker/build-includes/start.sh create mode 100644 docker/gh-pages-check/Dockerfile create mode 100644 docker/gh-pages-check/docker-compose.yml create mode 100644 docker/gh-pages/Dockerfile create mode 100644 docker/gh-pages/docker-compose.yml diff --git a/docker/moose-build-docs/Dockerfile b/docker/build-docs/Dockerfile similarity index 94% rename from docker/moose-build-docs/Dockerfile rename to docker/build-docs/Dockerfile index 839828c60..6fd7007ff 100644 --- a/docker/moose-build-docs/Dockerfile +++ b/docker/build-docs/Dockerfile @@ -10,4 +10,4 @@ RUN luarocks install metalua-compiler 0.7.3-1 RUN luarocks install metalua-parser 0.7.3-2 RUN luarocks install checks COPY start.sh /start.sh -RUN chmod +x /start.sh \ No newline at end of file +RUN chmod +x /start.sh diff --git a/docker/moose-build-docs/docker-compose.yml b/docker/build-docs/docker-compose.yml similarity index 100% rename from docker/moose-build-docs/docker-compose.yml rename to docker/build-docs/docker-compose.yml diff --git a/docker/moose-build-docs/start.sh b/docker/build-docs/start.sh similarity index 100% rename from docker/moose-build-docs/start.sh rename to docker/build-docs/start.sh diff --git a/docker/build-includes/Dockerfile b/docker/build-includes/Dockerfile new file mode 100644 index 000000000..2c72a7996 --- /dev/null +++ b/docker/build-includes/Dockerfile @@ -0,0 +1,10 @@ +FROM nickblah/lua:5.3-luarocks-ubuntu + +RUN apt-get -qq update +RUN apt-get -qq install tree +RUN apt-get -qq install build-essential +RUN apt-get -qq install git +RUN luarocks install luasrcdiet +RUN luarocks install luacheck +COPY start.sh /start.sh +RUN chmod +x /start.sh diff --git a/docker/build-includes/docker-compose.yml b/docker/build-includes/docker-compose.yml new file mode 100644 index 000000000..e994882fc --- /dev/null +++ b/docker/build-includes/docker-compose.yml @@ -0,0 +1,14 @@ +version: "3.5" + +services: + moose-build-includes: + image: moose/build-includes + build: + context: . + dockerfile: Dockerfile + container_name: moose-build-includes + volumes: + - ../../:/moose + stdin_open: true + tty: true + command: /bin/bash -c /start.sh diff --git a/docker/build-includes/start.sh b/docker/build-includes/start.sh new file mode 100644 index 000000000..10b29231e --- /dev/null +++ b/docker/build-includes/start.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# Prepare environment +cd /moose/ +mkdir -p build/result/Moose_Include_Dynamic +mkdir -p build/result/Moose_Include_Static + +GIT_SHA=$(git rev-parse HEAD) +GIT_SHA=$(echo $GIT_SHA|tr -d '\n') +COMMIT_TIME=$(date +%Y-%m-%dT%H:%M:%S) + +# Create Includes +lua "./Moose Setup/Moose_Create.lua" S "$COMMIT_TIME-$GIT_SHA" "./Moose Development/Moose" "./Moose Setup" "./build/result/Moose_Include_Static" +lua "./Moose Setup/Moose_Create.lua" D "$COMMIT_TIME-$GIT_SHA" "./Moose Development/Moose" "./Moose Setup" "./build/result/Moose_Include_Dynamic" + +# Create Moose_.lua +luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua + +# Run luacheck +luacheck --std=lua51c --config=.luacheckrc -gurasqq "Moose Development/Moose" diff --git a/docker/gh-pages-check/Dockerfile b/docker/gh-pages-check/Dockerfile new file mode 100644 index 000000000..282c600dd --- /dev/null +++ b/docker/gh-pages-check/Dockerfile @@ -0,0 +1,4 @@ +FROM node:latest + +WORKDIR /usr/app +RUN npm install linkinator \ No newline at end of file diff --git a/docker/gh-pages-check/docker-compose.yml b/docker/gh-pages-check/docker-compose.yml new file mode 100644 index 000000000..30035ba8e --- /dev/null +++ b/docker/gh-pages-check/docker-compose.yml @@ -0,0 +1,17 @@ +version: "3.5" + +services: + moose-gh-pages-checks: + image: moose/gh-pages-checks + #image: node:latest + #image: joskfg/np + build: + context: . + dockerfile: Dockerfile + container_name: moose-gh-pages-checks + volumes: + - .:/moose + stdin_open: true + tty: true + #command: /bin/bash -c /moose/start.sh + command: npx linkinator https://flightcontrol-master.github.io/MOOSE/ diff --git a/docker/gh-pages/Dockerfile b/docker/gh-pages/Dockerfile new file mode 100644 index 000000000..a499513b2 --- /dev/null +++ b/docker/gh-pages/Dockerfile @@ -0,0 +1,12 @@ +FROM ruby:2.7 + +ENV LC_ALL C.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US.UTF-8 + +WORKDIR /usr/src/app + +COPY Gemfile just-the-docs.gemspec ./ +RUN gem install bundler && bundle install + +EXPOSE 4000 diff --git a/docker/gh-pages/docker-compose.yml b/docker/gh-pages/docker-compose.yml new file mode 100644 index 000000000..26e978667 --- /dev/null +++ b/docker/gh-pages/docker-compose.yml @@ -0,0 +1,14 @@ +version: "3.5" + +services: + jekyll: + build: + context: ../../docs + dockerfile: ./Dockerfile + ports: + - 4000:4000 + volumes: + - ../../docs:/usr/src/app + stdin_open: true + tty: true + command: bundle exec jekyll serve -H 0.0.0.0 -t --force_polling From 0e2dff4e6b52294268203b146d2ef598a0440fa5 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Sun, 29 Oct 2023 23:06:09 +0100 Subject: [PATCH 38/51] Fixed some dead links in Ops.Airboss --- Moose Development/Moose/Ops/Airboss.lua | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index a1616b965..b9c544ad7 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -27,17 +27,17 @@ -- **Supported Carriers:** -- -- * [USS John C. Stennis](https://en.wikipedia.org/wiki/USS_John_C._Stennis) (CVN-74) --- * [USS Theodore Roosevelt](https://en.wikipedia.org/wiki/USS_Theodore_Roosevelt_(CVN-71\)) (CVN-71) [Super Carrier Module] --- * [USS Abraham Lincoln](https://en.wikipedia.org/wiki/USS_Abraham_Lincoln_(CVN-72\)) (CVN-72) [Super Carrier Module] --- * [USS George Washington](https://en.wikipedia.org/wiki/USS_George_Washington_(CVN-73\)) (CVN-73) [Super Carrier Module] +-- * [USS Theodore Roosevelt](https://en.wikipedia.org/wiki/USS_Theodore_Roosevelt_\(CVN-71\)) (CVN-71) [Super Carrier Module] +-- * [USS Abraham Lincoln](https://en.wikipedia.org/wiki/USS_Abraham_Lincoln_\(CVN-72\)) (CVN-72) [Super Carrier Module] +-- * [USS George Washington](https://en.wikipedia.org/wiki/USS_George_Washington_\(CVN-73\)) (CVN-73) [Super Carrier Module] -- * [USS Harry S. Truman](https://en.wikipedia.org/wiki/USS_Harry_S._Truman) (CVN-75) [Super Carrier Module] --- * [USS Forrestal](https://en.wikipedia.org/wiki/USS_Forrestal_(CV-59\)) (CV-59) [Heatblur Carrier Module] --- * [HMS Hermes](https://en.wikipedia.org/wiki/HMS_Hermes_(R12\)) (R12) --- * [HMS Invincible](https://en.wikipedia.org/wiki/HMS_Invincible_(R05\)) (R05) --- * [USS Tarawa](https://en.wikipedia.org/wiki/USS_Tarawa_(LHA-1\)) (LHA-1) --- * [USS America](https://en.wikipedia.org/wiki/USS_America_(LHA-6\)) (LHA-6) +-- * [USS Forrestal](https://en.wikipedia.org/wiki/USS_Forrestal_\(CV-59\)) (CV-59) [Heatblur Carrier Module] +-- * [HMS Hermes](https://en.wikipedia.org/wiki/HMS_Hermes_\(R12\)) (R12) +-- * [HMS Invincible](https://en.wikipedia.org/wiki/HMS_Invincible_\(R05\)) (R05) +-- * [USS Tarawa](https://en.wikipedia.org/wiki/USS_Tarawa_\(LHA-1\)) (LHA-1) +-- * [USS America](https://en.wikipedia.org/wiki/USS_America_\(LHA-6\)) (LHA-6) -- * [Juan Carlos I](https://en.wikipedia.org/wiki/Spanish_amphibious_assault_ship_Juan_Carlos_I) (L61) --- * [HMAS Canberra](https://en.wikipedia.org/wiki/HMAS_Canberra_(L02\)) (L02) +-- * [HMAS Canberra](https://en.wikipedia.org/wiki/HMAS_Canberra_\(L02\)) (L02) -- -- **Supported Aircraft:** -- @@ -45,7 +45,7 @@ -- * [F-14A/B Tomcat](https://forums.eagle.ru/forumdisplay.php?f=395) (Player & AI) -- * [A-4E Skyhawk Community Mod](https://forums.eagle.ru/showthread.php?t=224989) (Player & AI) -- * [AV-8B N/A Harrier](https://forums.eagle.ru/forumdisplay.php?f=555) (Player & AI) --- * [T-45C Goshawk](https://www.vnao-cvw-7.com/t-45-goshawk) (VNAO mod) (Player & AI) +-- * [T-45C Goshawk](https://forum.dcs.world/topic/203816-vnao-t-45-goshawk/) (VNAO mod) (Player & AI) -- * [FE/A-18E/F/G Superhornet](https://forum.dcs.world/topic/316971-cjs-super-hornet-community-mod-v20-official-thread/) (CJS mod) (Player & AI) -- * F/A-18C Hornet (AI) -- * F-14A Tomcat (AI) @@ -61,7 +61,7 @@ -- -- Heatblur's mighty F-14B Tomcat has been added (March 13th 2019) as well. Same goes for the A version. -- --- The [DCS Supercarriers](https://forums.eagle.ru/forum/151-dcs-supercarrier/) are also supported. +-- The [DCS Supercarriers](https://www.digitalcombatsimulator.com/de/shop/modules/supercarrier/) are also supported. -- -- ## Discussion -- From 92b21aa5c15803b29b226f3bd2dec3281048dffd Mon Sep 17 00:00:00 2001 From: kaltokri Date: Mon, 30 Oct 2023 14:48:49 +0100 Subject: [PATCH 39/51] Fixed broken links in documentation --- Moose Development/Moose/Core/Fsm.lua | 2 +- Moose Development/Moose/Core/Spawn.lua | 6 +++--- Moose Development/Moose/Functional/Artillery.lua | 4 ++-- Moose Development/Moose/Functional/Mantis.lua | 6 +++--- Moose Development/Moose/Functional/RAT.lua | 10 +++++----- Moose Development/Moose/Functional/Warehouse.lua | 6 +++--- Moose Development/Moose/Ops/Airboss.lua | 5 ----- Moose Development/Moose/Ops/CTLD.lua | 2 +- Moose Development/Moose/Ops/RescueHelo.lua | 2 -- Moose Development/Moose/Sound/SoundOutput.lua | 2 +- Moose Development/Moose/Tasking/DetectionManager.lua | 2 +- Moose Development/Moose/Tasking/Task_CARGO.lua | 11 +++++------ .../Moose/Tasking/Task_Cargo_Dispatcher.lua | 2 +- Moose Development/Moose/Wrapper/Airbase.lua | 2 +- Moose Development/Moose/Wrapper/Marker.lua | 2 -- 15 files changed, 27 insertions(+), 37 deletions(-) diff --git a/Moose Development/Moose/Core/Fsm.lua b/Moose Development/Moose/Core/Fsm.lua index 2b5f499e5..2580bd386 100644 --- a/Moose Development/Moose/Core/Fsm.lua +++ b/Moose Development/Moose/Core/Fsm.lua @@ -249,7 +249,7 @@ do -- FSM -- -- ### Linear Transition Example -- - -- This example is fully implemented in the MOOSE test mission on GITHUB: [FSM-100 - Transition Explanation](https://github.com/FlightControl-Master/MOOSE/blob/master/Moose%20Test%20Missions/FSM%20-%20Finite%20State%20Machine/FSM-100%20-%20Transition%20Explanation/FSM-100%20-%20Transition%20Explanation.lua) + -- This example is fully implemented in the MOOSE test mission on GITHUB: [FSM-100 - Transition Explanation](https://github.com/FlightControl-Master/MOOSE_MISSIONS/blob/master/FSM%20-%20Finite%20State%20Machine/FSM-100%20-%20Transition%20Explanation/FSM-100%20-%20Transition%20Explanation.lua) -- -- It models a unit standing still near Batumi, and flaring every 5 seconds while switching between a Green flare and a Red flare. -- The purpose of this example is not to show how exciting flaring is, but it demonstrates how a Linear Transition FSM can be build. diff --git a/Moose Development/Moose/Core/Spawn.lua b/Moose Development/Moose/Core/Spawn.lua index adcafc31f..052c7d152 100644 --- a/Moose Development/Moose/Core/Spawn.lua +++ b/Moose Development/Moose/Core/Spawn.lua @@ -1331,7 +1331,7 @@ do -- Delay methods return self end - --- Turns the Delay On for the @{Wrapper.Group} when spawning with @{SpawnScheduled}(). In effect then the 1st group will only be spawned + --- Turns the Delay On for the @{Wrapper.Group} when spawning with @{#SpawnScheduled}(). In effect then the 1st group will only be spawned -- after the number of seconds given in SpawnScheduled as arguments, and not immediately. -- @param #SPAWN self -- @return #SPAWN The SPAWN object @@ -1669,7 +1669,7 @@ end -- @param #number SpawnTimeVariation The variation to be applied on the defined time interval between each new spawn. -- The variation is a number between 0 and 1, representing the % of variation to be applied on the time interval. -- @param #boolean WithDelay Do not spawn the **first** group immediately, but delay the spawn as per the calculation below. --- Effectively the same as @{InitDelayOn}(). +-- Effectively the same as @{#InitDelayOn}(). -- @return #SPAWN self -- @usage -- -- NATO helicopters engaging in the battle field. @@ -3622,7 +3622,7 @@ function SPAWN:_OnLand( EventData ) end --- Will detect AIR Units shutting down their engines ... --- When the event takes place, and the method @{RepeatOnEngineShutDown} was called, the spawned Group will Re-SPAWN. +-- When the event takes place, and the method @{#InitRepeatOnEngineShutDown} was called, the spawned Group will Re-SPAWN. -- But only when the Unit was registered to have landed. -- @param #SPAWN self -- @param Core.Event#EVENTDATA EventData diff --git a/Moose Development/Moose/Functional/Artillery.lua b/Moose Development/Moose/Functional/Artillery.lua index 1a96ee165..df31fd196 100644 --- a/Moose Development/Moose/Functional/Artillery.lua +++ b/Moose Development/Moose/Functional/Artillery.lua @@ -291,14 +291,14 @@ -- ### Illumination Shells -- -- ARTY groups that possess shells can fire shells with illumination bombs. First, the group needs to be equipped with this weapon. This is done by the --- function @{ARTY.SetIlluminationShells}(*n*, *power*), where *n* is the number of shells the group has available and *power* the illumination power in mega candela (mcd). +-- function @{#ARTY.SetIlluminationShells}(*n*, *power*), where *n* is the number of shells the group has available and *power* the illumination power in mega candela (mcd). -- -- In order to execute an engagement with illumination shells one has to use the weapon type *ARTY.WeaponType.IlluminationShells* in the -- @{#ARTY.AssignTargetCoord}() function. -- -- In the simulation, the explosive shell that is fired is destroyed once it gets close to the target point but before it can actually impact. -- At this position an illumination bomb is triggered at a random altitude between 500 and 1000 meters. This interval can be set by the function --- @{ARTY.SetIlluminationMinMaxAlt}(*minalt*, *maxalt*). +-- @{#ARTY.SetIlluminationMinMaxAlt}(*minalt*, *maxalt*). -- -- ### Smoke Shells -- diff --git a/Moose Development/Moose/Functional/Mantis.lua b/Moose Development/Moose/Functional/Mantis.lua index 9bd80659b..72de47973 100644 --- a/Moose Development/Moose/Functional/Mantis.lua +++ b/Moose Development/Moose/Functional/Mantis.lua @@ -893,7 +893,7 @@ do --- Function to get the HQ object for further use -- @param #MANTIS self - -- @return Wrapper.GROUP#GROUP The HQ #GROUP object or *nil* if it doesn't exist + -- @return Wrapper.Group#GROUP The HQ #GROUP object or *nil* if it doesn't exist function MANTIS:GetCommandCenter() self:T(self.lid .. "GetCommandCenter") if self.HQ_CC then @@ -929,7 +929,7 @@ do --- Function to set the HQ object for further use -- @param #MANTIS self - -- @param Wrapper.GROUP#GROUP group The #GROUP object to be set as HQ + -- @param Wrapper.Group#GROUP group The #GROUP object to be set as HQ function MANTIS:SetCommandCenter(group) self:T(self.lid .. "SetCommandCenter") local group = group or nil @@ -991,7 +991,7 @@ do --- Set using your own #INTEL_DLINK object instead of #DETECTION -- @param #MANTIS self - -- @param Ops.Intelligence#INTEL_DLINK DLink The data link object to be used. + -- @param Ops.Intel#INTEL_DLINK DLink The data link object to be used. function MANTIS:SetUsingDLink(DLink) self:T(self.lid .. "SetUsingDLink") self.DLink = true diff --git a/Moose Development/Moose/Functional/RAT.lua b/Moose Development/Moose/Functional/RAT.lua index f5b262277..3f81559b7 100644 --- a/Moose Development/Moose/Functional/RAT.lua +++ b/Moose Development/Moose/Functional/RAT.lua @@ -225,7 +225,7 @@ -- -- * Landing: When an aircraft tries to land at an airport where it does not have a valid parking spot, it is immidiately despawned the moment its wheels touch the runway, i.e. -- when a landing event is triggered. This leads to the loss of the RAT aircraft. On possible way to circumvent the this problem is to let another RAT aircraft spawn at landing --- and not when it shuts down its engines. See the @{RAT.RespawnAfterLanding}() function. +-- and not when it shuts down its engines. See the @{#RAT.RespawnAfterLanding}() function. -- * Spawning: When a big aircraft is dynamically spawned on a small airbase a few things can go wrong. For example, it could be spawned at a parking spot with a shelter. -- Or it could be damaged by a scenery object when it is taxiing out to the runway, or it could overlap with other aircraft on parking spots near by. -- @@ -2474,11 +2474,11 @@ end -- @param #RAT self -- @param #number takeoff Takeoff type. Could also be air start. -- @param #number landing Landing type. Could also be a destination in air. --- @param Wrapper.Airport#AIRBASE _departure (Optional) Departure airbase. --- @param Wrapper.Airport#AIRBASE _destination (Optional) Destination airbase. +-- @param Wrapper.Airbase#AIRBASE _departure (Optional) Departure airbase. +-- @param Wrapper.Airbase#AIRBASE _destination (Optional) Destination airbase. -- @param #table _waypoint Initial waypoint. --- @return Wrapper.Airport#AIRBASE Departure airbase. --- @return Wrapper.Airport#AIRBASE Destination airbase. +-- @return Wrapper.Airbase#AIRBASE Departure airbase. +-- @return Wrapper.Airbase#AIRBASE Destination airbase. -- @return #table Table of flight plan waypoints. -- @return #nil If no valid departure or destination airport could be found. function RAT:_SetRoute(takeoff, landing, _departure, _destination, _waypoint) diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index 97222cd6f..8ce1752d0 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -742,7 +742,7 @@ -- -- ## Save Assets -- --- Saving asset data to file is achieved by the @{WAREHOUSE.Save}(*path*, *filename*) function. The parameter *path* specifies the path on the file system where the +-- Saving asset data to file is achieved by the @{#WAREHOUSE.Save}(*path*, *filename*) function. The parameter *path* specifies the path on the file system where the -- warehouse data is saved. If you do not specify a path, the file is saved your the DCS installation root directory. -- The parameter *filename* is optional and defines the name of the saved file. By default this is automatically created from the warehouse id and name, for example -- "Warehouse-1234_Batumi.txt". @@ -753,13 +753,13 @@ -- -- ### Automatic Save at Mission End -- --- The assets can be saved automatically when the mission is ended via the @{WAREHOUSE.SetSaveOnMissionEnd}(*path*, *filename*) function, i.e. +-- The assets can be saved automatically when the mission is ended via the @{#WAREHOUSE.SetSaveOnMissionEnd}(*path*, *filename*) function, i.e. -- -- warehouseBatumi:SetSaveOnMissionEnd("D:\\My Warehouse Data\\") -- -- ## Load Assets -- --- Loading assets data from file is achieved by the @{WAREHOUSE.Load}(*path*, *filename*) function. The parameter *path* specifies the path on the file system where the +-- Loading assets data from file is achieved by the @{#WAREHOUSE.Load}(*path*, *filename*) function. The parameter *path* specifies the path on the file system where the -- warehouse data is loaded from. If you do not specify a path, the file is loaded from your the DCS installation root directory. -- The parameter *filename* is optional and defines the name of the file to load. By default this is automatically generated from the warehouse id and name, for example -- "Warehouse-1234_Batumi.txt". diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index b9c544ad7..c8710d3bf 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -95,11 +95,6 @@ -- * [[MOOSE] Airboss - CASE I, "Until We Go Down" featuring the F-14B by Pikes](https://www.youtube.com/watch?v=ojgHDSw3Doc) -- * [[MOOSE] Airboss - Skipper Menu](https://youtu.be/awnecCxRoNQ) -- --- ### Lex explaining Boat Ops: --- --- * [( DCS HORNET ) Some boat ops basics VID 1](https://www.youtube.com/watch?v=LvGQS-3AzMc) --- * [( DCS HORNET ) Some boat ops basics VID 2](https://www.youtube.com/watch?v=bN44wvtRsw0) --- -- ### Jabbers Case I and III Recovery Tutorials: -- -- * [DCS World - F/A-18 - Case I Carrier Recovery Tutorial](https://www.youtube.com/watch?v=lm-M3VUy-_I) diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua index d98ffc882..80c8d7d6e 100644 --- a/Moose Development/Moose/Ops/CTLD.lua +++ b/Moose Development/Moose/Ops/CTLD.lua @@ -601,7 +601,7 @@ do -- -- === -- --- ![Banner Image](OPS_CTLD.jpg) +-- ![Banner Image](../Images/OPS_CTLD.jpg) -- -- # CTLD Concept -- diff --git a/Moose Development/Moose/Ops/RescueHelo.lua b/Moose Development/Moose/Ops/RescueHelo.lua index b341c8a14..65f1e57c5 100644 --- a/Moose Development/Moose/Ops/RescueHelo.lua +++ b/Moose Development/Moose/Ops/RescueHelo.lua @@ -64,8 +64,6 @@ -- -- === -- --- ![Banner Image](..\Presentations\RESCUEHELO\RescueHelo_Main.png) --- -- # Recue Helo -- -- The rescue helo will fly in close formation with another unit, which is typically an aircraft carrier. diff --git a/Moose Development/Moose/Sound/SoundOutput.lua b/Moose Development/Moose/Sound/SoundOutput.lua index 57ce2f9a4..38a8337fe 100644 --- a/Moose Development/Moose/Sound/SoundOutput.lua +++ b/Moose Development/Moose/Sound/SoundOutput.lua @@ -313,7 +313,7 @@ do -- Text-To-Speech -- -- ## Specific Voice -- - -- You can use a specific voice for the transmission with the @{SOUNDTEXT.SetVoice}(*VoiceName*) function. Here are some examples + -- You can use a specific voice for the transmission with the @{#SOUNDTEXT.SetVoice}(*VoiceName*) function. Here are some examples -- -- * Name: Microsoft Hazel Desktop, Culture: en-GB, Gender: Female, Age: Adult, Desc: Microsoft Hazel Desktop - English (Great Britain) -- * Name: Microsoft David Desktop, Culture: en-US, Gender: Male, Age: Adult, Desc: Microsoft David Desktop - English (United States) diff --git a/Moose Development/Moose/Tasking/DetectionManager.lua b/Moose Development/Moose/Tasking/DetectionManager.lua index 3130ed4b1..d5af8de8d 100644 --- a/Moose Development/Moose/Tasking/DetectionManager.lua +++ b/Moose Development/Moose/Tasking/DetectionManager.lua @@ -18,7 +18,7 @@ -- Derived classes need to implement the method @{#DETECTION_MANAGER.GetReportDisplayTime}() to use the correct display time for displayed messages during a report. -- -- Reporting can be started and stopped using the methods @{#DETECTION_MANAGER.StartReporting}() and @{#DETECTION_MANAGER.StopReporting}() respectively. --- If an ad-hoc report is requested, use the method @{#DETECTION_MANAGER#ReportNow}(). +-- If an ad-hoc report is requested, use the method @{#DETECTION_MANAGER.ReportNow}(). -- -- The default reporting interval is every 60 seconds. The reporting messages are displayed 15 seconds. -- diff --git a/Moose Development/Moose/Tasking/Task_CARGO.lua b/Moose Development/Moose/Tasking/Task_CARGO.lua index 0bb782526..637298e51 100644 --- a/Moose Development/Moose/Tasking/Task_CARGO.lua +++ b/Moose Development/Moose/Tasking/Task_CARGO.lua @@ -5,7 +5,7 @@ -- * TASK_CARGO is the **base class** for: -- -- * @{Tasking.Task_Cargo_Transport#TASK_CARGO_TRANSPORT} --- * @{Tasking.Task_CARGO_CSAR#TASK_CARGO_CSAR} +-- * @{Tasking.Task_Cargo_CSAR#TASK_CARGO_CSAR} -- -- -- === @@ -14,7 +14,7 @@ -- -- Test missions can be located on the main GITHUB site. -- --- [FlightControl-Master/MOOSE_MISSIONS/TAD - Task Dispatching/CGO - Cargo Dispatching/](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/TAD%20-%20Task%20Dispatching/CGO%20-%20Cargo%20Dispatching) +-- [FlightControl-Master/MOOSE_MISSIONS/TAD - Task Dispatching/CGO - Cargo Dispatching/](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/TAD%20-%20Task%20Dispatching/CGO%20-%20Cargo%20Task%20Dispatching) -- -- === -- @@ -34,7 +34,7 @@ -- The following TASK_CARGO_ classes are important, as they implement the CONCRETE tasks: -- -- * @{Tasking.Task_Cargo_Transport#TASK_CARGO_TRANSPORT}: Defines a task for a human player to transport a set of cargo between various zones. --- * @{Tasking.Task_CARGO_CSAR#TASK_CARGO_CSAR}: Defines a task for a human player to Search and Rescue wounded pilots. +-- * @{Tasking.Task_Cargo_CSAR#TASK_CARGO_CSAR}: Defines a task for a human player to Search and Rescue wounded pilots. -- -- However! The menu system and basic usage of the TASK_CARGO classes is explained in the @{#TASK_CARGO} class description. -- So please browse further below to understand how to use it from a player perspective! @@ -49,7 +49,7 @@ -- Once the task is assigned to the player and accepted by the player, the player will obtain -- an extra **Cargo (Radio) Menu** that contains the CARGO objects that need to be transported. -- --- Each @{Cargo.Cargo} object has a certain state: +-- Each @{CARGO.Cargo} object has a certain state: -- -- * **UnLoaded**: The cargo is located within the battlefield. It may still need to be transported. -- * **Loaded**: The cargo is loaded within a Carrier. This can be your air unit, or another air unit, or even a vehicle. @@ -298,8 +298,7 @@ -- -- When you are within the range of the deploy zone (can be also a polygon!), a message is communicated by HQ that you have arrived within the zone! -- --- The routing messages are formulated in the coordinate format that is currently active as configured in your settings profile. --- ![Task_Types](../Tasking/Task_Cargo_Settings.JPG) +-- The routing messages are formulated in the coordinate format that is currently active as configured in your settings profile. -- Use the **Settings Menu** to select the coordinate format that you would like to use for location determination. -- -- #### Unboard Cargo. diff --git a/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua index fd1ed2075..09623e79f 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua @@ -570,7 +570,7 @@ do -- TASK_CARGO_DISPATCHER -- @param #string CSARTaskPrefix (optional) The prefix of the CSAR task. -- @param Core.Point#COORDINATE CSARCoordinate The coordinate where a downed pilot will be spawned. -- @param #number CSARHeading The heading of the pilot in degrees. - -- @param DCSCountry#Country CSARCountry The country ID of the pilot that will be spawned. + -- @param #DCSCountry CSARCountry The country ID of the pilot that will be spawned. -- @param #string CSARBriefing The briefing of the CSAR task. -- @return #string The CSAR Task Name as a string. The Task Name is the main key and is shown in the task list of the Mission Tasking menu. -- @usage diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 5dcf2757b..c8c55c81b 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -61,7 +61,7 @@ -- -- The DCS Airbase APIs are used extensively within MOOSE. The AIRBASE class has for each DCS Airbase API a corresponding method. -- To be able to distinguish easily in your code the difference between a AIRBASE API call and a DCS Airbase API call, --- the first letter of the method is also capitalized. So, by example, the DCS Airbase method @{DCSWrapper.Airbase#Airbase.getName}() +-- the first letter of the method is also capitalized. So, by example, the DCS Airbase method DCSWrapper.Airbase#Airbase.getName() -- is implemented in the AIRBASE class as @{#AIRBASE.GetName}(). -- -- @field #AIRBASE AIRBASE diff --git a/Moose Development/Moose/Wrapper/Marker.lua b/Moose Development/Moose/Wrapper/Marker.lua index 4bb7f9c7b..9d138341c 100644 --- a/Moose Development/Moose/Wrapper/Marker.lua +++ b/Moose Development/Moose/Wrapper/Marker.lua @@ -32,8 +32,6 @@ -- -- === -- --- ![Banner Image](..\Presentations\MARKER\Marker_Main.jpg) --- -- # The MARKER Class Idea -- -- The MARKER class simplifies creating, updating and removing of markers on the F10 map. From d7df08d754f6ee55239490d9a30ba68dcab36485 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Mon, 30 Oct 2023 18:01:57 +0100 Subject: [PATCH 40/51] Fixed broken links in documentation --- Moose Development/Moose/AI/AI_A2A_Dispatcher.lua | 6 +++--- Moose Development/Moose/AI/AI_A2G_Dispatcher.lua | 10 ---------- Moose Development/Moose/AI/AI_CAP.lua | 10 +++++----- Moose Development/Moose/AI/AI_Formation.lua | 4 ++-- Moose Development/Moose/Actions/Act_Assign.lua | 4 ++-- Moose Development/Moose/Cargo/Cargo.lua | 4 ++-- Moose Development/Moose/Core/Astar.lua | 2 +- Moose Development/Moose/Core/Event.lua | 4 ++-- Moose Development/Moose/Core/Pathline.lua | 2 +- Moose Development/Moose/Core/Spot.lua | 6 +++--- Moose Development/Moose/Functional/DetectionZones.lua | 2 +- Moose Development/Moose/Functional/Escort.lua | 2 +- Moose Development/Moose/Ops/CSAR.lua | 2 -- Moose Development/Moose/Sound/Radio.lua | 2 +- 14 files changed, 24 insertions(+), 36 deletions(-) diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua index c0e20617b..e68068435 100644 --- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua @@ -310,7 +310,7 @@ do -- AI_A2A_DISPATCHER -- Use the method @{#AI_A2A_DISPATCHER.SetEngageRadius}() to set a specific Engage Radius. -- **The Engage Radius is defined for ALL squadrons which are operational.** -- - -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/release-2-2-pre/AID%20-%20AI%20Dispatching/AID-019%20-%20AI_A2A%20-%20Engage%20Range%20Test) + -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-019%20-%20Engage%20Range%20Test) -- -- In this example an Engage Radius is set to various values. -- @@ -333,7 +333,7 @@ do -- AI_A2A_DISPATCHER -- Use the method @{#AI_A2A_DISPATCHER.SetGciRadius}() to set a specific controlled ground intercept radius. -- **The Ground Controlled Intercept radius is defined for ALL squadrons which are operational.** -- - -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/release-2-2-pre/AID%20-%20AI%20Dispatching/AID-013%20-%20AI_A2A%20-%20Intercept%20Test) + -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-013%20-%20Intercept%20Test) -- -- In these examples, the Gci Radius is set to various values: -- @@ -366,7 +366,7 @@ do -- AI_A2A_DISPATCHER -- it makes it easier sometimes for the mission maker to envisage where the red and blue territories roughly are. -- In a hot war the borders are effectively defined by the ground based radar coverage of a coalition. -- - -- Demonstration Mission: [AID-009 - AI_A2A - Border Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/release-2-2-pre/AID%20-%20AI%20Dispatching/AID-009 - AI_A2A - Border Test) + -- Demonstration Mission: [AID-009 - AI_A2A - Border Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-009%20-%20Border%20Test) -- -- In this example a border is set for the CCCP A2A dispatcher: -- diff --git a/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua index 6be8a0872..c3bb89ee2 100644 --- a/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua @@ -296,8 +296,6 @@ do -- AI_A2G_DISPATCHER -- -- ## 1. AI\_A2G\_DISPATCHER constructor: -- - -- ![Banner Image](..\Presentations\AI_A2G_DISPATCHER\AI_A2G_DISPATCHER-ME_1.JPG) - -- -- -- The @{#AI_A2G_DISPATCHER.New}() method creates a new AI_A2G_DISPATCHER instance. -- @@ -311,8 +309,6 @@ do -- AI_A2G_DISPATCHER -- A reconnaissance network, is used to detect enemy ground targets, -- potentially group them into areas, and to understand the position, level of threat of the enemy. -- - -- ![Banner Image](..\Presentations\AI_A2G_DISPATCHER\Dia5.JPG) - -- -- As explained in the introduction, depending on the type of mission you want to achieve, different types of units can be applied to detect ground enemy targets. -- Ground based units are very useful to act as a reconnaissance, but they lack sometimes the visibility to detect targets at greater range. -- Recce are very useful to acquire the position of enemy ground targets when spread out over the battlefield at strategic positions. @@ -686,8 +682,6 @@ do -- AI_A2G_DISPATCHER -- -- Use the method @{#AI_A2G_DISPATCHER.SetSquadronGrouping}() to set the grouping of aircraft when spawned in. -- - -- ![Banner Image](..\Presentations\AI_A2G_DISPATCHER\Dia12.JPG) - -- -- In the case of **on call** engagement, the @{#AI_A2G_DISPATCHER.SetSquadronGrouping}() method has additional behaviour. -- When there aren't enough patrol flights airborne, a on call will be initiated for the remaining -- targets to be engaged. Depending on the grouping parameter, the spawned flights for on call aircraft are grouped into this setting. @@ -701,8 +695,6 @@ do -- AI_A2G_DISPATCHER -- The effectiveness can be set with the **overhead parameter**. This is a number that is used to calculate the amount of Units that dispatching command will allocate to GCI in surplus of detected amount of units. -- The **default value** of the overhead parameter is 1.0, which means **equal balance**. -- - -- ![Banner Image](..\Presentations\AI_A2G_DISPATCHER\Dia11.JPG) - -- -- However, depending on the (type of) aircraft (strength and payload) in the squadron and the amount of resources available, this parameter can be changed. -- -- The @{#AI_A2G_DISPATCHER.SetSquadronOverhead}() method can be used to tweak the defense strength, @@ -848,8 +840,6 @@ do -- AI_A2G_DISPATCHER -- -- For example, the following setup will set the default refuel tanker to "Tanker": -- - -- ![Banner Image](..\Presentations\AI_A2G_DISPATCHER\AI_A2G_DISPATCHER-ME_11.JPG) - -- -- -- Set the default tanker for refuelling to "Tanker", when the default fuel threshold has reached 90% fuel left. -- A2GDispatcher:SetDefaultFuelThreshold( 0.9 ) -- A2GDispatcher:SetDefaultTanker( "Tanker" ) diff --git a/Moose Development/Moose/AI/AI_CAP.lua b/Moose Development/Moose/AI/AI_CAP.lua index c2bce7d39..f2168a6c0 100644 --- a/Moose Development/Moose/AI/AI_CAP.lua +++ b/Moose Development/Moose/AI/AI_CAP.lua @@ -20,11 +20,11 @@ -- ### Author: **FlightControl** -- ### Contributions: -- --- * **[Quax](https://forums.eagle.ru/member.php?u=90530)**: Concept, Advice & Testing. --- * **[Pikey](https://forums.eagle.ru/member.php?u=62835)**: Concept, Advice & Testing. --- * **[Gunterlund](http://forums.eagle.ru:8080/member.php?u=75036)**: Test case revision. --- * **[Whisper](http://forums.eagle.ru/member.php?u=3829): Testing. --- * **[Delta99](https://forums.eagle.ru/member.php?u=125166): Testing. +-- * **Quax**: Concept, Advice & Testing. +-- * **Pikey**: Concept, Advice & Testing. +-- * **Gunterlund**: Test case revision. +-- * **Whisper**: Testing. +-- * **Delta99**: Testing. -- -- === -- diff --git a/Moose Development/Moose/AI/AI_Formation.lua b/Moose Development/Moose/AI/AI_Formation.lua index fa4e4ea4b..06b14d271 100644 --- a/Moose Development/Moose/AI/AI_Formation.lua +++ b/Moose Development/Moose/AI/AI_Formation.lua @@ -8,7 +8,7 @@ -- -- === -- --- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/FOR%20-%20Formation) +-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/FOR%20-%20AI%20Group%20Formation) -- -- === -- @@ -31,7 +31,7 @@ -- @field Core.Set#SET_GROUP FollowGroupSet -- @field #string FollowName -- @field #AI_FORMATION.MODE FollowMode The mode the escort is in. --- @field Scheduler#SCHEDULER FollowScheduler The instance of the SCHEDULER class. +-- @field Core.Scheduler#SCHEDULER FollowScheduler The instance of the SCHEDULER class. -- @field #number FollowDistance The current follow distance. -- @field #boolean ReportTargets If true, nearby targets are reported. -- @Field DCSTypes#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup. diff --git a/Moose Development/Moose/Actions/Act_Assign.lua b/Moose Development/Moose/Actions/Act_Assign.lua index 75f9e2e3f..c23383ca4 100644 --- a/Moose Development/Moose/Actions/Act_Assign.lua +++ b/Moose Development/Moose/Actions/Act_Assign.lua @@ -59,7 +59,7 @@ -- -- === -- --- # 1) @{#ACT_ASSIGN_ACCEPT} class, extends @{Core.Fsm.Assign#ACT_ASSIGN} +-- # 1) @{#ACT_ASSIGN_ACCEPT} class, extends @{Core.Fsm#ACT_ASSIGN} -- -- The ACT_ASSIGN_ACCEPT class accepts by default a task for a player. No player intervention is allowed to reject the task. -- @@ -69,7 +69,7 @@ -- -- === -- --- # 2) @{#ACT_ASSIGN_MENU_ACCEPT} class, extends @{Core.Fsm.Assign#ACT_ASSIGN} +-- # 2) @{#ACT_ASSIGN_MENU_ACCEPT} class, extends @{Core.Fsm#ACT_ASSIGN} -- -- The ACT_ASSIGN_MENU_ACCEPT class accepts a task when the player accepts the task through an added menu option. -- This assignment type is useful to conditionally allow the player to choose whether or not he would accept the task. diff --git a/Moose Development/Moose/Cargo/Cargo.lua b/Moose Development/Moose/Cargo/Cargo.lua index 257e118a9..462259b86 100644 --- a/Moose Development/Moose/Cargo/Cargo.lua +++ b/Moose Development/Moose/Cargo/Cargo.lua @@ -980,7 +980,7 @@ do -- CARGO --- Report to a Carrier Group with a Flaring signal. -- @param #CARGO self - -- @param Utils#UTILS.FlareColor FlareColor the color of the flare. + -- @param Utilities.Utils#UTILS.FlareColor FlareColor the color of the flare. -- @return #CARGO function CARGO:ReportFlare( FlareColor ) @@ -989,7 +989,7 @@ do -- CARGO --- Report to a Carrier Group with a Smoking signal. -- @param #CARGO self - -- @param Utils#UTILS.SmokeColor SmokeColor the color of the smoke. + -- @param Utilities.Utils#UTILS.SmokeColor SmokeColor the color of the smoke. -- @return #CARGO function CARGO:ReportSmoke( SmokeColor ) diff --git a/Moose Development/Moose/Core/Astar.lua b/Moose Development/Moose/Core/Astar.lua index 9514d179e..a7b032ad9 100644 --- a/Moose Development/Moose/Core/Astar.lua +++ b/Moose Development/Moose/Core/Astar.lua @@ -112,7 +112,7 @@ -- -- # Calculate the Path -- --- Finally, we have to calculate the path. This is done by the @{ASTAR.GetPath}(*ExcludeStart, ExcludeEnd*) function. This function returns a table of nodes, which +-- Finally, we have to calculate the path. This is done by the @{#GetPath}(*ExcludeStart, ExcludeEnd*) function. This function returns a table of nodes, which -- describe the optimal path from the start node to the end node. -- -- By default, the start and end node are include in the table that is returned. diff --git a/Moose Development/Moose/Core/Event.lua b/Moose Development/Moose/Core/Event.lua index 95c4f6a35..d057805f3 100644 --- a/Moose Development/Moose/Core/Event.lua +++ b/Moose Development/Moose/Core/Event.lua @@ -313,7 +313,7 @@ EVENTS = { -- @field Cargo.Cargo#CARGO Cargo The cargo object. -- @field #string CargoName The name of the cargo object. -- --- @field Core.ZONE#ZONE Zone The zone object. +-- @field Core.Zone#ZONE Zone The zone object. -- @field #string ZoneName The name of the zone. @@ -988,7 +988,7 @@ do -- Event Creation --- Creation of a New ZoneGoal Event. -- @param #EVENT self - -- @param Core.Functional#ZONE_GOAL ZoneGoal The ZoneGoal created. + -- @param Functional.ZoneGoal#ZONE_GOAL ZoneGoal The ZoneGoal created. function EVENT:CreateEventNewZoneGoal( ZoneGoal ) self:F( { ZoneGoal } ) diff --git a/Moose Development/Moose/Core/Pathline.lua b/Moose Development/Moose/Core/Pathline.lua index a71da23a3..b9b8b08f2 100644 --- a/Moose Development/Moose/Core/Pathline.lua +++ b/Moose Development/Moose/Core/Pathline.lua @@ -199,7 +199,7 @@ end --- Get points of pathline. Not that points are tables, that contain more information as just the 2D or 3D position but also the surface type etc. -- @param #PATHLINE self --- @return <#PATHLINE.Point> List of points. +-- @return #PATHLINE.Point List of points. function PATHLINE:GetPoints() return self.points end diff --git a/Moose Development/Moose/Core/Spot.lua b/Moose Development/Moose/Core/Spot.lua index af00fee8f..9db60f640 100644 --- a/Moose Development/Moose/Core/Spot.lua +++ b/Moose Development/Moose/Core/Spot.lua @@ -21,9 +21,9 @@ -- ### Author: **FlightControl** -- ### Contributions: -- --- * [**Ciribob**](https://forums.eagle.ru/member.php?u=112175): Showing the way how to lase targets + how laser codes work!!! Explained the autolase script. --- * [**EasyEB**](https://forums.eagle.ru/member.php?u=112055): Ideas and Beta Testing --- * [**Wingthor**](https://forums.eagle.ru/member.php?u=123698): Beta Testing +-- * **Ciribob**: Showing the way how to lase targets + how laser codes work!!! Explained the autolase script. +-- * **EasyEB**: Ideas and Beta Testing +-- * **Wingthor**: Beta Testing -- -- === -- diff --git a/Moose Development/Moose/Functional/DetectionZones.lua b/Moose Development/Moose/Functional/DetectionZones.lua index 8cb9b9d10..20680559d 100644 --- a/Moose Development/Moose/Functional/DetectionZones.lua +++ b/Moose Development/Moose/Functional/DetectionZones.lua @@ -21,7 +21,7 @@ do -- DETECTION_ZONES -- -- Retrieve the DetectedItems[].Set with the method @{Functional.Detection#DETECTION_BASE.GetDetectedSet}(). A @{Core.Set#SET_UNIT} object will be returned. -- - -- Retrieve the formed @{Zone@ZONE_UNIT}s as a result of the grouping the detected units within the DetectionZoneRange, use the method @{Functional.Detection#DETECTION_BASE.GetDetectionZones}(). + -- Retrieve the formed @{Core.Zone#ZONE_UNIT}s as a result of the grouping the detected units within the DetectionZoneRange, use the method @{Functional.Detection#DETECTION_BASE.GetDetectionZones}(). -- To understand the amount of zones created, use the method @{Functional.Detection#DETECTION_BASE.GetDetectionZoneCount}(). -- If you want to obtain a specific zone from the DetectedZones, use the method @{Functional.Detection#DETECTION_BASE.GetDetectionZone}() with a given index. -- diff --git a/Moose Development/Moose/Functional/Escort.lua b/Moose Development/Moose/Functional/Escort.lua index d0c470d3f..38d25de68 100644 --- a/Moose Development/Moose/Functional/Escort.lua +++ b/Moose Development/Moose/Functional/Escort.lua @@ -252,7 +252,7 @@ end --- Set a Detection method for the EscortClient to be reported upon. -- Detection methods are based on the derived classes from DETECTION_BASE. -- @param #ESCORT self --- @param Function.Detection#DETECTION_BASE Detection +-- @param Functional.Detection#DETECTION_BASE Detection function ESCORT:SetDetection( Detection ) self.Detection = Detection diff --git a/Moose Development/Moose/Ops/CSAR.lua b/Moose Development/Moose/Ops/CSAR.lua index 9d23a86e1..0c1950e41 100644 --- a/Moose Development/Moose/Ops/CSAR.lua +++ b/Moose Development/Moose/Ops/CSAR.lua @@ -46,8 +46,6 @@ -- -- === -- --- ![Banner Image](OPS_CSAR.jpg) --- -- # CSAR Concept -- -- * MOOSE-based Helicopter CSAR Operations for Players. diff --git a/Moose Development/Moose/Sound/Radio.lua b/Moose Development/Moose/Sound/Radio.lua index 56eb8ddf0..002e6ddaf 100644 --- a/Moose Development/Moose/Sound/Radio.lua +++ b/Moose Development/Moose/Sound/Radio.lua @@ -44,7 +44,7 @@ -- -- * First, you need to **"add a @{#RADIO} object** to your @{Wrapper.Positionable#POSITIONABLE}. This is done using the @{Wrapper.Positionable#POSITIONABLE.GetRadio}() function, -- * Then, you will **set the relevant parameters** to the transmission (see below), --- * When done, you can actually **broadcast the transmission** (i.e. play the sound) with the @{RADIO.Broadcast}() function. +-- * When done, you can actually **broadcast the transmission** (i.e. play the sound) with the @{#RADIO.Broadcast}() function. -- -- Methods to set relevant parameters for both a @{Wrapper.Unit#UNIT} or a @{Wrapper.Group#GROUP} or any other @{Wrapper.Positionable#POSITIONABLE} -- From b05683d3842996d5043fa98b9c043eff486b1840 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Tue, 31 Oct 2023 10:25:00 +0100 Subject: [PATCH 41/51] Fixed some broken links --- Moose Development/Moose/AI/AI_A2A_Gci.lua | 2 -- Moose Development/Moose/AI/AI_A2G_SEAD.lua | 20 +------------------ .../Moose/AI/AI_Air_Dispatcher.lua | 10 ---------- Moose Development/Moose/AI/AI_Air_Engage.lua | 2 +- Moose Development/Moose/AI/AI_BAI.lua | 2 +- Moose Development/Moose/AI/AI_Balancer.lua | 6 +++--- Moose Development/Moose/AI/AI_CAS.lua | 6 +++--- .../Moose/Actions/Act_Account.lua | 2 +- .../Moose/Actions/Act_Assist.lua | 2 +- Moose Development/Moose/Core/Database.lua | 2 +- Moose Development/Moose/Core/Menu.lua | 2 +- Moose Development/Moose/Core/Message.lua | 4 ++-- Moose Development/Moose/Core/Pathline.lua | 2 +- Moose Development/Moose/Core/Scheduler.lua | 2 +- Moose Development/Moose/Core/Settings.lua | 14 ++++++------- Moose Development/Moose/Core/Zone.lua | 12 +++++------ Moose Development/Moose/Functional/Fox.lua | 2 +- Moose Development/Moose/Functional/Range.lua | 6 +++--- .../Moose/Functional/Scoring.lua | 4 ++-- .../Moose/Functional/ZoneCaptureCoalition.lua | 2 +- Moose Development/Moose/Sound/RadioSpeech.lua | 2 +- Moose Development/Moose/Sound/SRS.lua | 2 +- .../Moose/Tasking/Task_Cargo_CSAR.lua | 4 ++-- 23 files changed, 41 insertions(+), 71 deletions(-) diff --git a/Moose Development/Moose/AI/AI_A2A_Gci.lua b/Moose Development/Moose/AI/AI_A2A_Gci.lua index e3e7adb04..e0f9a77ec 100644 --- a/Moose Development/Moose/AI/AI_A2A_Gci.lua +++ b/Moose Development/Moose/AI/AI_A2A_Gci.lua @@ -53,8 +53,6 @@ -- -- ## 2. AI_A2A_GCI is a FSM -- --- ![Process](..\Presentations\AI_GCI\Dia2.JPG) --- -- ### 2.1 AI_A2A_GCI States -- -- * **None** ( Group ): The process is not started yet. diff --git a/Moose Development/Moose/AI/AI_A2G_SEAD.lua b/Moose Development/Moose/AI/AI_A2G_SEAD.lua index 2a4e8856c..72182ae13 100644 --- a/Moose Development/Moose/AI/AI_A2G_SEAD.lua +++ b/Moose Development/Moose/AI/AI_A2G_SEAD.lua @@ -14,47 +14,31 @@ --- @type AI_A2G_SEAD --- @extends AI.AI_A2G_Patrol#AI_AIR_PATROL +-- @extends AI.Air_Patrol#AI_AIR_PATROL --- Implements the core functions to SEAD intruders. Use the Engage trigger to intercept intruders. -- --- ![Process](..\Presentations\AI_GCI\Dia3.JPG) --- -- The AI_A2G_SEAD is assigned a @{Wrapper.Group} and this must be done before the AI_A2G_SEAD process can be started using the **Start** event. -- --- ![Process](..\Presentations\AI_GCI\Dia4.JPG) --- -- The AI will fly towards the random 3D point within the patrol zone, using a random speed within the given altitude and speed limits. -- Upon arrival at the 3D point, a new random 3D point will be selected within the patrol zone using the given limits. -- --- ![Process](..\Presentations\AI_GCI\Dia5.JPG) --- -- This cycle will continue. -- --- ![Process](..\Presentations\AI_GCI\Dia6.JPG) --- -- During the patrol, the AI will detect enemy targets, which are reported through the **Detected** event. --- --- ![Process](..\Presentations\AI_GCI\Dia9.JPG) -- -- When enemies are detected, the AI will automatically engage the enemy. -- --- ![Process](..\Presentations\AI_GCI\Dia10.JPG) --- -- Until a fuel or damage threshold has been reached by the AI, or when the AI is commanded to RTB. -- When the fuel threshold has been reached, the airplane will fly towards the nearest friendly airbase and will land. -- --- ![Process](..\Presentations\AI_GCI\Dia13.JPG) --- -- ## 1. AI_A2G_SEAD constructor -- -- * @{#AI_A2G_SEAD.New}(): Creates a new AI_A2G_SEAD object. -- -- ## 3. Set the Range of Engagement -- --- ![Range](..\Presentations\AI_GCI\Dia11.JPG) --- -- An optional range can be set in meters, -- that will define when the AI will engage with the detected airborne enemy targets. -- The range can be beyond or smaller than the range of the Patrol Zone. @@ -63,8 +47,6 @@ -- -- ## 4. Set the Zone of Engagement -- --- ![Zone](..\Presentations\AI_GCI\Dia12.JPG) --- -- An optional @{Core.Zone} can be set, -- that will define when the AI will engage with the detected airborne enemy targets. -- Use the method @{AI.AI_CAP#AI_CAP_ZONE.SetEngageZone}() to define that Zone. -- TODO: Documentation. Check that this is actually correct. The originally referenced class does not exist. diff --git a/Moose Development/Moose/AI/AI_Air_Dispatcher.lua b/Moose Development/Moose/AI/AI_Air_Dispatcher.lua index 39fdf17f5..b422ac03e 100644 --- a/Moose Development/Moose/AI/AI_Air_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_Air_Dispatcher.lua @@ -292,8 +292,6 @@ do -- AI_AIR_DISPATCHER -- -- ## 1. AI\_AIR\_DISPATCHER constructor: -- - -- ![Banner Image](..\Presentations\AI_AIR_DISPATCHER\AI_AIR_DISPATCHER-ME_1.JPG) - -- -- -- The @{#AI_AIR_DISPATCHER.New}() method creates a new AI_AIR_DISPATCHER instance. -- @@ -306,8 +304,6 @@ do -- AI_AIR_DISPATCHER -- A reconnaissance network, is used to detect enemy ground targets, -- potentially group them into areas, and to understand the position, level of threat of the enemy. -- - -- ![Banner Image](..\Presentations\AI_AIR_DISPATCHER\Dia5.JPG) - -- -- As explained in the introduction, depending on the type of mission you want to achieve, different types of units can be applied to detect ground enemy targets. -- Ground based units are very useful to act as a reconnaissance, but they lack sometimes the visibility to detect targets at greater range. -- Recce are very useful to acquire the position of enemy ground targets when spread out over the battlefield at strategic positions. @@ -673,8 +669,6 @@ do -- AI_AIR_DISPATCHER -- -- Use the method @{#AI_AIR_DISPATCHER.SetSquadronGrouping}() to set the grouping of aircraft when spawned in. -- - -- ![Banner Image](..\Presentations\AI_AIR_DISPATCHER\Dia12.JPG) - -- -- In the case of **on call** engagement, the @{#AI_AIR_DISPATCHER.SetSquadronGrouping}() method has additional behaviour. -- When there aren't enough patrol flights airborne, a on call will be initiated for the remaining -- targets to be engaged. Depending on the grouping parameter, the spawned flights for on call aircraft are grouped into this setting. @@ -688,8 +682,6 @@ do -- AI_AIR_DISPATCHER -- The effectiveness can be set with the **overhead parameter**. This is a number that is used to calculate the amount of Units that dispatching command will allocate to GCI in surplus of detected amount of units. -- The **default value** of the overhead parameter is 1.0, which means **equal balance**. -- - -- ![Banner Image](..\Presentations\AI_AIR_DISPATCHER\Dia11.JPG) - -- -- However, depending on the (type of) aircraft (strength and payload) in the squadron and the amount of resources available, this parameter can be changed. -- -- The @{#AI_AIR_DISPATCHER.SetSquadronOverhead}() method can be used to tweak the defense strength, @@ -835,8 +827,6 @@ do -- AI_AIR_DISPATCHER -- -- For example, the following setup will set the default refuel tanker to "Tanker": -- - -- ![Banner Image](..\Presentations\AI_AIR_DISPATCHER\AI_AIR_DISPATCHER-ME_11.JPG) - -- -- -- Define the CAP -- A2ADispatcher:SetSquadron( "Sochi", AIRBASE.Caucasus.Sochi_Adler, { "SQ CCCP SU-34" }, 20 ) -- A2ADispatcher:SetSquadronCap( "Sochi", ZONE:New( "PatrolZone" ), 4000, 8000, 600, 800, 1000, 1300 ) diff --git a/Moose Development/Moose/AI/AI_Air_Engage.lua b/Moose Development/Moose/AI/AI_Air_Engage.lua index f75f48240..f5a7b2d44 100644 --- a/Moose Development/Moose/AI/AI_Air_Engage.lua +++ b/Moose Development/Moose/AI/AI_Air_Engage.lua @@ -14,7 +14,7 @@ --- @type AI_AIR_ENGAGE --- @extends AI.AI_AIR#AI_AIR +-- @extends AI.AI_Air#AI_AIR --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders. diff --git a/Moose Development/Moose/AI/AI_BAI.lua b/Moose Development/Moose/AI/AI_BAI.lua index 58b33e14f..e1fc59bbf 100644 --- a/Moose Development/Moose/AI/AI_BAI.lua +++ b/Moose Development/Moose/AI/AI_BAI.lua @@ -22,7 +22,7 @@ -- ### Author: **FlightControl** -- ### Contributions: -- --- * **[Gunterlund](http://forums.eagle.ru:8080/member.php?u=75036)**: Test case revision. +-- * **Gunterlund**: Test case revision. -- -- === -- diff --git a/Moose Development/Moose/AI/AI_Balancer.lua b/Moose Development/Moose/AI/AI_Balancer.lua index 14eba62c6..290dca57f 100644 --- a/Moose Development/Moose/AI/AI_Balancer.lua +++ b/Moose Development/Moose/AI/AI_Balancer.lua @@ -20,7 +20,7 @@ -- ### Author: **FlightControl** -- ### Contributions: -- --- * **[Dutch_Baron](https://forums.eagle.ru/member.php?u=112075)**: Working together with James has resulted in the creation of the AI_BALANCER class. James has shared his ideas on balancing AI with air units, and together we made a first design which you can use now :-) +-- * **Dutch_Baron**: Working together with James has resulted in the creation of the AI_BALANCER class. James has shared his ideas on balancing AI with air units, and together we made a first design which you can use now :-) -- -- === -- @@ -40,7 +40,7 @@ -- -- The parent class @{Core.Fsm#FSM_SET} manages the functionality to control the Finite State Machine (FSM). -- The mission designer can tailor the behaviour of the AI_BALANCER, by defining event and state transition methods. --- An explanation about state and event transition methods can be found in the @{FSM} module documentation. +-- An explanation about state and event transition methods can be found in the @{Core.Fsm} module documentation. -- -- The mission designer can tailor the AI_BALANCER behaviour, by implementing a state or event handling method for the following: -- @@ -52,7 +52,7 @@ -- -- ## 2. AI_BALANCER is a FSM -- --- ![Process](..\Presentations\AI_Balancer\Dia13.JPG) +-- ![Process](..\Presentations\AI_BALANCER\Dia13.JPG) -- -- ### 2.1. AI_BALANCER States -- diff --git a/Moose Development/Moose/AI/AI_CAS.lua b/Moose Development/Moose/AI/AI_CAS.lua index f4bcd5b27..7c748b5a6 100644 --- a/Moose Development/Moose/AI/AI_CAS.lua +++ b/Moose Development/Moose/AI/AI_CAS.lua @@ -22,9 +22,9 @@ -- ### Author: **FlightControl** -- ### Contributions: -- --- * **[Quax](https://forums.eagle.ru/member.php?u=90530)**: Concept, Advice & Testing. --- * **[Pikey](https://forums.eagle.ru/member.php?u=62835)**: Concept, Advice & Testing. --- * **[Gunterlund](http://forums.eagle.ru:8080/member.php?u=75036)**: Test case revision. +-- * **Quax**: Concept, Advice & Testing. +-- * **Pikey**: Concept, Advice & Testing. +-- * **Gunterlund**: Test case revision. -- -- === -- diff --git a/Moose Development/Moose/Actions/Act_Account.lua b/Moose Development/Moose/Actions/Act_Account.lua index 0fe2d6eb6..5b809af44 100644 --- a/Moose Development/Moose/Actions/Act_Account.lua +++ b/Moose Development/Moose/Actions/Act_Account.lua @@ -142,7 +142,7 @@ end -- ACT_ACCOUNT do -- ACT_ACCOUNT_DEADS - --- # @{#ACT_ACCOUNT_DEADS} FSM class, extends @{Core.Fsm.Account#ACT_ACCOUNT} + --- # @{#ACT_ACCOUNT_DEADS} FSM class, extends @{#ACT_ACCOUNT} -- -- The ACT_ACCOUNT_DEADS class accounts (detects, counts and reports) successful kills of DCS units. -- The process is given a @{Core.Set} of units that will be tracked upon successful destruction. diff --git a/Moose Development/Moose/Actions/Act_Assist.lua b/Moose Development/Moose/Actions/Act_Assist.lua index e7017ce90..45bb4d804 100644 --- a/Moose Development/Moose/Actions/Act_Assist.lua +++ b/Moose Development/Moose/Actions/Act_Assist.lua @@ -48,7 +48,7 @@ -- -- === -- --- # 1) @{#ACT_ASSIST_SMOKE_TARGETS_ZONE} class, extends @{Core.Fsm.Route#ACT_ASSIST} +-- # 1) @{#ACT_ASSIST_SMOKE_TARGETS_ZONE} class, extends @{#ACT_ASSIST} -- -- The ACT_ASSIST_SMOKE_TARGETS_ZONE class implements the core functions to smoke targets in a @{Core.Zone}. -- The targets are smoked within a certain range around each target, simulating a realistic smoking behaviour. diff --git a/Moose Development/Moose/Core/Database.lua b/Moose Development/Moose/Core/Database.lua index 2eeb2d244..180bd5b5a 100644 --- a/Moose Development/Moose/Core/Database.lua +++ b/Moose Development/Moose/Core/Database.lua @@ -681,7 +681,7 @@ do -- cargo --- Finds an CARGO based on the CargoName. -- @param #DATABASE self -- @param #string CargoName - -- @return Wrapper.Cargo#CARGO The found CARGO. + -- @return Cargo.Cargo#CARGO The found CARGO. function DATABASE:FindCargo( CargoName ) local CargoFound = self.CARGOS[CargoName] diff --git a/Moose Development/Moose/Core/Menu.lua b/Moose Development/Moose/Core/Menu.lua index 8a6edf657..fc9a75394 100644 --- a/Moose Development/Moose/Core/Menu.lua +++ b/Moose Development/Moose/Core/Menu.lua @@ -513,7 +513,7 @@ do -- MENU_COALITION --- @type MENU_COALITION -- @extends Core.Menu#MENU_BASE - --- Manages the main menus for @{DCS.coalition}s. + --- Manages the main menus for DCS.coalition. -- -- You can add menus with the @{#MENU_COALITION.New} method, which constructs a MENU_COALITION object and returns you the object reference. -- Using this object reference, you can then remove ALL the menus and submenus underlying automatically with @{#MENU_COALITION.Remove}. diff --git a/Moose Development/Moose/Core/Message.lua b/Moose Development/Moose/Core/Message.lua index 005850ec1..4d1d5d501 100644 --- a/Moose Development/Moose/Core/Message.lua +++ b/Moose Development/Moose/Core/Message.lua @@ -73,7 +73,7 @@ MESSAGE.Type = { Detailed = "Detailed Report", } ---- Creates a new MESSAGE object. Note that these MESSAGE objects are not yet displayed on the display panel. You must use the functions @{ToClient} or @{ToCoalition} or @{ToAll} to send these Messages to the respective recipients. +--- Creates a new MESSAGE object. Note that these MESSAGE objects are not yet displayed on the display panel. You must use the functions @{#MESSAGE.ToClient} or @{#MESSAGE.ToCoalition} or @{#MESSAGE.ToAll} to send these Messages to the respective recipients. -- @param self -- @param #string MessageText is the text of the Message. -- @param #number MessageDuration is a number in seconds of how long the MESSAGE should be shown on the display panel. @@ -379,7 +379,7 @@ end --- Sends a MESSAGE to a Coalition if the given Condition is true. -- @param #MESSAGE self --- @param CoalitionSide needs to be filled out by the defined structure of the standard scripting engine @{coalition.side}. +-- @param CoalitionSide needs to be filled out by the defined structure of the standard scripting engine @{#DCS.coalition.side}. -- @param #boolean Condition Sends the message only if the condition is true. -- @return #MESSAGE self function MESSAGE:ToCoalitionIf( CoalitionSide, Condition ) diff --git a/Moose Development/Moose/Core/Pathline.lua b/Moose Development/Moose/Core/Pathline.lua index b9b8b08f2..7cbb48552 100644 --- a/Moose Development/Moose/Core/Pathline.lua +++ b/Moose Development/Moose/Core/Pathline.lua @@ -199,7 +199,7 @@ end --- Get points of pathline. Not that points are tables, that contain more information as just the 2D or 3D position but also the surface type etc. -- @param #PATHLINE self --- @return #PATHLINE.Point List of points. +-- @return #list <#PATHLINE.Point> List of points. function PATHLINE:GetPoints() return self.points end diff --git a/Moose Development/Moose/Core/Scheduler.lua b/Moose Development/Moose/Core/Scheduler.lua index 36804e2ab..231157a5d 100644 --- a/Moose Development/Moose/Core/Scheduler.lua +++ b/Moose Development/Moose/Core/Scheduler.lua @@ -52,7 +52,7 @@ -- -- A SCHEDULER can manage **multiple** (repeating) schedules. Each planned or executing schedule has a unique **ScheduleID**. -- The ScheduleID is returned when the method @{#SCHEDULER.Schedule}() is called. --- It is recommended to store the ScheduleID in a variable, as it is used in the methods @{SCHEDULER.Start}() and @{SCHEDULER.Stop}(), +-- It is recommended to store the ScheduleID in a variable, as it is used in the methods @{#SCHEDULER.Start}() and @{#SCHEDULER.Stop}(), -- which can start and stop specific repeating schedules respectively within a SCHEDULER object. -- -- ## SCHEDULER constructor diff --git a/Moose Development/Moose/Core/Settings.lua b/Moose Development/Moose/Core/Settings.lua index 4a97a35eb..e24527798 100644 --- a/Moose Development/Moose/Core/Settings.lua +++ b/Moose Development/Moose/Core/Settings.lua @@ -91,7 +91,7 @@ -- -- Will customize which display format is used to indicate A2G coordinates in text as part of the Command Center communications. -- --- - A2G BR: [Bearing Range](https://en.wikipedia.org/wiki/Bearing_(navigation)). +-- - A2G BR: [Bearing Range](https://en.wikipedia.org/wiki/Bearing_\(navigation\)). -- - A2G MGRS: The [Military Grid Reference System](https://en.wikipedia.org/wiki/Military_Grid_Reference_System). The accuracy can also be adapted. -- - A2G LL DMS: Latitude Longitude [Degrees Minutes Seconds](https://en.wikipedia.org/wiki/Geographic_coordinate_conversion). The accuracy can also be adapted. -- - A2G LL DDM: Latitude Longitude [Decimal Degrees Minutes](https://en.wikipedia.org/wiki/Decimal_degrees). The accuracy can also be adapted. @@ -105,9 +105,9 @@ -- There are different methods that can be used to change the **System settings** using the \_SETTINGS object. -- -- - @{#SETTINGS.SetA2G_BR}(): Enable the BR display formatting by default. --- - @{#SETTINGS.SetA2G_MGRS}(): Enable the MGRS display formatting by default. Use @{SETTINGS.SetMGRS_Accuracy}() to adapt the accuracy of the MGRS formatting. --- - @{#SETTINGS.SetA2G_LL_DMS}(): Enable the LL DMS display formatting by default. Use @{SETTINGS.SetLL_Accuracy}() to adapt the accuracy of the Seconds formatting. --- - @{#SETTINGS.SetA2G_LL_DDM}(): Enable the LL DDM display formatting by default. Use @{SETTINGS.SetLL_Accuracy}() to adapt the accuracy of the Seconds formatting. +-- - @{#SETTINGS.SetA2G_MGRS}(): Enable the MGRS display formatting by default. Use @{#SETTINGS.SetMGRS_Accuracy}() to adapt the accuracy of the MGRS formatting. +-- - @{#SETTINGS.SetA2G_LL_DMS}(): Enable the LL DMS display formatting by default. Use @{#SETTINGS.SetLL_Accuracy}() to adapt the accuracy of the Seconds formatting. +-- - @{#SETTINGS.SetA2G_LL_DDM}(): Enable the LL DDM display formatting by default. Use @{#SETTINGS.SetLL_Accuracy}() to adapt the accuracy of the Seconds formatting. -- -- ### 3.1.4) A2G coordinates setting - additional notes -- @@ -135,9 +135,9 @@ -- There are different methods that can be used to change the **System settings** using the \_SETTINGS object. -- -- - @{#SETTINGS.SetA2A_BRAA}(): Enable the BR display formatting by default. --- - @{#SETTINGS.SetA2A_MGRS}(): Enable the MGRS display formatting by default. Use @{SETTINGS.SetMGRS_Accuracy}() to adapt the accuracy of the MGRS formatting. --- - @{#SETTINGS.SetA2A_LL_DMS}(): Enable the LL DMS display formatting by default. Use @{SETTINGS.SetLL_Accuracy}() to adapt the accuracy of the Seconds formatting. --- - @{#SETTINGS.SetA2A_LL_DDM}(): Enable the LL DDM display formatting by default. Use @{SETTINGS.SetLL_Accuracy}() to adapt the accuracy of the Seconds formatting. +-- - @{#SETTINGS.SetA2A_MGRS}(): Enable the MGRS display formatting by default. Use @{#SETTINGS.SetMGRS_Accuracy}() to adapt the accuracy of the MGRS formatting. +-- - @{#SETTINGS.SetA2A_LL_DMS}(): Enable the LL DMS display formatting by default. Use @{#SETTINGS.SetLL_Accuracy}() to adapt the accuracy of the Seconds formatting. +-- - @{#SETTINGS.SetA2A_LL_DDM}(): Enable the LL DDM display formatting by default. Use @{#SETTINGS.SetLL_Accuracy}() to adapt the accuracy of the Seconds formatting. -- - @{#SETTINGS.SetA2A_BULLS}(): Enable the BULLSeye display formatting by default. -- -- ### 3.2.4) A2A coordinates settings - additional notes diff --git a/Moose Development/Moose/Core/Zone.lua b/Moose Development/Moose/Core/Zone.lua index e4fb13558..648249020 100644 --- a/Moose Development/Moose/Core/Zone.lua +++ b/Moose Development/Moose/Core/Zone.lua @@ -570,7 +570,7 @@ end --- Start watching if the Object or Objects move into or out of a zone. -- @param #ZONE_BASE self --- @param Wrappe.Controllable#CONTROLLABLE Objects Object or Objects to watch, can be of type UNIT, GROUP, CLIENT, or SET\_UNIT, SET\_GROUP, SET\_CLIENT +-- @param Wrapper.Controllable#CONTROLLABLE Objects Object or Objects to watch, can be of type UNIT, GROUP, CLIENT, or SET\_UNIT, SET\_GROUP, SET\_CLIENT -- @return #ZONE_BASE self -- @usage -- -- Create a new zone and start watching it every 5 secs for a defined GROUP entering or leaving @@ -2749,11 +2749,11 @@ end --- Scan the zone for the presence of units of the given ObjectCategories. Does **not** scan for scenery at the moment. -- Note that **only after** a zone has been scanned, the zone can be evaluated by: -- --- * @{ZONE_POLYGON.IsAllInZoneOfCoalition}(): Scan the presence of units in the zone of a coalition. --- * @{ZONE_POLYGON.IsAllInZoneOfOtherCoalition}(): Scan the presence of units in the zone of an other coalition. --- * @{ZONE_POLYGON.IsSomeInZoneOfCoalition}(): Scan if there is some presence of units in the zone of the given coalition. --- * @{ZONE_POLYGON.IsNoneInZoneOfCoalition}(): Scan if there isn't any presence of units in the zone of an other coalition than the given one. --- * @{ZONE_POLYGON.IsNoneInZone}(): Scan if the zone is empty. +-- * @{Core.Zone#ZONE_POLYGON.IsAllInZoneOfCoalition}(): Scan the presence of units in the zone of a coalition. +-- * @{Core.Zone#ZONE_POLYGON.IsAllInZoneOfOtherCoalition}(): Scan the presence of units in the zone of an other coalition. +-- * @{Core.Zone#ZONE_POLYGON.IsSomeInZoneOfCoalition}(): Scan if there is some presence of units in the zone of the given coalition. +-- * @{Core.Zone#ZONE_POLYGON.IsNoneInZoneOfCoalition}(): Scan if there isn't any presence of units in the zone of an other coalition than the given one. +-- * @{Core.Zone#ZONE_POLYGON.IsNoneInZone}(): Scan if the zone is empty. -- @param #ZONE_POLYGON self -- @param ObjectCategories An array of categories of the objects to find in the zone. E.g. `{Object.Category.UNIT}` -- @param UnitCategories An array of unit categories of the objects to find in the zone. E.g. `{Unit.Category.GROUND_UNIT,Unit.Category.SHIP}` diff --git a/Moose Development/Moose/Functional/Fox.lua b/Moose Development/Moose/Functional/Fox.lua index 4d5a418e0..0c9c81b67 100644 --- a/Moose Development/Moose/Functional/Fox.lua +++ b/Moose Development/Moose/Functional/Fox.lua @@ -58,7 +58,7 @@ -- -- # The FOX Concept -- --- As you probably know [Fox](https://en.wikipedia.org/wiki/Fox_(code_word)) is a NATO brevity code for launching air-to-air munition. Therefore, the class name is not 100% accurate as this +-- As you probably know [Fox](https://en.wikipedia.org/wiki/Fox_\(code_word\)) is a NATO brevity code for launching air-to-air munition. Therefore, the class name is not 100% accurate as this -- script handles air-to-air but also surface-to-air missiles. -- -- # Basic Script diff --git a/Moose Development/Moose/Functional/Range.lua b/Moose Development/Moose/Functional/Range.lua index ab44ef3cd..18630e30b 100644 --- a/Moose Development/Moose/Functional/Range.lua +++ b/Moose Development/Moose/Functional/Range.lua @@ -4,7 +4,7 @@ -- -- The RANGE class enables easy set up of bombing and strafing ranges within DCS World. -- --- Implementation is based on the [Simple Range Script](https://forums.eagle.ru/showthread.php?t=157991) by [Ciribob](https://forums.eagle.ru/member.php?u=112175), which itself was motivated +-- Implementation is based on the [Simple Range Script](https://forums.eagle.ru/showthread.php?t=157991) by Ciribob, which itself was motivated -- by a script by SNAFU [see here](https://forums.eagle.ru/showthread.php?t=109174). -- -- [476th - Air Weapons Range Objects mod](http://www.476vfightergroup.com/downloads.php?do=file&id=287) is highly recommended for this class. @@ -42,9 +42,9 @@ -- -- === -- --- ### Author: **[funkyfranky](https://forums.eagle.ru/member.php?u=115026)** +-- ### Author: **funkyfranky** -- --- ### Contributions: [FlightControl](https://forums.eagle.ru/member.php?u=89536), [Ciribob](https://forums.eagle.ru/member.php?u=112175) +-- ### Contributions: FlightControl, Ciribob -- ### SRS Additions: Applevangelist -- -- === diff --git a/Moose Development/Moose/Functional/Scoring.lua b/Moose Development/Moose/Functional/Scoring.lua index a7093f8c1..1c86d5812 100644 --- a/Moose Development/Moose/Functional/Scoring.lua +++ b/Moose Development/Moose/Functional/Scoring.lua @@ -27,7 +27,7 @@ -- and creates a CSV file logging the scoring events and results for use at team or squadron websites. -- -- SCORING automatically calculates the threat level of the objects hit and destroyed by players, --- which can be @{Wrapper.Unit}, @{Static) and @{Scenery} objects. +-- which can be @{Wrapper.Unit}, @{Wrapper.Static) and @{Scenery} objects. -- -- Positive score points are granted when enemy or neutral targets are destroyed. -- Negative score points or penalties are given when a friendly target is hit or destroyed. @@ -81,7 +81,7 @@ -- -- * **Wingthor (TAW)**: Testing & Advice. -- * **Dutch-Baron (TAW)**: Testing & Advice. --- * **[Whisper](http://forums.eagle.ru/member.php?u=3829): Testing and Advice. +-- * **Whisper**: Testing and Advice. -- -- === -- diff --git a/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua b/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua index 3215b9a12..8dbf6f659 100644 --- a/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua +++ b/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua @@ -363,7 +363,7 @@ do -- ZONE_CAPTURE_COALITION --- ZONE_CAPTURE_COALITION Constructor. -- @param #ZONE_CAPTURE_COALITION self - -- @param Core.Zone#ZONE Zone A @{Core.Zone} object with the goal to be achieved. Alternatively, can be handed as the name of late activated group describing a @{ZONE_POLYGON} with its waypoints. + -- @param Core.Zone#ZONE Zone A @{Core.Zone} object with the goal to be achieved. Alternatively, can be handed as the name of late activated group describing a @{Core.Zone#ZONE_POLYGON} with its waypoints. -- @param DCSCoalition.DCSCoalition#coalition Coalition The initial coalition owning the zone. -- @param #table UnitCategories Table of unit categories. See [DCS Class Unit](https://wiki.hoggitworld.com/view/DCS_Class_Unit). Default {Unit.Category.GROUND_UNIT}. -- @param #table ObjectCategories Table of unit categories. See [DCS Class Object](https://wiki.hoggitworld.com/view/DCS_Class_Object). Default {Object.Category.UNIT, Object.Category.STATIC}, i.e. all UNITS and STATICS. diff --git a/Moose Development/Moose/Sound/RadioSpeech.lua b/Moose Development/Moose/Sound/RadioSpeech.lua index 8f18e9d53..88caaf34c 100644 --- a/Moose Development/Moose/Sound/RadioSpeech.lua +++ b/Moose Development/Moose/Sound/RadioSpeech.lua @@ -25,7 +25,7 @@ -- -- -- @type RADIOSPEECH --- @extends Core.RadioQueue#RADIOQUEUE +-- @extends Sound.RadioQueue#RADIOQUEUE RADIOSPEECH = { ClassName = "RADIOSPEECH", Vocabulary = { diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 70dd2adb6..eda0e8504 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -769,7 +769,7 @@ end --- Play sound file (ogg or mp3) via SRS. -- @param #MSRS self --- @param Sound.SoundFile#SOUNDFILE Soundfile Sound file to play. +-- @param Sound.SoundOutput#SOUNDFILE Soundfile Sound file to play. -- @param #number Delay Delay in seconds, before the sound file is played. -- @return #MSRS self function MSRS:PlaySoundFile(Soundfile, Delay) diff --git a/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua b/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua index 290ebc7f3..ddafed89f 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua @@ -73,7 +73,7 @@ do -- TASK_CARGO_CSAR --- @type TASK_CARGO_CSAR - -- @extends Tasking.Task_Cargo#TASK_CARGO + -- @extends Tasking.Task_CARGO#TASK_CARGO --- Orchestrates the task for players to execute CSAR for downed pilots. -- @@ -137,7 +137,7 @@ do -- TASK_CARGO_CSAR -- -- The cargoset "CargoSet" will embed all defined cargo of type "Pilots" (prefix) into its set. -- local CargoGroup = CARGO_GROUP:New( PilotGroup, "Pilots", "Downed Pilot", 500 ) -- - -- What is also needed, is to have a set of @{Core.Group}s defined that contains the clients of the players. + -- What is also needed, is to have a set of @{#Core.Group}s defined that contains the clients of the players. -- -- -- Allocate the Transport, which are the helicopter to retrieve the pilot, that can be manned by players. -- local GroupSet = SET_GROUP:New():FilterPrefixes( "Transport" ):FilterStart() From bd9022c01097486fca40e24306db198346db43c4 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 31 Oct 2023 10:45:56 +0100 Subject: [PATCH 42/51] ARMYGROUP Added parameter to delay init group --- Moose Development/Moose/Ops/ArmyGroup.lua | 144 ++++++++++++---------- Moose Development/Moose/Ops/OpsGroup.lua | 6 +- Moose Development/Moose/Wrapper/Group.lua | 2 + 3 files changed, 83 insertions(+), 69 deletions(-) diff --git a/Moose Development/Moose/Ops/ArmyGroup.lua b/Moose Development/Moose/Ops/ArmyGroup.lua index 1bbad51e8..ac893ae85 100644 --- a/Moose Development/Moose/Ops/ArmyGroup.lua +++ b/Moose Development/Moose/Ops/ArmyGroup.lua @@ -2043,82 +2043,90 @@ end -- @param #ARMYGROUP self -- @param #table Template Template used to init the group. Default is `self.template`. -- @return #ARMYGROUP self -function ARMYGROUP:_InitGroup(Template) +function ARMYGROUP:_InitGroup(Template, Delay) - -- First check if group was already initialized. - if self.groupinitialized then - self:T(self.lid.."WARNING: Group was already initialized! Will NOT do it again!") - return - end - - -- Get template of group. - local template=Template or self:_GetTemplate() - - -- Ground are always AI. - self.isAI=true - - -- Is (template) group late activated. - self.isLateActivated=template.lateActivation - - -- Ground groups cannot be uncontrolled. - self.isUncontrolled=false - - -- Max speed in km/h. - self.speedMax=self.group:GetSpeedMax() - - -- Is group mobile? - if self.speedMax>3.6 then - self.isMobile=true + if Delay and Delay>0 then + self:ScheduleOnce(Delay, ARMYGROUP._InitGroup, self, Template, 0) else - self.isMobile=false - end - - -- Cruise speed in km/h - self.speedCruise=self.speedMax*0.7 - - -- Group ammo. - self.ammo=self:GetAmmoTot() - - -- Radio parameters from template. - self.radio.On=false -- Radio is always OFF for ground. - self.radio.Freq=133 - self.radio.Modu=radio.modulation.AM - - -- Set default radio. - self:SetDefaultRadio(self.radio.Freq, self.radio.Modu, self.radio.On) - - -- Get current formation from first waypoint. - self.option.Formation=template.route.points[1].action - - -- Set default formation to "on road". - self.optionDefault.Formation=ENUMS.Formation.Vehicle.OnRoad - -- Default TACAN off. - self:SetDefaultTACAN(nil, nil, nil, nil, true) - self.tacan=UTILS.DeepCopy(self.tacanDefault) + -- First check if group was already initialized. + if self.groupinitialized then + self:T(self.lid.."WARNING: Group was already initialized! Will NOT do it again!") + return + end + + self:I(self.lid.."FF Initializing Group") - -- Units of the group. - local units=self.group:GetUnits() + -- Get template of group. + local template=Template or self:_GetTemplate() + + -- Ground are always AI. + self.isAI=true + + -- Is (template) group late activated. + self.isLateActivated=template.lateActivation + + -- Ground groups cannot be uncontrolled. + self.isUncontrolled=false + + -- Max speed in km/h. + self.speedMax=self.group:GetSpeedMax() + + -- Is group mobile? + if self.speedMax>3.6 then + self.isMobile=true + else + self.isMobile=false + end + + -- Cruise speed in km/h + self.speedCruise=self.speedMax*0.7 + + -- Group ammo. + self.ammo=self:GetAmmoTot() + + -- Radio parameters from template. + self.radio.On=false -- Radio is always OFF for ground. + self.radio.Freq=133 + self.radio.Modu=radio.modulation.AM + + -- Set default radio. + self:SetDefaultRadio(self.radio.Freq, self.radio.Modu, self.radio.On) + + -- Get current formation from first waypoint. + self.option.Formation=template.route.points[1].action + + -- Set default formation to "on road". + self.optionDefault.Formation=ENUMS.Formation.Vehicle.OnRoad - -- DCS group. - local dcsgroup=Group.getByName(self.groupname) - local size0=dcsgroup:getInitialSize() + -- Default TACAN off. + self:SetDefaultTACAN(nil, nil, nil, nil, true) + self.tacan=UTILS.DeepCopy(self.tacanDefault) + + -- Units of the group. + local units=self.group:GetUnits() + + -- DCS group. + local dcsgroup=Group.getByName(self.groupname) + local size0=dcsgroup:getInitialSize() + local u=dcsgroup:getUnits() + + -- Quick check. + if #units~=size0 then + self:T(self.lid..string.format("ERROR: Got #units=%d but group consists of %d units! u=%d", #units, size0, #u)) + end + + -- Add elemets. + for _,unit in pairs(units) do + local unitname=unit:GetName() + self:_AddElementByName(unitname) + end + - -- Quick check. - if #units~=size0 then - self:T(self.lid..string.format("ERROR: Got #units=%d but group consists of %d units!", #units, size0)) + -- Init done. + self.groupinitialized=true end - -- Add elemets. - for _,unit in pairs(units) do - local unitname=unit:GetName() - self:_AddElementByName(unitname) - end - - - -- Init done. - self.groupinitialized=true - return self end diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index ba562e542..2f423a8fa 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -1768,6 +1768,8 @@ function OPSGROUP:GetDCSUnit(UnitNumber) if DCSGroup then local unit=DCSGroup:getUnit(UnitNumber or 1) return unit + else + self:E(self.lid..string.format("ERROR: DCS group does not exist! Cannot get unit")) end return nil @@ -3517,9 +3519,11 @@ function OPSGROUP:OnEventBirth(EventData) local element=self:GetElementByName(unitname) if element and element.status~=OPSGROUP.ElementStatus.SPAWNED then - + -- Debug info. self:T(self.lid..string.format("EVENT: Element %s born ==> spawned", unitname)) + + self:T2(self.lid..string.format("DCS unit=%s isExist=%s", tostring(EventData.IniDCSUnit:getName()), tostring(EventData.IniDCSUnit:isExist()) )) -- Set element to spawned state. self:ElementSpawned(element) diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua index faeb810a5..6d67c46dd 100644 --- a/Moose Development/Moose/Wrapper/Group.lua +++ b/Moose Development/Moose/Wrapper/Group.lua @@ -305,6 +305,8 @@ function GROUP:GetDCSObject() if DCSGroup then return DCSGroup + else + env.error("ERROR: Could not get DCS group object!") end return nil From 77f97211024dc03555b1f7ee203ff9c7b3bff849 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 31 Oct 2023 11:44:45 +0100 Subject: [PATCH 43/51] AI - Fixed various `@extends` errors pointing to non-existing classes for AI_* --- Moose Development/Moose/AI/AI_A2A_Cap.lua | 2 +- Moose Development/Moose/AI/AI_A2A_Gci.lua | 2 +- Moose Development/Moose/AI/AI_A2A_Patrol.lua | 2 +- Moose Development/Moose/AI/AI_A2G_BAI.lua | 5 +++-- Moose Development/Moose/AI/AI_A2G_CAS.lua | 5 +++-- Moose Development/Moose/AI/AI_A2G_SEAD.lua | 5 +++-- Moose Development/Moose/AI/AI_Escort.lua | 7 ------- Moose Development/Moose/AI/AI_Formation.lua | 9 --------- 8 files changed, 12 insertions(+), 25 deletions(-) diff --git a/Moose Development/Moose/AI/AI_A2A_Cap.lua b/Moose Development/Moose/AI/AI_A2A_Cap.lua index 2b82e6d6c..7a19505c9 100644 --- a/Moose Development/Moose/AI/AI_A2A_Cap.lua +++ b/Moose Development/Moose/AI/AI_A2A_Cap.lua @@ -123,7 +123,7 @@ function AI_A2A_CAP:New2( AICap, EngageMinSpeed, EngageMaxSpeed, EngageFloorAlti -- Multiple inheritance ... :-) local AI_Air = AI_AIR:New( AICap ) - local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AICap, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL + local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AICap, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AICap, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType ) local self = BASE:Inherit( self, AI_Air_Engage ) --#AI_A2A_CAP diff --git a/Moose Development/Moose/AI/AI_A2A_Gci.lua b/Moose Development/Moose/AI/AI_A2A_Gci.lua index e0f9a77ec..14b605479 100644 --- a/Moose Development/Moose/AI/AI_A2A_Gci.lua +++ b/Moose Development/Moose/AI/AI_A2A_Gci.lua @@ -14,7 +14,7 @@ --- @type AI_A2A_GCI --- @extends AI.AI_A2A#AI_A2A +-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders. diff --git a/Moose Development/Moose/AI/AI_A2A_Patrol.lua b/Moose Development/Moose/AI/AI_A2A_Patrol.lua index 0c882a39a..866827ac4 100644 --- a/Moose Development/Moose/AI/AI_A2A_Patrol.lua +++ b/Moose Development/Moose/AI/AI_A2A_Patrol.lua @@ -11,7 +11,7 @@ --- @type AI_A2A_PATROL --- @extends AI.AI_A2A#AI_A2A +-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL --- Implements the core functions to patrol a @{Core.Zone} by an AI @{Wrapper.Group} or @{Wrapper.Group}. -- diff --git a/Moose Development/Moose/AI/AI_A2G_BAI.lua b/Moose Development/Moose/AI/AI_A2G_BAI.lua index 330110cca..5737873f2 100644 --- a/Moose Development/Moose/AI/AI_A2G_BAI.lua +++ b/Moose Development/Moose/AI/AI_A2G_BAI.lua @@ -12,7 +12,8 @@ -- @image AI_Air_To_Ground_Engage.JPG --- @type AI_A2G_BAI --- @extends AI.AI_A2A_Engage#AI_A2A_Engage -- TODO: Documentation. This class does not exist, unable to determine what it extends. +-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL +-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders. -- @@ -46,7 +47,7 @@ AI_A2G_BAI = { function AI_A2G_BAI:New2( AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) local AI_Air = AI_AIR:New( AIGroup ) - local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL + local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType ) local self = BASE:Inherit( self, AI_Air_Engage ) diff --git a/Moose Development/Moose/AI/AI_A2G_CAS.lua b/Moose Development/Moose/AI/AI_A2G_CAS.lua index cc16cc187..85175a628 100644 --- a/Moose Development/Moose/AI/AI_A2G_CAS.lua +++ b/Moose Development/Moose/AI/AI_A2G_CAS.lua @@ -12,7 +12,8 @@ -- @image AI_Air_To_Ground_Engage.JPG --- @type AI_A2G_CAS --- @extends AI.AI_A2G_Patrol#AI_AIR_PATROL TODO: Documentation. This class does not exist, unable to determine what it extends. +-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL +-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders. -- @@ -46,7 +47,7 @@ AI_A2G_CAS = { function AI_A2G_CAS:New2( AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) local AI_Air = AI_AIR:New( AIGroup ) - local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL + local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType ) local self = BASE:Inherit( self, AI_Air_Engage ) diff --git a/Moose Development/Moose/AI/AI_A2G_SEAD.lua b/Moose Development/Moose/AI/AI_A2G_SEAD.lua index 72182ae13..274db3530 100644 --- a/Moose Development/Moose/AI/AI_A2G_SEAD.lua +++ b/Moose Development/Moose/AI/AI_A2G_SEAD.lua @@ -14,7 +14,8 @@ --- @type AI_A2G_SEAD --- @extends AI.Air_Patrol#AI_AIR_PATROL +-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL +-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE --- Implements the core functions to SEAD intruders. Use the Engage trigger to intercept intruders. @@ -81,7 +82,7 @@ AI_A2G_SEAD = { function AI_A2G_SEAD:New2( AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) local AI_Air = AI_AIR:New( AIGroup ) - local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL + local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType ) local self = BASE:Inherit( self, AI_Air_Engage ) diff --git a/Moose Development/Moose/AI/AI_Escort.lua b/Moose Development/Moose/AI/AI_Escort.lua index adf56bcbc..46569b613 100644 --- a/Moose Development/Moose/AI/AI_Escort.lua +++ b/Moose Development/Moose/AI/AI_Escort.lua @@ -199,13 +199,6 @@ AI_ESCORT = { -- @field Functional.Detection#DETECTION_AREAS AI_ESCORT.Detection = nil ---- MENUPARAM type --- @type MENUPARAM --- @field #AI_ESCORT ParamSelf --- @field #Distance ParamDistance --- @field #function ParamFunction --- @field #string ParamMessage - --- AI_ESCORT class constructor for an AI group -- @param #AI_ESCORT self -- @param Wrapper.Client#CLIENT EscortUnit The client escorted by the EscortGroup. diff --git a/Moose Development/Moose/AI/AI_Formation.lua b/Moose Development/Moose/AI/AI_Formation.lua index 06b14d271..bea05f9f9 100644 --- a/Moose Development/Moose/AI/AI_Formation.lua +++ b/Moose Development/Moose/AI/AI_Formation.lua @@ -164,15 +164,6 @@ AI_FORMATION.__Enum.ReportType = { Ground = "G", } - - ---- MENUPARAM type --- @type MENUPARAM --- @field #AI_FORMATION ParamSelf --- @field #number ParamDistance --- @field #function ParamFunction --- @field #string ParamMessage - --- AI_FORMATION class constructor for an AI group -- @param #AI_FORMATION self -- @param Wrapper.Unit#UNIT FollowUnit The UNIT leading the FolllowGroupSet. From 1086c61ccf78d63d3b595362c6f95899a8241ea5 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Tue, 31 Oct 2023 13:04:48 +0100 Subject: [PATCH 44/51] Fixed broken links --- .../Moose/AI/AI_A2A_Dispatcher.lua | 4 ++-- Moose Development/Moose/AI/AI_A2A_Gci.lua | 20 +------------------ Moose Development/Moose/AI/AI_Patrol.lua | 4 ++-- Moose Development/Moose/Core/Fsm.lua | 2 +- Moose Development/Moose/Core/Set.lua | 8 ++++---- Moose Development/Moose/Core/Settings.lua | 6 +++--- Moose Development/Moose/Core/Zone.lua | 2 +- .../Moose/Functional/Artillery.lua | 4 ++-- .../Moose/Functional/Designate.lua | 6 +++--- .../Moose/Functional/Detection.lua | 2 +- .../Moose/Functional/ZoneCaptureCoalition.lua | 2 +- .../Moose/Functional/ZoneGoalCoalition.lua | 2 +- .../Moose/Tasking/CommandCenter.lua | 2 +- .../Moose/Tasking/Task_CARGO.lua | 4 ++-- 14 files changed, 25 insertions(+), 43 deletions(-) diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua index e68068435..27478a98b 100644 --- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua @@ -1233,7 +1233,7 @@ do -- AI_A2A_DISPATCHER -- -- **Use the method @{#AI_A2A_DISPATCHER.SetEngageRadius}() to modify the default Engage Radius for ALL squadrons.** -- - -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/release-2-2-pre/AID%20-%20AI%20Dispatching/AID-019%20-%20AI_A2A%20-%20Engage%20Range%20Test) + -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-019%20-%20Engage%20Range%20Test) -- -- @param #AI_A2A_DISPATCHER self -- @param #number EngageRadius (Optional, Default = 100000) The radius to report friendlies near the target. @@ -1283,7 +1283,7 @@ do -- AI_A2A_DISPATCHER -- Use the method @{#AI_A2A_DISPATCHER.SetGciRadius}() to set a specific controlled ground intercept radius. -- **The Ground Controlled Intercept radius is defined for ALL squadrons which are operational.** -- - -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/release-2-2-pre/AID%20-%20AI%20Dispatching/AID-013%20-%20AI_A2A%20-%20Intercept%20Test) + -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-013%20-%20Intercept%20Test) -- -- @param #AI_A2A_DISPATCHER self -- @param #number GciRadius (Optional, Default = 200000) The radius to ground control intercept detected targets from the nearest airbase. diff --git a/Moose Development/Moose/AI/AI_A2A_Gci.lua b/Moose Development/Moose/AI/AI_A2A_Gci.lua index e0f9a77ec..a2c8f966d 100644 --- a/Moose Development/Moose/AI/AI_A2A_Gci.lua +++ b/Moose Development/Moose/AI/AI_A2A_Gci.lua @@ -19,34 +19,20 @@ --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders. -- --- ![Process](..\Presentations\AI_GCI\Dia3.JPG) --- -- The AI_A2A_GCI is assigned a @{Wrapper.Group} and this must be done before the AI_A2A_GCI process can be started using the **Start** event. -- --- ![Process](..\Presentations\AI_GCI\Dia4.JPG) --- -- The AI will fly towards the random 3D point within the patrol zone, using a random speed within the given altitude and speed limits. -- Upon arrival at the 3D point, a new random 3D point will be selected within the patrol zone using the given limits. -- --- ![Process](..\Presentations\AI_GCI\Dia5.JPG) --- -- This cycle will continue. -- --- ![Process](..\Presentations\AI_GCI\Dia6.JPG) --- -- During the patrol, the AI will detect enemy targets, which are reported through the **Detected** event. -- --- ![Process](..\Presentations\AI_GCI\Dia9.JPG) --- -- When enemies are detected, the AI will automatically engage the enemy. -- --- ![Process](..\Presentations\AI_GCI\Dia10.JPG) --- -- Until a fuel or damage threshold has been reached by the AI, or when the AI is commanded to RTB. -- When the fuel threshold has been reached, the airplane will fly towards the nearest friendly airbase and will land. -- --- ![Process](..\Presentations\AI_GCI\Dia13.JPG) --- -- ## 1. AI_A2A_GCI constructor -- -- * @{#AI_A2A_GCI.New}(): Creates a new AI_A2A_GCI object. @@ -75,18 +61,14 @@ -- -- ## 3. Set the Range of Engagement -- --- ![Range](..\Presentations\AI_GCI\Dia11.JPG) --- -- An optional range can be set in meters, -- that will define when the AI will engage with the detected airborne enemy targets. -- The range can be beyond or smaller than the range of the Patrol Zone. -- The range is applied at the position of the AI. --- Use the method @{AI.AI_GCI#AI_A2A_GCI.SetEngageRange}() to define that range. +-- Use the method @{AI.AI_A2A_GCI#AI_A2A_GCI.SetEngageRange}() to define that range. -- -- ## 4. Set the Zone of Engagement -- --- ![Zone](..\Presentations\AI_GCI\Dia12.JPG) --- -- An optional @{Core.Zone} can be set, -- that will define when the AI will engage with the detected airborne enemy targets. -- Use the method @{AI.AI_CAP#AI_CAP_ZONE.SetEngageZone}() to define that Zone. diff --git a/Moose Development/Moose/AI/AI_Patrol.lua b/Moose Development/Moose/AI/AI_Patrol.lua index 6a502f679..6d8c98214 100644 --- a/Moose Development/Moose/AI/AI_Patrol.lua +++ b/Moose Development/Moose/AI/AI_Patrol.lua @@ -27,8 +27,8 @@ -- ### Author: **FlightControl** -- ### Contributions: -- --- * **[Dutch_Baron](https://forums.eagle.ru/member.php?u=112075)**: Working together with James has resulted in the creation of the AI_BALANCER class. James has shared his ideas on balancing AI with air units, and together we made a first design which you can use now :-) --- * **[Pikey](https://forums.eagle.ru/member.php?u=62835)**: Testing and API concept review. +-- * **Dutch_Baron**: Working together with James has resulted in the creation of the AI_BALANCER class. James has shared his ideas on balancing AI with air units, and together we made a first design which you can use now :-) +-- * **Pikey**: Testing and API concept review. -- -- === -- diff --git a/Moose Development/Moose/Core/Fsm.lua b/Moose Development/Moose/Core/Fsm.lua index 2580bd386..3b2f3b52c 100644 --- a/Moose Development/Moose/Core/Fsm.lua +++ b/Moose Development/Moose/Core/Fsm.lua @@ -1260,7 +1260,7 @@ do -- FSM_PROCESS --- Assign the process to a @{Wrapper.Unit} and activate the process. -- @param #FSM_PROCESS self - -- @param Task.Tasking#TASK Task + -- @param Tasking.Task#TASK Task -- @param Wrapper.Unit#UNIT ProcessUnit -- @return #FSM_PROCESS self function FSM_PROCESS:Assign( ProcessUnit, Task ) diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index 00bc8edf1..0f200e532 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -5471,7 +5471,7 @@ do -- SET_CARGO --- (R2.1) Remove CARGOs from SET_CARGO. -- @param Core.Set#SET_CARGO self - -- @param Wrapper.Cargo#CARGO RemoveCargoNames A single name or an array of CARGO names. + -- @param Cargo.Cargo#CARGO RemoveCargoNames A single name or an array of CARGO names. -- @return Core.Set#SET_CARGO self function SET_CARGO:RemoveCargosByName( RemoveCargoNames ) -- R2.1 @@ -5487,7 +5487,7 @@ do -- SET_CARGO --- (R2.1) Finds a Cargo based on the Cargo Name. -- @param #SET_CARGO self -- @param #string CargoName - -- @return Wrapper.Cargo#CARGO The found Cargo. + -- @return Cargo.Cargo#CARGO The found Cargo. function SET_CARGO:FindCargo( CargoName ) -- R2.1 local CargoFound = self.Set[CargoName] @@ -5630,7 +5630,7 @@ do -- SET_CARGO --- (R2.1) Iterate the SET_CARGO while identifying the nearest @{Cargo.Cargo#CARGO} from a @{Core.Point#POINT_VEC2}. -- @param #SET_CARGO self -- @param Core.Point#POINT_VEC2 PointVec2 A @{Core.Point#POINT_VEC2} object from where to evaluate the closest @{Cargo.Cargo#CARGO}. - -- @return Wrapper.Cargo#CARGO The closest @{Cargo.Cargo#CARGO}. + -- @return Cargo.Cargo#CARGO The closest @{Cargo.Cargo#CARGO}. function SET_CARGO:FindNearestCargoFromPointVec2( PointVec2 ) -- R2.1 self:F2( PointVec2 ) @@ -6195,7 +6195,7 @@ do -- SET_ZONE --- Start watching if the Object or Objects move into or out of our set of zones. -- @param #SET_ZONE self - -- @param Wrappe.Controllable#CONTROLLABLE Objects Object or Objects to watch, can be of type UNIT, GROUP, CLIENT, or SET\_UNIT, SET\_GROUP, SET\_CLIENT + -- @param Wrapper.Controllable#CONTROLLABLE Objects Object or Objects to watch, can be of type UNIT, GROUP, CLIENT, or SET\_UNIT, SET\_GROUP, SET\_CLIENT -- @return #SET_ZONE self -- @usage -- -- Create a SET_GROUP and a SET_ZONE for this: diff --git a/Moose Development/Moose/Core/Settings.lua b/Moose Development/Moose/Core/Settings.lua index e24527798..5712af676 100644 --- a/Moose Development/Moose/Core/Settings.lua +++ b/Moose Development/Moose/Core/Settings.lua @@ -120,7 +120,7 @@ -- -- Will customize which display format is used to indicate A2A coordinates in text as part of the Command Center communications. -- --- - A2A BRAA: [Bearing Range Altitude Aspect](https://en.wikipedia.org/wiki/Bearing_(navigation)). +-- - A2A BRAA: [Bearing Range Altitude Aspect](https://en.wikipedia.org/wiki/Bearing_\(navigation\)). -- - A2A MGRS: The [Military Grid Reference System](https://en.wikipedia.org/wiki/Military_Grid_Reference_System). The accuracy can also be adapted. -- - A2A LL DMS: Lattitude Longitude [Degrees Minutes Seconds](https://en.wikipedia.org/wiki/Geographic_coordinate_conversion). The accuracy can also be adapted. -- - A2A LL DDM: Lattitude Longitude [Decimal Degrees and Minutes](https://en.wikipedia.org/wiki/Decimal_degrees). The accuracy can also be adapted. @@ -190,8 +190,8 @@ -- -- There are different methods that can be used to change the **System settings** using the \_SETTINGS object. -- --- - @{#SETTINGS.SetMessageTime}(): Define for a specific @{Message.MESSAGE.MessageType} the duration to be displayed in seconds. --- - @{#SETTINGS.GetMessageTime}(): Retrieves for a specific @{Message.MESSAGE.MessageType} the duration to be displayed in seconds. +-- - @{Core.Settings#SETTINGS.SetMessageTime}(): Define for a specific @{Message.MESSAGE.MessageType} the duration to be displayed in seconds. +-- - @{Core.Settings#SETTINGS.GetMessageTime}(): Retrieves for a specific @{Message.MESSAGE.MessageType} the duration to be displayed in seconds. -- -- ## 3.5) **Era** of the battle -- diff --git a/Moose Development/Moose/Core/Zone.lua b/Moose Development/Moose/Core/Zone.lua index 648249020..175e3c660 100644 --- a/Moose Development/Moose/Core/Zone.lua +++ b/Moose Development/Moose/Core/Zone.lua @@ -1787,7 +1787,7 @@ ZONE_UNIT = { -- @param #ZONE_UNIT self -- @param #string ZoneName Name of the zone. -- @param Wrapper.Unit#UNIT ZoneUNIT The unit as the center of the zone. --- @param Dcs.DCSTypes#Distance Radius The radius of the zone. +-- @param #number Radius The radius of the zone in meters. -- @param #table Offset A table specifying the offset. The offset table may have the following elements: -- dx The offset in X direction, +x is north. -- dy The offset in Y direction, +y is east. diff --git a/Moose Development/Moose/Functional/Artillery.lua b/Moose Development/Moose/Functional/Artillery.lua index df31fd196..20ed363eb 100644 --- a/Moose Development/Moose/Functional/Artillery.lua +++ b/Moose Development/Moose/Functional/Artillery.lua @@ -25,9 +25,9 @@ -- -- === -- --- ### Author: **[funkyfranky](https://forums.eagle.ru/member.php?u=115026)** +-- ### Author: **funkyfranky** -- --- ### Contributions: [FlightControl](https://forums.eagle.ru/member.php?u=89536) +-- ### Contributions: FlightControl -- -- ==== -- @module Functional.Artillery diff --git a/Moose Development/Moose/Functional/Designate.lua b/Moose Development/Moose/Functional/Designate.lua index 7bc0c7a82..a55cadbc2 100644 --- a/Moose Development/Moose/Functional/Designate.lua +++ b/Moose Development/Moose/Functional/Designate.lua @@ -167,9 +167,9 @@ -- -- ### Contributions: -- --- * [**Ciribob**](https://forums.eagle.ru/member.php?u=112175): Showing the way how to lase targets + how laser codes work!!! Explained the autolase script. --- * [**EasyEB**](https://forums.eagle.ru/member.php?u=112055): Ideas and Beta Testing --- * [**Wingthor**](https://forums.eagle.ru/member.php?u=123698): Beta Testing +-- * **Ciribob**: Showing the way how to lase targets + how laser codes work!!! Explained the autolase script. +-- * **EasyEB**: Ideas and Beta Testing +-- * **Wingthor**: Beta Testing -- -- ### Authors: -- diff --git a/Moose Development/Moose/Functional/Detection.lua b/Moose Development/Moose/Functional/Detection.lua index 3558354a1..9fc086cd9 100644 --- a/Moose Development/Moose/Functional/Detection.lua +++ b/Moose Development/Moose/Functional/Detection.lua @@ -2452,7 +2452,7 @@ do -- DETECTION_AREAS -- -- Retrieve the DetectedItems[].Set with the method @{Functional.Detection#DETECTION_BASE.GetDetectedSet}(). A @{Core.Set#SET_UNIT} object will be returned. -- - -- Retrieve the formed @{Zone@ZONE_UNIT}s as a result of the grouping the detected units within the DetectionZoneRange, use the method @{Functional.Detection#DETECTION_AREAS.GetDetectionZones}(). + -- Retrieve the formed @{Core.Zone@ZONE_UNIT}s as a result of the grouping the detected units within the DetectionZoneRange, use the method @{Functional.Detection#DETECTION_AREAS.GetDetectionZones}(). -- To understand the amount of zones created, use the method @{Functional.Detection#DETECTION_AREAS.GetDetectionZoneCount}(). -- If you want to obtain a specific zone from the DetectedZones, use the method @{Functional.Detection#DETECTION_AREAS.GetDetectionZoneByID}() with a given index. -- diff --git a/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua b/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua index 8dbf6f659..113b3aa7f 100644 --- a/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua +++ b/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua @@ -364,7 +364,7 @@ do -- ZONE_CAPTURE_COALITION --- ZONE_CAPTURE_COALITION Constructor. -- @param #ZONE_CAPTURE_COALITION self -- @param Core.Zone#ZONE Zone A @{Core.Zone} object with the goal to be achieved. Alternatively, can be handed as the name of late activated group describing a @{Core.Zone#ZONE_POLYGON} with its waypoints. - -- @param DCSCoalition.DCSCoalition#coalition Coalition The initial coalition owning the zone. + -- @param #number Coalition The initial coalition owning the zone. -- @param #table UnitCategories Table of unit categories. See [DCS Class Unit](https://wiki.hoggitworld.com/view/DCS_Class_Unit). Default {Unit.Category.GROUND_UNIT}. -- @param #table ObjectCategories Table of unit categories. See [DCS Class Object](https://wiki.hoggitworld.com/view/DCS_Class_Object). Default {Object.Category.UNIT, Object.Category.STATIC}, i.e. all UNITS and STATICS. -- @return #ZONE_CAPTURE_COALITION diff --git a/Moose Development/Moose/Functional/ZoneGoalCoalition.lua b/Moose Development/Moose/Functional/ZoneGoalCoalition.lua index 64e0034ef..246d55c7a 100644 --- a/Moose Development/Moose/Functional/ZoneGoalCoalition.lua +++ b/Moose Development/Moose/Functional/ZoneGoalCoalition.lua @@ -54,7 +54,7 @@ do -- ZoneGoal --- ZONE_GOAL_COALITION Constructor. -- @param #ZONE_GOAL_COALITION self -- @param Core.Zone#ZONE Zone A @{Core.Zone} object with the goal to be achieved. - -- @param DCSCoalition.DCSCoalition#coalition Coalition The initial coalition owning the zone. Default coalition.side.NEUTRAL. + -- @param #number Coalition The initial coalition owning the zone. Default coalition.side.NEUTRAL. -- @param #table UnitCategories Table of unit categories. See [DCS Class Unit](https://wiki.hoggitworld.com/view/DCS_Class_Unit). Default {Unit.Category.GROUND_UNIT}. -- @return #ZONE_GOAL_COALITION function ZONE_GOAL_COALITION:New( Zone, Coalition, UnitCategories ) diff --git a/Moose Development/Moose/Tasking/CommandCenter.lua b/Moose Development/Moose/Tasking/CommandCenter.lua index 07a7ab2f4..8f4c5b1b3 100644 --- a/Moose Development/Moose/Tasking/CommandCenter.lua +++ b/Moose Development/Moose/Tasking/CommandCenter.lua @@ -339,7 +339,7 @@ end --- Gets the coalition of the command center. -- @param #COMMANDCENTER self --- @return DCScoalition#coalition +-- @return #number Coalition of the command center. function COMMANDCENTER:GetCoalition() return self.CommandCenterCoalition diff --git a/Moose Development/Moose/Tasking/Task_CARGO.lua b/Moose Development/Moose/Tasking/Task_CARGO.lua index 637298e51..b3b5a6711 100644 --- a/Moose Development/Moose/Tasking/Task_CARGO.lua +++ b/Moose Development/Moose/Tasking/Task_CARGO.lua @@ -49,7 +49,7 @@ -- Once the task is assigned to the player and accepted by the player, the player will obtain -- an extra **Cargo (Radio) Menu** that contains the CARGO objects that need to be transported. -- --- Each @{CARGO.Cargo} object has a certain state: +-- Each @{Tasking.Task_CARGO#TASK_CARGO} object has a certain state: -- -- * **UnLoaded**: The cargo is located within the battlefield. It may still need to be transported. -- * **Loaded**: The cargo is loaded within a Carrier. This can be your air unit, or another air unit, or even a vehicle. @@ -447,7 +447,7 @@ do -- TASK_CARGO -- -- ## 2.2) Handle TASK_CARGO Events ... -- - -- The TASK_CARGO classes define @{Cargo} transport tasks, + -- The TASK_CARGO classes define Cargo transport tasks, -- based on the tasking capabilities defined in @{Tasking.Task#TASK}. -- -- ### 2.2.1) Boarding events. From 52e66ae9694a6dc035fffb8f3e4da2e79ac3aade Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 31 Oct 2023 13:33:45 +0100 Subject: [PATCH 45/51] Broken Links - AI_A2A_Gci Removed reference to SetEngageZone - Fixed link to #AI_A2G_SEAD.SetEngageRange #2025 - AI_Air_Engage removed reference to SetEngageZone. Does not seem to exist any more. - AI_Air_Patrol removed reference to SetEngageZone. Does not seem to exist any more or is passed as argument now. - AI_FORMATION Fixed DCSTypes#AI.Option.Air.val.ROE OptionROE #2029 - SETTINGS Fixed link to Message #2021 - Fixed wrong indent of "Developer Note" in various classes --- Moose Development/Moose/AI/AI_A2A_Cap.lua | 12 +++++------ .../Moose/AI/AI_A2A_Dispatcher.lua | 12 +++++------ Moose Development/Moose/AI/AI_A2A_Gci.lua | 16 ++++----------- Moose Development/Moose/AI/AI_A2A_Patrol.lua | 12 +++++------ Moose Development/Moose/AI/AI_A2G_BAI.lua | 12 +++++------ Moose Development/Moose/AI/AI_A2G_CAS.lua | 12 +++++------ .../Moose/AI/AI_A2G_Dispatcher.lua | 12 +++++------ Moose Development/Moose/AI/AI_A2G_SEAD.lua | 16 +++++---------- Moose Development/Moose/AI/AI_Air.lua | 12 +++++------ Moose Development/Moose/AI/AI_Air_Engage.lua | 20 ++++++------------- Moose Development/Moose/AI/AI_Air_Patrol.lua | 16 ++++----------- .../Moose/AI/AI_Air_Squadron.lua | 12 +++++------ Moose Development/Moose/AI/AI_BAI.lua | 12 +++++------ Moose Development/Moose/AI/AI_Balancer.lua | 12 +++++------ Moose Development/Moose/AI/AI_CAP.lua | 12 +++++------ Moose Development/Moose/AI/AI_CAS.lua | 12 +++++------ Moose Development/Moose/AI/AI_Cargo.lua | 12 +++++------ Moose Development/Moose/AI/AI_Cargo_APC.lua | 12 +++++------ .../Moose/AI/AI_Cargo_Airplane.lua | 12 +++++------ .../Moose/AI/AI_Cargo_Dispatcher.lua | 12 +++++------ .../Moose/AI/AI_Cargo_Dispatcher_APC.lua | 12 +++++------ .../Moose/AI/AI_Cargo_Dispatcher_Airplane.lua | 12 +++++------ .../AI/AI_Cargo_Dispatcher_Helicopter.lua | 12 +++++------ .../Moose/AI/AI_Cargo_Dispatcher_Ship.lua | 12 +++++------ .../Moose/AI/AI_Cargo_Helicopter.lua | 12 +++++------ Moose Development/Moose/AI/AI_Cargo_Ship.lua | 12 +++++------ Moose Development/Moose/AI/AI_Escort.lua | 12 +++++------ .../Moose/AI/AI_Escort_Dispatcher.lua | 12 +++++------ .../Moose/AI/AI_Escort_Dispatcher_Request.lua | 12 +++++------ .../Moose/AI/AI_Escort_Request.lua | 12 +++++------ Moose Development/Moose/AI/AI_Formation.lua | 16 +++++++-------- Moose Development/Moose/AI/AI_Patrol.lua | 12 +++++------ .../Moose/Actions/Act_Assign.lua | 12 +++++------ .../Moose/Actions/Act_Assist.lua | 12 +++++------ Moose Development/Moose/Actions/Act_Route.lua | 12 +++++------ Moose Development/Moose/Cargo/Cargo.lua | 12 +++++------ Moose Development/Moose/Core/Message.lua | 2 +- Moose Development/Moose/Core/Settings.lua | 4 ++-- .../Moose/Functional/ZoneGoalCargo.lua | 12 +++++------ Moose Development/Moose/Sound/RadioSpeech.lua | 12 +++++------ .../Moose/Tasking/CommandCenter.lua | 12 +++++------ .../Moose/Tasking/DetectionManager.lua | 12 +++++------ Moose Development/Moose/Tasking/Mission.lua | 12 +++++------ Moose Development/Moose/Tasking/Task.lua | 12 +++++------ Moose Development/Moose/Tasking/TaskInfo.lua | 12 +++++------ Moose Development/Moose/Tasking/Task_A2A.lua | 2 +- .../Moose/Tasking/Task_CARGO.lua | 12 +++++------ .../Moose/Tasking/Task_Capture_Dispatcher.lua | 12 +++++------ .../Moose/Tasking/Task_Cargo_CSAR.lua | 12 +++++------ .../Moose/Tasking/Task_Cargo_Dispatcher.lua | 12 +++++------ .../Moose/Tasking/Task_Cargo_Transport.lua | 12 +++++------ .../Moose/Tasking/Task_Manager.lua | 12 +++++------ 52 files changed, 295 insertions(+), 325 deletions(-) diff --git a/Moose Development/Moose/AI/AI_A2A_Cap.lua b/Moose Development/Moose/AI/AI_A2A_Cap.lua index 7a19505c9..0c8aff8fa 100644 --- a/Moose Development/Moose/AI/AI_A2A_Cap.lua +++ b/Moose Development/Moose/AI/AI_A2A_Cap.lua @@ -91,12 +91,12 @@ -- An optional @{Core.Zone} can be set, -- that will define when the AI will engage with the detected airborne enemy targets. -- Use the method @{#AI_A2A_CAP.SetEngageZone}() to define that Zone. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_A2A_CAP diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua index e68068435..0caa31702 100644 --- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua @@ -176,12 +176,12 @@ -- Per one, two, three, four? -- -- **The default grouping is 1. That means, that each spawned defender will act individually.** - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Authors: **FlightControl** rework of GCICAP + introduction of new concepts (squadrons). diff --git a/Moose Development/Moose/AI/AI_A2A_Gci.lua b/Moose Development/Moose/AI/AI_A2A_Gci.lua index 14b605479..59da4f370 100644 --- a/Moose Development/Moose/AI/AI_A2A_Gci.lua +++ b/Moose Development/Moose/AI/AI_A2A_Gci.lua @@ -83,19 +83,11 @@ -- The range is applied at the position of the AI. -- Use the method @{AI.AI_GCI#AI_A2A_GCI.SetEngageRange}() to define that range. -- --- ## 4. Set the Zone of Engagement +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated -- --- ![Zone](..\Presentations\AI_GCI\Dia12.JPG) --- --- An optional @{Core.Zone} can be set, --- that will define when the AI will engage with the detected airborne enemy targets. --- Use the method @{AI.AI_CAP#AI_CAP_ZONE.SetEngageZone}() to define that Zone. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- -- === -- -- @field #AI_A2A_GCI diff --git a/Moose Development/Moose/AI/AI_A2A_Patrol.lua b/Moose Development/Moose/AI/AI_A2A_Patrol.lua index 866827ac4..1e66eb167 100644 --- a/Moose Development/Moose/AI/AI_A2A_Patrol.lua +++ b/Moose Development/Moose/AI/AI_A2A_Patrol.lua @@ -111,12 +111,12 @@ -- When the AI is damaged, it is required that a new Patrol is started. However, damage cannon be foreseen early on. -- Therefore, when the damage threshold is reached, the AI will return immediately to the home base (RTB). -- Use the method @{#AI_A2A_PATROL.ManageDamage}() to have this proces in place. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_A2A_PATROL diff --git a/Moose Development/Moose/AI/AI_A2G_BAI.lua b/Moose Development/Moose/AI/AI_A2G_BAI.lua index 5737873f2..28acea07f 100644 --- a/Moose Development/Moose/AI/AI_A2G_BAI.lua +++ b/Moose Development/Moose/AI/AI_A2G_BAI.lua @@ -16,12 +16,12 @@ -- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_A2G_BAI diff --git a/Moose Development/Moose/AI/AI_A2G_CAS.lua b/Moose Development/Moose/AI/AI_A2G_CAS.lua index 85175a628..7bae80ea3 100644 --- a/Moose Development/Moose/AI/AI_A2G_CAS.lua +++ b/Moose Development/Moose/AI/AI_A2G_CAS.lua @@ -16,12 +16,12 @@ -- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_A2G_CAS diff --git a/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua index c3bb89ee2..1fe9b4c5a 100644 --- a/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_A2G_Dispatcher.lua @@ -253,12 +253,12 @@ -- -- **The default grouping is 1. That means, that each spawned defender will act individually.** -- But you can specify a number between 1 and 4, so that the defenders will act as a group. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Author: **FlightControl** rework of GCICAP + introduction of new concepts (squadrons). diff --git a/Moose Development/Moose/AI/AI_A2G_SEAD.lua b/Moose Development/Moose/AI/AI_A2G_SEAD.lua index 274db3530..f98ffbe3b 100644 --- a/Moose Development/Moose/AI/AI_A2G_SEAD.lua +++ b/Moose Development/Moose/AI/AI_A2G_SEAD.lua @@ -44,19 +44,13 @@ -- that will define when the AI will engage with the detected airborne enemy targets. -- The range can be beyond or smaller than the range of the Patrol Zone. -- The range is applied at the position of the AI. --- Use the method @{AI.AI_GCI#AI_A2G_SEAD.SetEngageRange}() to define that range. +-- Use the method @{#AI_A2G_SEAD.SetEngageRange}() to define that range. -- --- ## 4. Set the Zone of Engagement +-- # Developer Note -- --- An optional @{Core.Zone} can be set, --- that will define when the AI will engage with the detected airborne enemy targets. --- Use the method @{AI.AI_CAP#AI_CAP_ZONE.SetEngageZone}() to define that Zone. -- TODO: Documentation. Check that this is actually correct. The originally referenced class does not exist. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_A2G_SEAD diff --git a/Moose Development/Moose/AI/AI_Air.lua b/Moose Development/Moose/AI/AI_Air.lua index 8db48ad99..07325c819 100644 --- a/Moose Development/Moose/AI/AI_Air.lua +++ b/Moose Development/Moose/AI/AI_Air.lua @@ -45,12 +45,12 @@ -- * **Start**: Start the transport process. -- * **Stop**: Stop the transport process. -- * **Monitor**: Monitor and take action. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- @field #AI_AIR AI_AIR = { ClassName = "AI_AIR", diff --git a/Moose Development/Moose/AI/AI_Air_Engage.lua b/Moose Development/Moose/AI/AI_Air_Engage.lua index f5a7b2d44..065395e63 100644 --- a/Moose Development/Moose/AI/AI_Air_Engage.lua +++ b/Moose Development/Moose/AI/AI_Air_Engage.lua @@ -61,19 +61,11 @@ -- The range is applied at the position of the AI. -- Use the method @{AI.AI_GCI#AI_AIR_ENGAGE.SetEngageRange}() to define that range. -- --- ## 4. Set the Zone of Engagement +-- # Developer Note -- --- ![Zone](..\Presentations\AI_GCI\Dia12.JPG) --- --- An optional @{Core.Zone} can be set, --- that will define when the AI will engage with the detected airborne enemy targets. --- Use the method @{AI.AI_CAP#AI_AIR_ENGAGE.SetEngageZone}() to define that Zone. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_AIR_ENGAGE @@ -456,12 +448,12 @@ function AI_AIR_ENGAGE:onafterEngageRoute( DefenderGroup, From, Event, To, Attac -- TODO: A factor of * 3 is way too close. This causes the AI not to engange until merged sometimes! if TargetDistance <= EngageDistance * 9 then - self:I(string.format("AI_AIR_ENGAGE onafterEngageRoute ==> __Engage - target distance = %.1f km", TargetDistance/1000)) + --self:I(string.format("AI_AIR_ENGAGE onafterEngageRoute ==> __Engage - target distance = %.1f km", TargetDistance/1000)) self:__Engage( 0.1, AttackSetUnit ) else - self:I(string.format("FF AI_AIR_ENGAGE onafterEngageRoute ==> Routing - target distance = %.1f km", TargetDistance/1000)) + --self:I(string.format("FF AI_AIR_ENGAGE onafterEngageRoute ==> Routing - target distance = %.1f km", TargetDistance/1000)) local EngageRoute = {} local AttackTasks = {} diff --git a/Moose Development/Moose/AI/AI_Air_Patrol.lua b/Moose Development/Moose/AI/AI_Air_Patrol.lua index 179f3d30f..00fc7f2d0 100644 --- a/Moose Development/Moose/AI/AI_Air_Patrol.lua +++ b/Moose Development/Moose/AI/AI_Air_Patrol.lua @@ -81,19 +81,11 @@ -- The range is applied at the position of the AI. -- Use the method @{AI.AI_CAP#AI_AIR_PATROL.SetEngageRange}() to define that range. -- --- ## 4. Set the Zone of Engagement +-- # Developer Note -- --- ![Zone](..\Presentations\AI_CAP\Dia12.JPG) --- --- An optional @{Core.Zone} can be set, --- that will define when the AI will engage with the detected airborne enemy targets. --- Use the method @{AI.AI_CAP#AI_AIR_PATROL.SetEngageZone}() to define that Zone. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_AIR_PATROL diff --git a/Moose Development/Moose/AI/AI_Air_Squadron.lua b/Moose Development/Moose/AI/AI_Air_Squadron.lua index b9bfee7a1..0c744b4ac 100644 --- a/Moose Development/Moose/AI/AI_Air_Squadron.lua +++ b/Moose Development/Moose/AI/AI_Air_Squadron.lua @@ -18,12 +18,12 @@ --- Implements the core functions modeling squadrons for airplanes and helicopters. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_AIR_SQUADRON diff --git a/Moose Development/Moose/AI/AI_BAI.lua b/Moose Development/Moose/AI/AI_BAI.lua index e1fc59bbf..3c5464343 100644 --- a/Moose Development/Moose/AI/AI_BAI.lua +++ b/Moose Development/Moose/AI/AI_BAI.lua @@ -130,12 +130,12 @@ -- AIBAIZone:SearchOff() -- -- Searching can be switched back on with the method @{#AI_BAI_ZONE.SearchOn}(). Use the method @{#AI_BAI_ZONE.SearchOnOff}() to flexibily switch searching on or off. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_BAI_ZONE diff --git a/Moose Development/Moose/AI/AI_Balancer.lua b/Moose Development/Moose/AI/AI_Balancer.lua index 290dca57f..fad0746ff 100644 --- a/Moose Development/Moose/AI/AI_Balancer.lua +++ b/Moose Development/Moose/AI/AI_Balancer.lua @@ -85,12 +85,12 @@ -- -- Note that when AI returns to an airbase, the AI_BALANCER will trigger the **Return** event and the AI will return, -- otherwise the AI_BALANCER will trigger a **Destroy** event, and the AI will be destroyed. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- @field #AI_BALANCER AI_BALANCER = { ClassName = "AI_BALANCER", diff --git a/Moose Development/Moose/AI/AI_CAP.lua b/Moose Development/Moose/AI/AI_CAP.lua index f2168a6c0..bb81f3f15 100644 --- a/Moose Development/Moose/AI/AI_CAP.lua +++ b/Moose Development/Moose/AI/AI_CAP.lua @@ -112,12 +112,12 @@ -- An optional @{Core.Zone} can be set, -- that will define when the AI will engage with the detected airborne enemy targets. -- Use the method @{#AI_CAP_ZONE.SetEngageZone}() to define that Zone. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_CAP_ZONE diff --git a/Moose Development/Moose/AI/AI_CAS.lua b/Moose Development/Moose/AI/AI_CAS.lua index 7c748b5a6..b99be5ef7 100644 --- a/Moose Development/Moose/AI/AI_CAS.lua +++ b/Moose Development/Moose/AI/AI_CAS.lua @@ -118,12 +118,12 @@ -- * **@{#AI_CAS_ZONE.Destroy}**: The AI has destroyed a target @{Wrapper.Unit}. -- * **@{#AI_CAS_ZONE.Destroyed}**: The AI has destroyed all target @{Wrapper.Unit}s assigned in the CAS task. -- * **Status**: The AI is checking status (fuel and damage). When the thresholds have been reached, the AI will RTB. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_CAS_ZONE diff --git a/Moose Development/Moose/AI/AI_Cargo.lua b/Moose Development/Moose/AI/AI_Cargo.lua index 3f4da5cac..14a403c48 100644 --- a/Moose Development/Moose/AI/AI_Cargo.lua +++ b/Moose Development/Moose/AI/AI_Cargo.lua @@ -25,12 +25,12 @@ -- * @{AI.AI_Cargo_APC} - Cargo transportation using APCs and other vehicles between zones. -- * @{AI.AI_Cargo_Helicopter} - Cargo transportation using helicopters between zones. -- * @{AI.AI_Cargo_Airplane} - Cargo transportation using airplanes to and from airbases. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- @field #AI_CARGO AI_CARGO = { ClassName = "AI_CARGO", diff --git a/Moose Development/Moose/AI/AI_Cargo_APC.lua b/Moose Development/Moose/AI/AI_Cargo_APC.lua index 1c522ea64..6088ea865 100644 --- a/Moose Development/Moose/AI/AI_Cargo_APC.lua +++ b/Moose Development/Moose/AI/AI_Cargo_APC.lua @@ -75,12 +75,12 @@ -- Using the @{#AI_CARGO_APC.Pickup}() method, you are able to direct the APCs towards a point on the battlefield to board/load the cargo at the specific coordinate. -- The APCs will follow nearby roads as much as possible, to ensure fast and clean cargo transportation between the objects and villages in the simulation environment. -- - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- -- @field #AI_CARGO_APC AI_CARGO_APC = { diff --git a/Moose Development/Moose/AI/AI_Cargo_Airplane.lua b/Moose Development/Moose/AI/AI_Cargo_Airplane.lua index feb5e827e..9dad75f25 100644 --- a/Moose Development/Moose/AI/AI_Cargo_Airplane.lua +++ b/Moose Development/Moose/AI/AI_Cargo_Airplane.lua @@ -41,12 +41,12 @@ -- marginal impact on the overall battlefield simulation. Fortunately, the firing strength of infantry is limited, and thus, respacing healthy infantry every -- time is not so much of an issue ... -- - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- @field #AI_CARGO_AIRPLANE AI_CARGO_AIRPLANE = { ClassName = "AI_CARGO_AIRPLANE", diff --git a/Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua b/Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua index 9847f17ee..ea954b97d 100644 --- a/Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua @@ -100,12 +100,12 @@ -- -- Yes, please ensure that the zones are declared using the @{Core.Zone} classes. -- Possible zones that function at the moment are ZONE, ZONE_GROUP, ZONE_UNIT, ZONE_POLYGON. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Author: **FlightControl** diff --git a/Moose Development/Moose/AI/AI_Cargo_Dispatcher_APC.lua b/Moose Development/Moose/AI/AI_Cargo_Dispatcher_APC.lua index 1316e36d2..ab25a8e60 100644 --- a/Moose Development/Moose/AI/AI_Cargo_Dispatcher_APC.lua +++ b/Moose Development/Moose/AI/AI_Cargo_Dispatcher_APC.lua @@ -137,12 +137,12 @@ -- Use @{#AI_CARGO_DISPATCHER_APC.SetHomeZone}() to specify the home zone. -- -- If no home zone is specified, the APCs will wait near the deploy zone for a new pickup command. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_CARGO_DISPATCHER_APC diff --git a/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua b/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua index b8c25aac4..a971936f6 100644 --- a/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua +++ b/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua @@ -108,12 +108,12 @@ -- -- **There are a lot of templates available that allows you to quickly setup an event handler for a specific event type!** -- - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- -- @field #AI_CARGO_DISPATCHER_AIRPLANE AI_CARGO_DISPATCHER_AIRPLANE = { diff --git a/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua b/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua index a7a90c7d1..c391324e4 100644 --- a/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua +++ b/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua @@ -140,12 +140,12 @@ -- Use @{#AI_CARGO_DISPATCHER_HELICOPTER.SetHomeZone}() to specify the home zone. -- -- If no home zone is specified, the helicopters will wait near the deploy zone for a new pickup command. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_CARGO_DISPATCHER_HELICOPTER diff --git a/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua b/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua index 3011184ac..152ea7881 100644 --- a/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua +++ b/Moose Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua @@ -130,12 +130,12 @@ -- Use @{#AI_CARGO_DISPATCHER_SHIP.SetHomeZone}() to specify the home zone. -- -- If no home zone is specified, the Ship will wait near the deploy zone for a new pickup command. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_CARGO_DISPATCHER_SHIP diff --git a/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua b/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua index 420e2cd12..6edfc3894 100644 --- a/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua +++ b/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua @@ -41,12 +41,12 @@ -- marginal impact on the overall battlefield simulation. Fortunately, the firing strength of infantry is limited, and thus, respacing healthy infantry every -- time is not so much of an issue ... -- - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_CARGO_HELICOPTER diff --git a/Moose Development/Moose/AI/AI_Cargo_Ship.lua b/Moose Development/Moose/AI/AI_Cargo_Ship.lua index 3a2fc13a5..669da09b5 100644 --- a/Moose Development/Moose/AI/AI_Cargo_Ship.lua +++ b/Moose Development/Moose/AI/AI_Cargo_Ship.lua @@ -54,12 +54,12 @@ -- Using the @{#AI_CARGO_SHIP.Pickup}() method, you are able to direct the Ship towards a Pickup zone to board/load the cargo at the specified -- coordinate. The Ship will follow the Shipping Lane to ensure consistent cargo transportation within the simulation environment. -- - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- @field #AI_CARGO_SHIP AI_CARGO_SHIP = { ClassName = "AI_CARGO_SHIP", diff --git a/Moose Development/Moose/AI/AI_Escort.lua b/Moose Development/Moose/AI/AI_Escort.lua index 46569b613..4f4429c9c 100644 --- a/Moose Development/Moose/AI/AI_Escort.lua +++ b/Moose Development/Moose/AI/AI_Escort.lua @@ -174,12 +174,12 @@ -- EscortPlanes = AI_ESCORT:New( EscortUnit, EscortGroup, "Desert", "Welcome to the mission. You are escorted by a plane with code name 'Desert', which can be instructed through the F10 radio menu." ) -- EscortPlanes:MenusAirplanes() -- create menus for airplanes -- EscortPlanes:__Start(2) - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- @field #AI_ESCORT AI_ESCORT = { ClassName = "AI_ESCORT", diff --git a/Moose Development/Moose/AI/AI_Escort_Dispatcher.lua b/Moose Development/Moose/AI/AI_Escort_Dispatcher.lua index 15d21c30f..7bb869899 100644 --- a/Moose Development/Moose/AI/AI_Escort_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_Escort_Dispatcher.lua @@ -20,12 +20,12 @@ --- Models the automatic assignment of AI escorts to player flights. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_ESCORT_DISPATCHER diff --git a/Moose Development/Moose/AI/AI_Escort_Dispatcher_Request.lua b/Moose Development/Moose/AI/AI_Escort_Dispatcher_Request.lua index c507e04f4..0b3180910 100644 --- a/Moose Development/Moose/AI/AI_Escort_Dispatcher_Request.lua +++ b/Moose Development/Moose/AI/AI_Escort_Dispatcher_Request.lua @@ -20,12 +20,12 @@ --- Models the assignment of AI escorts to player flights upon request using the radio menu. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_ESCORT_DISPATCHER_REQUEST diff --git a/Moose Development/Moose/AI/AI_Escort_Request.lua b/Moose Development/Moose/AI/AI_Escort_Request.lua index cac0b57d5..eba5ea8cd 100644 --- a/Moose Development/Moose/AI/AI_Escort_Request.lua +++ b/Moose Development/Moose/AI/AI_Escort_Request.lua @@ -136,12 +136,12 @@ -- -- Escort groups can have their own mission. This menu item will allow the escort group to resume their Mission from a given waypoint. -- Note that this is really fantastic, as you now have the dynamic of taking control of the escort groups, and allowing them to resume their path or mission. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Authors: **FlightControl** diff --git a/Moose Development/Moose/AI/AI_Formation.lua b/Moose Development/Moose/AI/AI_Formation.lua index bea05f9f9..f09c8ad63 100644 --- a/Moose Development/Moose/AI/AI_Formation.lua +++ b/Moose Development/Moose/AI/AI_Formation.lua @@ -34,8 +34,8 @@ -- @field Core.Scheduler#SCHEDULER FollowScheduler The instance of the SCHEDULER class. -- @field #number FollowDistance The current follow distance. -- @field #boolean ReportTargets If true, nearby targets are reported. --- @Field DCSTypes#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup. --- @field DCSTypes#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the FollowGroup. +-- @field DCS#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup. +-- @field DCS#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the FollowGroup. -- @field #number dtFollow Time step between position updates. @@ -92,12 +92,12 @@ -- local LargeFormation = AI_FORMATION:New( LeaderUnit, FollowGroupSet, "Center Wing Formation", "Briefing" ) -- LargeFormation:FormationCenterWing( 500, 50, 0, 250, 250 ) -- LargeFormation:__Start( 1 ) - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- @field #AI_FORMATION AI_FORMATION = { ClassName = "AI_FORMATION", diff --git a/Moose Development/Moose/AI/AI_Patrol.lua b/Moose Development/Moose/AI/AI_Patrol.lua index 6a502f679..0c096665e 100644 --- a/Moose Development/Moose/AI/AI_Patrol.lua +++ b/Moose Development/Moose/AI/AI_Patrol.lua @@ -144,12 +144,12 @@ -- When the AI is damaged, it is required that a new AIControllable is started. However, damage cannon be foreseen early on. -- Therefore, when the damage threshold is reached, the AI will return immediately to the home base (RTB). -- Use the method @{#AI_PATROL_ZONE.ManageDamage}() to have this process in place. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @field #AI_PATROL_ZONE diff --git a/Moose Development/Moose/Actions/Act_Assign.lua b/Moose Development/Moose/Actions/Act_Assign.lua index c23383ca4..3b261cfb1 100644 --- a/Moose Development/Moose/Actions/Act_Assign.lua +++ b/Moose Development/Moose/Actions/Act_Assign.lua @@ -51,12 +51,12 @@ -- * **After** the state transition. -- The state transition method needs to start with the name **OnAfter + the name of the state**. -- These state transition methods need to provide a return value, which is specified at the function description. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- # 1) @{#ACT_ASSIGN_ACCEPT} class, extends @{Core.Fsm#ACT_ASSIGN} diff --git a/Moose Development/Moose/Actions/Act_Assist.lua b/Moose Development/Moose/Actions/Act_Assist.lua index 45bb4d804..9b4744561 100644 --- a/Moose Development/Moose/Actions/Act_Assist.lua +++ b/Moose Development/Moose/Actions/Act_Assist.lua @@ -57,12 +57,12 @@ -- # 1.1) ACT_ASSIST_SMOKE_TARGETS_ZONE constructor: -- -- * @{#ACT_ASSIST_SMOKE_TARGETS_ZONE.New}(): Creates a new ACT_ASSIST_SMOKE_TARGETS_ZONE object. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @module Actions.Act_Assist diff --git a/Moose Development/Moose/Actions/Act_Route.lua b/Moose Development/Moose/Actions/Act_Route.lua index d83133752..3ddb58cbe 100644 --- a/Moose Development/Moose/Actions/Act_Route.lua +++ b/Moose Development/Moose/Actions/Act_Route.lua @@ -69,12 +69,12 @@ -- # 1.1) ACT_ROUTE_ZONE constructor: -- -- * @{#ACT_ROUTE_ZONE.New}(): Creates a new ACT_ROUTE_ZONE object. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- @module Actions.Act_Route diff --git a/Moose Development/Moose/Cargo/Cargo.lua b/Moose Development/Moose/Cargo/Cargo.lua index 462259b86..12b477eb9 100644 --- a/Moose Development/Moose/Cargo/Cargo.lua +++ b/Moose Development/Moose/Cargo/Cargo.lua @@ -233,12 +233,12 @@ -- Note that this option is optional, so can be omitted. The default value of the RR is 250 meters. -- * **NR=** Provide the maximum range in meters when the cargo units will be boarded within the carrier during boarding. -- Note that this option is optional, so can be omitted. The default value of the RR is 10 meters. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Author: **FlightControl** diff --git a/Moose Development/Moose/Core/Message.lua b/Moose Development/Moose/Core/Message.lua index 4d1d5d501..cb455fc62 100644 --- a/Moose Development/Moose/Core/Message.lua +++ b/Moose Development/Moose/Core/Message.lua @@ -343,7 +343,7 @@ end --- Sends a MESSAGE to a Coalition. -- @param #MESSAGE self --- @param #DCS.coalition.side CoalitionSide @{#DCS.coalition.side} to which the message is displayed. +-- @param DCS#coalition.side CoalitionSide @{#DCS.coalition.side} to which the message is displayed. -- @param Core.Settings#SETTINGS Settings (Optional) Settings for message display. -- @return #MESSAGE Message object. -- @usage diff --git a/Moose Development/Moose/Core/Settings.lua b/Moose Development/Moose/Core/Settings.lua index e24527798..f29863c59 100644 --- a/Moose Development/Moose/Core/Settings.lua +++ b/Moose Development/Moose/Core/Settings.lua @@ -190,8 +190,8 @@ -- -- There are different methods that can be used to change the **System settings** using the \_SETTINGS object. -- --- - @{#SETTINGS.SetMessageTime}(): Define for a specific @{Message.MESSAGE.MessageType} the duration to be displayed in seconds. --- - @{#SETTINGS.GetMessageTime}(): Retrieves for a specific @{Message.MESSAGE.MessageType} the duration to be displayed in seconds. +-- - @{#SETTINGS.SetMessageTime}(): Define for a specific @{Core.Message#MESSAGE.MessageType} the duration to be displayed in seconds. +-- - @{#SETTINGS.GetMessageTime}(): Retrieves for a specific @{Core.Message#MESSAGE.MessageType} the duration to be displayed in seconds. -- -- ## 3.5) **Era** of the battle -- diff --git a/Moose Development/Moose/Functional/ZoneGoalCargo.lua b/Moose Development/Moose/Functional/ZoneGoalCargo.lua index d957130da..988e0ac53 100644 --- a/Moose Development/Moose/Functional/ZoneGoalCargo.lua +++ b/Moose Development/Moose/Functional/ZoneGoalCargo.lua @@ -4,12 +4,12 @@ -- -- ZONE_GOAL_CARGO models processes that have a Goal with a defined achievement involving a Zone and Cargo. -- Derived classes implement the ways how the achievements can be realized. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Author: **FlightControl** diff --git a/Moose Development/Moose/Sound/RadioSpeech.lua b/Moose Development/Moose/Sound/RadioSpeech.lua index 88caaf34c..008909fcc 100644 --- a/Moose Development/Moose/Sound/RadioSpeech.lua +++ b/Moose Development/Moose/Sound/RadioSpeech.lua @@ -17,12 +17,12 @@ --- Makes the radio speak. -- -- # RADIOSPEECH usage - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- -- @type RADIOSPEECH -- @extends Sound.RadioQueue#RADIOQUEUE diff --git a/Moose Development/Moose/Tasking/CommandCenter.lua b/Moose Development/Moose/Tasking/CommandCenter.lua index 07a7ab2f4..52f8c9977 100644 --- a/Moose Development/Moose/Tasking/CommandCenter.lua +++ b/Moose Development/Moose/Tasking/CommandCenter.lua @@ -162,12 +162,12 @@ -- choose from 2 added menu options either to accept or reject the assigned task within 30 seconds. -- If the task is not accepted within 30 seconds; the task will be cancelled and a new task will be assigned. -- - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- @field #COMMANDCENTER COMMANDCENTER = { ClassName = "COMMANDCENTER", diff --git a/Moose Development/Moose/Tasking/DetectionManager.lua b/Moose Development/Moose/Tasking/DetectionManager.lua index d5af8de8d..da560e5d0 100644 --- a/Moose Development/Moose/Tasking/DetectionManager.lua +++ b/Moose Development/Moose/Tasking/DetectionManager.lua @@ -32,12 +32,12 @@ -- ------------------------------- -- The @{#DETECTION_REPORTING.New}() method creates a new DETECTION_REPORTING instance. -- - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Contributions: Mechanist, Prof_Hilactic, FlightControl - Concept & Testing diff --git a/Moose Development/Moose/Tasking/Mission.lua b/Moose Development/Moose/Tasking/Mission.lua index ec4085109..1c65725d2 100644 --- a/Moose Development/Moose/Tasking/Mission.lua +++ b/Moose Development/Moose/Tasking/Mission.lua @@ -117,12 +117,12 @@ -- - @{#MISSION.ReportPlayersPerTask}(): Generates a report showing the active players per task. -- - @{#MISSION.ReportPlayersProgress}(): Generates a report showing the task progress per player. -- - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- @field #MISSION MISSION = { ClassName = "MISSION", diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index ad760d83d..ed96e9b60 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -203,12 +203,12 @@ -- -- These different completion states are important for the mission designer to reflect scoring to a player. -- A success could mean a positive score to be given, while a failure could mean a negative score or penalties to be awarded. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Author(s): **FlightControl** diff --git a/Moose Development/Moose/Tasking/TaskInfo.lua b/Moose Development/Moose/Tasking/TaskInfo.lua index 2c6ea9487..858937ac5 100644 --- a/Moose Development/Moose/Tasking/TaskInfo.lua +++ b/Moose Development/Moose/Tasking/TaskInfo.lua @@ -18,12 +18,12 @@ -- # TASKINFO class, extends @{Core.Base#BASE} -- -- ## The TASKINFO class implements the methods to contain information and display information of a task. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- @field #TASKINFO TASKINFO = { ClassName = "TASKINFO", diff --git a/Moose Development/Moose/Tasking/Task_A2A.lua b/Moose Development/Moose/Tasking/Task_A2A.lua index 97221d63b..a43c79c9f 100644 --- a/Moose Development/Moose/Tasking/Task_A2A.lua +++ b/Moose Development/Moose/Tasking/Task_A2A.lua @@ -35,7 +35,7 @@ do -- TASK_A2A -- * @{#TASK_A2A.SetScoreOnDestroy}(): Set a score when a target in scope of the A2A attack, has been destroyed. -- * @{#TASK_A2A.SetScoreOnSuccess}(): Set a score when all the targets in scope of the A2A attack, have been destroyed. -- * @{#TASK_A2A.SetPenaltyOnFailed}(): Set a penalty when the A2A attack has failed. - -- + -- -- # Developer Note -- -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE diff --git a/Moose Development/Moose/Tasking/Task_CARGO.lua b/Moose Development/Moose/Tasking/Task_CARGO.lua index 637298e51..c33b04d77 100644 --- a/Moose Development/Moose/Tasking/Task_CARGO.lua +++ b/Moose Development/Moose/Tasking/Task_CARGO.lua @@ -390,12 +390,12 @@ -- - @{Tasking.Task_CARGO#TASK_CARGO_TRANSPORT}: Documents the specific methods how to handle the cargo transportation tasking from a mission designer perspective. -- - @{Tasking.Task_CARGO#TASK_CARGO_CSAR}: Documents the specific methods how to handle the cargo CSAR tasking from a mission designer perspective. -- - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Author: **FlightControl** diff --git a/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua index 1cf999b8c..d7cbafb5c 100644 --- a/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua +++ b/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua @@ -45,12 +45,12 @@ -- * Switch between metric and imperial measurement system. -- * Switch between coordinate formats used in messages: BR, BRA, LL DMS, LL DDM, MGRS. -- * Various other options. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Author: **FlightControl** diff --git a/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua b/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua index ddafed89f..00c05375f 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua @@ -52,12 +52,12 @@ -- -- Enjoy! -- FC - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Author: **FlightControl** diff --git a/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua index 09623e79f..e00a35160 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua @@ -52,12 +52,12 @@ -- * Switch between coordinate formats used in messages: BR, BRA, LL DMS, LL DDM, MGRS. -- * Different settings modes for A2G and A2A operations. -- * Various other options. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Author: **FlightControl** diff --git a/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua b/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua index bfe066d10..af0431bf5 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua @@ -41,12 +41,12 @@ -- * Switch between coordinate formats used in messages: BR, BRA, LL DMS, LL DDM, MGRS. -- * Different settings modes for A2G and A2A operations. -- * Various other options. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- Please read through the #Tasking.Task_Cargo process to understand the mechanisms of tasking and cargo tasking and handling. diff --git a/Moose Development/Moose/Tasking/Task_Manager.lua b/Moose Development/Moose/Tasking/Task_Manager.lua index 82f3fceac..127b455ad 100644 --- a/Moose Development/Moose/Tasking/Task_Manager.lua +++ b/Moose Development/Moose/Tasking/Task_Manager.lua @@ -23,12 +23,12 @@ -- If an ad-hoc report is requested, use the method @{Tasking.Task_Manager#TASK_MANAGER#ManageTasks}(). -- -- The default task management interval is every 60 seconds. - -- - -- # Developer Note - -- - -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE - -- Therefore, this class is considered to be deprecated - -- +-- +-- # Developer Note +-- +-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE +-- Therefore, this class is considered to be deprecated +-- -- === -- -- ### Contributions: Mechanist, Prof_Hilactic, FlightControl - Concept & Testing From d92d2d07c590b14546195c71e08f759729e5f7c6 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Tue, 31 Oct 2023 15:21:15 +0100 Subject: [PATCH 46/51] Fixed broken links --- Moose Development/Moose/AI/AI_Air_Engage.lua | 22 ++----------------- Moose Development/Moose/Cargo/Cargo.lua | 4 ++-- Moose Development/Moose/Core/Message.lua | 2 +- Moose Development/Moose/Core/Zone.lua | 10 ++++----- .../Moose/Functional/Suppression.lua | 4 ++-- .../Moose/Functional/ZoneGoalCargo.lua | 2 +- Moose Development/Moose/Sound/SRS.lua | 4 ++-- Moose Development/Moose/Tasking/Task.lua | 2 +- .../Moose/Tasking/Task_Capture_Dispatcher.lua | 2 +- .../Moose/Tasking/Task_Cargo_Dispatcher.lua | 6 ++--- .../Moose/Wrapper/Controllable.lua | 6 ++--- .../Moose/Wrapper/Positionable.lua | 8 +++---- Moose Development/Moose/Wrapper/Storage.lua | 2 +- 13 files changed, 28 insertions(+), 46 deletions(-) diff --git a/Moose Development/Moose/AI/AI_Air_Engage.lua b/Moose Development/Moose/AI/AI_Air_Engage.lua index f5a7b2d44..7fcc68075 100644 --- a/Moose Development/Moose/AI/AI_Air_Engage.lua +++ b/Moose Development/Moose/AI/AI_Air_Engage.lua @@ -19,42 +19,26 @@ --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders. -- --- ![Process](..\Presentations\AI_GCI\Dia3.JPG) --- -- The AI_AIR_ENGAGE is assigned a @{Wrapper.Group} and this must be done before the AI_AIR_ENGAGE process can be started using the **Start** event. -- --- ![Process](..\Presentations\AI_GCI\Dia4.JPG) --- -- The AI will fly towards the random 3D point within the patrol zone, using a random speed within the given altitude and speed limits. -- Upon arrival at the 3D point, a new random 3D point will be selected within the patrol zone using the given limits. -- --- ![Process](..\Presentations\AI_GCI\Dia5.JPG) --- -- This cycle will continue. -- --- ![Process](..\Presentations\AI_GCI\Dia6.JPG) --- -- During the patrol, the AI will detect enemy targets, which are reported through the **Detected** event. --- --- ![Process](..\Presentations\AI_GCI\Dia9.JPG) -- -- When enemies are detected, the AI will automatically engage the enemy. -- --- ![Process](..\Presentations\AI_GCI\Dia10.JPG) --- -- Until a fuel or damage threshold has been reached by the AI, or when the AI is commanded to RTB. -- When the fuel threshold has been reached, the airplane will fly towards the nearest friendly airbase and will land. -- --- ![Process](..\Presentations\AI_GCI\Dia13.JPG) --- -- ## 1. AI_AIR_ENGAGE constructor -- -- * @{#AI_AIR_ENGAGE.New}(): Creates a new AI_AIR_ENGAGE object. -- -- ## 3. Set the Range of Engagement -- --- ![Range](..\Presentations\AI_GCI\Dia11.JPG) --- -- An optional range can be set in meters, -- that will define when the AI will engage with the detected airborne enemy targets. -- The range can be beyond or smaller than the range of the Patrol Zone. @@ -62,10 +46,8 @@ -- Use the method @{AI.AI_GCI#AI_AIR_ENGAGE.SetEngageRange}() to define that range. -- -- ## 4. Set the Zone of Engagement --- --- ![Zone](..\Presentations\AI_GCI\Dia12.JPG) --- --- An optional @{Core.Zone} can be set, +-- +-- An optional @{Core.Zone} can be set, -- that will define when the AI will engage with the detected airborne enemy targets. -- Use the method @{AI.AI_CAP#AI_AIR_ENGAGE.SetEngageZone}() to define that Zone. -- diff --git a/Moose Development/Moose/Cargo/Cargo.lua b/Moose Development/Moose/Cargo/Cargo.lua index 462259b86..23c5fbce1 100644 --- a/Moose Development/Moose/Cargo/Cargo.lua +++ b/Moose Development/Moose/Cargo/Cargo.lua @@ -86,7 +86,7 @@ -- There are also dispatchers that make AI work together to transport cargo automatically!!! -- -- - @{AI.AI_Cargo_Dispatcher_APC} derived classes will create for your dynamic cargo handlers controlled by AI ground vehicle groups (APCs) to transport cargo between sites. --- - @{AI.AI_Cargo_Dispatcher_Helicopters} derived classes will create for your dynamic cargo handlers controlled by AI helicopter groups to transport cargo between sites. +-- - @{AI.AI_Cargo_Dispatcher_Helicopter} derived classes will create for your dynamic cargo handlers controlled by AI helicopter groups to transport cargo between sites. -- -- ## 3.3) Cargo transportation tasking. -- @@ -398,7 +398,7 @@ do -- CARGO -- -- * AI Armoured Personnel Carriers to transport cargo and engage in battles, using the @{AI.AI_Cargo_APC#AI_CARGO_APC} class. -- * AI Helicopters to transport cargo, using the @{AI.AI_Cargo_Helicopter#AI_CARGO_HELICOPTER} class. - -- * AI Planes to transport cargo, using the @{AI.AI_Cargo_Plane#AI_CARGO_PLANE} class. + -- * AI Planes to transport cargo, using the @{AI.AI_Cargo_Airplane#AI_CARGO_AIRPLANE} class. -- * AI Ships is planned. -- -- The above cargo classes are also used by the TASK\_CARGO\_ classes to allow human players to transport cargo as part of a tasking: diff --git a/Moose Development/Moose/Core/Message.lua b/Moose Development/Moose/Core/Message.lua index 4d1d5d501..5bedc8fa8 100644 --- a/Moose Development/Moose/Core/Message.lua +++ b/Moose Development/Moose/Core/Message.lua @@ -127,7 +127,7 @@ end --- Creates a new MESSAGE object of a certain type. -- Note that these MESSAGE objects are not yet displayed on the display panel. --- You must use the functions @{ToClient} or @{ToCoalition} or @{ToAll} to send these Messages to the respective recipients. +-- You must use the functions @{Core.Message#ToClient} or @{Core.Message#ToCoalition} or @{Core.Message#ToAll} to send these Messages to the respective recipients. -- The message display times are automatically defined based on the timing settings in the @{Core.Settings} menu. -- @param self -- @param #string MessageText is the text of the Message. diff --git a/Moose Development/Moose/Core/Zone.lua b/Moose Development/Moose/Core/Zone.lua index 175e3c660..1760a1f76 100644 --- a/Moose Development/Moose/Core/Zone.lua +++ b/Moose Development/Moose/Core/Zone.lua @@ -1057,11 +1057,11 @@ end --- Scan the zone for the presence of units of the given ObjectCategories. -- Note that **only after** a zone has been scanned, the zone can be evaluated by: -- --- * @{ZONE_RADIUS.IsAllInZoneOfCoalition}(): Scan the presence of units in the zone of a coalition. --- * @{ZONE_RADIUS.IsAllInZoneOfOtherCoalition}(): Scan the presence of units in the zone of an other coalition. --- * @{ZONE_RADIUS.IsSomeInZoneOfCoalition}(): Scan if there is some presence of units in the zone of the given coalition. --- * @{ZONE_RADIUS.IsNoneInZoneOfCoalition}(): Scan if there isn't any presence of units in the zone of an other coalition than the given one. --- * @{ZONE_RADIUS.IsNoneInZone}(): Scan if the zone is empty. +-- * @{Core.Zone#ZONE_RADIUS.IsAllInZoneOfCoalition}(): Scan the presence of units in the zone of a coalition. +-- * @{Core.Zone#ZONE_RADIUS.IsAllInZoneOfOtherCoalition}(): Scan the presence of units in the zone of an other coalition. +-- * @{Core.Zone#ZONE_RADIUS.IsSomeInZoneOfCoalition}(): Scan if there is some presence of units in the zone of the given coalition. +-- * @{Core.Zone#ZONE_RADIUS.IsNoneInZoneOfCoalition}(): Scan if there isn't any presence of units in the zone of an other coalition than the given one. +-- * @{Core.Zone#ZONE_RADIUS.IsNoneInZone}(): Scan if the zone is empty. -- @param #ZONE_RADIUS self -- @param ObjectCategories An array of categories of the objects to find in the zone. E.g. `{Object.Category.UNIT}` -- @param UnitCategories An array of unit categories of the objects to find in the zone. E.g. `{Unit.Category.GROUND_UNIT,Unit.Category.SHIP}` diff --git a/Moose Development/Moose/Functional/Suppression.lua b/Moose Development/Moose/Functional/Suppression.lua index 8c6b88a93..d93959990 100644 --- a/Moose Development/Moose/Functional/Suppression.lua +++ b/Moose Development/Moose/Functional/Suppression.lua @@ -33,9 +33,9 @@ -- -- === -- --- ### Author: **[funkyfranky](https://forums.eagle.ru/member.php?u=115026)** +-- ### Author: **funkyfranky** -- --- ### Contributions: [FlightControl](https://forums.eagle.ru/member.php?u=89536) +-- ### Contributions: FlightControl -- -- === -- diff --git a/Moose Development/Moose/Functional/ZoneGoalCargo.lua b/Moose Development/Moose/Functional/ZoneGoalCargo.lua index d957130da..bc9f8c003 100644 --- a/Moose Development/Moose/Functional/ZoneGoalCargo.lua +++ b/Moose Development/Moose/Functional/ZoneGoalCargo.lua @@ -61,7 +61,7 @@ do -- ZoneGoal --- ZONE_GOAL_CARGO Constructor. -- @param #ZONE_GOAL_CARGO self -- @param Core.Zone#ZONE Zone A @{Core.Zone} object with the goal to be achieved. - -- @param DCSCoalition.DCSCoalition#coalition Coalition The initial coalition owning the zone. + -- @param #number Coalition The initial coalition owning the zone. -- @return #ZONE_GOAL_CARGO function ZONE_GOAL_CARGO:New( Zone, Coalition ) diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index eda0e8504..b16bc01c9 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -797,7 +797,7 @@ end --- Play a SOUNDTEXT text-to-speech object. -- @param #MSRS self --- @param Sound.SoundFile#SOUNDTEXT SoundText Sound text. +-- @param Sound.SoundOutput#SOUNDTEXT SoundText Sound text. -- @param #number Delay Delay in seconds, before the sound file is played. -- @return #MSRS self function MSRS:PlaySoundText(SoundText, Delay) @@ -1435,7 +1435,7 @@ end --- Replacement function for @{#MSRS.PlaySoundText} -- @param #MSRS self --- @param Sound.SoundFile#SOUNDTEXT SoundText Sound text. +-- @param Sound.SoundOutput#SOUNDTEXT SoundText Sound text. -- @param #number Delay Delay in seconds, before the sound file is played. -- @return #MSRS self MSRS_BACKEND_DCSGRPC.Functions.PlaySoundText = function (self, SoundText, Delay) diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index ad760d83d..abaabf286 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -1773,7 +1773,7 @@ do -- Links --- Set detection of a task -- @param #TASK self - -- @param Function.Detection#DETECTION_BASE Detection + -- @param Functional.Detection#DETECTION_BASE Detection -- @param DetectedItem -- @return #TASK function TASK:SetDetection( Detection, DetectedItem ) diff --git a/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua index 1cf999b8c..d458c6100 100644 --- a/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua +++ b/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua @@ -245,7 +245,7 @@ do -- TASK_CAPTURE_DISPATCHER -- @param #string TaskPrefix (optional) The prefix of the capture zone task. -- If no TaskPrefix is given, then "Capture" will be used as the TaskPrefix. -- The TaskPrefix will be appended with a . + a number of 3 digits, if the TaskPrefix already exists in the task collection. - -- @param Functional.CaptureZoneCoalition#ZONE_CAPTURE_COALITION CaptureZone The zone of the coalition to be captured as the task goal. + -- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION CaptureZone The zone of the coalition to be captured as the task goal. -- @param #string Briefing The briefing of the task to be shown to the player. -- @return Tasking.Task_Capture_Zone#TASK_CAPTURE_ZONE -- @usage diff --git a/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua index 09623e79f..abe4ff439 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua @@ -144,7 +144,7 @@ do -- TASK_CARGO_DISPATCHER -- -- Note that the name of the cargo is "Engineer Team 1". -- local CargoGroup = CARGO_GROUP:New( PilotGroup, "Workmaterials", "Engineer Team 1", 500 ) -- - -- What is also needed, is to have a set of @{Core.Group}s defined that contains the clients of the players. + -- What is also needed, is to have a set of @{Wrapper.Group}s defined that contains the clients of the players. -- -- -- Allocate the Transport, which are the helicopters to retrieve the pilot, that can be manned by players. -- -- The name of these helicopter groups containing one client begins with "Transport", as modelled within the mission editor. @@ -214,7 +214,7 @@ do -- TASK_CARGO_DISPATCHER -- -- The method will create a new CSAR task, and will generate the pilots cargo itself, at the specified coordinate. -- - -- What is first needed, is to have a set of @{Core.Group}s defined that contains the clients of the players. + -- What is first needed, is to have a set of @{Wrapper.Group}s defined that contains the clients of the players. -- -- -- Allocate the Transport, which are the helicopter to retrieve the pilot, that can be manned by players. -- local GroupSet = SET_GROUP:New():FilterPrefixes( "Transport" ):FilterStart() @@ -686,7 +686,7 @@ do -- TASK_CARGO_DISPATCHER -- @param #string TaskPrefix (optional) The prefix of the transport task. -- This prefix will be appended with a . + a number of 3 digits. -- If no TaskPrefix is given, then "Transport" will be used as the prefix. - -- @param Core.SetCargo#SET_CARGO SetCargo The SetCargo to be transported. + -- @param Core.Set#SET_CARGO SetCargo The SetCargo to be transported. -- @param #string Briefing The briefing of the task transport to be shown to the player. -- @param #boolean Silent If true don't send a message that a new task is available. -- @return Tasking.Task_Cargo_Transport#TASK_CARGO_TRANSPORT diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index f54f0bfd8..ded42ebfd 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -489,7 +489,7 @@ end --- Return a Combo Task taking an array of Tasks. -- @param #CONTROLLABLE self --- @param DCS#TaskArray DCSTasks Array of @{DCSTasking.Task#Task} +-- @param DCS#TaskArray DCSTasks Array of DCSTasking.Task#Task -- @return DCS#Task function CONTROLLABLE:TaskCombo( DCSTasks ) @@ -2739,7 +2739,7 @@ do -- Route methods -- @param Core.Zone#ZONE Zone The zone where to route to. -- @param #boolean Randomize Defines whether to target point gets randomized within the Zone. -- @param #number Speed The speed in m/s. Default is 5.555 m/s = 20 km/h. - -- @param Base#FORMATION Formation The formation string. + -- @param Core.Base#FORMATION Formation The formation string. function CONTROLLABLE:TaskRouteToZone( Zone, Randomize, Speed, Formation ) self:F2( Zone ) @@ -2799,7 +2799,7 @@ do -- Route methods -- @param #CONTROLLABLE self -- @param DCS#Vec2 Vec2 The Vec2 where to route to. -- @param #number Speed The speed in m/s. Default is 5.555 m/s = 20 km/h. - -- @param Base#FORMATION Formation The formation string. + -- @param Core.Base#FORMATION Formation The formation string. function CONTROLLABLE:TaskRouteToVec2( Vec2, Speed, Formation ) local DCSControllable = self:GetDCSObject() diff --git a/Moose Development/Moose/Wrapper/Positionable.lua b/Moose Development/Moose/Wrapper/Positionable.lua index 57e50c7be..f181cbd23 100644 --- a/Moose Development/Moose/Wrapper/Positionable.lua +++ b/Moose Development/Moose/Wrapper/Positionable.lua @@ -1684,7 +1684,7 @@ do -- Cargo --- Add cargo. -- @param #POSITIONABLE self - -- @param Core.Cargo#CARGO Cargo + -- @param Cargo.Cargo#CARGO Cargo -- @return #POSITIONABLE function POSITIONABLE:AddCargo( Cargo ) self.__.Cargo[Cargo] = Cargo @@ -1700,7 +1700,7 @@ do -- Cargo --- Remove cargo. -- @param #POSITIONABLE self - -- @param Core.Cargo#CARGO Cargo + -- @param Cargo.Cargo#CARGO Cargo -- @return #POSITIONABLE function POSITIONABLE:RemoveCargo( Cargo ) self.__.Cargo[Cargo] = nil @@ -1709,7 +1709,7 @@ do -- Cargo --- Returns if carrier has given cargo. -- @param #POSITIONABLE self - -- @return Core.Cargo#CARGO Cargo + -- @return Cargo.Cargo#CARGO Cargo function POSITIONABLE:HasCargo( Cargo ) return self.__.Cargo[Cargo] end @@ -1733,7 +1733,7 @@ do -- Cargo --- Get cargo item count. -- @param #POSITIONABLE self - -- @return Core.Cargo#CARGO Cargo + -- @return Cargo.Cargo#CARGO Cargo function POSITIONABLE:CargoItemCount() local ItemCount = 0 for CargoName, Cargo in pairs( self.__.Cargo ) do diff --git a/Moose Development/Moose/Wrapper/Storage.lua b/Moose Development/Moose/Wrapper/Storage.lua index be07bb477..4ffc505da 100644 --- a/Moose Development/Moose/Wrapper/Storage.lua +++ b/Moose Development/Moose/Wrapper/Storage.lua @@ -8,7 +8,7 @@ -- -- ## Example Missions: -- --- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Wrapper%20-%20Storage). +-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Wrapper/Storage). -- -- === -- From 87dda491138068bd3d9ba2d39309b363a4c490cb Mon Sep 17 00:00:00 2001 From: kaltokri Date: Tue, 31 Oct 2023 15:44:07 +0100 Subject: [PATCH 47/51] Fixed broken links --- Moose Development/Moose/Actions/Act_Route.lua | 2 +- Moose Development/Moose/Core/Spawn.lua | 2 +- Moose Development/Moose/Functional/RAT.lua | 4 ++-- Moose Development/Moose/Functional/ZoneGoalCargo.lua | 4 ++-- .../Moose/Tasking/Task_A2A_Dispatcher.lua | 4 ++-- Moose Development/Moose/Tasking/Task_CARGO.lua | 10 +++++----- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Moose Development/Moose/Actions/Act_Route.lua b/Moose Development/Moose/Actions/Act_Route.lua index 3ddb58cbe..b387b6584 100644 --- a/Moose Development/Moose/Actions/Act_Route.lua +++ b/Moose Development/Moose/Actions/Act_Route.lua @@ -60,7 +60,7 @@ -- -- === -- --- # 1) @{#ACT_ROUTE_ZONE} class, extends @{Core.Fsm.Route#ACT_ROUTE} +-- # 1) @{#ACT_ROUTE_ZONE} class, extends @{#ACT_ROUTE} -- -- The ACT_ROUTE_ZONE class implements the core functions to route an AIR @{Wrapper.Controllable} player @{Wrapper.Unit} to a @{Core.Zone}. -- The player receives on perioding times messages with the coordinates of the route to follow. diff --git a/Moose Development/Moose/Core/Spawn.lua b/Moose Development/Moose/Core/Spawn.lua index 052c7d152..8e62efe4b 100644 --- a/Moose Development/Moose/Core/Spawn.lua +++ b/Moose Development/Moose/Core/Spawn.lua @@ -58,7 +58,7 @@ -- @field #SPAWN.SpawnZoneTable SpawnZoneTable -- @extends Core.Base#BASE ---- Allows to spawn dynamically new @{Core.Group}s. +--- Allows to spawn dynamically new @{Wrapper.Group}s. -- -- Each SPAWN object needs to be have related **template groups** setup in the Mission Editor (ME), -- which is a normal group with the **Late Activation** flag set. diff --git a/Moose Development/Moose/Functional/RAT.lua b/Moose Development/Moose/Functional/RAT.lua index 3f81559b7..52a8e9965 100644 --- a/Moose Development/Moose/Functional/RAT.lua +++ b/Moose Development/Moose/Functional/RAT.lua @@ -46,9 +46,9 @@ -- -- === -- --- ### Author: **[funkyfranky](https://forums.eagle.ru/member.php?u=115026)** +-- ### Author: **funkyfranky** -- --- ### Contributions: [FlightControl](https://forums.eagle.ru/member.php?u=89536) +-- ### Contributions: FlightControl -- -- === -- @module Functional.RAT diff --git a/Moose Development/Moose/Functional/ZoneGoalCargo.lua b/Moose Development/Moose/Functional/ZoneGoalCargo.lua index c32145d73..7a19ed02a 100644 --- a/Moose Development/Moose/Functional/ZoneGoalCargo.lua +++ b/Moose Development/Moose/Functional/ZoneGoalCargo.lua @@ -259,7 +259,7 @@ do -- ZoneGoal --- Set the owning coalition of the zone. -- @param #ZONE_GOAL_CARGO self - -- @param DCSCoalition.DCSCoalition#coalition Coalition + -- @param #number Coalition function ZONE_GOAL_CARGO:SetCoalition( Coalition ) self.Coalition = Coalition end @@ -267,7 +267,7 @@ do -- ZoneGoal --- Get the owning coalition of the zone. -- @param #ZONE_GOAL_CARGO self - -- @return DCSCoalition.DCSCoalition#coalition Coalition. + -- @return #number Coalition. function ZONE_GOAL_CARGO:GetCoalition() return self.Coalition end diff --git a/Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua index 00c760141..9b0f8f5b5 100644 --- a/Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua +++ b/Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua @@ -401,7 +401,7 @@ do -- TASK_A2A_DISPATCHER --- Calculates which friendlies are nearby the area -- @param #TASK_A2A_DISPATCHER self -- @param DetectedItem - -- @return #number, Core.CommandCenter#REPORT + -- @return #number, Tasking.CommandCenter#REPORT function TASK_A2A_DISPATCHER:GetFriendliesNearBy( DetectedItem ) local DetectedSet = DetectedItem.Set @@ -444,7 +444,7 @@ do -- TASK_A2A_DISPATCHER --- Calculates which HUMAN friendlies are nearby the area -- @param #TASK_A2A_DISPATCHER self -- @param DetectedItem - -- @return #number, Core.CommandCenter#REPORT + -- @return #number, Tasking.CommandCenter#REPORT function TASK_A2A_DISPATCHER:GetPlayerFriendliesNearBy( DetectedItem ) local DetectedSet = DetectedItem.Set diff --git a/Moose Development/Moose/Tasking/Task_CARGO.lua b/Moose Development/Moose/Tasking/Task_CARGO.lua index 4b344dd84..2c6c8ed3d 100644 --- a/Moose Development/Moose/Tasking/Task_CARGO.lua +++ b/Moose Development/Moose/Tasking/Task_CARGO.lua @@ -514,7 +514,7 @@ do -- TASK_CARGO -- @param #string Event -- @param #string To -- @param Wrapper.Unit#UNIT TaskUnit The Unit (Client) that Deployed the cargo. You can use this to retrieve the PlayerName etc. - -- @param Core.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. + -- @param Cargo.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. -- @param Core.Zone#ZONE DeployZone The zone where the Cargo got Deployed or UnBoarded. -- @return #boolean @@ -525,7 +525,7 @@ do -- TASK_CARGO -- @param #string Event -- @param #string To -- @param Wrapper.Unit#UNIT TaskUnit The Unit (Client) that Deployed the cargo. You can use this to retrieve the PlayerName etc. - -- @param Core.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. + -- @param Cargo.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. -- @param Core.Zone#ZONE DeployZone The zone where the Cargo got Deployed or UnBoarded. -- @usage -- @@ -567,7 +567,7 @@ do -- TASK_CARGO -- @param #string Event -- @param #string To -- @param Wrapper.Unit#UNIT TaskUnit The Unit (Client) that PickedUp the cargo. You can use this to retrieve the PlayerName etc. - -- @param Core.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. + -- @param Cargo.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. -- @return #boolean --- CargoPickedUp Handler OnAfter for TASK_CARGO @@ -577,7 +577,7 @@ do -- TASK_CARGO -- @param #string Event -- @param #string To -- @param Wrapper.Unit#UNIT TaskUnit The Unit (Client) that PickedUp the cargo. You can use this to retrieve the PlayerName etc. - -- @param Core.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. + -- @param Cargo.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. local Fsm = self:GetUnitProcess() @@ -843,7 +843,7 @@ do -- TASK_CARGO -- @param From -- @param Event -- @param To - -- @param Core.Cargo#CARGO Cargo + -- @param Cargo.Cargo#CARGO Cargo function Fsm:onafterRouteToPickup( TaskUnit, Task, From, Event, To, Cargo ) self:F( { TaskUnit = TaskUnit, Task = Task and Task:GetClassNameAndID() } ) From 13a8babe7566bdf077699a873c4018df358cfb87 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Tue, 31 Oct 2023 16:05:48 +0100 Subject: [PATCH 48/51] Fixed broken links --- Moose Development/Moose/AI/AI_A2A_Gci.lua | 1 - Moose Development/Moose/AI/AI_A2G_SEAD.lua | 1 - Moose Development/Moose/AI/AI_Air_Engage.lua | 1 - Moose Development/Moose/Functional/ZoneGoalCoalition.lua | 6 +++--- Moose Development/Moose/Tasking/TaskInfo.lua | 2 +- Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Moose Development/Moose/AI/AI_A2A_Gci.lua b/Moose Development/Moose/AI/AI_A2A_Gci.lua index ff03a8c7a..e40e8513b 100644 --- a/Moose Development/Moose/AI/AI_A2A_Gci.lua +++ b/Moose Development/Moose/AI/AI_A2A_Gci.lua @@ -65,7 +65,6 @@ -- that will define when the AI will engage with the detected airborne enemy targets. -- The range can be beyond or smaller than the range of the Patrol Zone. -- The range is applied at the position of the AI. --- Use the method @{AI.AI_A2A_GCI#AI_A2A_GCI.SetEngageRange}() to define that range. -- -- # Developer Note -- diff --git a/Moose Development/Moose/AI/AI_A2G_SEAD.lua b/Moose Development/Moose/AI/AI_A2G_SEAD.lua index f98ffbe3b..b6f9d9426 100644 --- a/Moose Development/Moose/AI/AI_A2G_SEAD.lua +++ b/Moose Development/Moose/AI/AI_A2G_SEAD.lua @@ -44,7 +44,6 @@ -- that will define when the AI will engage with the detected airborne enemy targets. -- The range can be beyond or smaller than the range of the Patrol Zone. -- The range is applied at the position of the AI. --- Use the method @{#AI_A2G_SEAD.SetEngageRange}() to define that range. -- -- # Developer Note -- diff --git a/Moose Development/Moose/AI/AI_Air_Engage.lua b/Moose Development/Moose/AI/AI_Air_Engage.lua index 441193b45..90c20b79e 100644 --- a/Moose Development/Moose/AI/AI_Air_Engage.lua +++ b/Moose Development/Moose/AI/AI_Air_Engage.lua @@ -43,7 +43,6 @@ -- that will define when the AI will engage with the detected airborne enemy targets. -- The range can be beyond or smaller than the range of the Patrol Zone. -- The range is applied at the position of the AI. --- Use the method @{AI.AI_GCI#AI_AIR_ENGAGE.SetEngageRange}() to define that range. -- -- ## 4. Set the Zone of Engagement -- diff --git a/Moose Development/Moose/Functional/ZoneGoalCoalition.lua b/Moose Development/Moose/Functional/ZoneGoalCoalition.lua index 246d55c7a..1eae7942b 100644 --- a/Moose Development/Moose/Functional/ZoneGoalCoalition.lua +++ b/Moose Development/Moose/Functional/ZoneGoalCoalition.lua @@ -80,7 +80,7 @@ do -- ZoneGoal --- Set the owning coalition of the zone. -- @param #ZONE_GOAL_COALITION self - -- @param DCSCoalition.DCSCoalition#coalition Coalition The coalition ID, e.g. *coalition.side.RED*. + -- @param #number Coalition The coalition ID, e.g. *coalition.side.RED*. -- @return #ZONE_GOAL_COALITION function ZONE_GOAL_COALITION:SetCoalition( Coalition ) self.PreviousCoalition = self.Coalition or Coalition @@ -120,14 +120,14 @@ do -- ZoneGoal --- Get the owning coalition of the zone. -- @param #ZONE_GOAL_COALITION self - -- @return DCSCoalition.DCSCoalition#coalition Coalition. + -- @return #number Coalition. function ZONE_GOAL_COALITION:GetCoalition() return self.Coalition end --- Get the previous coalition, i.e. the one owning the zone before the current one. -- @param #ZONE_GOAL_COALITION self - -- @return DCSCoalition.DCSCoalition#coalition Coalition. + -- @return #number Coalition. function ZONE_GOAL_COALITION:GetPreviousCoalition() return self.PreviousCoalition end diff --git a/Moose Development/Moose/Tasking/TaskInfo.lua b/Moose Development/Moose/Tasking/TaskInfo.lua index 858937ac5..4007230dc 100644 --- a/Moose Development/Moose/Tasking/TaskInfo.lua +++ b/Moose Development/Moose/Tasking/TaskInfo.lua @@ -256,7 +256,7 @@ end --- Add Cargo. -- @param #TASKINFO self --- @param Core.Cargo#CARGO Cargo +-- @param Cargo.Cargo#CARGO Cargo -- @param #number Order The display order, which is a number from 0 to 100. -- @param #TASKINFO.Detail Detail The detail Level. -- @param #boolean Keep (optional) If true, this would indicate that the planned taskinfo would be persistent when the task is completed, so that the original planned task info is used at the completed reports. diff --git a/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua index 37bb3afd4..be2086a2f 100644 --- a/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua +++ b/Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua @@ -128,7 +128,7 @@ do -- TASK_CAPTURE_DISPATCHER -- -- ## 2.2. Create a set of player groups. -- - -- What is also needed, is to have a set of @{Core.Group}s defined that contains the clients of the players. + -- What is also needed, is to have a set of @{Wrapper.Group}s defined that contains the clients of the players. -- -- -- Allocate the player slots, which must be aircraft (airplanes or helicopters), that can be manned by players. -- -- We use the method FilterPrefixes to filter those player groups that have client slots, as defined in the mission editor. From aa7d0b1e25e32db5d6bbeccd1c8ecb607e243c5d Mon Sep 17 00:00:00 2001 From: kaltokri Date: Tue, 31 Oct 2023 16:30:48 +0100 Subject: [PATCH 49/51] Fixed broken links --- Moose Development/Moose/Functional/RAT.lua | 2 +- Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Functional/RAT.lua b/Moose Development/Moose/Functional/RAT.lua index 52a8e9965..57a0783da 100644 --- a/Moose Development/Moose/Functional/RAT.lua +++ b/Moose Development/Moose/Functional/RAT.lua @@ -4605,7 +4605,7 @@ function RAT:_TaskHolding(P1, Altitude, Speed, Duration) end --- Function which is called after passing every waypoint. Info on waypoint is given and special functions are executed. --- @param Core.Group#GROUP group Group of aircraft. +-- @param Wrapper.Group#GROUP group Group of aircraft. -- @param #RAT rat RAT object. -- @param #number wp Waypoint index. Running number of the waypoints. Determines the actions to be executed. function RAT._WaypointFunction(group, rat, wp) diff --git a/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua b/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua index 00c05375f..9d6ecc544 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua @@ -301,7 +301,7 @@ do -- TASK_CARGO_CSAR -- @param #string Event The Event string. -- @param #string To The To State string. -- @param Wrapper.Unit#UNIT TaskUnit The Unit (Client) that PickedUp the cargo. You can use this to retrieve the PlayerName etc. - -- @param Core.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. + -- @param Cargo.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. --- OnAfter Transition Handler for Event CargoDeployed. -- @function [parent=#TASK_CARGO_CSAR] OnAfterCargoDeployed @@ -310,7 +310,7 @@ do -- TASK_CARGO_CSAR -- @param #string Event The Event string. -- @param #string To The To State string. -- @param Wrapper.Unit#UNIT TaskUnit The Unit (Client) that Deployed the cargo. You can use this to retrieve the PlayerName etc. - -- @param Core.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. + -- @param Cargo.Cargo#CARGO Cargo The Cargo that got PickedUp by the TaskUnit. You can use this to check Cargo Status. -- @param Core.Zone#ZONE DeployZone The zone where the Cargo got Deployed or UnBoarded. local Fsm = self:GetUnitProcess() @@ -318,7 +318,7 @@ do -- TASK_CARGO_CSAR local CargoReport = REPORT:New( "Rescue a downed pilot from the following position:") SetCargo:ForEachCargo( - --- @param Core.Cargo#CARGO Cargo + --- @param Cargo.Cargo#CARGO Cargo function( Cargo ) local CargoType = Cargo:GetType() local CargoName = Cargo:GetName() @@ -358,7 +358,7 @@ do -- TASK_CARGO_CSAR -- Loop the CargoSet (so evaluate each Cargo in the SET_CARGO ). for CargoID, CargoData in pairs( Set ) do - local Cargo = CargoData -- Core.Cargo#CARGO + local Cargo = CargoData -- Cargo.Cargo#CARGO self:F( { Cargo = Cargo:GetName(), CargoDeployed = Cargo:IsDeployed() } ) From e032781a92ceb06aa936381ec4dfe7764c0f9b3b Mon Sep 17 00:00:00 2001 From: kaltokri Date: Tue, 31 Oct 2023 16:36:51 +0100 Subject: [PATCH 50/51] Changed Core.Group to Wrapper.Group --- Moose Development/Moose/AI/AI_Escort.lua | 28 +++++++++---------- .../Moose/AI/AI_Escort_Request.lua | 2 +- Moose Development/Moose/AI/AI_Formation.lua | 6 ++-- .../Moose/Tasking/Task_Cargo_CSAR.lua | 2 +- .../Moose/Tasking/Task_Cargo_Transport.lua | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Moose Development/Moose/AI/AI_Escort.lua b/Moose Development/Moose/AI/AI_Escort.lua index 4f4429c9c..4eeba1fe3 100644 --- a/Moose Development/Moose/AI/AI_Escort.lua +++ b/Moose Development/Moose/AI/AI_Escort.lua @@ -261,7 +261,7 @@ function AI_ESCORT:New( EscortUnit, EscortGroupSet, EscortName, EscortBriefing ) EscortGroupSet:ForEachGroup( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) -- Set EscortGroup known at EscortUnit. if not self.PlayerUnit._EscortGroups then @@ -343,7 +343,7 @@ function AI_ESCORT:onafterStart( EscortGroupSet ) self:F() EscortGroupSet:ForEachGroup( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) EscortGroup:WayPointInitialize() @@ -381,7 +381,7 @@ function AI_ESCORT:onafterStart( EscortGroupSet ) self:_InitFlightMenus() self.EscortGroupSet:ForSomeGroupAlive( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) self:_InitEscortMenus( EscortGroup ) @@ -412,7 +412,7 @@ function AI_ESCORT:onafterStop( EscortGroupSet ) self:F() EscortGroupSet:ForEachGroup( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) EscortGroup:WayPointInitialize() @@ -561,7 +561,7 @@ function AI_ESCORT:SetFlightMenuFormation( Formation ) local MenuFlightFormationID = MENU_GROUP_COMMAND:New( self.PlayerGroup, Formation, FlightMenuFormation, function ( self, Formation, ... ) self.EscortGroupSet:ForSomeGroupAlive( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup, self, Formation, Arguments ) if EscortGroup:IsAir() then self:E({FormationID=FormationID}) @@ -1242,7 +1242,7 @@ function AI_ESCORT:MenuAssistedAttack() self:F() self.EscortGroupSet:ForSomeGroupAlive( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) if not EscortGroup:IsAir() then -- Request assistance from other escorts. @@ -1439,7 +1439,7 @@ function AI_ESCORT:_FlightHoldPosition( OrbitGroup, OrbitHeight, OrbitSeconds ) local EscortUnit = self.PlayerUnit self.EscortGroupSet:ForEachGroupAlive( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup, OrbitGroup ) if EscortGroup:IsAir() then if OrbitGroup == nil then @@ -1467,7 +1467,7 @@ end function AI_ESCORT:_FlightJoinUp() self.EscortGroupSet:ForEachGroupAlive( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) if EscortGroup:IsAir() then self:_JoinUp( EscortGroup ) @@ -1494,7 +1494,7 @@ end function AI_ESCORT:_FlightFormationTrail( XStart, XSpace, YStart ) self.EscortGroupSet:ForEachGroupAlive( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) if EscortGroup:IsAir() then self:_EscortFormationTrail( EscortGroup, XStart, XSpace, YStart ) @@ -1521,7 +1521,7 @@ end function AI_ESCORT:_FlightFormationStack( XStart, XSpace, YStart, YSpace ) self.EscortGroupSet:ForEachGroupAlive( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) if EscortGroup:IsAir() then self:_EscortFormationStack( EscortGroup, XStart, XSpace, YStart, YSpace ) @@ -1544,7 +1544,7 @@ end function AI_ESCORT:_FlightFlare( Color, Message ) self.EscortGroupSet:ForEachGroupAlive( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) if EscortGroup:IsAir() then self:_Flare( EscortGroup, Color, Message ) @@ -1567,7 +1567,7 @@ end function AI_ESCORT:_FlightSmoke( Color, Message ) self.EscortGroupSet:ForEachGroupAlive( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) if EscortGroup:IsAir() then self:_Smoke( EscortGroup, Color, Message ) @@ -1598,7 +1598,7 @@ end function AI_ESCORT:_FlightSwitchReportNearbyTargets( ReportTargets ) self.EscortGroupSet:ForEachGroupAlive( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) if EscortGroup:IsAir() then self:_EscortSwitchReportNearbyTargets( EscortGroup, ReportTargets ) @@ -1806,7 +1806,7 @@ end function AI_ESCORT:_FlightAttackTarget( DetectedItem ) self.EscortGroupSet:ForEachGroupAlive( - -- @param Core.Group#GROUP EscortGroup + -- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup, DetectedItem ) if EscortGroup:IsAir() then self:_AttackTarget( EscortGroup, DetectedItem ) diff --git a/Moose Development/Moose/AI/AI_Escort_Request.lua b/Moose Development/Moose/AI/AI_Escort_Request.lua index eba5ea8cd..c5d1782e0 100644 --- a/Moose Development/Moose/AI/AI_Escort_Request.lua +++ b/Moose Development/Moose/AI/AI_Escort_Request.lua @@ -297,7 +297,7 @@ function AI_ESCORT_REQUEST:onafterStop( EscortGroupSet ) self:F() EscortGroupSet:ForEachGroup( - --- @param Core.Group#GROUP EscortGroup + --- @param Wrapper.Group#GROUP EscortGroup function( EscortGroup ) EscortGroup:WayPointInitialize() diff --git a/Moose Development/Moose/AI/AI_Formation.lua b/Moose Development/Moose/AI/AI_Formation.lua index f09c8ad63..949ad9875 100644 --- a/Moose Development/Moose/AI/AI_Formation.lua +++ b/Moose Development/Moose/AI/AI_Formation.lua @@ -996,7 +996,7 @@ function AI_FORMATION:SetFlightModeMission( FollowGroup ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission ) else self.FollowGroupSet:ForSomeGroupAlive( - --- @param Core.Group#GROUP EscortGroup + --- @param Wrapper.Group#GROUP EscortGroup function( FollowGroup ) FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission ) @@ -1020,7 +1020,7 @@ function AI_FORMATION:SetFlightModeAttack( FollowGroup ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack ) else self.FollowGroupSet:ForSomeGroupAlive( - --- @param Core.Group#GROUP EscortGroup + --- @param Wrapper.Group#GROUP EscortGroup function( FollowGroup ) FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack ) @@ -1044,7 +1044,7 @@ function AI_FORMATION:SetFlightModeFormation( FollowGroup ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation ) else self.FollowGroupSet:ForSomeGroupAlive( - --- @param Core.Group#GROUP EscortGroup + --- @param Wrapper.Group#GROUP EscortGroup function( FollowGroup ) FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation ) diff --git a/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua b/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua index 9d6ecc544..3a9cc0522 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua @@ -137,7 +137,7 @@ do -- TASK_CARGO_CSAR -- -- The cargoset "CargoSet" will embed all defined cargo of type "Pilots" (prefix) into its set. -- local CargoGroup = CARGO_GROUP:New( PilotGroup, "Pilots", "Downed Pilot", 500 ) -- - -- What is also needed, is to have a set of @{#Core.Group}s defined that contains the clients of the players. + -- What is also needed, is to have a set of @{#Wrapper.Group}s defined that contains the clients of the players. -- -- -- Allocate the Transport, which are the helicopter to retrieve the pilot, that can be manned by players. -- local GroupSet = SET_GROUP:New():FilterPrefixes( "Transport" ):FilterStart() diff --git a/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua b/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua index af0431bf5..95ddc6fbc 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua @@ -123,7 +123,7 @@ do -- TASK_CARGO_TRANSPORT -- -- The cargoset "CargoSet" will embed all defined cargo of type "Pilots" (prefix) into its set. -- local CargoGroup = CARGO_GROUP:New( PilotGroup, "Cargo", "Engineer Team 1", 500 ) -- - -- What is also needed, is to have a set of Core.Groups defined that contains the clients of the players. + -- What is also needed, is to have a set of Wrapper.Groups defined that contains the clients of the players. -- -- -- Allocate the Transport, which are the helicopter to retrieve the pilot, that can be manned by players. -- local GroupSet = SET_GROUP:New():FilterPrefixes( "Transport" ):FilterStart() From 1561f49c9c1dab73025577a232ca1432aacbcec7 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 31 Oct 2023 19:53:20 +0100 Subject: [PATCH 51/51] Lings - Fixed link in Core.Condition (will add demo miz) - Fixed lings in Task_Cargo_CSAR und Task_Cargo_Transport --- Moose Development/Moose/Core/Condition.lua | 2 +- Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua | 2 +- Moose Development/Moose/Tasking/Task_Cargo_Transport.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Core/Condition.lua b/Moose Development/Moose/Core/Condition.lua index 7e9842a7b..9d65f43cd 100644 --- a/Moose Development/Moose/Core/Condition.lua +++ b/Moose Development/Moose/Core/Condition.lua @@ -9,7 +9,7 @@ -- -- ## Example Missions: -- --- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Operation). +-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Core/Condition). -- -- === -- diff --git a/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua b/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua index 3a9cc0522..f0c14b227 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua @@ -137,7 +137,7 @@ do -- TASK_CARGO_CSAR -- -- The cargoset "CargoSet" will embed all defined cargo of type "Pilots" (prefix) into its set. -- local CargoGroup = CARGO_GROUP:New( PilotGroup, "Pilots", "Downed Pilot", 500 ) -- - -- What is also needed, is to have a set of @{#Wrapper.Group}s defined that contains the clients of the players. + -- What is also needed, is to have a set of @{Wrapper.Group}s defined that contains the clients of the players. -- -- -- Allocate the Transport, which are the helicopter to retrieve the pilot, that can be manned by players. -- local GroupSet = SET_GROUP:New():FilterPrefixes( "Transport" ):FilterStart() diff --git a/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua b/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua index 95ddc6fbc..6f8137c6a 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_Transport.lua @@ -123,7 +123,7 @@ do -- TASK_CARGO_TRANSPORT -- -- The cargoset "CargoSet" will embed all defined cargo of type "Pilots" (prefix) into its set. -- local CargoGroup = CARGO_GROUP:New( PilotGroup, "Cargo", "Engineer Team 1", 500 ) -- - -- What is also needed, is to have a set of Wrapper.Groups defined that contains the clients of the players. + -- What is also needed, is to have a set of @{Wrapper.Group}s defined that contains the clients of the players. -- -- -- Allocate the Transport, which are the helicopter to retrieve the pilot, that can be manned by players. -- local GroupSet = SET_GROUP:New():FilterPrefixes( "Transport" ):FilterStart()