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 
# Conflicts:
#	Moose Development/Moose/Core/Menu.lua
#	Moose Development/Moose/Functional/Mantis.lua
This commit is contained in:
Applevangelist
2024-05-19 12:50:41 +02:00
parent 639c5bc71a c985d40ca0
commit da8a02465e
4 changed files with 205 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Functional/Mantis.lua
View File

@@ -638,7 +638,7 @@ do
-- TODO Version
-- @field #string version
self.version="0.8.16"
self.version="0.8.17"
self:I(string.format("***** Starting MANTIS Version %s *****", self.version))
--- FSM Functions ---
@@ -1264,7 +1264,7 @@ do
end
local friendlyset -- Core.Set#SET_GROUP
if self.checkforfriendlies == true then
friendlyset = SET_GROUP:New():FilterCoalitions(self.Coalition):FilterCategories({"plane","helicopter"}):FilterOnce()
friendlyset = SET_GROUP:New():FilterCoalitions(self.Coalition):FilterCategories({"plane","helicopter"}):FilterFunction(function(grp) if grp and grp:InAir() then return true else return false end end):FilterOnce()
end
for _,_coord in pairs (set) do
local coord = _coord -- get current coord to check