From ffc86bf046e361a5661cd4fa770fa3f0ba06c6c4 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 8 Feb 2023 16:28:04 +0100 Subject: [PATCH 1/3] Unwanted changes --- .gitignore | 1 - Moose Development/Moose/.vscode/settings.json | 9 ++------- Moose Development/Moose/Ops/Airboss.lua | 12 ++++++------ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 634be4279..fe5b6b4f8 100644 --- a/.gitignore +++ b/.gitignore @@ -228,4 +228,3 @@ MooseCodeWS.code-workspace .gitignore .gitignore /.gitignore -Moose Development/Moose/.vscode/settings.json diff --git a/Moose Development/Moose/.vscode/settings.json b/Moose Development/Moose/.vscode/settings.json index f25704250..5d2eecfde 100644 --- a/Moose Development/Moose/.vscode/settings.json +++ b/Moose Development/Moose/.vscode/settings.json @@ -1,8 +1,7 @@ { "Lua.workspace.preloadFileSize": 1000, "Lua.diagnostics.disable": [ - "undefined-doc-name", - "need-check-nil" + "undefined-doc-name" ], "Lua.diagnostics.globals": [ "BASE", @@ -15,9 +14,5 @@ ], "Lua.completion.displayContext": 5, "Lua.runtime.version": "Lua 5.1", - "Lua.completion.callSnippet": "Both", - "Lua.workspace.library": [ - "${3rd}/lfs/library" - ], - "Lua.workspace.checkThirdParty": false + "Lua.completion.callSnippet": "Both" } \ No newline at end of file diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 9cebc5e58..338f2239c 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -1812,7 +1812,7 @@ AIRBOSS.version = "1.3.0" function AIRBOSS:New( carriername, alias ) -- Inherit everthing from FSM class. - self = BASE:Inherit( self, FSM:New() ) -- #AIRBOSS + local self = BASE:Inherit( self, FSM:New() ) -- #AIRBOSS -- Debug. self:F2( { carriername = carriername, alias = alias } ) @@ -8318,7 +8318,7 @@ function AIRBOSS:OnEventLand( EventData ) local dist = coord:Get2DDistance( self:GetCoordinate() ) -- Get wire - local wire = self:_GetWirePos( coord, 0 ) + local wire = self:_GetWire( coord, 0 ) -- Aircraft type. local _type = EventData.IniUnit:GetTypeName() @@ -10154,11 +10154,11 @@ function AIRBOSS:_GetSternCoord() return self.sterncoord end ---- Get wire from +--- Get wire from draw argument. -- @param #AIRBOSS self -- @param Core.Point#COORDINATE Lcoord Landing position. -- @return #number Trapped wire (1-4) or 99 if no wire was trapped. -function AIRBOSS:_GetWire() +function AIRBOSS:_GetWireFromDrawArg() local wireArgs={} wireArgs[1]=141 @@ -10181,7 +10181,7 @@ end -- @param Core.Point#COORDINATE Lcoord Landing position. -- @param #number dc Distance correction. Shift the landing coord back if dc>0 and forward if dc<0. -- @return #number Trapped wire (1-4) or 99 if no wire was trapped. -function AIRBOSS:_GetWirePos( Lcoord, dc ) +function AIRBOSS:_GetWire( Lcoord, dc ) -- Final bearing (true). local FB = self:GetFinalBearing() @@ -10299,7 +10299,7 @@ function AIRBOSS:_Trapped( playerData ) end -- Get wire. - local wire = self:_GetWirePos( coord, dcorr ) + local wire = self:_GetWire( coord, dcorr ) -- Debug. local text = string.format( "Player %s _Trapped: v=%.1f km/h, s-dcorr=%.1f m ==> wire=%d (dcorr=%d)", playerData.name, v, s - dcorr, wire, dcorr ) From 9f02232589a6e8ec4d1567e967c13a7651198682 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 8 Feb 2023 16:29:25 +0100 Subject: [PATCH 2/3] Update settings.json --- Moose Development/Moose/.vscode/settings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/Moose Development/Moose/.vscode/settings.json b/Moose Development/Moose/.vscode/settings.json index 5d2eecfde..c40b79cc6 100644 --- a/Moose Development/Moose/.vscode/settings.json +++ b/Moose Development/Moose/.vscode/settings.json @@ -10,7 +10,6 @@ "trigger", "coord", "missionCommands", - "world" ], "Lua.completion.displayContext": 5, "Lua.runtime.version": "Lua 5.1", From 9862c32378c67473c8dc4833004517cf194ef7aa Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 8 Feb 2023 16:30:44 +0100 Subject: [PATCH 3/3] Update settings.json --- Moose Development/Moose/.vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/.vscode/settings.json b/Moose Development/Moose/.vscode/settings.json index c40b79cc6..13211d027 100644 --- a/Moose Development/Moose/.vscode/settings.json +++ b/Moose Development/Moose/.vscode/settings.json @@ -9,7 +9,7 @@ "__Moose", "trigger", "coord", - "missionCommands", + "missionCommands" ], "Lua.completion.displayContext": 5, "Lua.runtime.version": "Lua 5.1",