diff --git a/.gitignore b/.gitignore index 135102f04..5e42c0c93 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,8 @@ _gsdata_/ .gitattributes .gitignore Moose Test Missions/MOOSE_Test_Template.miz +Moose Development/Moose/.vscode/launch.json +MooseCodeWS.code-workspace +.gitignore +.gitignore +/.gitignore 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..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 @@ -2458,7 +2456,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,}, diff --git a/Moose Development/Moose/Functional/Range.lua b/Moose Development/Moose/Functional/Range.lua index 870e3f71c..069fdee0f 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 diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index 82a832172..9b0d03a37 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -4920,8 +4920,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.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. + airbasecoaltion = nil + end if CoalitionNew==airbasecoaltion then -- Airbase already owned by the coalition that captured the warehouse. Airbase can be used by this warehouse. 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 diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 097b781b2..231d7a5ad 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -134,7 +134,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 @@ -154,7 +153,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",