From a7b444dfea6ccab899f7c635252771b0fada6825 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 09:29:55 +0200 Subject: [PATCH 01/44] Update OpsGroup.lua --- Moose Development/Moose/Ops/OpsGroup.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index b8f52b52e..a7a75c28f 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -340,6 +340,8 @@ OPSGROUP.version="0.7.1" -- TODO: Invisible/immortal. -- TODO: F10 menu. -- TODO: Add pseudo function. +-- TODO: EPLRS datalink. +-- TODO: Emission on/off. ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- Constructor From e198aae1dd851ee991d8b6481d2b2fb7add2b08d Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 10:28:18 +0200 Subject: [PATCH 02/44] Update ATIS.lua --- Moose Development/Moose/Ops/ATIS.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index 001b43f1b..1532cd1b3 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -580,6 +580,7 @@ ATIS.version="0.9.1" -- DONE: Metric units. -- DONE: Set UTC correction. -- DONE: Set magnetic variation. +-- DONE: New DCS 2.7 weather presets. ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- Constructor From 41e0f92cc07413cc631ee2a5c95763a5237a4130 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 19:49:04 +0200 Subject: [PATCH 03/44] Update Unit.lua --- Moose Development/Moose/Wrapper/Unit.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 1d1df1b63..0a0d50ba3 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -1429,7 +1429,7 @@ function UNIT:GetTemplateFuel() return nil end ---- GROUND - Switch on/off radar emissions +--- GROUND - Switch on/off radar emissions. -- @param #UNIT self -- @param #boolean switch function UNIT:EnableEmission(switch) From 38b40e2931eac9632576b65c41cf8f8a0ded9449 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 21:16:34 +0200 Subject: [PATCH 04/44] Update Unit.lua --- Moose Development/Moose/Wrapper/Unit.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 0a0d50ba3..38033821c 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -1162,8 +1162,6 @@ end - - --- Returns if the unit is a friendly unit. -- @param #UNIT self -- @return #boolean IsFriendly evaluation result. From 42d253a9cacbe9094970da5f941f7fba6e0e3426 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 21:22:09 +0200 Subject: [PATCH 05/44] Update Unit.lua --- Moose Development/Moose/Wrapper/Unit.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 38033821c..00060a946 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -1162,6 +1162,7 @@ end + --- Returns if the unit is a friendly unit. -- @param #UNIT self -- @return #boolean IsFriendly evaluation result. From 6519c30b3a2e81c6c206212d1119b82d9e3981d0 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 21:26:26 +0200 Subject: [PATCH 06/44] Update Unit.lua --- Moose Development/Moose/Wrapper/Unit.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 00060a946..38033821c 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -1162,7 +1162,6 @@ end - --- Returns if the unit is a friendly unit. -- @param #UNIT self -- @return #boolean IsFriendly evaluation result. From 40415ef93389dc9c931a09839d0dd7306c8864b0 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 21:31:55 +0200 Subject: [PATCH 07/44] Update Unit.lua --- Moose Development/Moose/Wrapper/Unit.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 38033821c..00060a946 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -1162,6 +1162,7 @@ end + --- Returns if the unit is a friendly unit. -- @param #UNIT self -- @return #boolean IsFriendly evaluation result. From 2289e16d91dbbcb7009eca406e750ee4d86da2e0 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 21:45:17 +0200 Subject: [PATCH 08/44] Update Unit.lua --- Moose Development/Moose/Wrapper/Unit.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 00060a946..0a0d50ba3 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -1163,6 +1163,7 @@ end + --- Returns if the unit is a friendly unit. -- @param #UNIT self -- @return #boolean IsFriendly evaluation result. From 3e470e557d25f86476ecdcddacbd0b8ad01d9435 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 22:19:27 +0200 Subject: [PATCH 09/44] Update Unit.lua --- Moose Development/Moose/Wrapper/Unit.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 0a0d50ba3..65199d97d 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -154,8 +154,8 @@ function UNIT:Name() return self.UnitName end - ---- @param #UNIT self +--- Get the DCS unit object. +-- @param #UNIT self -- @return DCS#Unit function UNIT:GetDCSObject() From 7106efbc049c17ce587abcf41dc4d021466c0a00 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 22:56:54 +0200 Subject: [PATCH 10/44] Update Unit.lua --- Moose Development/Moose/Wrapper/Unit.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 65199d97d..41b6fed81 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -154,7 +154,7 @@ function UNIT:Name() return self.UnitName end ---- Get the DCS unit object. +--- Get the DCS unit object you want. -- @param #UNIT self -- @return DCS#Unit function UNIT:GetDCSObject() From 4b6aa3b56fa1e9da1eafc29a53c5e4b974153175 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 23:29:31 +0200 Subject: [PATCH 11/44] Update appveyor.yml --- .appveyor/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml index 7fcd96a10..9cfb705f8 100644 --- a/.appveyor/appveyor.yml +++ b/.appveyor/appveyor.yml @@ -70,7 +70,7 @@ build_script: "Authorization" = "Bearer $token" "Content-type" = "application/json" } - $RequestBody = @{ accountName = 'FlightControl-Master'; projectSlug = 'moose-docs'; branch = "$env:appveyor_repo_branch"; environmentVariables = @{} } | ConvertTo-Json + $RequestBody = @{ accountName = 'funkyfranky'; 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 } From 5aeb48006986c98f04cfbffb637627e8505acad1 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 23:29:53 +0200 Subject: [PATCH 12/44] Update ATIS.lua --- Moose Development/Moose/Ops/ATIS.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index 1532cd1b3..569497197 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -581,6 +581,7 @@ ATIS.version="0.9.1" -- DONE: Set UTC correction. -- DONE: Set magnetic variation. -- DONE: New DCS 2.7 weather presets. +-- DONE: ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- Constructor From 6d53a30b1fef7c13bc0ba1ac97ac3d47239788a7 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 23:36:14 +0200 Subject: [PATCH 13/44] Update appveyor.yml --- .appveyor/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml index 9cfb705f8..6b0baf00f 100644 --- a/.appveyor/appveyor.yml +++ b/.appveyor/appveyor.yml @@ -57,7 +57,7 @@ build_script: "Authorization" = "Bearer $token" "Content-type" = "application/json" } - $RequestBody = @{ accountName = 'FlightControl-Master'; projectSlug = 'moose-include'; branch = "$env:appveyor_repo_branch"; environmentVariables = @{} } | ConvertTo-Json + $RequestBody = @{ accountName = 'funkyfranky'; 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 } From 1f949463aaa33c2ed0db2ba09d731ca96c77addc Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 17 Apr 2021 23:36:49 +0200 Subject: [PATCH 14/44] Update ATIS.lua --- Moose Development/Moose/Ops/ATIS.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index 569497197..91333138d 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -581,7 +581,7 @@ ATIS.version="0.9.1" -- DONE: Set UTC correction. -- DONE: Set magnetic variation. -- DONE: New DCS 2.7 weather presets. --- DONE: +-- DONE: whatever ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- Constructor From 3675ddaf0460c63fdba8282ea337e636ad1394ae Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Sun, 18 Apr 2021 12:09:37 +0200 Subject: [PATCH 15/44] Revert "Update Group.lua" --- Moose Development/Moose/Wrapper/Group.lua | 53 +---------------------- 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua index 4ab573ec0..9c6c0a79c 100644 --- a/Moose Development/Moose/Wrapper/Group.lua +++ b/Moose Development/Moose/Wrapper/Group.lua @@ -2169,40 +2169,6 @@ function GROUP:GetThreatLevel() return threatlevelMax end ---- Get the unit in the group with the highest threat level, which is still alive. --- @param #GROUP self --- @return Wrapper.Unit#UNIT The most dangerous unit in the group. --- @return #number Threat level of the unit. -function GROUP:GetHighestThreat() - - -- Get units of the group. - local units=self:GetUnits() - - if units then - - local threat=nil ; local maxtl=0 - for _,_unit in pairs(units or {}) do - local unit=_unit --Wrapper.Unit#UNIT - - if unit and unit:IsAlive() then - - -- Threat level of group. - local tl=unit:GetThreatLevel() - - -- Check if greater the current threat. - if tl>maxtl then - maxtl=tl - threat=unit - end - end - end - - return threat, maxtl - end - - return nil, nil -end - --- Returns true if the first unit of the GROUP is in the air. -- @param Wrapper.Group#GROUP self @@ -2585,23 +2551,6 @@ do -- Players end ---- GROUND - Switch on/off radar emissions --- @param #GROUP self --- @param #boolean switch -function GROUP:EnableEmission(switch) - self:F2( self.GroupName ) - local switch = switch or false - - local DCSUnit = self:GetDCSObject() - - if DCSUnit then - - DCSUnit:enableEmission(switch) - - end - -end - --do -- Smoke -- ----- Signal a flare at the position of the GROUP. @@ -2692,4 +2641,4 @@ end -- -- -- ---end +--end \ No newline at end of file From 8ba3a30278e439aa1787337b792d139f889e4104 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 18 Apr 2021 14:34:36 +0200 Subject: [PATCH 16/44] Update appveyor.yml --- .appveyor/appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml index 6b0baf00f..7fcd96a10 100644 --- a/.appveyor/appveyor.yml +++ b/.appveyor/appveyor.yml @@ -57,7 +57,7 @@ build_script: "Authorization" = "Bearer $token" "Content-type" = "application/json" } - $RequestBody = @{ accountName = 'funkyfranky'; projectSlug = 'moose-include'; branch = "$env:appveyor_repo_branch"; environmentVariables = @{} } | ConvertTo-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 } @@ -70,7 +70,7 @@ build_script: "Authorization" = "Bearer $token" "Content-type" = "application/json" } - $RequestBody = @{ accountName = 'funkyfranky'; projectSlug = 'moose-docs'; branch = "$env:appveyor_repo_branch"; environmentVariables = @{} } | ConvertTo-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 } From 91b6da70afa3d7462bdaf435aa0e66ac80431953 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 18 Apr 2021 14:49:01 +0200 Subject: [PATCH 17/44] Update Event.lua --- Moose Development/Moose/Core/Event.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Core/Event.lua b/Moose Development/Moose/Core/Event.lua index 7bb39a1b7..07ddcfdf1 100644 --- a/Moose Development/Moose/Core/Event.lua +++ b/Moose Development/Moose/Core/Event.lua @@ -254,7 +254,7 @@ EVENTS = { -- Note that at the beginning of each field description, there is an indication which field will be populated depending on the object type involved in the Event: -- -- * A (Object.Category.)UNIT : A UNIT object type is involved in the Event. --- * A (Object.Category.)STATIC : A STATIC object type is involved in the Event.µ +-- * A (Object.Category.)STATIC : A STATIC object type is involved in the Event. -- -- @type EVENTDATA -- @field #number id The identifier of the event. From 9f095a1d280922516706c75e24a44a89dc396d07 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 18 Apr 2021 22:14:51 +0200 Subject: [PATCH 18/44] Update appveyor.yml - Token for my appveyor account. --- .appveyor/appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml index 7fcd96a10..3649b6c8f 100644 --- a/.appveyor/appveyor.yml +++ b/.appveyor/appveyor.yml @@ -52,7 +52,7 @@ build_script: if( $env:appveyor_repo_branch -eq 'master' -or $env:appveyor_repo_branch -eq 'develop' ) { $apiUrl = 'https://ci.appveyor.com/api' - $token = 'qts80b5kpq0ooj4x6vvw' + $token = 'v2.bg2hb0fnxm96dr5f8yb' $headers = @{ "Authorization" = "Bearer $token" "Content-type" = "application/json" @@ -65,7 +65,7 @@ build_script: if( $env:appveyor_repo_branch -eq 'master' -or $env:appveyor_repo_branch -eq 'develop' ) { $apiUrl = 'https://ci.appveyor.com/api' - $token = 'qts80b5kpq0ooj4x6vvw' + $token = 'v2.bg2hb0fnxm96dr5f8yb' $headers = @{ "Authorization" = "Bearer $token" "Content-type" = "application/json" From 2d6545429aadb161ecbfd944b4495e61a5428686 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 18 Apr 2021 22:16:46 +0200 Subject: [PATCH 19/44] Update Unit.lua - Appveyor test --- Moose Development/Moose/Wrapper/Unit.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 41b6fed81..65199d97d 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -154,7 +154,7 @@ function UNIT:Name() return self.UnitName end ---- Get the DCS unit object you want. +--- Get the DCS unit object. -- @param #UNIT self -- @return DCS#Unit function UNIT:GetDCSObject() From 1d6be07cff0fd5172f1f7399f13d0ebfaee306c7 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 18 Apr 2021 22:59:20 +0200 Subject: [PATCH 20/44] Update appveyor.yml --- .appveyor/appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml index 3649b6c8f..687110cf4 100644 --- a/.appveyor/appveyor.yml +++ b/.appveyor/appveyor.yml @@ -51,6 +51,7 @@ 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.bg2hb0fnxm96dr5f8yb' $headers = @{ From 0577940d58658221262488a11d592cf7848e08fd Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 19 Apr 2021 20:38:50 +0200 Subject: [PATCH 21/44] Update appveyor.yml --- .appveyor/appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml index 687110cf4..ad1246a3c 100644 --- a/.appveyor/appveyor.yml +++ b/.appveyor/appveyor.yml @@ -53,7 +53,7 @@ build_script: { echo "Hello World!" $apiUrl = 'https://ci.appveyor.com/api' - $token = 'v2.bg2hb0fnxm96dr5f8yb' + $token = 'v2.6hcv3ige78kg3yvg4ge8' $headers = @{ "Authorization" = "Bearer $token" "Content-type" = "application/json" @@ -66,7 +66,7 @@ build_script: if( $env:appveyor_repo_branch -eq 'master' -or $env:appveyor_repo_branch -eq 'develop' ) { $apiUrl = 'https://ci.appveyor.com/api' - $token = 'v2.bg2hb0fnxm96dr5f8yb' + $token = 'v2.6hcv3ige78kg3yvg4ge8' $headers = @{ "Authorization" = "Bearer $token" "Content-type" = "application/json" From 40700a387c273f87e6cbf932e5dc633b9b6dc6da Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 19 Apr 2021 20:42:24 +0200 Subject: [PATCH 22/44] Update appveyor.yml --- .appveyor/appveyor.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml index ad1246a3c..0ab5e1e66 100644 --- a/.appveyor/appveyor.yml +++ b/.appveyor/appveyor.yml @@ -27,23 +27,23 @@ init: install: # 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 +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 +C:\ProgramData\chocolatey\lib +C:\ProgramData\chocolatey\bin From b2eba4911a2459f4250dbbc8525a57986bb22152 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 19 Apr 2021 20:44:50 +0200 Subject: [PATCH 23/44] Update appveyor.yml --- .appveyor/appveyor.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml index 0ab5e1e66..f59be974d 100644 --- a/.appveyor/appveyor.yml +++ b/.appveyor/appveyor.yml @@ -27,18 +27,18 @@ init: install: # 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" +- 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 +- call luarocks install luasrcdiet +- call luarocks install checks +- call luarocks install luadocumentor +- call luarocks install luacheck #cache: From 3749686882ef13c1c1e9d747c9f01459c732475c Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 19 Apr 2021 20:46:30 +0200 Subject: [PATCH 24/44] Update appveyor.yml --- .appveyor/appveyor.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml index f59be974d..78c43a456 100644 --- a/.appveyor/appveyor.yml +++ b/.appveyor/appveyor.yml @@ -26,19 +26,20 @@ init: # - 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 +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: From 82da7a8f24fc4c17bc2d4c16c3f60bde44fb8818 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 19 Apr 2021 20:47:16 +0200 Subject: [PATCH 25/44] Update appveyor.yml --- .appveyor/appveyor.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml index 78c43a456..a89bb8662 100644 --- a/.appveyor/appveyor.yml +++ b/.appveyor/appveyor.yml @@ -29,17 +29,17 @@ 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 +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: From 3b2af6ea07ecd68b0b4aa511cfb6ca360f8eb20d Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 19 Apr 2021 20:49:17 +0200 Subject: [PATCH 26/44] Update appveyor.yml --- .appveyor/appveyor.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml index a89bb8662..2af7fd529 100644 --- a/.appveyor/appveyor.yml +++ b/.appveyor/appveyor.yml @@ -28,21 +28,21 @@ init: 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 + 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: +cache: C:\ProgramData\chocolatey\lib C:\ProgramData\chocolatey\bin From 8ae6192a5feb5ff6e5c1ba8c47aa479e9d9a3b95 Mon Sep 17 00:00:00 2001 From: IdefixRC Date: Tue, 20 Apr 2021 15:43:45 +0800 Subject: [PATCH 27/44] Create Airbase.lua New Syria Airbases added to list: H4, Gaziantep, Rosh Pina, Sayqal, Shayrat, Tiyas, Tha'lah and Naqoura --- Moose Development/Moose/Wrapper/Airbase.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 317c3b448..df18bc9ef 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -361,6 +361,14 @@ AIRBASE.TheChannel = { -- * AIRBASE.Syria.Beirut_Rafic_Hariri -- * AIRBASE.Syria.An_Nasiriyah -- * AIRBASE.Syria.Abu_al_Duhur +-- * AIRBASE.Syria.H4 +-- * AIRBASE.Syria.Gaziantep +-- * AIRBASE.Syria.Rosh_Pina +-- * AIRBASE.Syria.Sayqal +-- * AIRBASE.Syria.Shayrat +-- * AIRBASE.Syria.Tiyas +-- * AIRBASE.Syria.Tha_lah +-- * AIRBASE.Syria.Naqoura -- -- @field Syria AIRBASE.Syria={ @@ -397,6 +405,14 @@ AIRBASE.Syria={ ["Beirut_Rafic_Hariri"]="Beirut-Rafic Hariri", ["An_Nasiriyah"]="An Nasiriyah", ["Abu_al_Duhur"]="Abu al-Duhur", + ["H4"]="H4", + ["Gaziantep"]="Gaziantep", + ["Rosh_Pina"]="Rosh Pina", + ["Sayqal"]="Sayqal", + ["Shayrat"]="Shayrat", + ["Tiyas"]="Tiyas", + ["Tha_lah"]="Tha'lah", + ["Naqoura"]="Naqoura", } From 2531a25c9e127059ef49306f6761a0dfba965707 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Tue, 20 Apr 2021 11:36:59 +0200 Subject: [PATCH 28/44] Update Group.lua Add EnableEmissions --- Moose Development/Moose/Wrapper/Group.lua | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua index 9c6c0a79c..1a2f00fa8 100644 --- a/Moose Development/Moose/Wrapper/Group.lua +++ b/Moose Development/Moose/Wrapper/Group.lua @@ -2551,6 +2551,23 @@ do -- Players end +--- GROUND - Switch on/off radar emissions +-- @param #GROUP self +-- @param #boolean switch +function GROUP:EnableEmission(switch) + self:F2( self.GroupName ) + local switch = switch or false + + local DCSUnit = self:GetDCSObject() + + if DCSUnit then + + DCSUnit:enableEmission(switch) + + end + +end + --do -- Smoke -- ----- Signal a flare at the position of the GROUP. @@ -2641,4 +2658,4 @@ end -- -- -- ---end \ No newline at end of file +--end From a8549e2b7d4df7c5f89c1c9110cc8ff41c3c05e6 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Tue, 20 Apr 2021 16:50:00 +0200 Subject: [PATCH 29/44] Update Airbase.lua --- Moose Development/Moose/Wrapper/Airbase.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index d015bbde9..2f3c1603e 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -362,6 +362,14 @@ AIRBASE.TheChannel = { -- * AIRBASE.Syria.Beirut_Rafic_Hariri -- * AIRBASE.Syria.An_Nasiriyah -- * AIRBASE.Syria.Abu_al_Duhur +-- * AIRBASE.Syria.H4 +-- * AIRBASE.Syria.Gaziantep +-- * AIRBASE.Syria.Rosh_Pina +-- * AIRBASE.Syria.Sayqal +-- * AIRBASE.Syria.Shayrat +-- * AIRBASE.Syria.Tiyas +-- * AIRBASE.Syria.Tha_lah +-- * AIRBASE.Syria.Naqoura -- -- @field Syria AIRBASE.Syria={ @@ -398,6 +406,14 @@ AIRBASE.Syria={ ["Beirut_Rafic_Hariri"]="Beirut-Rafic Hariri", ["An_Nasiriyah"]="An Nasiriyah", ["Abu_al_Duhur"]="Abu al-Duhur", + ["H4"]="H4", + ["Gaziantep"]="Gaziantep", + ["Rosh_Pina"]="Rosh Pina", + ["Sayqal"]="Sayqal", + ["Shayrat"]="Shayrat", + ["Tiyas"]="Tiyas", + ["Tha_lah"]="Tha'lah", + ["Naqoura"]="Naqoura", } From 18fca6461bb6ff7d08b73403475c40689fda84ac Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Tue, 20 Apr 2021 17:27:48 +0200 Subject: [PATCH 30/44] Update Group.lua --- Moose Development/Moose/Wrapper/Group.lua | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua index 9c6c0a79c..1a2f00fa8 100644 --- a/Moose Development/Moose/Wrapper/Group.lua +++ b/Moose Development/Moose/Wrapper/Group.lua @@ -2551,6 +2551,23 @@ do -- Players end +--- GROUND - Switch on/off radar emissions +-- @param #GROUP self +-- @param #boolean switch +function GROUP:EnableEmission(switch) + self:F2( self.GroupName ) + local switch = switch or false + + local DCSUnit = self:GetDCSObject() + + if DCSUnit then + + DCSUnit:enableEmission(switch) + + end + +end + --do -- Smoke -- ----- Signal a flare at the position of the GROUP. @@ -2641,4 +2658,4 @@ end -- -- -- ---end \ No newline at end of file +--end From 19eb9dca30a3c794c902e41ec3a6fe2200fdc004 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Tue, 20 Apr 2021 18:49:54 +0200 Subject: [PATCH 31/44] Update Utils.lua --- Moose Development/Moose/Utilities/Utils.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index d53284871..1e9c2597b 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -6,7 +6,7 @@ -- -- ### Contributions: -- --- * FlightControl : Rework to OO framework +-- * FlightControl : Rework to OO framework. -- -- @module Utils -- @image MOOSE.JPG From 62c42adebc4a98614174fdf8af1f1666a0ccc0b2 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Wed, 21 Apr 2021 15:48:54 +0200 Subject: [PATCH 32/44] Update DCS.lua --- Moose Development/Moose/DCS.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/DCS.lua b/Moose Development/Moose/DCS.lua index 9fcac18cb..92052d5cf 100644 --- a/Moose Development/Moose/DCS.lua +++ b/Moose Development/Moose/DCS.lua @@ -1226,7 +1226,7 @@ do -- Group -- @param #Group self -- @return #number - --- Returns initial size of the group. If some of the units will be destroyed, initial size of the group will not be changed. Initial size limits the unitNumber parameter for Group.getUnit() function. + --- Returns initial size of the group. If some of the units will be destroyed, initial size of the group will not be changed; Initial size limits the unitNumber parameter for Group.getUnit() function. -- @function [parent=#Group] getInitialSize -- @param #Group self -- @return #number From f4f12f786cfb7afd9594a33c5d9eb1c2f1c2c077 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Wed, 21 Apr 2021 18:52:44 +0200 Subject: [PATCH 33/44] Update Airboss.lua Escape error --- Moose Development/Moose/Ops/Airboss.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 12370b7a7..cf5057e81 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -17846,7 +17846,7 @@ function AIRBOSS:onbeforeLoad(From, Event, To, path, filename) -- Check default path. if path==nil and not lfs then - self:E(self.lid.."WARNING: lfs not desanitized. Results will be saved in DCS installation root directory rather than your \"Saved Games\DCS\" folder.") + self:E(self.lid.."WARNING: lfs not desanitized. Results will be saved in DCS installation root directory rather than your \"Saved Games\\DCS\" folder.") end -- Set path or default. From a1a414925fb61d52f58d2728f7479cd2b2d71dd5 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Thu, 22 Apr 2021 08:19:56 +0200 Subject: [PATCH 34/44] Update Airboss.lua --- Moose Development/Moose/Ops/Airboss.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 041843d56..dc3de77a3 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -18037,7 +18037,7 @@ function AIRBOSS:onbeforeLoad(From, Event, To, path, filename) -- Check default path. if path==nil and not lfs then - self:E(self.lid.."WARNING: lfs not desanitized. Results will be saved in DCS installation root directory rather than your \"Saved Games\DCS\" folder.") + self:E(self.lid.."WARNING: lfs not desanitized. Results will be saved in DCS installation root directory rather than your \"Saved Games\\DCS\" folder.") end -- Set path or default. From 9d6851adec13578a3fb968bdd98f4a14847917fe Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Thu, 22 Apr 2021 08:30:19 +0200 Subject: [PATCH 35/44] Update Airboss.lua Escape error 17933 --- Moose Development/Moose/Ops/Airboss.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index dc3de77a3..38d04d4ff 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -17930,7 +17930,7 @@ function AIRBOSS:onbeforeSave(From, Event, To, path, filename) -- Check default path. if path==nil and not lfs then - self:E(self.lid.."WARNING: lfs not desanitized. Results will be saved in DCS installation root directory rather than your \"Saved Games\DCS\" folder.") + self:E(self.lid.."WARNING: lfs not desanitized. Results will be saved in DCS installation root directory rather than your \"Saved Games\\DCS\" folder.") end return true From 2475f22937e63fc3e3f2b26080a922368a634038 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Thu, 22 Apr 2021 10:08:57 +0200 Subject: [PATCH 36/44] Create .luacheckrc --- .luacheckrc | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .luacheckrc diff --git a/.luacheckrc b/.luacheckrc new file mode 100644 index 000000000..b29cbbc22 --- /dev/null +++ b/.luacheckrc @@ -0,0 +1,54 @@ +ignore = { + "011", -- A syntax error. + "021", -- An invalid inline option. + "022", -- An unpaired inline push directive. + "023", -- An unpaired inline pop directive. + "111", -- Setting an undefined global variable. + "112", -- Mutating an undefined global variable. + "113", -- Accessing an undefined global variable. + "121", -- Setting a read-only global variable. + "122", -- Setting a read-only field of a global variable. + "131", -- Unused implicitly defined global variable. + "142", -- Setting an undefined field of a global variable. + "143", -- Accessing an undefined field of a global variable. + "211", -- Unused local variable. + "212", -- Unused argument. + "213", -- Unused loop variable. + "221", -- Local variable is accessed but never set. + "231", -- Local variable is set but never accessed. + "232", -- An argument is set but never accessed. + "233", -- Loop variable is set but never accessed. + "241", -- Local variable is mutated but never accessed. + "311", -- Value assigned to a local variable is unused. + "312", -- Value of an argument is unused. + "313", -- Value of a loop variable is unused. + "314", -- Value of a field in a table literal is unused. + "321", -- Accessing uninitialized local variable. + "331", -- Value assigned to a local variable is mutated but never accessed. + "341", -- Mutating uninitialized local variable. + "411", -- Redefining a local variable. + "412", -- Redefining an argument. + "413", -- Redefining a loop variable. + "421", -- Shadowing a local variable. + "422", -- Shadowing an argument. + "423", -- Shadowing a loop variable. + "431", -- Shadowing an upvalue. + "432", -- Shadowing an upvalue argument. + "433", -- Shadowing an upvalue loop variable. + "511", -- Unreachable code. + "512", -- Loop can be executed at most once. + "521", -- Unused label. + "531", -- Left-hand side of an assignment is too short. + "532", -- Left-hand side of an assignment is too long. + "541", -- An empty do end block. + "542", -- An empty if branch. + "551", -- An empty statement. + "561", -- Cyclomatic complexity of a function is too high. + "571", -- A numeric for loop goes from #(expr) down to 1 or less without negative step. + "611", -- A line consists of nothing but whitespace. + "612", -- A line contains trailing whitespace. + "613", -- Trailing whitespace in a string. + "614", -- Trailing whitespace in a comment. + "621", -- Inconsistent indentation (SPACE followed by TAB). + "631", -- Line is too long. +} From 0259e41ce8f194737d4cddadd49bd1534bc152e7 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Thu, 22 Apr 2021 10:10:59 +0200 Subject: [PATCH 37/44] Create .luacheckrc --- .luacheckrc | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .luacheckrc diff --git a/.luacheckrc b/.luacheckrc new file mode 100644 index 000000000..b29cbbc22 --- /dev/null +++ b/.luacheckrc @@ -0,0 +1,54 @@ +ignore = { + "011", -- A syntax error. + "021", -- An invalid inline option. + "022", -- An unpaired inline push directive. + "023", -- An unpaired inline pop directive. + "111", -- Setting an undefined global variable. + "112", -- Mutating an undefined global variable. + "113", -- Accessing an undefined global variable. + "121", -- Setting a read-only global variable. + "122", -- Setting a read-only field of a global variable. + "131", -- Unused implicitly defined global variable. + "142", -- Setting an undefined field of a global variable. + "143", -- Accessing an undefined field of a global variable. + "211", -- Unused local variable. + "212", -- Unused argument. + "213", -- Unused loop variable. + "221", -- Local variable is accessed but never set. + "231", -- Local variable is set but never accessed. + "232", -- An argument is set but never accessed. + "233", -- Loop variable is set but never accessed. + "241", -- Local variable is mutated but never accessed. + "311", -- Value assigned to a local variable is unused. + "312", -- Value of an argument is unused. + "313", -- Value of a loop variable is unused. + "314", -- Value of a field in a table literal is unused. + "321", -- Accessing uninitialized local variable. + "331", -- Value assigned to a local variable is mutated but never accessed. + "341", -- Mutating uninitialized local variable. + "411", -- Redefining a local variable. + "412", -- Redefining an argument. + "413", -- Redefining a loop variable. + "421", -- Shadowing a local variable. + "422", -- Shadowing an argument. + "423", -- Shadowing a loop variable. + "431", -- Shadowing an upvalue. + "432", -- Shadowing an upvalue argument. + "433", -- Shadowing an upvalue loop variable. + "511", -- Unreachable code. + "512", -- Loop can be executed at most once. + "521", -- Unused label. + "531", -- Left-hand side of an assignment is too short. + "532", -- Left-hand side of an assignment is too long. + "541", -- An empty do end block. + "542", -- An empty if branch. + "551", -- An empty statement. + "561", -- Cyclomatic complexity of a function is too high. + "571", -- A numeric for loop goes from #(expr) down to 1 or less without negative step. + "611", -- A line consists of nothing but whitespace. + "612", -- A line contains trailing whitespace. + "613", -- Trailing whitespace in a string. + "614", -- Trailing whitespace in a comment. + "621", -- Inconsistent indentation (SPACE followed by TAB). + "631", -- Line is too long. +} From 5091ed7d6d564ba1764ef79ab59c1eb38f6e6198 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Thu, 22 Apr 2021 10:26:02 +0200 Subject: [PATCH 38/44] Update Airboss.lua --- Moose Development/Moose/Ops/Airboss.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index cf5057e81..a6924682d 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -17739,7 +17739,7 @@ function AIRBOSS:onbeforeSave(From, Event, To, path, filename) -- Check default path. if path==nil and not lfs then - self:E(self.lid.."WARNING: lfs not desanitized. Results will be saved in DCS installation root directory rather than your \"Saved Games\DCS\" folder.") + self:E(self.lid.."WARNING: lfs not desanitized. Results will be saved in DCS installation root directory rather than your \"Saved Games\\DCS\" folder.") end return true From aa13583aa7bfc4b817dc477e71746c8d56adca61 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Thu, 22 Apr 2021 12:39:35 +0200 Subject: [PATCH 39/44] Update README.md added badge --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7ba71d91c..976a47f96 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build status](https://ci.appveyor.com/api/projects/status/1y8nfmx7lwsn33tt?svg=true)](https://ci.appveyor.com/project/Applevangelist/MOOSE) + # MOOSE framework MOOSE is a **M**ission **O**bject **O**riented **S**cripting **E**nvironment, and is meant for mission designers in DCS World. @@ -50,9 +52,7 @@ This repository contains all the demonstration missions in packed format (*.miz) This repository contains all the demonstration missions in unpacked format. That means that there is no .miz file included, but all the .miz contents are unpacked. - - - + ## [MOOSE Web Site](https://flightcontrol-master.github.io/MOOSE_DOCS/) Documentation on the MOOSE class hierarchy, usage guides and background information can be found here for normal users, beta testers and contributors. From 9c6c2ec5ca735bf315d2d299fe6614762806a7e9 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Thu, 22 Apr 2021 12:46:37 +0200 Subject: [PATCH 40/44] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 5e42c0c93..fe5b6b4f8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,8 @@ local.properties # External tool builders .externalToolBuilders/ +# AppVeyor +.appveyor/ # CDT-specific .cproject From 459ff8038ba8ad2866a30a0006b0b91ad3e22c1a Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Fri, 23 Apr 2021 09:51:58 +0200 Subject: [PATCH 41/44] Update Controllable.lua Some Docu updates --- Moose Development/Moose/Wrapper/Controllable.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 951342d97..b07d09046 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -2910,7 +2910,7 @@ end --- Set option for Rules of Engagement (ROE). -- @param Wrapper.Controllable#CONTROLLABLE self -- @param #number ROEvalue ROE value. See ENUMS.ROE. --- @return Wrapper.Controllable#CONTROLLABLE self +-- @return #CONTROLLABLE self function CONTROLLABLE:OptionROE(ROEvalue) local DCSControllable = self:GetDCSObject() @@ -2952,8 +2952,8 @@ function CONTROLLABLE:OptionROEHoldFirePossible() end --- Weapons Hold: AI will hold fire under all circumstances. --- @param Wrapper.Controllable#CONTROLLABLE self --- @return Wrapper.Controllable#CONTROLLABLE self +-- @param #CONTROLLABLE self +-- @return #CONTROLLABLE self function CONTROLLABLE:OptionROEHoldFire() self:F2( { self.ControllableName } ) @@ -3551,7 +3551,7 @@ end -- Note that when WayPointInitialize is called, the Mission of the controllable is RESTARTED! -- @param #CONTROLLABLE self -- @param #table WayPoints If WayPoints is given, then use the route. --- @return #CONTROLLABLE +-- @return #CONTROLLABLE self function CONTROLLABLE:WayPointInitialize( WayPoints ) self:F( { WayPoints } ) @@ -3582,7 +3582,7 @@ end -- @param #number WayPoint The waypoint number. Note that the start waypoint on the route is WayPoint 1! -- @param #number WayPointIndex When defining multiple WayPoint functions for one WayPoint, use WayPointIndex to set the sequence of actions. -- @param #function WayPointFunction The waypoint function to be called when the controllable moves over the waypoint. The waypoint function takes variable parameters. --- @return #CONTROLLABLE +-- @return #CONTROLLABLE self function CONTROLLABLE:WayPointFunction( WayPoint, WayPointIndex, WayPointFunction, ... ) self:F2( { WayPoint, WayPointIndex, WayPointFunction } ) @@ -3598,7 +3598,7 @@ end -- @param #CONTROLLABLE self -- @param #number WayPoint The WayPoint from where to execute the mission. -- @param #number WaitTime The amount seconds to wait before initiating the mission. --- @return #CONTROLLABLE +-- @return #CONTROLLABLE self function CONTROLLABLE:WayPointExecute( WayPoint, WaitTime ) self:F( { WayPoint, WaitTime } ) @@ -3682,6 +3682,7 @@ end --- Sets Controllable Option for A2A attack range for AIR FIGHTER units. -- @param #CONTROLLABLE self -- @param #number range Defines the range +-- @return #CONTROLLABLE self -- @usage Range can be one of MAX_RANGE = 0, NEZ_RANGE = 1, HALF_WAY_RMAX_NEZ = 2, TARGET_THREAT_EST = 3, RANDOM_RANGE = 4. Defaults to 3. See: https://wiki.hoggitworld.com/view/DCS_option_missileAttack function CONTROLLABLE:OptionAAAttackRange(range) self:F2( { self.ControllableName } ) @@ -3733,6 +3734,7 @@ end -- @param #number radius Radius of the relocation zone, default 500 -- @param #boolean onroad If true, route on road (less problems with AI way finding), default true -- @param #boolean shortcut If true and onroad is set, take a shorter route - if available - off road, default false +-- @return #CONTROLLABLE self function CONTROLLABLE:RelocateGroundRandomInRadius(speed, radius, onroad, shortcut) self:F2( { self.ControllableName } ) From 41274e7801710de87fdc1c50379f54f494b87190 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Fri, 23 Apr 2021 10:59:22 +0200 Subject: [PATCH 42/44] Update Controllable.lua --- .../Moose/Wrapper/Controllable.lua | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 5db0632ab..dc004b4c1 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -3753,3 +3753,24 @@ function CONTROLLABLE:RelocateGroundRandomInRadius(speed, radius, onroad, shortc return self end + +--- Defines how long a GROUND unit/group will move to avoid an ongoing attack. +-- @param #CONTROLLABLE self +-- @param #number Seconds Any positive number: AI will disperse, but only for the specified time before continuing their route. 0: AI will not disperse. +-- @return #CONTROLLABLE self +function CONTROLLABLE:OptionDisperseOnAttack(Seconds) + self:F2( { self.ControllableName } ) + -- Set default if not specified. + local seconds = Seconds or 0 + local DCSControllable = self:GetDCSObject() + if DCSControllable then + local Controller = self:_GetController() + if Controller then + if self:IsGround() then + self:SetOption(AI.Option.GROUND.id.DISPERSE_ON_ATTACK, seconds) + end + end + return self + end + return nil +end From bbb21749578b6692a44910e59e878196f82d1c5a Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Fri, 23 Apr 2021 12:00:49 +0200 Subject: [PATCH 43/44] Update Controllable.lua added `OptionDisperseOnAttack` for GROUND units --- .../Moose/Wrapper/Controllable.lua | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index b07d09046..55fd34f12 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -3758,3 +3758,24 @@ function CONTROLLABLE:RelocateGroundRandomInRadius(speed, radius, onroad, shortc return self end + +--- Defines how long a GROUND unit/group will move to avoid an ongoing attack. +-- @param #CONTROLLABLE self +-- @param #number Seconds Any positive number: AI will disperse, but only for the specified time before continuing their route. 0: AI will not disperse. +-- @return #CONTROLLABLE self +function CONTROLLABLE:OptionDisperseOnAttack(Seconds) + self:F2( { self.ControllableName } ) + -- Set default if not specified. + local seconds = Seconds or 0 + local DCSControllable = self:GetDCSObject() + if DCSControllable then + local Controller = self:_GetController() + if Controller then + if self:IsGround() then + self:SetOption(AI.Option.GROUND.id.DISPERSE_ON_ATTACK, seconds) + end + end + return self + end + return nil +end From dc64b98c59b733fc2e9db111581b0ba068c2bdf2 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 23 Apr 2021 13:27:24 +0200 Subject: [PATCH 44/44] Update Act_Route.lua - Fixed bug in ACT_GROUP:GetRouteText --- Moose Development/Moose/Actions/Act_Route.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Actions/Act_Route.lua b/Moose Development/Moose/Actions/Act_Route.lua index f2c5ebcda..7f075b420 100644 --- a/Moose Development/Moose/Actions/Act_Route.lua +++ b/Moose Development/Moose/Actions/Act_Route.lua @@ -190,7 +190,7 @@ do -- ACT_ROUTE self:F( { ZoneName = ZoneName } ) local Zone = Zone -- Core.Zone#ZONE local ZoneCoord = Zone:GetCoordinate() - local ZoneDistance = ZoneCoord:Get2DDistance( self.Coordinate ) + local ZoneDistance = ZoneCoord:Get2DDistance( Coordinate ) self:F( { ShortestDistance, ShortestReferenceName } ) if ShortestDistance == 0 or ZoneDistance < ShortestDistance then ShortestDistance = ZoneDistance