Merge branch 'FF/Ops' into FF/OpsDev

Moose Development/Moose/Core/Base.lua

@@ -1153,10 +1153,19 @@ function BASE:_Serialize(Arguments)
   text = string.gsub(text,"(\n+)","")
   text = string.gsub(text,"%(%(","%(")
   text = string.gsub(text,"%)%)","%)")
-  text = string.gsub(text,"(%s+)","")
+  text = string.gsub(text,"(%s+)"," ")
   return text
 end
 
+----- (Internal) Serialize arguments
+---- @param #BASE self
+---- @param #table Arguments
+---- @return #string Text
+--function BASE:_Serialize(Arguments)
+--  local text=UTILS.BasicSerialize(Arguments)
+--  return text
+--end
+
 --- Trace a function call. This function is private.
 -- @param #BASE self
 -- @param Arguments A #table or any field.

Moose Development/Moose/Core/ClientMenu.lua

@@ -20,7 +20,7 @@
 -- 
 -- @module Core.ClientMenu
 -- @image Core_Menu.JPG
--- last change: Oct 2023
+-- last change: Apr 2024
 
 -- TODO
 ----------------------------------------------------------------------------------------------------------------
@@ -51,6 +51,7 @@
 -- @field #boolean Generic
 -- @field #boolean debug
 -- @field #CLIENTMENUMANAGER Controller
+-- @field #active boolean
 -- @extends Core.Base#BASE
 
 ---
