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

More updates to fix the RemoveUnit problems for DATABASE and SETs.

Browse Source
This commit is contained in:
FlightControl
2018-09-11 15:26:23 +02:00
parent 9647a1a84e
commit d5e2365bb3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua
View File

@@ -885,7 +885,7 @@ function AI_CARGO_DISPATCHER:onafterMonitor()
-- The Pickup sequence ... -- The Pickup sequence ...
-- Check if this Carrier need to go and Pickup something... -- Check if this Carrier need to go and Pickup something...
-- So, if the cargo bay is not full yet with cargo to be loaded ... -- So, if the cargo bay is not full yet with cargo to be loaded ...
self:I( { IsRelocating = AI_Cargo:IsRelocating(), IsTransporting = AI_Cargo:IsTransporting() } ) self:I( { Carrier = CarrierGroupName, IsRelocating = AI_Cargo:IsRelocating(), IsTransporting = AI_Cargo:IsTransporting() } )
if AI_Cargo:IsRelocating() == false and AI_Cargo:IsTransporting() == false then if AI_Cargo:IsRelocating() == false and AI_Cargo:IsTransporting() == false then
-- ok, so there is a free Carrier -- ok, so there is a free Carrier
-- now find the first cargo that is Unloaded -- now find the first cargo that is Unloaded
@@ -944,7 +944,7 @@ function AI_CARGO_DISPATCHER:onafterMonitor()
if self.HomeZone then if self.HomeZone then
if not self.CarrierHome[Carrier] then if not self.CarrierHome[Carrier] then
self.CarrierHome[Carrier] = true self.CarrierHome[Carrier] = true
AI_Cargo:__Home( 60, self.HomeZone:GetRandomPointVec2(), math.random( self.PickupMinSpeed, self.PickupMaxSpeed ), self.HomeZone ) AI_Cargo:Home( self.HomeZone:GetRandomPointVec2(), math.random( self.PickupMinSpeed, self.PickupMaxSpeed ), self.HomeZone )
end end
end end
end end

2
Moose Development/Moose/Wrapper/Group.lua
View File

@@ -269,7 +269,7 @@ function GROUP:Destroy( GenerateEvent )
self:CreateEventDead( timer.getTime(), UnitData ) self:CreateEventDead( timer.getTime(), UnitData )
end end
else else
self:CreateEventRemove( timer.getTime(), UnitData ) self:CreateEventRemoveUnit( timer.getTime(), UnitData )
end end
end end
USERFLAG:New( self:GetName() ):Set( 100 ) USERFLAG:New( self:GetName() ):Set( 100 )