@jtff/miztemplate-lib 3.8.8 → 3.8.10

package/lua/settings/settings-qra.lua

@@ -1,25 +1,25 @@
-QRAConfig = {
-    {
-        enable = false,
-        name = "QRA Training AutoSpawn",
-        type = JTFF_QRA.Type.TangoAuto,
-        benefit_coalition = coalition.side.BLUE,
-        templates = {
-            'qra_armed',
-            'qra_safe',
-        },
-        skill = 'Excellent'
-    },
-    {
-        enable = false,
-        name = "QRA Training ManualSpawn",
-        type = JTFF_QRA.Type.TangoManual,
-        benefit_coalition = coalition.side.BLUE,
-    },
-    {
-        enable = false,
-        name = "QRA Alpha",
-        type = JTFF_QRA.Type.Alpha,
-        benefit_coalition = coalition.side.BLUE,
-    },
+QRAConfig = {
+    {
+        enable = false,
+        name = "QRA Training AutoSpawn",
+        type = JTFF_QRA.Type.TangoAuto,
+        benefit_coalition = coalition.side.BLUE,
+        templates = {
+            'qra_armed',
+            'qra_safe',
+        },
+        skill = 'Excellent'
+    },
+    {
+        enable = false,
+        name = "QRA Training ManualSpawn",
+        type = JTFF_QRA.Type.TangoManual,
+        benefit_coalition = coalition.side.BLUE,
+    },
+    {
+        enable = false,
+        name = "QRA Alpha",
+        type = JTFF_QRA.Type.Alpha,
+        benefit_coalition = coalition.side.BLUE,
+    },
 }

package/lua/src/110-set_clients.lua

@@ -6,34 +6,39 @@ Set_CLIENT:HandleEvent(EVENTS.Refueling)
 Set_CLIENT:HandleEvent(EVENTS.RefuelingStop)
 Set_CLIENT:HandleEvent(EVENTS.PlayerEnterAircraft)
 function Set_CLIENT:OnEventPlayerEnterAircraft(EventData)
-    if (EventData.IniGroup) then
+    if (EventData.IniGroupName) then
+        jtff_log.debug(string.format("OnEventPlayerEnterAircraft: IniGroupName = %s", EventData.IniGroupName),"GENERAL")
+        jtff_log.debug(string.format("OnEventPlayerEnterAircraft: IniPlayerName = %s", EventData.IniPlayerName),"GENERAL")
+        jtff_log.debug(string.format("OnEventPlayerEnterAircraft: IniUnitName = %s", net.lua2json(EventData.IniUnitName)),"GENERAL")
+        local clientGroup = GROUP:FindByName(EventData.IniGroupName)
+        local clientUnit = UNIT:FindByName(EventData.IniUnitName)
         local clientSetting = SETTINGS:Set( EventData.IniPlayerName)
         clientSetting:SetImperial()
         clientSetting:SetA2G_MGRS()
         clientSetting:SetMenutextShort(true)
         if type(InterceptArray) == 'table' then
             for index, objIntercept in ipairs(InterceptArray) do
-                if (objIntercept.menus[EventData.IniUnit:GetCoalition()]) then
-                    MENU_GROUP_COMMAND:New( EventData.IniGroup, "High Aspect", objIntercept.menus[EventData.IniUnit:GetCoalition()], StartInterceptTraining, {EventData.IniUnit:GetName(),index,-20,20} )
-                    MENU_GROUP_COMMAND:New( EventData.IniGroup, "Medium Aspect Left", objIntercept.menus[EventData.IniUnit:GetCoalition()], StartInterceptTraining, {EventData.IniUnit:GetName(),index,20,50} )
-                    MENU_GROUP_COMMAND:New( EventData.IniGroup, "Medium Aspect Right", objIntercept.menus[EventData.IniUnit:GetCoalition()], StartInterceptTraining, {EventData.IniUnit:GetName(),index,-50,-20} )
-                    MENU_GROUP_COMMAND:New( EventData.IniGroup, "Low Aspect Left", objIntercept.menus[EventData.IniUnit:GetCoalition()], StartInterceptTraining, {EventData.IniUnit:GetName(),index,50,80} )
-                    MENU_GROUP_COMMAND:New( EventData.IniGroup, "Low Aspect Right", objIntercept.menus[EventData.IniUnit:GetCoalition()], StartInterceptTraining, {EventData.IniUnit:GetName(),index,-80,-50} )
+                if (objIntercept.menus[clientUnit:GetCoalition()]) then
+                    MENU_GROUP_COMMAND:New( clientGroup, "High Aspect", objIntercept.menus[clientUnit:GetCoalition()], StartInterceptTraining, {clientUnit:GetName(),index,-20,20} )
+                    MENU_GROUP_COMMAND:New( clientGroup, "Medium Aspect Left", objIntercept.menus[clientUnit:GetCoalition()], StartInterceptTraining, {clientUnit:GetName(),index,20,50} )
+                    MENU_GROUP_COMMAND:New( clientGroup, "Medium Aspect Right", objIntercept.menus[clientUnit:GetCoalition()], StartInterceptTraining, {clientUnit:GetName(),index,-50,-20} )
+                    MENU_GROUP_COMMAND:New( clientGroup, "Low Aspect Left", objIntercept.menus[clientUnit:GetCoalition()], StartInterceptTraining, {clientUnit:GetName(),index,50,80} )
+                    MENU_GROUP_COMMAND:New( clientGroup, "Low Aspect Right", objIntercept.menus[clientUnit:GetCoalition()], StartInterceptTraining, {clientUnit:GetName(),index,-80,-50} )
                 end
             end
         end
         jtff_log.debug(string.format("Add QRA Menu for group [%s], player name [%s]",EventData.IniGroupName , EventData.IniPlayerName),"QRA")
         if type(QRAArray) == 'table' then
             for index, objQRA in ipairs(QRAArray) do
-                if (MenuCoalitionQRA[EventData.IniUnit:GetCoalition()]) and (objQRA.customconfig.type == JTFF_QRA.Type.TangoAuto) then
-                    objQRA.menu[EventData.IniUnit:GetCoalition()] = MENU_GROUP_COMMAND:New(
-                            EventData.IniGroup,
+                if (MenuCoalitionQRA[clientUnit:GetCoalition()]) and (objQRA.customconfig.type == JTFF_QRA.Type.TangoAuto) then
+                    objQRA.menu[clientUnit:GetCoalition()] = MENU_GROUP_COMMAND:New(
+                            clientGroup,
                             "Trigger " .. objQRA.customconfig.name,
-                            MenuCoalitionQRA[EventData.IniUnit:GetCoalition()],
+                            MenuCoalitionQRA[clientUnit:GetCoalition()],
                             QRATrigger,
                             {
                                 objQRA,
-                                EventData.IniUnit:GetName(),
+                                clientUnit:GetName(),
                                 index,
                             }
                     )
@@ -41,21 +46,21 @@ function Set_CLIENT:OnEventPlayerEnterAircraft(EventData)
             end
         end
         jtff_log.debug(string.format("Add Tanker Menu for group [%s], player name [%s]",EventData.IniGroupName , EventData.IniPlayerName),"TANKER")
-        if EventData.IniUnit:GetCoalition() == coalition.side.BLUE then
-            MENU_GROUP_COMMAND:New( EventData.IniGroup, "Nearest Tanker Info", MenuCoalitionTankerBlue, NearestTankerInfo, { EventData.IniUnit, EventData.IniGroup}  )
-            MENU_GROUP_COMMAND:New( EventData.IniGroup, "All Tankers Info", MenuCoalitionTankerBlue, AllTankersInfo, {EventData.IniUnit,EventData.IniGroup} )
+        if clientUnit:GetCoalition() == coalition.side.BLUE then
+            MENU_GROUP_COMMAND:New( clientGroup, "Nearest Tanker Info", MenuCoalitionTankerBlue, NearestTankerInfo, { clientUnit, clientGroup}  )
+            MENU_GROUP_COMMAND:New( clientGroup, "All Tankers Info", MenuCoalitionTankerBlue, AllTankersInfo, {clientUnit,clientGroup} )
         else
-            MENU_GROUP_COMMAND:New( EventData.IniGroup, "Nearest Tanker Info", MenuCoalitionTankerRed, NearestTankerInfo, { EventData.IniUnit, EventData.IniGroup}  )
-            MENU_GROUP_COMMAND:New( EventData.IniGroup, "All Tankers Info", MenuCoalitionTankerRed, AllTankersInfo, {EventData.IniUnit,EventData.IniGroup} )
+            MENU_GROUP_COMMAND:New( clientGroup, "Nearest Tanker Info", MenuCoalitionTankerRed, NearestTankerInfo, { clientUnit, clientGroup}  )
+            MENU_GROUP_COMMAND:New( clientGroup, "All Tankers Info", MenuCoalitionTankerRed, AllTankersInfo, {clientUnit,clientGroup} )
         end
-        local GroupMenu = MENU_GROUP:New( EventData.IniGroup, "My Group settings" )
+        local GroupMenu = MENU_GROUP:New( clientGroup, "My Group settings" )
         jtff_log.debug(string.format("Add Immortal Menu for group [%s], player name [%s]",EventData.IniGroupName , EventData.IniPlayerName),"GENERAL")
-        BASE:SetState( EventData.IniGroup, "isImmortal", false )
-        BASE:SetState( EventData.IniUnit, "isRefueling", false )
-        MENU_GROUP_COMMAND:New( EventData.IniGroup, "Switch immortal status", GroupMenu, switchGroupImmortalStatus, EventData.IniGroup )
+        BASE:SetState( clientGroup, "isImmortal", false )
+        BASE:SetState( clientUnit, "isRefueling", false )
+        MENU_GROUP_COMMAND:New( clientGroup, "Switch immortal status", GroupMenu, switchGroupImmortalStatus, clientGroup )
         if (type(AIRBOSSArray) == 'table') then
             if #AIRBOSSArray > 0 then
-                MENU_GROUP_COMMAND:New( EventData.IniGroup, "Switch Airboss subtitles", GroupMenu, switchGroupAirbossSubtitlesStatus, EventData.IniGroup )
+                MENU_GROUP_COMMAND:New( clientGroup, "Switch Airboss subtitles", GroupMenu, switchGroupAirbossSubtitlesStatus, clientGroup )
             end
         end
     end