@@ -58,7 +59,7 @@
 CLIENTMENU = {
   ClassName = "CLIENTMENUE",
   lid = "",
-  version = "0.1.1",
+  version = "0.1.2",
   name = nil,
   path = nil,
   group = nil,
@@ -70,6 +71,7 @@ CLIENTMENU = {
   debug = false,
   Controller = nil,
   groupname = nil,
+  active = false,
 }
 
 ---
@@ -114,7 +116,7 @@ function CLIENTMENU:NewEntry(Client,Text,Parent,Function,...)
   if self.Functionargs and self.debug then
     self:T({"Functionargs",self.Functionargs})
   end
-  if not self.Generic then
+  if not self.Generic and self.active == false then
     if Function ~= nil then
       local ErrorHandler = function( errmsg )
         env.info( "MOOSE Error in CLIENTMENU COMMAND function: " .. errmsg )
@@ -133,8 +135,10 @@ function CLIENTMENU:NewEntry(Client,Text,Parent,Function,...)
         end
       end
       self.path = missionCommands.addCommandForGroup(self.GroupID,Text,self.parentpath, self.CallHandler)
+      self.active = true
     else
       self.path = missionCommands.addSubMenuForGroup(self.GroupID,Text,self.parentpath)
+      self.active = true
     end
   else
     if self.parentpath then
@@ -200,6 +204,7 @@ function CLIENTMENU:RemoveF10()
     if not status then
       self:I(string.format("**** Error Removing Menu Entry %s for %s!",tostring(self.name),self.groupname))
     end
+    self.active = false
   end
   return self
 end
@@ -412,7 +417,7 @@ end
 CLIENTMENUMANAGER = {
   ClassName = "CLIENTMENUMANAGER",
   lid = "",
-  version = "0.1.4",
+  version = "0.1.5a",
   name = nil,
   clientset = nil,
   menutree = {},
@@ -676,6 +681,7 @@ end
 function CLIENTMENUMANAGER:Propagate(Client)
   self:T(self.lid.."Propagate")
   --self:I(UTILS.PrintTableToLog(Client,1))
+  local knownunits = {} -- track so we can ID multi seated
   local Set = self.clientset.Set
   if Client then
     Set = {Client}
@@ -684,28 +690,36 @@ function CLIENTMENUMANAGER:Propagate(Client)
   for _,_client in pairs(Set) do
     local client = _client -- Wrapper.Client#CLIENT
     if client and client:IsAlive() then
+      local playerunit = client:GetName()
+      local playergroup = client:GetGroup()
       local playername = client:GetPlayerName() or "none"
-        if not self.playertree[playername] then
-          self.playertree[playername] = {}
-        end
-        for level,branch in pairs (self.menutree) do
-          self:T("Building branch:" .. level)
-          for _,leaf in pairs(branch) do
-            self:T("Building leaf:" .. leaf)
-            local entry = self:FindEntryByUUID(leaf)
-            if entry then
-              self:T("Found generic entry:" .. entry.UUID)
-              local parent = nil
-              if entry.Parent and entry.Parent.UUID then
-                parent = self.playertree[playername][entry.Parent.UUID] or self:FindEntryByUUID(entry.Parent.UUID)
-              end
-              self.playertree[playername][entry.UUID] = CLIENTMENU:NewEntry(client,entry.name,parent,entry.Function,unpack(entry.Functionargs))
-              self.playertree[playername][entry.UUID].Once = entry.Once
-            else
-              self:T("NO generic entry for:" .. leaf)
-            end  
-          end
+      if not knownunits[playerunit] then
+        knownunits[playerunit] = true
+      else
+        self:I("Player in multi seat unit: "..playername)
+        break -- multi seat already build
+      end
+      if not self.playertree[playername] then
+        self.playertree[playername] = {}
+      end
+      for level,branch in pairs (self.menutree) do
+        self:T("Building branch:" .. level)
+        for _,leaf in pairs(branch) do
+          self:T("Building leaf:" .. leaf)
+          local entry = self:FindEntryByUUID(leaf)
+          if entry then
+            self:T("Found generic entry:" .. entry.UUID)
+            local parent = nil
+            if entry.Parent and entry.Parent.UUID then
+              parent = self.playertree[playername][entry.Parent.UUID] or self:FindEntryByUUID(entry.Parent.UUID)
+            end
+            self.playertree[playername][entry.UUID] = CLIENTMENU:NewEntry(client,entry.name,parent,entry.Function,unpack(entry.Functionargs))
+            self.playertree[playername][entry.UUID].Once = entry.Once
+          else
+            self:T("NO generic entry for:" .. leaf)
+          end  
         end
+      end
     end
   end
   return self
@@ -719,6 +733,7 @@ end
 function CLIENTMENUMANAGER:AddEntry(Entry,Client)
   self:T(self.lid.."AddEntry")
   local Set = self.clientset.Set
+  local knownunits = {}
   if Client then
     Set = {Client}
   end
@@ -726,6 +741,13 @@ function CLIENTMENUMANAGER:AddEntry(Entry,Client)
     local client = _client -- Wrapper.Client#CLIENT
     if client and client:IsAlive() then
       local playername = client:GetPlayerName()
+      local unitname = client:GetName()
+      if not knownunits[unitname] then
+        knownunits[unitname] = true
+      else
+        self:I("Player in multi seat unit: "..playername)  
+        break
+      end
       if Entry then
         self:T("Adding generic entry:" .. Entry.UUID)
         local parent = nil

Moose Development/Moose/Core/Database.lua

@@ -1009,7 +1009,7 @@ function DATABASE:_RegisterGroupTemplate( GroupTemplate, CoalitionSide, Category
   self.Templates.Groups[GroupTemplateName].CategoryID = CategoryID
   self.Templates.Groups[GroupTemplateName].CoalitionID = CoalitionSide
   self.Templates.Groups[GroupTemplateName].CountryID = CountryID
-
+  
   local UnitNames = {}
 
   for unit_num, UnitTemplate in pairs( GroupTemplate.units ) do
@@ -1074,7 +1074,7 @@ end
 -- @param #string unitname Name of the associated unit.
 -- @return #number Octal
 function DATABASE:GetNextSTN(octal,unitname)
-  local first = UTILS.OctalToDecimal(octal)
+  local first = UTILS.OctalToDecimal(octal) or 0
   if self.STNS[first] == unitname then return octal end
   local nextoctal = 77777
   local found = false
@@ -1111,7 +1111,7 @@ end
 -- @param #string unitname Name of the associated unit.
 -- @return #number Octal
 function DATABASE:GetNextSADL(octal,unitname)
-  local first = UTILS.OctalToDecimal(octal)
+  local first = UTILS.OctalToDecimal(octal) or 0
   if self.SADL[first] == unitname then return octal end
   local nextoctal = 7777
   local found = false
@@ -1685,7 +1685,7 @@ function DATABASE:_EventOnPlayerLeaveUnit( Event )
     if Event.IniObjectCategory == 1 then
 
       -- Try to get the player name. This can be buggy for multicrew aircraft!
-      local PlayerName = Event.IniUnit:GetPlayerName() or FindPlayerName(Event.IniUnitName)
+      local PlayerName = Event.IniPlayerName or Event.IniUnit:GetPlayerName() or FindPlayerName(Event.IniUnitName)
           
       if PlayerName then
 
@@ -2081,7 +2081,7 @@ function DATABASE:_RegisterTemplates()
                   for group_num, Template in pairs(obj_type_data.group) do
 
                     if obj_type_name ~= "static" and Template and Template.units and type(Template.units) == 'table' then  --making sure again- this is a valid group
-
+                      
                       self:_RegisterGroupTemplate(Template, CoalitionSide, _DATABASECategory[string.lower(CategoryName)], CountryID)
 
                     else

Moose Development/Moose/Core/Message.lua

@@ -395,29 +395,36 @@ end
 --- Sends a MESSAGE to all players. 
 -- @param #MESSAGE self
 -- @param Core.Settings#Settings Settings (Optional) Settings for message display.
--- @return #MESSAGE
+-- @param #number Delay (Optional) Delay in seconds before the message is send. Default instantly (`nil`).
+-- @return #MESSAGE self
 -- @usage
 --
---   -- Send a message created to all players.
---   MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 ):ToAll()
---   or
---   MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 ):ToAll()
---   or
---   MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 )
---   MessageAll:ToAll()
+-- -- Send a message created to all players.
+-- MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 ):ToAll()
+-- or
+-- MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 ):ToAll()
+-- or
+-- MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 )
+-- MessageAll:ToAll()
 --
-function MESSAGE:ToAll( Settings )
+function MESSAGE:ToAll( Settings, Delay )
   self:F()
 
