weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

CTLD - fix side effects in weight check - fixes #1688 (#1689)

Browse Source 
Fixed _FindCratesNearby() to optionally ignore the helo's max load capacity, which prevented CTLD from finding, listing, building crates is weights are used. Fixes #1688
This commit is contained in:
Applevangelist 2022-02-16 10:02:44 +01:00 committed by GitHub
parent 53f45ace4c
commit 44ad841d05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1021,7 +1021,7 @@ CTLD.UnitTypes = {
--- CTLD class version. --- CTLD class version.
-- @field #string version -- @field #string version
CTLD.version="1.0.8" CTLD.version="1.0.9"
--- Instantiate a new CTLD. --- Instantiate a new CTLD.
-- @param #CTLD self -- @param #CTLD self
@ -1844,7 +1844,7 @@ function CTLD:_GetCrates(Group, Unit, Cargo, number, drop)
local capabilities = self:_GetUnitCapabilities(Unit) -- #CTLD.UnitCapabilities local capabilities = self:_GetUnitCapabilities(Unit) -- #CTLD.UnitCapabilities
local canloadcratesno = capabilities.cratelimit local canloadcratesno = capabilities.cratelimit
local loaddist = self.CrateDistance or 35 local loaddist = self.CrateDistance or 35
local nearcrates, numbernearby = self:_FindCratesNearby(Group,Unit,loaddist) local nearcrates, numbernearby = self:_FindCratesNearby(Group,Unit,loaddist,true)
if numbernearby >= canloadcratesno and not drop then if numbernearby >= canloadcratesno and not drop then
self:_SendMessage("There are enough crates nearby already! Take care of those first!", 10, false, Group) self:_SendMessage("There are enough crates nearby already! Take care of those first!", 10, false, Group)
return self return self
@ -2027,7 +2027,7 @@ end
function CTLD:_ListCratesNearby( _group, _unit) function CTLD:_ListCratesNearby( _group, _unit)
self:T(self.lid .. " _ListCratesNearby") self:T(self.lid .. " _ListCratesNearby")
local finddist = self.CrateDistance or 35 local finddist = self.CrateDistance or 35
local crates,number = self:_FindCratesNearby(_group,_unit, finddist) -- #table local crates,number = self:_FindCratesNearby(_group,_unit, finddist,true) -- #table
if number > 0 then if number > 0 then
local text = REPORT:New("Crates Found Nearby:") local text = REPORT:New("Crates Found Nearby:")
text:Add("------------------------------------------------------------") text:Add("------------------------------------------------------------")
@ -2084,9 +2084,10 @@ end
-- @param Wrapper.Group#GROUP _group Group -- @param Wrapper.Group#GROUP _group Group
-- @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
-- @return #table Table of crates -- @return #table Table of crates
-- @return #number Number Number of crates found -- @return #number Number Number of crates found
function CTLD:_FindCratesNearby( _group, _unit, _dist) function CTLD:_FindCratesNearby( _group, _unit, _dist, _ignoreweight)
self:T(self.lid .. " _FindCratesNearby") self:T(self.lid .. " _FindCratesNearby")
local finddist = _dist local finddist = _dist
local location = _group:GetCoordinate() local location = _group:GetCoordinate()
@ -2109,7 +2110,7 @@ function CTLD:_FindCratesNearby( _group, _unit, _dist)
if static and static:IsAlive() then if static and static:IsAlive() then
local staticpos = static:GetCoordinate() local staticpos = static:GetCoordinate()
local distance = self:_GetDistance(location,staticpos) local distance = self:_GetDistance(location,staticpos)
if distance <= finddist and static and weight <= maxloadable then if distance <= finddist and static and (weight <= maxloadable or _ignoreweight) then
index = index + 1 index = index + 1
table.insert(found, staticid, cargo) table.insert(found, staticid, cargo)
maxloadable = maxloadable - weight maxloadable = maxloadable - weight
@ -2167,7 +2168,7 @@ function CTLD:_LoadCratesNearby(Group, Unit)
end end
-- get nearby crates -- get nearby crates
local finddist = self.CrateDistance or 35 local finddist = self.CrateDistance or 35
local nearcrates,number = self:_FindCratesNearby(Group,Unit,finddist) -- #table local nearcrates,number = self:_FindCratesNearby(Group,Unit,finddist,false) -- #table
self:T(self.lid .. " Crates found: " .. number) self:T(self.lid .. " Crates found: " .. number)
if number == 0 and self.hoverautoloading then if number == 0 and self.hoverautoloading then
return self -- exit return self -- exit
@ -2663,7 +2664,7 @@ function CTLD:_BuildCrates(Group, Unit,Engineering)
end end
-- get nearby crates -- get nearby crates
local finddist = self.CrateDistance or 35 local finddist = self.CrateDistance or 35
local crates,number = self:_FindCratesNearby(Group,Unit, finddist) -- #table local crates,number = self:_FindCratesNearby(Group,Unit, finddist,true) -- #table
local buildables = {} local buildables = {}
local foundbuilds = false local foundbuilds = false
local canbuild = false local canbuild = false
@ -2747,7 +2748,7 @@ function CTLD:_RepairCrates(Group, Unit, Engineering)
self:T(self.lid .. " _RepairCrates") self:T(self.lid .. " _RepairCrates")
-- get nearby crates -- get nearby crates
local finddist = self.CrateDistance or 35 local finddist = self.CrateDistance or 35
local crates,number = self:_FindCratesNearby(Group,Unit,finddist) -- #table local crates,number = self:_FindCratesNearby(Group,Unit,finddist,true) -- #table
local buildables = {} local buildables = {}
local foundbuilds = false local foundbuilds = false
local canbuild = false local canbuild = false
@ -4023,7 +4024,7 @@ end
self:T(_engineers.lid .. _engineers:GetStatus()) self:T(_engineers.lid .. _engineers:GetStatus())
if wrenches and wrenches:IsAlive() then if wrenches and wrenches:IsAlive() then
if engineers:IsStatus("Running") or engineers:IsStatus("Searching") then if engineers:IsStatus("Running") or engineers:IsStatus("Searching") then
local crates,number = self:_FindCratesNearby(wrenches,nil, self.EngineerSearch) -- #table local crates,number = self:_FindCratesNearby(wrenches,nil, self.EngineerSearch,true) -- #table
engineers:Search(crates,number) engineers:Search(crates,number)
elseif engineers:IsStatus("Moving") then elseif engineers:IsStatus("Moving") then
engineers:Move() engineers:Move()