tweak(death): damage event for ambulance

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,31 @@ 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")

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

@@ -10,8 +10,9 @@ Config = {
     discordActionLink = GetConvar("discordActionLink", "https://discord.gg/Z9Mxu72zZ6"),
     discordActionText2 = GetConvar("core:discordActionText2", "STORE"),
     discordActionLink2 = GetConvar("core:discordActionLink2", "https://andyyy.tebex.io/category/fivem-scripts"),
-    randomUnlockedVehicleChance = GetConvarInt("core:randomUnlockedVehicleChance", 30),
     disableVehicleAirControl = GetConvarInt("core:disableVehicleAirControl", 1) == 1,
+    randomUnlockedVehicleChance = GetConvarInt("core:randomUnlockedVehicleChance", 30),
+    requireKeys = GetConvarInt("core:requireKeys", 1) == 1,
     useInventoryForKeys = GetConvarInt("core:useInventoryForKeys", 1) == 1,
     groups = json.decode(GetConvar("core:groups", "[]")),
     compatibility = json.decode(GetConvar("core:compatibility", "[]"))

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)

client/vehicle/main.lua

@@ -480,22 +480,35 @@ CreateThread(function()
     local wait = 500
     while true do
         Wait(wait)
+
+        local reset = true
         playerVehicle = cache.seat == -1 and cache.vehicle
-        if playerVehicle then
-            if Config.disableVehicleAirControl and not vehicleClassNotDisableAirControl[GetVehicleClass(playerVehicle)] and (IsEntityInAir(playerVehicle) or IsEntityUpsidedown(playerVehicle)) then
-                wait = 0
-                DisableControlAction(0, 59) -- disable vehicle air control.
-                DisableControlAction(0, 60)
-            elseif not GetIsVehicleEngineRunning(playerVehicle) and not hasVehicleKeysCheck(playerVehicle) then
-                wait = 0
-                DisableControlAction(0, 59)
-                if DoesEntityExist(playerVehicle) and IsVehicleEngineStarting(playerVehicle) then
-                    SetVehicleEngineOn(playerVehicle, false, true, true) -- don't turn on engine if no keys.
-                end
-            else
-                wait = 500
+
+        local entering = GetVehiclePedIsEntering(cache.ped)
+        if entering and DoesEntityExist(entering) and IsVehicleNeedsToBeHotwired(entering) then
+            SetVehicleNeedsToBeHotwired(entering, false)
+        end
+        
+        if not playerVehicle then goto skip end
+
+        if Config.disableVehicleAirControl and not vehicleClassNotDisableAirControl[GetVehicleClass(playerVehicle)] and (IsEntityInAir(playerVehicle) or IsEntityUpsidedown(playerVehicle)) then
+            wait = 0
+            reset = false
+            DisableControlAction(0, 59) -- disable vehicle air control.
+            DisableControlAction(0, 60)
+        end
+        if Config.requireKeys and not GetIsVehicleEngineRunning(playerVehicle) and not hasVehicleKeysCheck(playerVehicle) then
+            wait = 0
+            reset = false
+            DisableControlAction(0, 59)
+            DisableControlAction(0, 71)
+            if DoesEntityExist(playerVehicle) and IsVehicleEngineStarting(playerVehicle) then
+                SetVehicleEngineOn(playerVehicle, false, true, true) -- don't turn on engine if no keys.
             end
-        elseif wait ~= 500 then
+        end
+
+        ::skip::
+        if (reset or not playerVehicle) and wait ~= 500 then
             wait = 500
         end
     end

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

@@ -7,6 +7,7 @@ local tempPlayersInfo = {}
 Config = {
     serverName = GetConvar("core:serverName", "Unconfigured ND-Core Server"),
     discordInvite = GetConvar("core:discordInvite", "https://discord.gg/Z9Mxu72zZ6"),
+    discordMemeberRequired = GetConvarInt("core:discordMemeberRequired", 1) == 1,
     discordAppId = GetConvar("core:discordAppId", "858146067018416128"),
     discordAsset = GetConvar("core:discordAsset", "andyyy"),
     discordAssetSmall = GetConvar("core:discordAssetSmall", "andyyy"),
@@ -101,7 +102,7 @@ AddEventHandler("playerConnecting", function(name, setKickReason, deferrals)
 
     if mainIdentifier and Config.discordBotToken ~= "false" and Config.discordGuildId ~= "false" then
         discordInfo = checkDiscordIdentifier(identifiers)
-        if not discordInfo then
+        if not discordInfo and Config.discordMemeberRequired then
             deferrals.done(("Your discord was not found, join our discord here: %s."):format(Config.discordInvite))
             Wait(0)
         end

server/player.lua

@@ -165,7 +165,22 @@ local function createCharacterTable(info)
     end
     
     -- Save character information to database
-    function self.save()
+    function self.save(key)
+        if key then
+            local charData = self[key]
+            if not charData or type(charData) == "function" then
+                return lib.print.error(key, "Is not valid character data.")
+            end
+
+            if type(charData) == "table" then
+                charData = json.encode(charData)
+            end
+
+            local query = ("UPDATE nd_characters SET `%s` = ? WHERE charid = ?"):format(key)
+            local affectedRows = MySQL.update.await(query, {charData, self.id})
+            return affectedRows > 0
+        end
+
         local affectedRows = MySQL.update.await("UPDATE nd_characters SET name = ?, firstname = ?, lastname = ?, dob = ?, gender = ?, cash = ?, bank = ?, phonenumber = ?, `groups` = ?, metadata = ? WHERE charid = ?", {
             self.name,
             self.firstname,
@@ -254,11 +269,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
 

server/vehicle.lua

@@ -90,6 +90,9 @@ function NDCore.getVehicle(entity)
         if saveProperties and self.id and self.owner then
             local properties = lib.callback.await("ND_Vehicles:getProps", NetworkGetEntityOwner(entity), self.netId)
             if properties then
+                if self.properties?.callsign then
+                    properties.callsign = true
+                end
                 MySQL.query("UPDATE nd_vehicles SET properties = ? WHERE id = ?", {json.encode(properties), self.id})
             end
         end
@@ -102,6 +105,11 @@ function NDCore.getVehicle(entity)
         if not DoesEntityExist(entity) then return end
         local properties = type(props) == "string" and json.decode(props) or props
         local state = Entity(entity).state
+
+        if self.properties?.callsign then
+            properties.callsign = true
+        end
+
         state.props = properties
         self.properties = properties
         
@@ -406,11 +414,27 @@ function NDCore.spawnOwnedVehicle(source, vehicleId, coords, heading)
     if not vehicle or not vehicle.available or vehicle.owner ~= player.id then return end
 
     MySQL.query.await("UPDATE nd_vehicles SET stored = ? WHERE id = ?", {0, vehicleId})
+
+    local properties = vehicle.properties
+    if properties.callsign then
+        local callsign = player.getMetadata("callsign")
+        if not callsign or callsign == "" then goto skip end
+        
+        callsign = tostring(callsign)
+        if not callsign or callsign:len() ~= 3 then goto skip end
+
+        properties.modFender = tonumber(callsign:sub(1, 1))
+        properties.modRightFender = tonumber(callsign:sub(2, 2))
+        properties.modRoof = tonumber(callsign:sub(3, 3))
+    end
+
+    ::skip::
+
     return NDCore.createVehicle({
         owner = player.id,
-        model = vehicle.properties.model,
+        model = properties.model,
         coords = vec4(coords.x, coords.y, coords.z, coords.w or coords.heading or heading),
-        properties = vehicle.properties,
+        properties = properties,
         vehicleId = vehicleId,
         source = source
     })