diff --git a/client/main.lua b/client/main.lua index 7a69553..d7e8069 100644 --- a/client/main.lua +++ b/client/main.lua @@ -15,7 +15,7 @@ Config = { randomUnlockedVehicleChance = GetConvarInt("core:randomUnlockedVehicleChance", 30), requireKeys = GetConvarInt("core:requireKeys", 1) == 1, useInventoryForKeys = GetConvarInt("core:useInventoryForKeys", 1) == 1, - groups = {}, + groups = json.decode(GetConvar("core:groups", "[]")), compatibility = json.decode(GetConvar("core:compatibility", "[]")), lockpickTries = GetConvarInt("core:lockpickTries", 3) } diff --git a/server/player.lua b/server/player.lua index b22e214..eb211c5 100644 --- a/server/player.lua +++ b/server/player.lua @@ -405,16 +405,18 @@ local function createCharacterTable(info) function self.addGroup(name, rank, customGroup, isJob) local groupRank = tonumber(rank) or 1 local groupInfo = Config.groups?[name] or {} - local rankData = groupInfo?.ranks?[groupRank] + local rankData = groupInfo?.ranksData?[groupRank] local groupLabel = groupInfo?.label or name local rankName = rankData?.label or groupRank local isBoss = rankData?.isBoss or false + local metadata = groupInfo?.metadata or {} if customGroup then if customGroup.label then groupLabel = customGroup.label end if customGroup.rankName then rankName = customGroup.rankName end if customGroup.isBoss ~= nil then isBoss = customGroup.isBoss end + if customGroup.metadata then metadata = customGroup.metadata end end if isJob then @@ -429,7 +431,8 @@ local function createCharacterTable(info) rankName = rankName, rank = groupRank, isJob = isJob, - isBoss = isBoss + isBoss = isBoss, + metadata = metadata } if not isJob then