From ec95fef7f556469a4fbc4d27ca1c8420d5b758d0 Mon Sep 17 00:00:00 2001 From: Mojito-Fivem Date: Sun, 7 Nov 2021 11:15:17 +0000 Subject: [PATCH 1/2] refactor(client/functions): Remove local rounding function for QBCore.Shared.Round --- client/functions.lua | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/client/functions.lua b/client/functions.lua index 70bd678..71e0ef4 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -265,15 +265,6 @@ end -- Vehicle -local function Round(value, numDecimalPlaces) - if numDecimalPlaces then - local power = 10 ^ numDecimalPlaces - return math.floor((value * power) + 0.5) / (power) - else - return math.floor(value + 0.5) - end -end - local function Trim(value) if value then return (string.gsub(value, '^%s*(.-)%s*$', '%1')) @@ -343,11 +334,11 @@ function QBCore.Functions.GetVehicleProperties(vehicle) model = GetEntityModel(vehicle), plate = Trim(GetVehicleNumberPlateText(vehicle)), plateIndex = GetVehicleNumberPlateTextIndex(vehicle), - bodyHealth = Round(GetVehicleBodyHealth(vehicle), 1), - engineHealth = Round(GetVehicleEngineHealth(vehicle), 1), - tankHealth = Round(GetVehiclePetrolTankHealth(vehicle), 1), - fuelLevel = Round(GetVehicleFuelLevel(vehicle), 1), - dirtLevel = Round(GetVehicleDirtLevel(vehicle), 1), + bodyHealth = QBCore.Shared.Round(GetVehicleBodyHealth(vehicle), 0.1), + engineHealth = QBCore.Shared.Round(GetVehicleEngineHealth(vehicle), 0.1), + tankHealth = QBCore.Shared.Round(GetVehiclePetrolTankHealth(vehicle), 0.1), + fuelLevel = QBCore.Shared.Round(GetVehicleFuelLevel(vehicle), 0.1), + dirtLevel = QBCore.Shared.Round(GetVehicleDirtLevel(vehicle), 0.1), color1 = colorPrimary, color2 = colorSecondary, pearlescentColor = pearlescentColor, From 20fa745e288e15c9a0c4602fb931846151471844 Mon Sep 17 00:00:00 2001 From: Mojito-Fivem Date: Sun, 7 Nov 2021 11:17:29 +0000 Subject: [PATCH 2/2] refactor(client/functions): Add local trim function to shared.lua --- client/functions.lua | 12 ++---------- shared.lua | 9 +++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/client/functions.lua b/client/functions.lua index 71e0ef4..650981a 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -265,14 +265,6 @@ end -- Vehicle -local function Trim(value) - if value then - return (string.gsub(value, '^%s*(.-)%s*$', '%1')) - else - return nil - end -end - function QBCore.Functions.SpawnVehicle(model, cb, coords, isnetworked) local model = GetHashKey(model) local ped = PlayerPedId() @@ -308,7 +300,7 @@ end function QBCore.Functions.GetPlate(vehicle) if vehicle == 0 then return end - return Trim(GetVehicleNumberPlateText(vehicle)) + return QBCore.Shared.Trim(GetVehicleNumberPlateText(vehicle)) end function QBCore.Functions.GetVehicleProperties(vehicle) @@ -332,7 +324,7 @@ function QBCore.Functions.GetVehicleProperties(vehicle) return { model = GetEntityModel(vehicle), - plate = Trim(GetVehicleNumberPlateText(vehicle)), + plate = QBCore.Shared.Trim(GetVehicleNumberPlateText(vehicle)), plateIndex = GetVehicleNumberPlateTextIndex(vehicle), bodyHealth = QBCore.Shared.Round(GetVehicleBodyHealth(vehicle), 0.1), engineHealth = QBCore.Shared.Round(GetVehicleEngineHealth(vehicle), 0.1), diff --git a/shared.lua b/shared.lua index 59339d9..a9bd249 100644 --- a/shared.lua +++ b/shared.lua @@ -36,6 +36,14 @@ QBShared.SplitStr = function(str, delimiter) return result end +QBShared.Trim = function(value) + if value then + return (string.gsub(value, '^%s*(.-)%s*$', '%1')) + else + return nil + end +end + -- Math Rounding Credits: http://lua-users.org/wiki/SimpleRound QBShared.Sign = function(v) return (v >= 0 and 1) or -1 @@ -46,6 +54,7 @@ QBShared.Round = function(v, bracket) return QBShared.Sign(v/bracket + QBShared.Sign(v) * 0.5) * bracket end + QBShared.StarterItems = { ['phone'] = { amount = 1, item = 'phone' }, ['id_card'] = { amount = 1, item = 'id_card' },