wip(compat/qb/server): basic functions

Feat/custom group info

client/death.lua

@@ -29,14 +29,13 @@ AddEventHandler("gameEventTriggered", function(name, args)
 	local victim = args[1]
 	if not IsPedAPlayer(victim) or NetworkGetPlayerIndexFromPed(victim) ~= cache.playerId then return end
 
-    if not IsPedDeadOrDying(victim, true) then
+    local hit, bone = GetPedLastDamageBone(victim)
-        local hit, bone = GetPedLastDamageBone(victim)
+    if hit and usingAmbulance then
-        if hit and usingAmbulance then
+        local damageWeapon = ambulance:getLastDamagingWeapon(victim)
-            local damageWeapon = ambulance:getLastDamagingWeapon(victim)
+        ambulance:updateBodyDamage(bone, damageWeapon)
-            return damageWeapon and ambulance:updateBodyDamage(bone, damageWeapon)
-        end
-        return
     end
+    
+    if not IsPedDeadOrDying(victim, true) or GetEntityHealth(victim) > 100 then return end
 
     local killerEntity, deathCause = GetPedSourceOfDeath(cache.ped), GetPedCauseOfDeath(cache.ped)
     local killerClientId = NetworkGetPlayerIndexFromPed(killerEntity)

client/events.lua

@@ -22,5 +22,50 @@ RegisterNetEvent("ND:updateLastLocation", function(location)
 end)
 
 RegisterNetEvent("ND:revivePlayer", function()
-    NDCore.revivePlayer(true)
+    if source == "" then return end
+    local veh = GetVehiclePedIsIn(cache.ped)
+    local seat = cache.seat
+    local coords = GetEntityCoords(cache.ped)
+    NetworkResurrectLocalPlayer(coords.x, coords.y, coords.z, GetEntityHeading(cache.ped), true, true, false)
+
+    local ped = PlayerPedId()
+    if cache.ped ~= ped then
+        DeleteEntity(cache.ped)
+        ClearAreaOfPeds(coords.x, coords.y, coords.z, 0.2, false)
+    end
+
+    SetEntityInvincible(ped, false)
+    FreezeEntityPosition(ped, false)
+    SetEntityVisible(ped, true)
+    SetEveryoneIgnorePlayer(ped, false)
+    SetPedCanBeTargetted(ped, true)
+    SetEntityCanBeDamaged(ped, true)
+    SetBlockingOfNonTemporaryEvents(ped, false)
+    SetPedCanRagdollFromPlayerImpact(ped, true)
+    ClearPedTasksImmediately(ped)
+
+    if veh and veh ~= 0 then
+        SetPedIntoVehicle(ped, veh, seat)
+    end
+end)
+
+RegisterNetEvent("ND:characterUnloaded")
+
+RegisterNetEvent("ND:clothingMenu", function()
+    if GetResourceState("fivem-appearance") ~= "started" then return end
+    
+    local function customize(appearance)
+        if not appearance then return end
+        TriggerServerEvent("ND:updateClothing", appearance)
+    end
+    
+    exports["fivem-appearance"]:startPlayerCustomization(customize, {
+        ped = false,
+        headBlend = true,
+        faceFeatures = true,
+        headOverlays = true,
+        components = true,
+        props = true,
+        tattoos = true
+    })
 end)

client/functions.lua

@@ -33,50 +33,6 @@ function NDCore.getConfig(info)
     return Config[info]
 end
 
-function NDCore.revivePlayer(reset, keepDead)
-    local usingAmbulance = GetResourceState("ND_Ambulance") == "started"
-    if not keepDead then
-        LocalPlayer.state.dead = false
-        if usingAmbulance then
-            local state = Player(cache.serverId).state
-            state:set("isDead", false, true)
-        end
-    end
-
-    local veh = GetVehiclePedIsIn(cache.ped)
-    local seat = cache.seat
-    local coords = GetEntityCoords(cache.ped)
-    NetworkResurrectLocalPlayer(coords.x, coords.y, coords.z, GetEntityHeading(cache.ped), true, true, false)
-
-    local ped = PlayerPedId()
-    if cache.ped ~= ped then
-        DeleteEntity(cache.ped)
-        ClearAreaOfPeds(coords.x, coords.y, coords.z, 0.2, false)
-    end
-
-    SetEntityInvincible(ped, false)
-    FreezeEntityPosition(ped, false)
-    SetEntityVisible(ped, true)
-    SetEveryoneIgnorePlayer(ped, false)
-    SetPedCanBeTargetted(ped, true)
-    SetEntityCanBeDamaged(ped, true)
-    SetBlockingOfNonTemporaryEvents(ped, false)
-    SetPedCanRagdollFromPlayerImpact(ped, true)
-    ClearPedTasksImmediately(ped)
-
-    if veh and veh ~= 0 then
-        SetPedIntoVehicle(ped, veh, seat)
-    end
-    if reset and GetPedMovementClipset(ped) == `move_m@injured` then
-        ClearEntityLastDamageEntity(ped)
-        SetPedMoveRateOverride(ped, 1.0)
-        ResetPedMovementClipset(ped, 0)
-    end
-    if reset and usingAmbulance then
-        exports["ND_Ambulance"]:resetBodyDamage()
-    end
-end
-
 function NDCore.notify(...)
     lib.notify(...)
 end

client/main.lua

@@ -7,7 +7,7 @@ Config = {
     discordAsset = GetConvar("core:discordAsset", "andyyy"),
     discordAssetSmall = GetConvar("core:discordAssetSmall", "andyyy"),
     discordActionText = GetConvar("core:discordActionText", "DISCORD"),
-    discordActionLink = GetConvar("discordActionLink", "https://discord.gg/Z9Mxu72zZ6"),
+    discordActionLink = GetConvar("core:discordActionLink", "https://discord.gg/Z9Mxu72zZ6"),
     discordActionText2 = GetConvar("core:discordActionText2", "STORE"),
     discordActionLink2 = GetConvar("core:discordActionLink2", "https://andyyy.tebex.io/category/fivem-scripts"),
     disableVehicleAirControl = GetConvarInt("core:disableVehicleAirControl", 1) == 1,

compatibility/qb/server.lua

@@ -1 +1,73 @@
 if not lib.table.contains(Config.compatibility, "qb") then return end
+
+local QBCore = {}
+
+QBCore.Config = QBConfig
+QBCore.Shared = QBShared
+QBCore.ClientCallbacks = {}
+QBCore.ServerCallbacks = {}
+
+QBCore.Players = {}
+QBCore.Functions = {}
+QBCore.Player_Buckets = {}
+QBCore.Entity_Buckets = {}
+QBCore.UsableItems = {}
+
+function QBCore.Functions.GetCoords(entity)
+    local coords = GetEntityCoords(entity)
+    local heading = GetEntityHeading(entity)
+    return vec4(coords.x, coords.y, coords.z, heading)
+end
+
+function QBCore.Functions.GetIdentifier(source, idtype)
+    if GetConvarInt("sv_fxdkMode", 0) == 1 then return "license:fxdk" end
+    return GetPlayerIdentifierByType(source, idtype or "license")
+end
+
+function QBCore.Functions.GetSource(identifier)
+    for src, _ in pairs(NDCore.players) do
+        local idens = GetPlayerIdentifiers(src)
+        for _, id in pairs(idens) do
+            if identifier == id then
+                return src
+            end
+        end
+    end
+    return 0
+end
+
+local function createPlayer(player)
+    
+end
+
+function QBCore.Functions.GetPlayer(source)
+    if type(source) == "number" then
+        return createPlayer(NDCore.players[source])
+    else
+        return createPlayer(NDCore.players[QBCore.Functions.GetSource(source)])
+    end
+end
+
+function QBCore.Functions.GetPlayerByCitizenId(citizenid)
+    for src in pairs(NDCore.players) do
+        if NDCore.players[src].id == citizenid then
+            return NDCore.players[src]
+        end
+    end
+end
+
+-- function QBCore.Functions.GetOfflinePlayerByCitizenId(citizenid)
+--     return QBCore.Player.GetOfflinePlayer(citizenid)
+-- end
+
+-- function QBCore.Functions.GetPlayerByLicense(license)
+--     return QBCore.Player.GetPlayerByLicense(license)
+-- end
+
+function QBCore.Functions.GetPlayerByPhone(number)
+    for src in pairs(NDCore.players) do
+        if NDCore.players[src].phonenumber == number then
+            return createPlayer(NDCore.players[src])
+        end
+    end
+end

server/main.lua

@@ -24,6 +24,7 @@ Config = {
     groups = json.decode(GetConvar("core:groups", "[]")),
     admins = json.decode(GetConvar("core:admins", "[]")),
     adminDiscordRoles = json.decode(GetConvar("core:adminDiscordRoles", "[]")),
+    groupRoles = json.decode(GetConvar("core:groupRoles", "[]")),
     multiCharacter = false,
     compatibility = json.decode(GetConvar("core:compatibility", "[]"))
 }
@@ -154,3 +155,10 @@ RegisterNetEvent("ND:playerEliminated", function(info)
         deathInfo = info
     })
 end)
