diff --git a/server-data/resources/[Christmas]/changer_square/fxmanifest.lua b/server-data/resources/[Christmas]/changer_square/fxmanifest.lua deleted file mode 100644 index 216c1f9b4..000000000 --- a/server-data/resources/[Christmas]/changer_square/fxmanifest.lua +++ /dev/null @@ -1,4 +0,0 @@ -fx_version 'adamant' -games { 'gta5' } - -this_is_a_map 'yes' \ No newline at end of file diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_beaver.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_beaver.ydr deleted file mode 100644 index b156e0789..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_beaver.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_border.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_border.ydr deleted file mode 100644 index aec8dd439..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_border.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_candy.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_candy.ydr deleted file mode 100644 index c4828dbb8..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_candy.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_ferris.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_ferris.ydr deleted file mode 100644 index a7c21038b..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_ferris.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_gifts.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_gifts.ydr deleted file mode 100644 index ead7c67ac..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_gifts.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_iglu.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_iglu.ydr deleted file mode 100644 index fda710234..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_iglu.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_luzes.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_luzes.ydr deleted file mode 100644 index f8ce4c938..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_luzes.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_mahzinha1.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_mahzinha1.ydr deleted file mode 100644 index 0fd9762b0..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_mahzinha1.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_mahzinha2.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_mahzinha2.ydr deleted file mode 100644 index a5b76d5b2..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_mahzinha2.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_santa.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_santa.ydr deleted file mode 100644 index 07f367db9..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_santa.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_santa.ytyp b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_santa.ytyp deleted file mode 100644 index 15954a24d..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_santa.ytyp and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_star.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_star.ydr deleted file mode 100644 index 43ffc2994..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_star.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_tree.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_tree.ydr deleted file mode 100644 index d4a0ffad1..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_tree.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_tree2.ydr b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_tree2.ydr deleted file mode 100644 index cab39c680..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_tree2.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_txt.ytd b/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_txt.ytd deleted file mode 100644 index f2cf371e4..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_props/changer_snow_txt.ytd and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_snow_manifest.ymf b/server-data/resources/[Christmas]/changer_square/stream/changer_snow_manifest.ymf deleted file mode 100644 index 233f2c1dc..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_snow_manifest.ymf and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/changer_ymap.ymap b/server-data/resources/[Christmas]/changer_square/stream/changer_ymap.ymap deleted file mode 100644 index 8379fb794..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/changer_ymap.ymap and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/hei_dt1_13_strm_0.ymap b/server-data/resources/[Christmas]/changer_square/stream/hei_dt1_13_strm_0.ymap deleted file mode 100644 index db8fd6a0e..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/hei_dt1_13_strm_0.ymap and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_0.ybn b/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_0.ybn deleted file mode 100644 index e3b280a5e..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_0.ybn and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_build1.ydr b/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_build1.ydr deleted file mode 100644 index aa564a499..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_build1.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_dtlb.ydr b/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_dtlb.ydr deleted file mode 100644 index 2a8ff5111..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_dtlb.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_grounddetailb.ydr b/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_grounddetailb.ydr deleted file mode 100644 index cfcffc849..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_grounddetailb.ydr and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_superlod_children.ydd b/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_superlod_children.ydd deleted file mode 100644 index 18a4b6d1d..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/objetos/dt1_13_superlod_children.ydd and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/objetos/hi@dt1_13_0.ybn b/server-data/resources/[Christmas]/changer_square/stream/objetos/hi@dt1_13_0.ybn deleted file mode 100644 index 4b2f813fb..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/objetos/hi@dt1_13_0.ybn and /dev/null differ diff --git a/server-data/resources/[Christmas]/changer_square/stream/prop_ld_ferris_wheel+hidr.ytd b/server-data/resources/[Christmas]/changer_square/stream/prop_ld_ferris_wheel+hidr.ytd deleted file mode 100644 index d6c18ce94..000000000 Binary files a/server-data/resources/[Christmas]/changer_square/stream/prop_ld_ferris_wheel+hidr.ytd and /dev/null differ diff --git a/server-data/resources/[bpt_addons]/bpt_addonaccount/LICENSE b/server-data/resources/[bpt_addons]/bpt_addonaccount/LICENSE index e8e8b9ba3..3277ea90a 100644 --- a/server-data/resources/[bpt_addons]/bpt_addonaccount/LICENSE +++ b/server-data/resources/[bpt_addons]/bpt_addonaccount/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - Copyright (C) 2024 bitpredator + Copyright (C) 2024-2025 bitpredator This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - bpt_addonaccount Copyright (C) 2024 bitpredator + bpt_addonaccount Copyright (C) 2024-2025 bitpredator This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/server-data/resources/[bpt_addons]/bpt_addonaccount/README.md b/server-data/resources/[bpt_addons]/bpt_addonaccount/README.md index 58e2b11e7..de463a25e 100644 --- a/server-data/resources/[bpt_addons]/bpt_addonaccount/README.md +++ b/server-data/resources/[bpt_addons]/bpt_addonaccount/README.md @@ -1,7 +1,7 @@

