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 'develop'

Browse Source
This commit is contained in:
FlightControl
2018-10-18 20:25:35 +02:00
parent 9ecd48f523 90e7688cea
commit a22b9e925a
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Moose Development/Moose/AI/AI_Cargo_APC.lua
View File

@@ -119,7 +119,6 @@ function AI_CARGO_APC:SetCarrier( CargoCarrier )
self.CargoCarrier:SetState( self.CargoCarrier, "AI_CARGO_APC", self ) self.CargoCarrier:SetState( self.CargoCarrier, "AI_CARGO_APC", self )
CargoCarrier:HandleEvent( EVENTS.Dead ) CargoCarrier:HandleEvent( EVENTS.Dead )
CargoCarrier:HandleEvent( EVENTS.Hit )
function CargoCarrier:OnEventDead( EventData ) function CargoCarrier:OnEventDead( EventData )
self:F({"dead"}) self:F({"dead"})
@@ -133,18 +132,20 @@ function AI_CARGO_APC:SetCarrier( CargoCarrier )
end end
end end
end end
function CargoCarrier:OnEventHit( EventData ) -- CargoCarrier:HandleEvent( EVENTS.Hit )
self:F({"hit"}) --
local AICargoTroops = self:GetState( self, "AI_CARGO_APC" ) -- function CargoCarrier:OnEventHit( EventData )
if AICargoTroops then -- self:F({"hit"})
self:F( { OnHitLoaded = AICargoTroops:Is( "Loaded" ) } ) -- local AICargoTroops = self:GetState( self, "AI_CARGO_APC" )
if AICargoTroops:Is( "Loaded" ) or AICargoTroops:Is( "Boarding" ) then -- if AICargoTroops then
-- There are enemies within combat radius. Unload the CargoCarrier. -- self:F( { OnHitLoaded = AICargoTroops:Is( "Loaded" ) } )
AICargoTroops:Unload( false ) -- if AICargoTroops:Is( "Loaded" ) or AICargoTroops:Is( "Boarding" ) then
end -- -- There are enemies within combat radius. Unload the CargoCarrier.
end -- AICargoTroops:Unload( false )
end -- end
-- end
-- end
self.Zone = ZONE_UNIT:New( self.CargoCarrier:GetName() .. "-Zone", self.CargoCarrier, self.CombatRadius ) self.Zone = ZONE_UNIT:New( self.CargoCarrier:GetName() .. "-Zone", self.CargoCarrier, self.CombatRadius )
self.Coalition = self.CargoCarrier:GetCoalition() self.Coalition = self.CargoCarrier:GetCoalition()