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

Warehouse 0.1.9

Browse Source 
Many bugs spotted
This commit is contained in:
funkyfranky
2018-08-16 23:10:23 +02:00
parent 22da329fca
commit 5a2e1f01b4
4 changed files with 112 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Functional/RAT.lua
View File

@@ -2116,7 +2116,7 @@ function RAT:_SpawnWithRoute(_departure, _destination, _takeoff, _landing, _live
end
-- Modify the spawn template to follow the flight plan.
local successful=self:_ModifySpawnTemplate(waypoints, livery, _lastpos, departure, takeoff)
local successful=self:_ModifySpawnTemplate(waypoints, livery, _lastpos, departure, takeoff, parkingdata)
if not successful then
return nil
end

22
Moose Development/Moose/Functional/Warehouse.lua
View File

@@ -191,7 +191,7 @@ WAREHOUSE.TransportType = {
--- Warehouse class version.
-- @field #string version
WAREHOUSE.version="0.1.8w"
WAREHOUSE.version="0.1.9"
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: Warehouse todo list.
@@ -1118,7 +1118,7 @@ function WAREHOUSE:onafterRequest(From, Event, To, Request)
CargoTransport = AI_CARGO_DISPATCHER_HELICOPTER:New(TransportSet, CargoGroups, DeployZoneSet)
-- Home zone.
CargoTransport:Setairbase(self.airbase)
--CargoTransport:Setairbase(self.airbase)
--CargoTransport:SetHomeZone(self.spawnzone)
elseif Request.transporttype==WAREHOUSE.TransportType.APC then
@@ -1563,24 +1563,28 @@ end
function WAREHOUSE:_RouteAirRat(Aircraft, ToAirbase, Speed)
if Aircraft and Aircraft:IsAlive()~=nil then
-- Get parking data of all units.
local parkingdata={}
local units=Aircraft:GetUnits()
for _,_unit in pairs(units) do
local unit=_unit --Wrapper.Unit#UNIT
local _spot,_terminal,_distance=unit:GetCoordinate():GetClosestOccupiedParkingSpot(self.airbase)
table.insert(parkingdata, {spot=_spot, TerminalID=_terminal})
table.insert(parkingdata, {Coordinate=_spot, TerminalID=_terminal})
end
env.info("FF parking data")
self:E(parkingdata)
-- Create a RAT object to use its flight plan.
local rat=RAT:New(Aircraft)
local rat=RAT:New(Aircraft:GetName())
-- Init some parameters.
rat:SetDeparture(self.airbase:GetName())
rat:SetDestination(ToAirbase:GetName())
--rat:SetCoalitionAircraft(color)
rat:SetCountry(self.country)
rat:NoRespawn()
rat:SetCountry(self.country)
rat:NoRespawn()
-- Init spawn but do not actually spawn.
rat:Spawn(0)
@@ -1590,12 +1594,16 @@ function WAREHOUSE:_RouteAirRat(Aircraft, ToAirbase, Speed)
Aircraft:Destroy()
-- Spawn RAT aircraft at specific parking sports.
local spawnindex=rat:_SpawnWithRoute(self.airbase:GetName(), ToAirbase:GetName(), RAT.wp.cold, nil, nil, nil, nil, nil, parkingdata)
local spawnindex=rat:_SpawnWithRoute(self.airbase:GetName(), ToAirbase:GetName(), RAT.wp.hot, nil, nil, nil, nil, nil, parkingdata)
-- Get the group and check it's name.
local group=rat.ratcraft[spawnindex].group --Wrapper.Group#GROUP
self:E(self.wid..string.format("Spawned new RAT aircraft as group %s", group:GetName()))
group:SmokeBlue()
-- Activate group.
local bla=group:SetCommand({id='Start', params={}})
self:E({bla=bla})
return group
end