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 remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	Moose Development/Moose/Functional/AmmoTruck.lua
This commit is contained in:
Applevangelist 2023-07-03 17:30:50 +02:00
commit 102a48bf97
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Moose Development/Moose/Functional/AmmoTruck.lua
View File

@ -77,7 +77,7 @@
-- ammotruck.monitor = -60 -- 1 minute - AMMOTRUCK checks run every one minute -- ammotruck.monitor = -60 -- 1 minute - AMMOTRUCK checks run every one minute
-- ammotruck.routeonroad = true -- Trucks will **try** to drive on roads -- ammotruck.routeonroad = true -- Trucks will **try** to drive on roads
-- ammotruck.usearmygroup = false -- If true, will make use of ARMYGROUP in the background (if used in DEV branch) -- ammotruck.usearmygroup = false -- If true, will make use of ARMYGROUP in the background (if used in DEV branch)
-- ammotruck.reloads = 5 -- Maxn re-arms a truck can do before he needs to go home and restock. Set to -1 for unlimited -- ammotruck.reloads = 5 -- Maxn re-arms a truck can do before he needs to go home and restock. Set to -1 for unlimited
-- --
-- ## 3 FSM Events to shape mission -- ## 3 FSM Events to shape mission
-- --
@ -373,7 +373,7 @@ function AMMOTRUCK:CheckReturningTrucks(dataset)
truck.statusquo = AMMOTRUCK.State.IDLE truck.statusquo = AMMOTRUCK.State.IDLE
truck.timestamp = timer.getAbsTime() truck.timestamp = timer.getAbsTime()
truck.coordinate = coord truck.coordinate = coord
truck.reloads = self.reloads or 5 truck.reloads = self.reloads or 5
self:__TruckHome(1,truck) self:__TruckHome(1,truck)
end end
end end
@ -545,7 +545,7 @@ function AMMOTRUCK:CheckTrucksAlive()
newtruck.statusquo = AMMOTRUCK.State.IDLE newtruck.statusquo = AMMOTRUCK.State.IDLE
newtruck.timestamp = timer.getAbsTime() newtruck.timestamp = timer.getAbsTime()
newtruck.coordinate = truck:GetCoordinate() newtruck.coordinate = truck:GetCoordinate()
newtruck.reloads = self.reloads or 5 newtruck.reloads = self.reloads or 5
self.trucklist[name] = newtruck self.trucklist[name] = newtruck
end end
end end
@ -632,10 +632,10 @@ function AMMOTRUCK:onafterMonitor(From, Event, To)
unloadingtrucks[#unloadingtrucks+1] = data unloadingtrucks[#unloadingtrucks+1] = data
elseif data.statusquo == AMMOTRUCK.State.RETURNING then elseif data.statusquo == AMMOTRUCK.State.RETURNING then
returningtrucks[#returningtrucks+1] = data returningtrucks[#returningtrucks+1] = data
if data.reloads > 0 or data.reloads == -1 then if data.reloads > 0 or data.reloads == -1 then
idletrucks[#idletrucks+1] = data idletrucks[#idletrucks+1] = data
found = true found = true
end end
end end
else else
self.truckset[data.name] = nil self.truckset[data.name] = nil
@ -759,11 +759,11 @@ end
local scheduler = SCHEDULER:New(nil,destroyammo,{ammo},self.waitingtime) local scheduler = SCHEDULER:New(nil,destroyammo,{ammo},self.waitingtime)
-- one reload less -- one reload less
if truck.reloads ~= -1 then if truck.reloads ~= -1 then
truck.reloads = truck.reloads - 1 truck.reloads = truck.reloads - 1
end end
return self return self
end end
--- ---