weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-18 05:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-ng' into branch

Browse Source
This commit is contained in:
Applevangelist
2026-02-07 16:59:42 +01:00
parent 3261a59cee 7ec43c9913
commit 17d33b460f
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Functional/RAT.lua
+8
View File
@@ -3042,6 +3042,14 @@ function RAT:_SetRoute(takeoff, landing, _departure, _destination, _waypoint)
if landing==RAT.wp.air then if landing==RAT.wp.air then
local vec2=destination:GetRandomVec2() local vec2=destination:GetRandomVec2()
Pdestination=COORDINATE:NewFromVec2(vec2) Pdestination=COORDINATE:NewFromVec2(vec2)
elseif destination:IsShip() then
-- Crudely predict where the ship will be
local _ship = UNIT:FindByName(destination:GetName())
local _shipHeading = _ship:GetHeading()
Pdestination=destination:GetCoordinate()
local _transitTime = Pdeparture:Get2DDistance(Pdestination) / VxCruise
Pdestination.x = Pdestination.x + (_ship:GetGroundSpeed() * math.cos(math.rad(_shipHeading)) * _transitTime)
Pdestination.z = Pdestination.z + (_ship:GetGroundSpeed() * math.sin(math.rad(_shipHeading)) * _transitTime)
else else
Pdestination=destination:GetCoordinate() Pdestination=destination:GetCoordinate()
end end
Moose Development/Moose/Wrapper/Controllable.lua
+2 -1
View File
@@ -2184,7 +2184,8 @@ function CONTROLLABLE:TaskFunction( FunctionString, ... )
local ArgumentKey = '_' .. tostring( arg ):match( "table: (.*)" ) local ArgumentKey = '_' .. tostring( arg ):match( "table: (.*)" )
self:SetState( self, ArgumentKey, arg ) self:SetState( self, ArgumentKey, arg )
DCSScript[#DCSScript + 1] = "local Arguments = MissionControllable:GetState( MissionControllable, '" .. ArgumentKey .. "' ) " DCSScript[#DCSScript + 1] = "local Arguments = MissionControllable:GetState( MissionControllable, '" .. ArgumentKey .. "' ) "
DCSScript[#DCSScript + 1] = FunctionString .. "( MissionControllable, unpack( Arguments ) )" --DCSScript[#DCSScript + 1] = FunctionString .. "( MissionControllable, unpack( Arguments ) )"
DCSScript[#DCSScript + 1] = FunctionString .. "( MissionControllable, ((type(Arguments)=='table') and unpack(Arguments) or nil))"
else else
DCSScript[#DCSScript + 1] = FunctionString .. "( MissionControllable )" DCSScript[#DCSScript + 1] = FunctionString .. "( MissionControllable )"
end end