feat(server/groups): row specific option to include off duty players

Author: antond15

config.lua

@@ -45,22 +45,25 @@ return {
     -- Default keybind for the '/scoreboard' command
     commandKey = 'DELETE',
 
-    -- Whether to include off-duty players in group count
+    -- Whether to include off-duty players in group count (if not defined in the group row itself)
     includeOffDuty = false,
 
     -- Group list shown in the scoreboard
     groups = {
         {
             label = 'Police',
             groups = {'police', 'sheriff'},
+            includeOffDuty = false,
         },
         {
             label = 'EMS',
             groups = {'ambulance'},
+            includeOffDuty = false,
         },
         {
             label = 'Mechanics',
             groups = {'lsc', 'bennys', 'hayes'},
+            includeOffDuty = true,
         },
         {
             label = 'Taxi',

modules/server/sections/groups/esx.lua

@@ -148,7 +148,7 @@ local function getAllGroupsCounts()
     local includeOffDuty = Config.includeOffDuty
 
     for index, group in ipairs(Config.groups) do
-        counts[index] = getGroupsCount(group.groups, includeOffDuty)
+        counts[index] = getGroupsCount(group.groups, group.includeOffDuty or group.includeOffDuty == nil and includeOffDuty)
     end
 
     return counts

modules/server/sections/groups/ox.lua

@@ -25,7 +25,7 @@ local function getAllGroupsCounts()
     local includeOffDuty = Config.includeOffDuty
 
     for index, group in ipairs(Config.groups) do
-        counts[index] = getGroupsCount(group.groups, includeOffDuty)
+        counts[index] = getGroupsCount(group.groups, group.includeOffDuty or group.includeOffDuty == nil and includeOffDuty)
     end
 
     return counts

modules/server/sections/groups/qb.lua

@@ -137,7 +137,7 @@ local function getAllGroupsCounts()
     local includeOffDuty = Config.includeOffDuty
 
     for index, group in ipairs(Config.groups) do
-        counts[index] = getGroupsCount(group.groups, includeOffDuty)
+        counts[index] = getGroupsCount(group.groups, group.includeOffDuty or group.includeOffDuty == nil and includeOffDuty)
     end
 
     return counts

modules/server/sections/groups/qbx.lua

@@ -147,7 +147,7 @@ local function getAllGroupsCounts()
     local includeOffDuty = Config.includeOffDuty
 
     for index, group in ipairs(Config.groups) do
-        counts[index] = getGroupsCount(group.groups, includeOffDuty)
+        counts[index] = getGroupsCount(group.groups, group.includeOffDuty or group.includeOffDuty == nil and includeOffDuty)
     end
 
     return counts