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 pull request #436 from FlightControl-Master/master-353-task-cargo-transport

Browse Source 
Master 353 task cargo transport
This commit is contained in:
Sven Van de Velde 2017-04-17 18:54:39 +02:00 committed by GitHub
commit 83dd39d318
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Moose Development/Moose/Core/Cargo.lua
View File

@ -697,7 +697,7 @@ function CARGO_UNIT:onenterBoarding( From, Event, To, CargoCarrier, NearRadius,
NearRadius = NearRadius or 25 NearRadius = NearRadius or 25
if From == "UnLoaded" then if From == "UnLoaded" or From == "Boarding" then
local CargoCarrierPointVec2 = CargoCarrier:GetPointVec2() local CargoCarrierPointVec2 = CargoCarrier:GetPointVec2()
local CargoCarrierHeading = CargoCarrier:GetHeading() -- Get Heading of object in degrees. local CargoCarrierHeading = CargoCarrier:GetHeading() -- Get Heading of object in degrees.
local CargoDeployHeading = ( ( CargoCarrierHeading + Angle ) >= 360 ) and ( CargoCarrierHeading + Angle - 360 ) or ( CargoCarrierHeading + Angle ) local CargoDeployHeading = ( ( CargoCarrierHeading + Angle ) >= 360 ) and ( CargoCarrierHeading + Angle - 360 ) or ( CargoCarrierHeading + Angle )
@ -709,25 +709,6 @@ function CARGO_UNIT:onenterBoarding( From, Event, To, CargoCarrier, NearRadius,
Points[#Points+1] = PointStartVec2:RoutePointGround( Speed ) Points[#Points+1] = PointStartVec2:RoutePointGround( Speed )
Points[#Points+1] = CargoDeployPointVec2:RoutePointGround( Speed ) Points[#Points+1] = CargoDeployPointVec2:RoutePointGround( Speed )
-- I need to do this mess, otherwise the units will stop boarding at a point in time...
-- This is a DCS bug that i am handling in this way.
do
local CargoBooardPointVec2 = CargoDeployPointVec2:GetRandomPointVec2InRadius(NearRadius,0)
Points[#Points+1] = CargoBooardPointVec2:RoutePointGround( Speed )
end
do
local CargoBooardPointVec2 = CargoDeployPointVec2:GetRandomPointVec2InRadius(NearRadius,0)
Points[#Points+1] = CargoBooardPointVec2:RoutePointGround( Speed )
end
do
local CargoBooardPointVec2 = CargoDeployPointVec2:GetRandomPointVec2InRadius(NearRadius,0)
Points[#Points+1] = CargoBooardPointVec2:RoutePointGround( Speed )
end
do
local CargoBooardPointVec2 = CargoDeployPointVec2:GetRandomPointVec2InRadius(NearRadius,0)
Points[#Points+1] = CargoBooardPointVec2:RoutePointGround( Speed )
end
local TaskRoute = self.CargoObject:TaskRoute( Points ) local TaskRoute = self.CargoObject:TaskRoute( Points )
self.CargoObject:SetTask( TaskRoute, 2 ) self.CargoObject:SetTask( TaskRoute, 2 )