From e4906eb083fc56da91d699f3a79ac19da48c84e5 Mon Sep 17 00:00:00 2001 From: Wingthor Date: Sat, 1 Feb 2020 19:30:32 +0100 Subject: [PATCH 1/6] Test Commits and pipe --- .gitignore | 1 + Moose Development/Moose/Utilities/Utils.lua | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 135102f04..f908db72e 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,4 @@ _gsdata_/ .gitattributes .gitignore Moose Test Missions/MOOSE_Test_Template.miz +Moose Development/Moose/.vscode/launch.json diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index 766b8de47..7346dcc38 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -436,7 +436,7 @@ UTILS.tostringLL = function( lat, lon, acc, DMS) secFrmtStr = '%0' .. width .. '.' .. acc .. 'f' end - -- 024° 23' 12"N or 024° 23' 12.03"N + -- 024� 23' 12"N or 024� 23' 12.03"N return string.format('%03d°', latDeg) .. ' ' .. string.format('%02d', latMin) .. '\' ' .. string.format(secFrmtStr, latSec) .. '"' .. latHemi .. ' ' .. string.format('%03d°', lonDeg) .. ' ' .. string.format('%02d', lonMin) .. '\' ' .. string.format(secFrmtStr, lonSec) .. '"' .. lonHemi @@ -1080,3 +1080,4 @@ function UTILS.GetModulationName(Modulation) end +-- Just a test to see commits in new environment for Wingthor \ No newline at end of file From 5e1fb36d0123b41e205e973c65051ffe691c1f32 Mon Sep 17 00:00:00 2001 From: Wingthor Date: Sat, 1 Feb 2020 20:27:00 +0100 Subject: [PATCH 2/6] Fixed issue 1254 --- Moose Development/Moose/Functional/Range.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Functional/Range.lua b/Moose Development/Moose/Functional/Range.lua index d181ebbec..ba217f14b 100644 --- a/Moose Development/Moose/Functional/Range.lua +++ b/Moose Development/Moose/Functional/Range.lua @@ -1088,7 +1088,7 @@ end -- @return #RANGE self function RANGE:SetSoundfilesPath(path) self.soundpath=tostring(path or "Range Soundfiles/") - self:I(self.lid..string.format("Setting sound files path to %s", self.soundpath)) + self:I(self.id..string.format("Setting sound files path to %s", self.soundpath)) return self end From b68e254bc04f3a24009c7c377d7d4f50d87d0ae3 Mon Sep 17 00:00:00 2001 From: Wingthor Date: Thu, 6 Feb 2020 15:36:54 +0100 Subject: [PATCH 3/6] Fixes issue #1258 WAREHOUSE:onafterChangeCountry() --- .gitignore | 4 ++++ Moose Development/Moose/Functional/Warehouse.lua | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f908db72e..5e42c0c93 100644 --- a/.gitignore +++ b/.gitignore @@ -222,3 +222,7 @@ _gsdata_/ .gitignore Moose Test Missions/MOOSE_Test_Template.miz Moose Development/Moose/.vscode/launch.json +MooseCodeWS.code-workspace +.gitignore +.gitignore +/.gitignore diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index bd98267cb..9c25b50f5 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -4894,8 +4894,14 @@ function WAREHOUSE:onafterChangeCountry(From, Event, To, Country) self.queue={} -- Airbase could have been captured before and already belongs to the new coalition. - local airbase=AIRBASE:FindByName(self.airbasename) - local airbasecoaltion=airbase:GetCoalition() + -- Check if Warehouse has a arbiase atthached + local airbasecoaltion + if self.airbasse ~= nil then + local airbase=AIRBASE:FindByName(self.airbasename) + airbasecoaltion=airbase:GetCoalition() + else -- Warehouse has no airbase attached so just keep whatever, self.airbase will still be nil since CoalitionNew will not be nil if Warehouse have a airbse attacjed. + airbasecoaltion = nil + end if CoalitionNew==airbasecoaltion then -- Airbase already owned by the coalition that captured the warehouse. Airbase can be used by this warehouse. From f685064c0c6efee4ffe2970f7fd6a9f6569a5f41 Mon Sep 17 00:00:00 2001 From: Wingthor Date: Sat, 8 Feb 2020 12:44:50 +0100 Subject: [PATCH 4/6] fixed the typo on self.airbasse to self.airbase. Tested with and without this line `SetAirbase(AIRBASE:FindByName(AIRBASE.Caucasus.Kutaisi))` in the test script. Resolves issue #1258 --- Moose Development/Moose/Functional/Warehouse.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index 9c25b50f5..999eb97c9 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -4896,7 +4896,7 @@ function WAREHOUSE:onafterChangeCountry(From, Event, To, Country) -- Airbase could have been captured before and already belongs to the new coalition. -- Check if Warehouse has a arbiase atthached local airbasecoaltion - if self.airbasse ~= nil then + if self.airbase ~= nil then local airbase=AIRBASE:FindByName(self.airbasename) airbasecoaltion=airbase:GetCoalition() else -- Warehouse has no airbase attached so just keep whatever, self.airbase will still be nil since CoalitionNew will not be nil if Warehouse have a airbse attacjed. From a2759b1cc01f1de8581b6ef372c0c5dd213e123a Mon Sep 17 00:00:00 2001 From: Wingthor Date: Tue, 11 Feb 2020 15:55:10 +0100 Subject: [PATCH 5/6] Issue #1264 Abu_Musa_Island_Airport --- .scannerwork/.sonar_lock | 0 .scannerwork/report-task.txt | 6 ++++++ Moose Development/Moose/Functional/ATC_Ground.lua | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .scannerwork/.sonar_lock create mode 100644 .scannerwork/report-task.txt diff --git a/.scannerwork/.sonar_lock b/.scannerwork/.sonar_lock new file mode 100644 index 000000000..e69de29bb diff --git a/.scannerwork/report-task.txt b/.scannerwork/report-task.txt new file mode 100644 index 000000000..cc70ad160 --- /dev/null +++ b/.scannerwork/report-task.txt @@ -0,0 +1,6 @@ +projectKey=Test +serverUrl=http://localhost:9000 +serverVersion=8.1.0.31237 +dashboardUrl=http://localhost:9000/dashboard?id=Test +ceTaskId=AXAlUJO97YLjwz1VUDXR +ceTaskUrl=http://localhost:9000/api/ce/task?id=AXAlUJO97YLjwz1VUDXR diff --git a/Moose Development/Moose/Functional/ATC_Ground.lua b/Moose Development/Moose/Functional/ATC_Ground.lua index ba407eb37..ded08800f 100644 --- a/Moose Development/Moose/Functional/ATC_Ground.lua +++ b/Moose Development/Moose/Functional/ATC_Ground.lua @@ -2458,7 +2458,7 @@ end ATC_GROUND_PERSIANGULF = { ClassName = "ATC_GROUND_PERSIANGULF", Airbases = { - [AIRBASE.PersianGulf.Abu_Musa_Island_Airport] = { + [AIRBASE.PersianGulf.Al_Dhafra_AB] = { ---FIX by Wingthor Changed from Abu_Musa_Island_Airport PointsRunways = { [1] = { [1]={["y"]=-122813.71002344,["x"]=-31689.936027827,}, From ce60e7ce741ffcdc42db91dfe86d2a7d5cfb5b28 Mon Sep 17 00:00:00 2001 From: 132nd-Entropy Date: Wed, 12 Feb 2020 16:25:45 +0100 Subject: [PATCH 6/6] FIX: removed Mellan_Airstrip from list of Nevada airfields (not a valid airport and has no taxiway designations, resulting in a scripting error if included) --- Moose Development/Moose/Functional/ATC_Ground.lua | 4 +--- Moose Development/Moose/Wrapper/Airbase.lua | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Moose Development/Moose/Functional/ATC_Ground.lua b/Moose Development/Moose/Functional/ATC_Ground.lua index ded08800f..9ded69874 100644 --- a/Moose Development/Moose/Functional/ATC_Ground.lua +++ b/Moose Development/Moose/Functional/ATC_Ground.lua @@ -1052,7 +1052,6 @@ end -- * `AIRBASE.Nevada.Laughlin_Airport` -- * `AIRBASE.Nevada.Lincoln_County` -- * `AIRBASE.Nevada.McCarran_International_Airport` --- * `AIRBASE.Nevada.Mellan_Airstrip` -- * `AIRBASE.Nevada.Mesquite` -- * `AIRBASE.Nevada.Mina_Airport_3Q0` -- * `AIRBASE.Nevada.Nellis_AFB` @@ -1096,8 +1095,7 @@ end -- -- -- Monitor specific airbases. -- ATC_Ground = ATC_GROUND_NEVADA:New( --- { AIRBASE.Nevada.Laughlin_Airport, --- AIRBASE.Nevada.Mellan_Airstrip, +-- { AIRBASE.Nevada.Laughlin_Airport, -- AIRBASE.Nevada.Lincoln_County, -- AIRBASE.Nevada.North_Las_Vegas, -- AIRBASE.Nevada.McCarran_International_Airport diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 37530551f..cf349c3b3 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -124,7 +124,6 @@ AIRBASE.Caucasus = { -- * AIRBASE.Nevada.Jean_Airport -- * AIRBASE.Nevada.Laughlin_Airport -- * AIRBASE.Nevada.Lincoln_County --- * AIRBASE.Nevada.Mellan_Airstrip -- * AIRBASE.Nevada.Mesquite -- * AIRBASE.Nevada.Mina_Airport_3Q0 -- * AIRBASE.Nevada.North_Las_Vegas @@ -144,7 +143,6 @@ AIRBASE.Nevada = { ["Jean_Airport"] = "Jean Airport", ["Laughlin_Airport"] = "Laughlin Airport", ["Lincoln_County"] = "Lincoln County", - ["Mellan_Airstrip"] = "Mellan Airstrip", ["Mesquite"] = "Mesquite", ["Mina_Airport_3Q0"] = "Mina Airport 3Q0", ["North_Las_Vegas"] = "North Las Vegas",