feat(server/player): updatecharacter server event

tweak(client/peds): copying clothing

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)
-        if hit and usingAmbulance then
-            local damageWeapon = ambulance:getLastDamagingWeapon(victim)
-            return damageWeapon and ambulance:updateBodyDamage(bone, damageWeapon)
-        end
-        return
+    local hit, bone = GetPedLastDamageBone(victim)
+    if hit and usingAmbulance then
+        local damageWeapon = ambulance:getLastDamagingWeapon(victim)
+        ambulance:updateBodyDamage(bone, damageWeapon)
     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,56 +33,8 @@ 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(...)
-    if GetResourceState("ModernHUD") == "started" then
-        exports["ModernHUD"]:notify(...)
-    elseif GetResourceState("ox_lib") == "started" then
-        lib.notify(...)
-    end
+    lib.notify(...)
 end
 
 for name, func in pairs(NDCore) do

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,

client/peds.lua

@@ -218,10 +218,10 @@ end)
 RegisterCommand("getclothing", function(source, args, rawCommand)
     local info = ""
     for k, v in pairs(clothingComponents) do
-        info = ("%s\n%s = {\n    drawable = %s,\n    texture = %s\n},"):format(info, k, GetPedDrawableVariation(cache.ped, v), GetPedTextureVariation(cache.ped, v))
+        info = ("%s\n%s = { drawable = %s, texture = %s },"):format(info, k, GetPedDrawableVariation(cache.ped, v), GetPedTextureVariation(cache.ped, v))
     end
     for k, v in pairs(clothingProps) do
-        info = ("%s\n%s = {\n    drawable = %s,\n    texture = %s\n},"):format(info, k, GetPedPropIndex(cache.ped, v), GetPedPropTextureIndex(cache.ped, v))
+        info = ("%s\n%s = { drawable = %s, texture = %s },"):format(info, k, GetPedPropIndex(cache.ped, v), GetPedPropTextureIndex(cache.ped, v))
     end
     lib.setClipboard(info)
 end, false)

server/commands.lua

@@ -262,7 +262,7 @@ lib.addCommand("pay", {
 end)
 
 lib.addCommand("unlock", {
-    help = "Admin force unlock vehicles",
+    help = "Admin Command, force unlock vehicle.",
     restricted = "group.admin",
 }, function(source, args, raw)
     local ped = GetPlayerPed(source)
@@ -309,13 +309,13 @@ lib.addCommand("revive", {
 end)
 
 lib.addCommand("dv", {
-    help = "Admin command, delete vehicles within the range.",
+    help = "Admin command, delete vehicles within the range or the closest.",
     restricted = "group.admin",
     params = {
         {
             name = "range",
             type = "number",
-            help = "The range to select vehicles for deleteion from",
+            help = "Range to delete vehicles in",
             optional = true
         }
     }

server/main.lua

@@ -154,3 +154,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)
@@ -269,11 +272,7 @@ local function createCharacterTable(info)
     
     function self.notify(...)
         if not self.source then return end
-        if GetResourceState("ModernHUD") == "started" then
-            TriggerClientEvent("ModernHUD:notify", self.source, ...)
-        elseif GetResourceState("ox_lib") == "started" then
-            TriggerClientEvent("ox_lib:notify", self.source, ...)
-        end
+        TriggerClientEvent("ox_lib:notify", self.source, ...)
         return true
     end
 
@@ -347,8 +346,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
 
@@ -370,6 +372,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
@@ -385,6 +388,7 @@ local function createCharacterTable(info)
             self.jobInfo = job
         end
         self.triggerEvent("ND:updateCharacter", removeCharacterFunctions(self))
+        TriggerEvent("ND:updateCharacter", self)
         return job
     end
 
@@ -430,7 +434,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,
@@ -441,7 +445,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)