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

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

Browse Source 
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Ops/Intelligence.lua
#	Moose Development/Moose/Ops/PlayerTask.lua
This commit is contained in:
Applevangelist
2025-12-22 12:24:25 +01:00
parent 12fa333907 68aab10902
commit 0e3500f587
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/Intelligence.lua
+2 -2
View File
@@ -986,14 +986,14 @@ function INTEL:UpdateIntel()
-- Check if unit is in any of the corridor zones. -- Check if unit is in any of the corridor zones.
if self.corridorzoneset:Count()>0 then if self.corridorzoneset:Count()>0 then
self:I("Corridorzone Check for unit "..unit:GetName()) self:T("Corridorzone Check for unit "..unit:GetName())
local inzone = false local inzone = false
for _,_zone in pairs(self.corridorzoneset.Set) do for _,_zone in pairs(self.corridorzoneset.Set) do
local zone=_zone --Core.Zone#ZONE local zone=_zone --Core.Zone#ZONE
if unit:IsInZone(zone) then if unit:IsInZone(zone) then
local debugtext = "Corridorzone Check for unit "..unit:GetName().."\n" local debugtext = "Corridorzone Check for unit "..unit:GetName().."\n"
debugtext = debugtext .. string.format("IsAir %s | Alt %dm | Floor %dm | Ceil %dm",tostring(unit:IsAir()),tonumber(unit:GetAltitude()),tonumber(self.corridorfloor),tonumber(self.corridorceiling)) debugtext = debugtext .. string.format("IsAir %s | Alt %dm | Floor %dm | Ceil %dm",tostring(unit:IsAir()),tonumber(unit:GetAltitude()),tonumber(self.corridorfloor),tonumber(self.corridorceiling))
MESSAGE:New(debugtext,15,"INTEL"):ToAll():ToLog() MESSAGE:New(debugtext,15,"INTEL"):ToAllIf(self.verbose>1):ToLogIf(self.verbose>1)
if unit:IsAir() and (self.corridorfloor ~= nil or self.corridorceiling ~= nil) then if unit:IsAir() and (self.corridorfloor ~= nil or self.corridorceiling ~= nil) then
local alt = unit:GetAltitude() local alt = unit:GetAltitude()
if self.corridorfloor and alt > self.corridorfloor then inzone = true end if self.corridorfloor and alt > self.corridorfloor then inzone = true end
Moose Development/Moose/Ops/PlayerTask.lua
+2 -2
View File
@@ -21,7 +21,7 @@
-- === -- ===
-- @module Ops.PlayerTask -- @module Ops.PlayerTask
-- @image OPS_PlayerTask.jpg -- @image OPS_PlayerTask.jpg
-- @date Last Update Oct 2025 -- @date Last Update Dec 2025
do do
@@ -4988,7 +4988,7 @@ function PLAYERTASKCONTROLLER:_LoadTasksPersisted()
return self return self
end end
--- --- [User] Clear persisted data on disk.
-- @param #PLAYERTASKCONTROLLER self -- @param #PLAYERTASKCONTROLLER self
function PLAYERTASKCONTROLLER:ClearPersistedData() function PLAYERTASKCONTROLLER:ClearPersistedData()
if lfs and io then if lfs and io then