-  if self.MessageType then
-    local Settings = Settings or _SETTINGS -- Core.Settings#SETTINGS
-    self.MessageDuration = Settings:GetMessageTime( self.MessageType )
-    self.MessageCategory = "" -- self.MessageType .. ": "
-  end
+  if Delay and Delay>0 then
+    self:ScheduleOnce(Delay, MESSAGE.ToAll, self, Settings, 0)
+  else
 
-  if self.MessageDuration ~= 0 then
-    self:T( self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ) .. " / " .. self.MessageDuration )
-    trigger.action.outText( self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ), self.MessageDuration, self.ClearScreen )
+    if self.MessageType then
+      local Settings = Settings or _SETTINGS -- Core.Settings#SETTINGS
+      self.MessageDuration = Settings:GetMessageTime( self.MessageType )
+      self.MessageCategory = "" -- self.MessageType .. ": "
+    end
+  
+    if self.MessageDuration ~= 0 then
+      self:T( self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ) .. " / " .. self.MessageDuration )
+      trigger.action.outText( self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ), self.MessageDuration, self.ClearScreen )
+    end
+    
   end
 
   return self

Moose Development/Moose/Core/Set.lua

@@ -4388,8 +4388,8 @@ do -- SET_CLIENT
     return self
   end
 
-  --- Builds a set of CLIENTs that contain the given string in their unit/pilot name.
-  -- **Attention!** Bad naming convention as this **does not** filter only **prefixes** but all clients that **contain** the string. 
+  --- Builds a set of CLIENTs that contain the given string in their **unit/pilot** name and **NOT** the group name!
+  -- **Attention!** Bad naming convention as this **does not** filter only **prefixes** but all clients that **contain** the string. Pattern matching applies.
   -- @param #SET_CLIENT self
   -- @param #string Prefixes The string pattern(s) that needs to be contained in the unit/pilot name. Can also be passed as a `#table` of strings.
   -- @return #SET_CLIENT self

Moose Development/Moose/Core/Spawn.lua

@@ -292,9 +292,10 @@ SPAWN = {
 
 --- Enumerator for spawns at airbases
 -- @type SPAWN.Takeoff
--- @extends Wrapper.Group#GROUP.Takeoff
-
--- @field #SPAWN.Takeoff Takeoff
+-- @field #number Air Take off happens in air.
+-- @field #number Runway Spawn on runway. Does not work in MP!
+-- @field #number Hot Spawn at parking with engines on.
+-- @field #number Cold Spawn at parking with engines off.
 SPAWN.Takeoff = {
   Air = 1,
   Runway = 2,
@@ -1467,6 +1468,30 @@ do -- Delay methods
 
 end -- Delay methods
 
+--- Hide the group on the map view (visible to game master slots!).
+-- @param #SPAWN self
+-- @return #SPAWN The SPAWN object
+function SPAWN:InitHiddenOnMap()
+  self.SpawnHiddenOnMap = true
+  return self
+end
+
+--- Hide the group on MFDs (visible to game master slots!).
+-- @param #SPAWN self
+-- @return #SPAWN The SPAWN object
+function SPAWN:InitHiddenOnMFD()
+  self.SpawnHiddenOnMFD = true
+  return self
+end
+
+--- Hide the group on planner (visible to game master slots!).
+-- @param #SPAWN self
+-- @return #SPAWN The SPAWN object
+function SPAWN:InitHiddenOnPlanner()
+  self.SpawnHiddenOnPlanner = true
+  return self
+end
+
 --- Will spawn a group based on the internal index.
 -- Note: This method uses the global _DATABASE object (an instance of @{Core.Database#DATABASE}), which contains ALL initial and new spawned objects in MOOSE.
 -- @param #SPAWN self
@@ -1740,7 +1765,20 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
         if self.SpawnInitModu then
           SpawnTemplate.modulation = self.SpawnInitModu
         end
+        
+        -- hiding options
+        if self.SpawnHiddenOnPlanner then
+          SpawnTemplate.hiddenOnPlanner=true
+        end
 
+        if self.SpawnHiddenOnMFD then
+          SpawnTemplate.hiddenOnMFD=true
+        end
+        
+        if self.SpawnHiddenOnMap then
+          SpawnTemplate.hidden=true
+        end
+        
         -- Set country, coalition and category.
         SpawnTemplate.CategoryID = self.SpawnInitCategory or SpawnTemplate.CategoryID
         SpawnTemplate.CountryID = self.SpawnInitCountry or SpawnTemplate.CountryID
@@ -3238,7 +3276,7 @@ end
 --- Get the index from a given group.
 -- The function will search the name of the group for a #, and will return the number behind the #-mark.
 function SPAWN:GetSpawnIndexFromGroup( SpawnGroup )
-  self:F2( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnGroup } )
+  self:F3( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnGroup } )
 
   local IndexString = string.match( SpawnGroup:GetName(), "#(%d*)$" ):sub( 2 )
   local Index = tonumber( IndexString )
@@ -3250,7 +3288,7 @@ end
 
 --- Return the last maximum index that can be used.
 function SPAWN:_GetLastIndex()
-  self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix } )
+  self:F3( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix } )
 
   return self.SpawnMaxGroups
 end