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/master' into develop

Browse Source
This commit is contained in:
Applevangelist 2024-08-26 18:22:59 +02:00
commit e2b6efde7a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Moose Development/Moose/Ops/CTLD.lua
View File

@ -2945,11 +2945,12 @@ end
-- @param Wrapper.Unit#UNIT _unit Unit -- @param Wrapper.Unit#UNIT _unit Unit
-- @param #number _dist Distance -- @param #number _dist Distance
-- @param #boolean _ignoreweight Find everything in range, ignore loadable weight -- @param #boolean _ignoreweight Find everything in range, ignore loadable weight
-- @param #boolean ignoretype Find everything in range, ignore loadable type name
-- @return #table Crates Table of crates -- @return #table Crates Table of crates
-- @return #number Number Number of crates found -- @return #number Number Number of crates found
-- @return #table CratesGC Table of crates possibly loaded by GC -- @return #table CratesGC Table of crates possibly loaded by GC
-- @return #number NumberGC Number of crates possibly loaded by GC -- @return #number NumberGC Number of crates possibly loaded by GC
function CTLD:_FindCratesNearby( _group, _unit, _dist, _ignoreweight) function CTLD:_FindCratesNearby( _group, _unit, _dist, _ignoreweight, ignoretype)
self:T(self.lid .. " _FindCratesNearby") self:T(self.lid .. " _FindCratesNearby")
local finddist = _dist local finddist = _dist
local location = _group:GetCoordinate() local location = _group:GetCoordinate()
@ -2962,7 +2963,7 @@ function CTLD:_FindCratesNearby( _group, _unit, _dist, _ignoreweight)
local loadedmass = 0 local loadedmass = 0
local unittype = "none" local unittype = "none"
local capabilities = {} local capabilities = {}
local maxmass = 2000 --local maxmass = 2000
local maxloadable = 2000 local maxloadable = 2000
local IsHook = self:IsHook(_unit) local IsHook = self:IsHook(_unit)
if not _ignoreweight then if not _ignoreweight then
@ -2984,6 +2985,7 @@ function CTLD:_FindCratesNearby( _group, _unit, _dist, _ignoreweight)
--self:I(self.lid .. " Loading restricted: " .. tostring(restricted)) --self:I(self.lid .. " Loading restricted: " .. tostring(restricted))
local staticpos = static:GetCoordinate() --or dcsunitpos local staticpos = static:GetCoordinate() --or dcsunitpos
local cando = cargo:UnitCanCarry(_unit) local cando = cargo:UnitCanCarry(_unit)
if ignoretype == true then cando = true end
--self:I(self.lid .. " Unit can carry: " .. tostring(cando)) --self:I(self.lid .. " Unit can carry: " .. tostring(cando))
--- Testing --- Testing
local distance = self:_GetDistance(location,staticpos) local distance = self:_GetDistance(location,staticpos)