+
+RegisterNetEvent("ND::updateClothing", function(clothing)
+    local src = source
+    local player = NDCore.getPlayer(src)
+    if not player or not clothing or type(clothing) ~= "table" then return end
+    player.setMetadata("clothing", clothing)
+end)

server/player.lua

@@ -114,6 +114,7 @@ local function createCharacterTable(info)
             end
         end
         self.triggerEvent("ND:updateCharacter", removeCharacterFunctions(self))
+        TriggerEvent("ND:updateCharacter", self)
     end
     
     ---@param key string|table
@@ -128,6 +129,7 @@ local function createCharacterTable(info)
             self.metadata[key] = value
         end
         self.triggerEvent("ND:updateCharacter", removeCharacterFunctions(self))
+        TriggerEvent("ND:updateCharacter", self)
         return self.metadata
     end
 
@@ -224,6 +226,7 @@ local function createCharacterTable(info)
             self.metadata.licenses = {license}
         end
         self.triggerEvent("ND:updateCharacter", removeCharacterFunctions(self))
+        TriggerEvent("ND:updateCharacter", self)
     end
 
     function self.getLicense(identifier)
@@ -306,6 +309,12 @@ local function createCharacterTable(info)
                     self.addGroup("admin")
                 end
             end
+            
+            for group, role in pairs(Config.groupRoles) do
+                if lib.table.contains(roles, role) then
+                    self.addGroup(group)
+                end
+            end
         end
 
         for name, _ in pairs(self.groups) do
