diff --git a/__resource.lua b/__resource.lua index a6a15dc6..be77bcc9 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ES Extended' -version '1.0.14' +version '1.1.0' server_scripts { '@async/async.lua', diff --git a/client/main.lua b/client/main.lua index 77ccec35..a899bced 100644 --- a/client/main.lua +++ b/client/main.lua @@ -480,7 +480,7 @@ end) Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) if IsControlJustReleased(0, Keys['F2']) and GetLastInputMethod(2) and not isDead and not ESX.UI.Menu.IsOpen('default', 'es_extended', 'inventory') then ESX.ShowInventory() @@ -515,7 +515,7 @@ if Config.DisableWantedLevel then Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) local playerId = PlayerId() if GetPlayerWantedLevel(playerId) ~= 0 then diff --git a/client/modules/blip.lua b/client/modules/blip.lua new file mode 100644 index 00000000..22297a5e --- /dev/null +++ b/client/modules/blip.lua @@ -0,0 +1,25 @@ +ESX.Blip.CreateBlip = function(coords, text, sprite, color, scale, display) + local blip = AddBlipForCoord( table.unpack(coords) ) + + SetBlipSprite(blip, sprite) + + if display then + SetBlipDisplay(blip, display) + end + + if scale then + SetBlipScale(blip, scale) + end + + if color then + SetBlipColour(blip, color) + end + + SetBlipAsShortRange(blip, true) + + BeginTextCommandSetBlipName('STRING') + AddTextComponentSubstringPlayerName(text) + EndTextCommandSetBlipName(blip) + + return blip +end \ No newline at end of file diff --git a/client/modules/scaleform.lua b/client/modules/scaleform.lua index 20a9c6e8..33d32860 100644 --- a/client/modules/scaleform.lua +++ b/client/modules/scaleform.lua @@ -47,7 +47,7 @@ ESX.Scaleform.ShowBreakingNews = function(title, msg, bottom, sec) SetScaleformMovieAsNoLongerNeeded(scaleform) end -ESX.Scaleform.ShowPopupWarning = function(title, msg, bottom, sec) +ESX.Scaleform.ShowPopupWarning = function(title, msg, footer, sec) local scaleform = ESX.Scaleform.Utils.RequestScaleformMovie('POPUP_WARNING') BeginScaleformMovieMethod(scaleform, 'SHOW_POPUP_WARNING') @@ -55,7 +55,7 @@ ESX.Scaleform.ShowPopupWarning = function(title, msg, bottom, sec) PushScaleformMovieMethodParameterFloat(500.0) -- black background PushScaleformMovieMethodParameterString(title) PushScaleformMovieMethodParameterString(msg) - PushScaleformMovieMethodParameterString(bottom) + PushScaleformMovieMethodParameterString(footer) PushScaleformMovieMethodParameterBool(true) EndScaleformMovieMethod() diff --git a/config.lua b/config.lua index 27e32bb9..46e53930 100644 --- a/config.lua +++ b/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'sv' Config.Accounts = { 'bank', 'black_money' } Config.AccountLabels = { bank = _U('bank'), black_money = _U('black_money') }