diff --git a/.gitignore b/.gitignore index 35f0201c3..c84f22bdf 100644 --- a/.gitignore +++ b/.gitignore @@ -235,4 +235,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..13211d027 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", @@ -10,14 +9,9 @@ "__Moose", "trigger", "coord", - "missionCommands", - "world" + "missionCommands" ], "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 1c833cdb6..21b5caa61 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -1819,7 +1819,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 } ) @@ -8338,7 +8338,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() @@ -10180,11 +10180,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 @@ -10207,7 +10207,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() @@ -10328,7 +10328,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 )