weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-20 17:07:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-ng' into develop

Browse Source
This commit is contained in:
Applevangelist
2026-04-25 16:49:58 +02:00
parent d38fc4ec8f f186b4bd58
commit 801cc105da
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Functional/Warehouse.lua
+2 -2
View File
@@ -4097,7 +4097,7 @@ function WAREHOUSE:_RegisterAsset(group, ngroups, forceattribute, forcecargobay,
-- Get name of template group. -- Get name of template group.
local templategroupname=group:GetName() local templategroupname=group:GetName()
local unit = group:GetUnit(1) local unit = group:GetUnit(1)
local Descriptors= (unit and unit:IsAlive()) and unit:GetDesc() or {} local Descriptors= (unit and unit:IsAlive()~=nil) and unit:GetDesc() or {}
local Category=group:GetCategory() local Category=group:GetCategory()
local TypeName=group:GetTypeName() or "none" local TypeName=group:GetTypeName() or "none"
local SpeedMax=group:GetSpeedMax() local SpeedMax=group:GetSpeedMax()
@@ -4115,7 +4115,7 @@ function WAREHOUSE:_RegisterAsset(group, ngroups, forceattribute, forcecargobay,
for _i,_unit in pairs(group:GetUnits()) do for _i,_unit in pairs(group:GetUnits()) do
local unit=_unit --Wrapper.Unit#UNIT local unit=_unit --Wrapper.Unit#UNIT
local Desc=unit:GetDesc() local Desc=unit:GetDesc()
-- Weight. We sum up all units in the group. -- Weight. We sum up all units in the group.
local unitweight=forceweight or Desc.massEmpty local unitweight=forceweight or Desc.massEmpty
if unitweight then if unitweight then
Moose Development/Moose/Ops/TARS.lua
+5 -6
View File
@@ -1119,12 +1119,11 @@ function TARS_SESSION:FindTargets()
local searchzone = self.searchzone -- Core.Zone#ZONE_BASE local searchzone = self.searchzone -- Core.Zone#ZONE_BASE
or ZONE_RADIUS:New("TARS Debug", coordinate:GetVec2(), scan_radius) or ZONE_RADIUS:New("TARS Debug", coordinate:GetVec2(), scan_radius)
--if searchzone then if searchzone.DrawID then searchzone:UndrawZone() end
if searchzone.DrawID then searchzone:UndrawZone() end searchzone:UpdateFromVec2(coordinate:GetVec2(), scan_radius)
searchzone:UpdateFromVec2(coordinate:GetVec2(), scan_radius) searchzone:DrawZone(-1, {0, 0, 1}, 1, {0, 1, 0}, .2, 2, true)
searchzone:DrawZone(-1, {0, 0, 1}, 1, {0, 1, 0}, .2, 2, true) self.searchzone = searchzone
self.searchzone = searchzone self:ScheduleOnce(30, ZONE_BASE.UndrawZone, searchzone)
--end
end end
if self.PilotParameterHelper == true then if self.PilotParameterHelper == true then