Helicopter AI_CARGO_DISPATCHER working (almost).

Queueing at deploy locations working.
This commit is contained in:
FlightControl_Master
2018-05-12 08:37:27 +02:00
parent ac7ae68ee8
commit 25a6cbcf6d
7 changed files with 502 additions and 118 deletions

View File

@@ -37,11 +37,13 @@ AI_CARGO_DISPATCHER = {
-- @map <Wrapper.Group#GROUP, AI.AI_Cargo_APC#AI_CARGO_APC>
--- @field #AI_CARGO_DISPATCHER.AI_CARGO_APC
AI_CARGO_DISPATCHER.AICargoAPC = {}
AI_CARGO_DISPATCHER.AI_Cargo = {}
--- @field #AI_CARGO_DISPATCHER.PickupCargo
AI_CARGO_DISPATCHER.PickupCargo = {}
--- Creates a new AI_CARGO_DISPATCHER object.
-- @param #AI_CARGO_DISPATCHER self
-- @param Core.Set#SET_GROUP SetAPC
@@ -54,7 +56,7 @@ AI_CARGO_DISPATCHER.PickupCargo = {}
-- SetAPC = SET_GROUP:New():FilterPrefixes( "APC" ):FilterStart()
-- SetCargo = SET_CARGO:New():FilterTypes( "Infantry" ):FilterStart()
-- SetDeployZone = SET_ZONE:New():FilterPrefixes( "Deploy" ):FilterStart()
-- AICargoDispatcher = AI_CARGO_DISPATCHER:New( SetAPC, SetCargo )
-- AICargoDispatcher = AI_CARGO_DISPATCHER:New( SetAPC, SetCargo, SetDeployZone )
--
function AI_CARGO_DISPATCHER:New( SetAPC, SetCargo, SetDeployZones )
@@ -76,14 +78,42 @@ function AI_CARGO_DISPATCHER:New( SetAPC, SetCargo, SetDeployZones )
self:AddTransition( "*", "Unloading", "*" )
self:AddTransition( "*", "Unloaded", "*" )
self:AddTransition( "*", "Home", "*" )
self.MonitorTimeInterval = 30
self.DeployRadiusInner = 200
self.DeployRadiusOuter = 500
self.CarrierHome = {}
return self
end
--- Set the home zone.
-- When there is nothing anymore to pickup, the carriers will go to a random coordinate in this zone.
-- They will await here new orders.
-- @param #AI_CARGO_DISPATCHER self
-- @param Core.Zone#ZONE_BASE HomeZone
-- @return #AI_CARGO_DISPATCHER
-- @usage
--
-- -- Create a new cargo dispatcher
-- AICargoDispatcher = AI_CARGO_DISPATCHER:New( SetAPC, SetCargo, SetDeployZone )
--
-- -- Set the home coordinate
-- local HomeZone = ZONE:New( "Home" )
-- AICargoDispatcher:SetHomeZone( HomeZone )
--
function AI_CARGO_DISPATCHER:SetHomeZone( HomeZone )
self.HomeZone = HomeZone
return self
end
--- The Start trigger event, which actually takes action at the specified time interval.
-- @param #AI_CARGO_DISPATCHER self
-- @param Wrapper.Group#GROUP APC
@@ -92,60 +122,78 @@ function AI_CARGO_DISPATCHER:onafterMonitor()
for APCGroupName, Carrier in pairs( self.SetAPC:GetSet() ) do
local Carrier = Carrier -- Wrapper.Group#GROUP
local AICargoAPC = self.AICargoAPC[Carrier]
if not AICargoAPC then
local AI_Cargo = self.AI_Cargo[Carrier]
if not AI_Cargo then
-- ok, so this APC does not have yet an AI_CARGO_APC object...
-- let's create one and also declare the Loaded and UnLoaded handlers.
self.AICargoAPC[Carrier] = self:AICargo( Carrier, self.SetCargo, self.CombatRadius )
AICargoAPC = self.AICargoAPC[Carrier]
self.AI_Cargo[Carrier] = self:AICargo( Carrier, self.SetCargo, self.CombatRadius )
AI_Cargo = self.AI_Cargo[Carrier]
function AICargoAPC.OnAfterPickup( AICargoAPC, APC, From, Event, To, Cargo )
function AI_Cargo.OnAfterPickup( AI_Cargo, APC, From, Event, To, Cargo )
self:Pickup( APC, Cargo )
end
function AICargoAPC.OnAfterLoad( AICargoAPC, APC )
function AI_Cargo.OnAfterLoad( AI_Cargo, APC )
self:Loading( APC )
end
function AICargoAPC.OnAfterLoaded( AICargoAPC, APC, From, Event, To, Cargo )
function AI_Cargo.OnAfterLoaded( AI_Cargo, APC, From, Event, To, Cargo )
self:Loaded( APC, Cargo )
end
function AICargoAPC.OnAfterDeploy( AICargoAPC, APC )
function AI_Cargo.OnAfterDeploy( AI_Cargo, APC )
self:Deploy( APC )
end
function AICargoAPC.OnAfterUnload( AICargoAPC, APC )
function AI_Cargo.OnAfterUnload( AI_Cargo, APC )
self:Unloading( APC )
end
function AICargoAPC.OnAfterUnloaded( AICargoAPC, APC )
function AI_Cargo.OnAfterUnloaded( AI_Cargo, APC )
self:Unloaded( APC )
end
end
-- The Pickup sequence ...
-- Check if this APC need to go and Pickup something...
self:I( { IsTransporting = AICargoAPC:IsTransporting() } )
if AICargoAPC:IsTransporting() == false then
self:I( { IsTransporting = AI_Cargo:IsTransporting() } )
if AI_Cargo:IsTransporting() == false then
-- ok, so there is a free APC
-- now find the first cargo that is Unloaded
local PickupCargo = nil
for CargoName, Cargo in pairs( self.SetCargo:GetSet() ) do
local Cargo = Cargo -- Cargo.Cargo#CARGO
self:F( { Cargo = Cargo:GetName(), UnLoaded = Cargo:IsUnLoaded(), Deployed = Cargo:IsDeployed(), PickupCargo = self.PickupCargo[Cargo] ~= nil } )
if Cargo:IsUnLoaded() and not Cargo:IsDeployed() then
if not self.PickupCargo[Cargo] then
self.PickupCargo[Cargo] = Carrier
local CargoVec2 = { x = Cargo:GetX(), y = Cargo:GetY() }
local LocationFound = false
for APC, Vec2 in pairs( self.PickupCargo ) do
if Vec2.x == CargoVec2.x and Vec2.y == CargoVec2.y then
LocationFound = true
break
end
end
if LocationFound == false then
self.PickupCargo[Carrier] = CargoVec2
PickupCargo = Cargo
break
end
end
end
if PickupCargo then
AICargoAPC:Pickup( PickupCargo:GetCoordinate():GetRandomCoordinateInRadius( 25, 50 ), 70 )
self.CarrierHome[Carrier] = nil
AI_Cargo:Pickup( PickupCargo:GetCoordinate() )
break
else
if self.HomeZone then
if not self.CarrierHome[Carrier] then
self.CarrierHome[Carrier] = true
AI_Cargo:Home( self.HomeZone:GetRandomPointVec2() )
end
end
end
end
end
@@ -175,9 +223,10 @@ function AI_CARGO_DISPATCHER:OnAfterLoaded( From, Event, To, APC, Cargo )
local RandomZone = self.SetDeployZones:GetRandomZone()
self:I( { RandomZone = RandomZone } )
self.AICargoAPC[APC]:Deploy( RandomZone:GetCoordinate():GetRandomCoordinateInRadius( 25, 200 ), 70 )
self.PickupCargo[Cargo] = nil
self.AI_Cargo[APC]:Deploy( RandomZone:GetCoordinate(), 70 )
self.PickupCargo[APC] = nil
return self
end