FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FF/MasterDevel' into FF/OpsDev

Browse Source
This commit is contained in:
Frank 2023-02-08 16:35:49 +01:00
commit 2c24e56aa5
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -235,4 +235,3 @@ MooseCodeWS.code-workspace
.gitignore .gitignore
.gitignore .gitignore
/.gitignore /.gitignore
Moose Development/Moose/.vscode/settings.json

12
Moose Development/Moose/.vscode/settings.json vendored
View File

@ -1,8 +1,7 @@
{ {
"Lua.workspace.preloadFileSize": 1000, "Lua.workspace.preloadFileSize": 1000,
"Lua.diagnostics.disable": [ "Lua.diagnostics.disable": [
"undefined-doc-name", "undefined-doc-name"
"need-check-nil"
], ],
"Lua.diagnostics.globals": [ "Lua.diagnostics.globals": [
"BASE", "BASE",
@ -10,14 +9,9 @@
"__Moose", "__Moose",
"trigger", "trigger",
"coord", "coord",
"missionCommands", "missionCommands"
"world"
], ],
"Lua.completion.displayContext": 5, "Lua.completion.displayContext": 5,
"Lua.runtime.version": "Lua 5.1", "Lua.runtime.version": "Lua 5.1",
"Lua.completion.callSnippet": "Both", "Lua.completion.callSnippet": "Both"
"Lua.workspace.library": [
"${3rd}/lfs/library"
],
"Lua.workspace.checkThirdParty": false
} }

12
Moose Development/Moose/Ops/Airboss.lua
View File

@ -1819,7 +1819,7 @@ AIRBOSS.version = "1.3.0"
function AIRBOSS:New( carriername, alias ) function AIRBOSS:New( carriername, alias )
-- Inherit everthing from FSM class. -- Inherit everthing from FSM class.
self = BASE:Inherit( self, FSM:New() ) -- #AIRBOSS local self = BASE:Inherit( self, FSM:New() ) -- #AIRBOSS
-- Debug. -- Debug.
self:F2( { carriername = carriername, alias = alias } ) self:F2( { carriername = carriername, alias = alias } )
@ -8338,7 +8338,7 @@ function AIRBOSS:OnEventLand( EventData )
local dist = coord:Get2DDistance( self:GetCoordinate() ) local dist = coord:Get2DDistance( self:GetCoordinate() )
-- Get wire -- Get wire
local wire = self:_GetWirePos( coord, 0 ) local wire = self:_GetWire( coord, 0 )
-- Aircraft type. -- Aircraft type.
local _type = EventData.IniUnit:GetTypeName() local _type = EventData.IniUnit:GetTypeName()
@ -10180,11 +10180,11 @@ function AIRBOSS:_GetSternCoord()
return self.sterncoord return self.sterncoord
end end
--- Get wire from --- Get wire from draw argument.
-- @param #AIRBOSS self -- @param #AIRBOSS self
-- @param Core.Point#COORDINATE Lcoord Landing position. -- @param Core.Point#COORDINATE Lcoord Landing position.
-- @return #number Trapped wire (1-4) or 99 if no wire was trapped. -- @return #number Trapped wire (1-4) or 99 if no wire was trapped.
function AIRBOSS:_GetWire() function AIRBOSS:_GetWireFromDrawArg()
local wireArgs={} local wireArgs={}
wireArgs[1]=141 wireArgs[1]=141
@ -10207,7 +10207,7 @@ end
-- @param Core.Point#COORDINATE Lcoord Landing position. -- @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. -- @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. -- @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). -- Final bearing (true).
local FB = self:GetFinalBearing() local FB = self:GetFinalBearing()
@ -10328,7 +10328,7 @@ function AIRBOSS:_Trapped( playerData )
end end
-- Get wire. -- Get wire.
local wire = self:_GetWirePos( coord, dcorr ) local wire = self:_GetWire( coord, dcorr )
-- Debug. -- 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 ) 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 )