@@ -320,10 +329,10 @@ local function createCharacterTable(info)
     ---@param rank number
     ---@param isJob boolean
     ---@return boolean
-    function self.addGroup(name, rank, isJob)
+    function self.addGroup(name, rank, info, isJob)
         local groupRank = tonumber(rank) or 1
-        local groupInfo = Config.groups?[name]
+        local groupInfo = info or Config.groups?[name]
-        local bossRank = groupInfo and groupInfo.minimumBossRank
+        local bossRank = groupInfo?.minimumBossRank
 
         -- if not groupInfo then return end
         if isJob then
@@ -334,8 +343,8 @@ local function createCharacterTable(info)
 
         self.groups[name] = {
             name = name,
-            label = groupInfo and groupInfo.label or name,
+            label = groupInfo?.label or name,
-            rankName = groupInfo and groupInfo.ranks[groupRank] or groupRank,
+            rankName = groupInfo?.ranks?[groupRank] or groupRank,
             rank = groupRank,
             isJob = isJob,
             isBoss = bossRank and groupRank >= bossRank
@@ -343,8 +352,11 @@ local function createCharacterTable(info)
         
         if not isJob then
             self.triggerEvent("ND:updateCharacter", removeCharacterFunctions(self))
+            TriggerEvent("ND:updateCharacter", self)
         end
+
         lib.addPrincipal(self.source, ("group.%s"):format(name))
+
         return self.groups[name]
     end
 
@@ -366,6 +378,7 @@ local function createCharacterTable(info)
 
         self.groups[name] = nil
         self.triggerEvent("ND:updateCharacter", removeCharacterFunctions(self))
+        TriggerEvent("ND:updateCharacter", self)
         lib.removePrincipal(self.source, ("group.%s"):format(name))
         return group
     end
@@ -375,12 +388,13 @@ local function createCharacterTable(info)
     ---@return boolean
     function self.setJob(name, rank)
         self.removeGroup(self.job)
-        local job = self.addGroup(name, rank, true)
+        local job = self.addGroup(name, rank, nil, true)
         if job then
             self.job = job.name
             self.jobInfo = job
         end
         self.triggerEvent("ND:updateCharacter", removeCharacterFunctions(self))
+        TriggerEvent("ND:updateCharacter", self)
         return job
     end
 
@@ -426,7 +440,7 @@ function NDCore.newCharacter(src, info)
         inventory = info.inventory or {}
     }
 
-    charInfo.id = MySQL.insert.await("INSERT INTO nd_characters (identifier, name, firstname, lastname, dob, gender, cash, bank, phonenumber, `groups`, metadata) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", {
+    charInfo.id = MySQL.insert.await("INSERT INTO nd_characters (identifier, name, firstname, lastname, dob, gender, cash, bank, phonenumber, `groups`, metadata, inventory) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", {
         identifier,
         charInfo.name,
         charInfo.firstname,
@@ -437,7 +451,8 @@ function NDCore.newCharacter(src, info)
         charInfo.bank,
         charInfo.phonenumber,
         json.encode(charInfo.groups),
-        json.encode(charInfo.metadata)
+        json.encode(charInfo.metadata),
+        json.encode(charInfo.inventory)
     })
 
     return createCharacterTable(charInfo)

server/vehicle.lua

@@ -730,3 +730,30 @@ lib.callback.register("ND_Vehicles:getOwnedVehicles", function(src)
     if not player then return end
     return NDCore.getVehicles(player.id)
 end)
+
+AddEventHandler("ND:characterLoaded", function(player)
+    local ownedExistingVehicles = {}
+    local ownedVehicles = NDCore.getVehicles(player.id)
+    local vehicles = GetAllVehicles()
+    local vehiclesToImpound = {}
+    
+    for i=1, #vehicles do
+        local veh = vehicles[i]
+        local state = Entity(veh).state
+        if state.owner == player.id then
+            ownedExistingVehicles[#ownedExistingVehicles+1] = state.id
+        end
+    end
+
+    for i=1, #ownedVehicles do
+        local veh = ownedVehicles[i]
+        if veh and not veh.stored and not veh.impounded and not lib.table.contains(ownedExistingVehicles, veh.id) then
+            vehiclesToImpound[#vehiclesToImpound+1] = veh.id
+        end
+    end
+
+    if #vehiclesToImpound == 0 then return end
+
+    local query = ("UPDATE nd_vehicles SET impounded = ? WHERE owner = ? AND id IN (%s)"):format(table.concat(vehiclesToImpound, ", "))
+    MySQL.rawExecute(query, {1, player.id})
+end)