bpt_addonaccount

Discord -Copyright (C) 2024 bitpredator +Copyright (C) 2024-2025 bitpredator This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/server-data/resources/[bpt_addons]/bpt_addonaccount/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_addonaccount/fxmanifest.lua index dbc5331a2..cf9f1fbb8 100644 --- a/server-data/resources/[bpt_addons]/bpt_addonaccount/fxmanifest.lua +++ b/server-data/resources/[bpt_addons]/bpt_addonaccount/fxmanifest.lua @@ -4,7 +4,7 @@ game("gta5") author("bitpredator") description("Allows resources to store account data, such as society funds") lua54("yes") -version("1.0.2") +version("1.0.3") server_scripts({ "@es_extended/imports.lua", diff --git a/server-data/resources/[bpt_addons]/bpt_addonaccount/server/classes/addonaccount.lua b/server-data/resources/[bpt_addons]/bpt_addonaccount/server/classes/addonaccount.lua index c13d86f23..929278220 100644 --- a/server-data/resources/[bpt_addons]/bpt_addonaccount/server/classes/addonaccount.lua +++ b/server-data/resources/[bpt_addons]/bpt_addonaccount/server/classes/addonaccount.lua @@ -1,3 +1,5 @@ +---@diagnostic disable: undefined-global + function CreateAddonAccount(name, owner, money) local self = {} diff --git a/server-data/resources/[bpt_addons]/bpt_addonaccount/server/main.lua b/server-data/resources/[bpt_addons]/bpt_addonaccount/server/main.lua index 6d35f8209..276959a75 100644 --- a/server-data/resources/[bpt_addons]/bpt_addonaccount/server/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_addonaccount/server/main.lua @@ -1,3 +1,5 @@ +---@diagnostic disable: undefined-global + local AccountsIndex, Accounts, SharedAccounts = {}, {}, {} AddEventHandler("onResourceStart", function(resourceName) diff --git a/server-data/resources/[esx]/vSync/client/client.lua b/server-data/resources/[esx]/vSync/client/client.lua index a84a4cdea..9e3ada46e 100644 --- a/server-data/resources/[esx]/vSync/client/client.lua +++ b/server-data/resources/[esx]/vSync/client/client.lua @@ -44,8 +44,6 @@ AddEventHandler("vSync:updateTime", function(base, offset, freeze) end) Citizen.CreateThread(function() - local hour = 0 - local minute = 0 while true do Citizen.Wait(0) local newBaseTime = baseTime @@ -57,8 +55,8 @@ Citizen.CreateThread(function() timeOffset = timeOffset + baseTime - newBaseTime end baseTime = newBaseTime - hour = math.floor(((baseTime + timeOffset) / 60) % 24) - minute = math.floor((baseTime + timeOffset) % 60) + local hour = math.floor(((baseTime + timeOffset) / 60) % 24) + local minute = math.floor((baseTime + timeOffset) % 60) NetworkOverrideClockTime(hour, minute, 0) end end) diff --git a/server-data/resources/[esx]/vSync/config.lua b/server-data/resources/[esx]/vSync/config.lua index e449c3de2..7ec9cb3f5 100644 --- a/server-data/resources/[esx]/vSync/config.lua +++ b/server-data/resources/[esx]/vSync/config.lua @@ -4,7 +4,7 @@ Config.AdminByID = false -- Set to true if you want to set the access to the com Config.DynamicWeather = false -- Set this to false if you don't want the weather to change automatically every 10 minutes. -- On server start -Config.StartWeather = "XMAS" -- Default weather default: 'EXTRASUNNY' +Config.StartWeather = "EXTRASUNNY" -- Default weather default: 'EXTRASUNNY' Config.BaseTime = 8 -- Time default: 8 Config.TimeOffset = 0 -- Time offset default: 0 Config.FreezeTime = false -- freeze time default: false @@ -14,29 +14,29 @@ Config.NewWeatherTimer = 10 -- Time (in minutes) between each weather change d Config.Locale = "en" -- Languages : en, fr, pt, tr, pt_br Config.Admins = { -- Only if Config.AdminByID is set to true - "steam/license:STEAMID/LICENSE", -- EXAMPLE : steam:110000145959807 or license:1234975140128921327 + "steam/license:STEAMID/LICENSE", -- EXAMPLE : steam:110000145959807 or license:1234975140128921327 } Config.Ace = { -- Only if Config.AdminByID is set to false - "command", -- LEAVE BY DEFAULT TO GIVE ACCESS TO ADMINS AND SUPERADMINS IF U DIDN'T TOUCH ADMIN SYSTEM. - --'vsyncr', -- Gives access to weather/time commands only to groups that have access to 'vsyncr' in your server.cfg (like this: add_ace group.admin vsyncr allow) - --'yourgroupaccess', -- add_ace group.yourgroup yourgroupaccess allow + "command", -- LEAVE BY DEFAULT TO GIVE ACCESS TO ADMINS AND SUPERADMINS IF U DIDN'T TOUCH ADMIN SYSTEM. + --'vsyncr', -- Gives access to weather/time commands only to groups that have access to 'vsyncr' in your server.cfg (like this: add_ace group.admin vsyncr allow) + --'yourgroupaccess', -- add_ace group.yourgroup yourgroupaccess allow } Config.AvailableWeatherTypes = { -- DON'T TOUCH EXCEPT IF YOU KNOW WHAT YOU ARE DOING - "EXTRASUNNY", - "CLEAR", - "NEUTRAL", - "SMOG", - "FOGGY", - "OVERCAST", - "CLOUDS", - "CLEARING", - "RAIN", - "THUNDER", - "SNOW", - "BLIZZARD", - "SNOWLIGHT", - "XMAS", - "HALLOWEEN", + "EXTRASUNNY", + "CLEAR", + "NEUTRAL", + "SMOG", + "FOGGY", + "OVERCAST", + "CLOUDS", + "CLEARING", + "RAIN", + "THUNDER", + "SNOW", + "BLIZZARD", + "SNOWLIGHT", + "XMAS", + "HALLOWEEN", } diff --git a/server-data/resources/[esx]/vSync/fxmanifest.lua b/server-data/resources/[esx]/vSync/fxmanifest.lua index 9dfa80ef7..a9c907d85 100644 --- a/server-data/resources/[esx]/vSync/fxmanifest.lua +++ b/server-data/resources/[esx]/vSync/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version("bodacious") game("gta5") description("vSyncRevamped") -version("1.0.2") +version("1.0.3") server_scripts({ "config.lua", diff --git a/server-data/resources/[esx]/vSync/locale.lua b/server-data/resources/[esx]/vSync/locale.lua index d532cde3c..05509f481 100644 --- a/server-data/resources/[esx]/vSync/locale.lua +++ b/server-data/resources/[esx]/vSync/locale.lua @@ -1,21 +1,17 @@ Locales = {} function _(str, ...) -- Translate string - - if Locales[Config.Locale] ~= nil then - - if Locales[Config.Locale][str] ~= nil then - return string.format(Locales[Config.Locale][str], ...) - else - return 'Translation [' .. Config.Locale .. '][' .. str .. '] does not exist' - end - - else - return 'Locale [' .. Config.Locale .. '] does not exist' - end - + if Locales[Config.Locale] ~= nil then + if Locales[Config.Locale][str] ~= nil then + return string.format(Locales[Config.Locale][str], ...) + else + return "Translation [" .. Config.Locale .. "][" .. str .. "] does not exist" + end + else + return "Locale [" .. Config.Locale .. "] does not exist" + end end function _U(str, ...) -- Translate string first char uppercase - return tostring(_(str, ...):gsub("^%l", string.upper)) -end \ No newline at end of file + return tostring(_(str, ...):gsub("^%l", string.upper)) +end diff --git a/server-data/resources/[esx]/vSync/server/server.lua b/server-data/resources/[esx]/vSync/server/server.lua index 68288abad..5d0736bab 100644 --- a/server-data/resources/[esx]/vSync/server/server.lua +++ b/server-data/resources/[esx]/vSync/server/server.lua @@ -4,6 +4,7 @@ local timeOffset = Config.TimeOffset local freezeTime = Config.FreezeTime local blackout = Config.Blackout local newWeatherTimer = Config.NewWeatherTimer +local isAllowedToChange = {} RegisterServerEvent("vSync:requestSync") AddEventHandler("vSync:requestSync", function() @@ -329,5 +330,3 @@ function NextWeatherStage() end TriggerEvent("vSync:requestSync") end - -print("vSync Revamped by Kalinka loaded!") diff --git a/server-data/resources/[esx_addons]/esx_garage/LICENSE b/server-data/resources/[esx_addons]/esx_garage/LICENSE index 7d46e0bd6..fed02f7bf 100644 --- a/server-data/resources/[esx_addons]/esx_garage/LICENSE +++ b/server-data/resources/[esx_addons]/esx_garage/LICENSE @@ -631,8 +631,7 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - esx_garage - Copyright (C) 2015-2024 + esx_garage Copyright (C) 2015-2025 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -649,13 +648,13 @@ the "copyright" line and a pointer to where the full notice is found. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short +If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_garage Copyright (C) 2015-2024 - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. +esx_garage Copyright (C) 2015-2025 +This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. +This is free software, and you are welcome to redistribute it +under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands diff --git a/server-data/resources/[esx_addons]/esx_garage/README.md b/server-data/resources/[esx_addons]/esx_garage/README.md index a8d1004a3..53053a189 100644 --- a/server-data/resources/[esx_addons]/esx_garage/README.md +++ b/server-data/resources/[esx_addons]/esx_garage/README.md @@ -1,15 +1,13 @@ -

[ESX] Garage

Discord - Documentation +

esx_garage

+

Discord -Store Your vehicles in style! ESX garage has an amazing New UI to help you be stylish while parking your broken, rusty Nissan Micra! - -# Legal - -esx_Garage - store vehicles in style! - -Copyright (C) ESX-Framework +Copyright (C) 2024-2025 bitpredator This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. -You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. +ATTENTION: +You are not authorized to change the name of the resource and the resources within it. + +If you want to contribute you can open a pull request. \ No newline at end of file diff --git a/server-data/resources/[esx_addons]/esx_garage/client/antidespawn.lua b/server-data/resources/[esx_addons]/esx_garage/client/antidespawn.lua index 6cd1d0803..b261c68e5 100644 --- a/server-data/resources/[esx_addons]/esx_garage/client/antidespawn.lua +++ b/server-data/resources/[esx_addons]/esx_garage/client/antidespawn.lua @@ -1,9 +1,8 @@ -local model, coords, heading -local vehicle = CreateVehicle(model, coords.x, coords.y, coords.z + 1.0, heading, true, false) +local vehicle SetVehicleNeedsToBeHotwired(vehicle, false) SetVehicleHasBeenOwnedByPlayer(vehicle, true) SetEntityAsMissionEntity(vehicle, true, true) SetVehicleIsStolen(vehicle, false) SetVehicleIsWanted(vehicle, false) -SetVehRadioStation(vehicle, 'OFF') \ No newline at end of file +SetVehRadioStation(vehicle, "OFF") diff --git a/server-data/resources/[esx_addons]/esx_garage/client/main.lua b/server-data/resources/[esx_addons]/esx_garage/client/main.lua index 6f5325bd6..50e6e34d1 100644 --- a/server-data/resources/[esx_addons]/esx_garage/client/main.lua +++ b/server-data/resources/[esx_addons]/esx_garage/client/main.lua @@ -1,3 +1,5 @@ +---@diagnostic disable: undefined-global + local LastMarker, LastPart, thisGarage, thisPound = nil, nil, nil, nil local next = next local nearMarker, menuIsShowed = false, false @@ -13,9 +15,6 @@ AddEventHandler("esx_garage:closemenu", function() hideAll = true, }) - if not menuIsShowed and thisGarage then - ESX.TextUI(TranslateCap("access_parking")) - end if not menuIsShowed and thisPound then ESX.TextUI(TranslateCap("access_Impound")) end @@ -106,15 +105,9 @@ end) AddEventHandler("esx_garage:hasEnteredMarker", function(name, part) if part == "EntryPoint" then - local isInVehicle = IsPedInAnyVehicle(ESX.PlayerData.ped, false) + local _ = IsPedInAnyVehicle(ESX.PlayerData.ped, false) local garage = Config.Garages[name] thisGarage = garage - - if isInVehicle then - ESX.TextUI(TranslateCap("park_veh")) - else - ESX.TextUI(TranslateCap("access_parking")) - end end if part == "GetOutPoint" then diff --git a/server-data/resources/[esx_addons]/esx_garage/config.lua b/server-data/resources/[esx_addons]/esx_garage/config.lua index 0527437d4..15cf989a4 100644 --- a/server-data/resources/[esx_addons]/esx_garage/config.lua +++ b/server-data/resources/[esx_addons]/esx_garage/config.lua @@ -35,32 +35,9 @@ Config.Markers = { Config.Garages = { VespucciBoulevard = { EntryPoint = { - x = -285.2, - y = -886.5, - z = 31.0, - }, - SpawnPoint = { - x = -309.3, - y = -897.0, - z = 31.0, - heading = 351.8, - }, - Sprite = 357, - Scale = 0.8, - Colour = 3, - ImpoundedName = "LosSantos", - }, - SanAndreasAvenue = { - EntryPoint = { - x = 216.4, - y = -786.6, - z = 30.8, - }, - SpawnPoint = { - x = 218.9, - y = -779.7, - z = 30.8, - heading = 338.8, + x = 394.865936, + y = -1637.657104, + z = 29.279907, }, Sprite = 357, Scale = 0.8, @@ -87,45 +64,12 @@ Config.Impounds = { Colour = 1, Cost = 3000, }, - PaletoBay = { - GetOutPoint = { - x = -211.4, - y = 6206.5, - z = 31.4, - }, - SpawnPoint = { - x = -204.6, - y = 6221.6, - z = 30.5, - heading = 227.2, - }, - Sprite = 524, - Scale = 0.8, - Colour = 1, - Cost = 3000, - }, - SandyShores = { - GetOutPoint = { - x = 1728.2, - y = 3709.3, - z = 33.2, - }, - SpawnPoint = { - x = 1722.7, - y = 3713.6, - z = 33.2, - heading = 19.9, - }, - Sprite = 524, - Scale = 0.8, - Colour = 1, - Cost = 3000, - }, } exports("getGarages", function() return Config.Garages end) + exports("getImpounds", function() return Config.Impounds end) diff --git a/server-data/resources/[esx_addons]/esx_garage/fxmanifest.lua b/server-data/resources/[esx_addons]/esx_garage/fxmanifest.lua index b80baf0eb..0a5c0ee43 100644 --- a/server-data/resources/[esx_addons]/esx_garage/fxmanifest.lua +++ b/server-data/resources/[esx_addons]/esx_garage/fxmanifest.lua @@ -1,10 +1,10 @@ fx_version("cerulean") game("gta5") -author("ESX-Framework") +author("ESX-Framework - Rework: Bitpredator") description("Allows Players to Store & Retrieve their vehicles") -version("1.0.2") +version("1.0.3") lua54("yes") @@ -12,7 +12,7 @@ shared_script("@es_extended/imports.lua") server_scripts({ "@es_extended/locale.lua", "locales/*.lua", "@oxmysql/lib/MySQL.lua", "config.lua", "server/main.lua" }) -client_scripts({ "@es_extended/locale.lua", "locales/*.lua", "config.lua", "client/main.lua" }) +client_scripts({ "@es_extended/locale.lua", "locales/*.lua", "config.lua", "client/*.lua" }) ui_page("nui/ui.html") diff --git a/server-data/resources/[esx_addons]/esx_garage/locales/en.lua b/server-data/resources/[esx_addons]/esx_garage/locales/en.lua index 38adcf821..a0e40e21c 100644 --- a/server-data/resources/[esx_addons]/esx_garage/locales/en.lua +++ b/server-data/resources/[esx_addons]/esx_garage/locales/en.lua @@ -1,11 +1,9 @@ Locales["en"] = { ["parking_blip_name"] = "Garage", ["Impound_blip_name"] = "Impound", - ["access_parking"] = "press [E] to access the car park.", ["access_Impound"] = "press [E] to access the impound.", - ["park_veh"] = "press [E] to park the vehicle.", - ["not_owning_veh"] = "You do not own this vehicle!", ["veh_released"] = "Successfully Retrieved Vehicle.", + ["not_owning_veh"] = "You do not own this vehicle!", ["veh_Impound_released"] = "Successfully Retrieved Vehicle From Impound.", ["veh_stored"] = "Successfully Stored Vehicle", ["veh_impounded"] = "Impounded Vehicle", diff --git a/server-data/resources/[esx_addons]/esx_garage/locales/it.lua b/server-data/resources/[esx_addons]/esx_garage/locales/it.lua index f3be9c2cd..b44213ed6 100644 --- a/server-data/resources/[esx_addons]/esx_garage/locales/it.lua +++ b/server-data/resources/[esx_addons]/esx_garage/locales/it.lua @@ -1,11 +1,9 @@ Locales["it"] = { - ["parking_blip_name"] = "Garage", + ["parking_blip_name"] = "Parcheggio del sequestro", ["Impound_blip_name"] = "Sequestro", - ["access_parking"] = "premi [E] per accedere al parcheggio.", ["access_Impound"] = "premi [E] per accedere al sequestro.", - ["park_veh"] = "premi [E] per parcheggiare il veicolo.", - ["not_owning_veh"] = "non possiedi questo veicolo!", ["veh_released"] = " Veicolo recuperato con successo. ", + ["not_owning_veh"] = "non possiedi questo veicolo!", ["veh_Impound_released"] = " Veicolo recuperato con successo dal sequestro. ", ["veh_stored"] = " Veicolo depositato con successo ", ["veh_impounded"] = " Veicolo sequestrato ", diff --git a/server-data/resources/[esx_addons]/esx_garage/nui/ui.html b/server-data/resources/[esx_addons]/esx_garage/nui/ui.html index d8c4b7e7f..1e1954248 100644 --- a/server-data/resources/[esx_addons]/esx_garage/nui/ui.html +++ b/server-data/resources/[esx_addons]/esx_garage/nui/ui.html @@ -8,22 +8,22 @@

diff --git a/server-data/resources/[esx_addons]/esx_garage/server/main.lua b/server-data/resources/[esx_addons]/esx_garage/server/main.lua index 2e2b2e665..86fde6c06 100644 --- a/server-data/resources/[esx_addons]/esx_garage/server/main.lua +++ b/server-data/resources/[esx_addons]/esx_garage/server/main.lua @@ -1,3 +1,5 @@ +---@diagnostic disable: undefined-global + RegisterServerEvent("esx_garage:updateOwnedVehicle") AddEventHandler("esx_garage:updateOwnedVehicle", function(stored, parking, Impound, data, spawn) local source = source