From 57564af25010c7563b684370bde6c0cc34f0c49e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 4 Aug 2017 11:44:48 +0200 Subject: [PATCH 01/42] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..df5f258b --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-esx_garage +FXServer ESX Garage From deebe151660b9e441b7658972652686902edd040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 4 Aug 2017 11:45:24 +0200 Subject: [PATCH 02/42] Update README.md --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index df5f258b..27ce05e4 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,15 @@ # fxserver-esx_garage FXServer ESX Garage + +[INSTALLATION] + +1) CD in your resources/[esx] folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_garage esx_garage +``` +3) Add this in your server.cfg : + +``` +start esx_garage +``` From 6d40d7d6a4517f5d1443db60404c4e9bf9123189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 4 Aug 2017 11:46:39 +0200 Subject: [PATCH 03/42] Add files --- __resource.lua | 14 ++ client/main.lua | 369 ++++++++++++++++++++++++++++++++++++++++++++++++ config.lua | 80 +++++++++++ server/main.lua | 67 +++++++++ 4 files changed, 530 insertions(+) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 config.lua create mode 100644 server/main.lua diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..40b44860 --- /dev/null +++ b/__resource.lua @@ -0,0 +1,14 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Garage' + +server_scripts { + '@mysql-async/lib/MySQL.lua', + 'config.lua', + 'server/main.lua' +} + +client_scripts { + 'config.lua', + 'client/main.lua' +} diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..84625a50 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,369 @@ +ESX = nil +local LastGarage = nil +local LastPart = nil +local LastParking = nil + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) + +AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) + + if part == 'ExteriorEntryPoint' then + + local playerPed = GetPlayerPed(-1) + local coords = GetEntityCoords(playerPed) + local garage = Config.Garages[name] + + if IsPedInAnyVehicle(playerPed, false) then + + local vehicle, distance = ESX.Game.GetClosestVehicle({ + x = coords.x, + y = coords.y, + z = coords.z + }) + + if distance <= 2.0 then + + local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) + + local spawnCoords = { + x = garage.InteriorSpawnPoint.Pos.x, + y = garage.InteriorSpawnPoint.Pos.y, + z = garage.InteriorSpawnPoint.Pos.z + } + + DeleteVehicle(vehicle) + + ESX.Game.Teleport(playerPed, spawnCoords, function() + + TriggerEvent('instance:create') + + ESX.Game.SpawnLocalVehicle(vehicleProps.model, spawnCoords, garage.InteriorSpawnPoint.Heading, function(vehicle) + TaskWarpPedIntoVehicle(playerPed, vehicle, -1) + ESX.Game.SetVehicleProperties(vehicle, vehicleProps) + end) + + ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) + + Citizen.CreateThread(function() + + for i=1, #garage.Parkings, 1 do + for j=1, #vehicles, 1 do + + if i == vehicles[j].zone then + + local vehicleLoaded = false + + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { + x = garage.Parkings[i].Pos.x, + y = garage.Parkings[i].Pos.y, + z = garage.Parkings[i].Pos.z + }, garage.Parkings[i].Heading, function(vehicle) + ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) + vehicleLoaded = true + end) + + while not vehicleLoaded do + Citizen.Wait(0) + end + + end + + end + end + + end) + + end, name) + + end) + + end + + else + + ESX.Game.Teleport(playerPed, { + x = garage.InteriorSpawnPoint.Pos.x, + y = garage.InteriorSpawnPoint.Pos.y, + z = garage.InteriorSpawnPoint.Pos.z + }, function() + + TriggerEvent('instance:create') + + ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) + + Citizen.CreateThread(function() + + for i=1, #garage.Parkings, 1 do + for j=1, #vehicles, 1 do + + if i == vehicles[j].zone then + + local vehicleLoaded = false + + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { + x = garage.Parkings[i].Pos.x, + y = garage.Parkings[i].Pos.y, + z = garage.Parkings[i].Pos.z + }, garage.Parkings[i].Heading, function(vehicle) + ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) + vehicleLoaded = true + end) + + while not vehicleLoaded do + Citizen.Wait(0) + end + + end + + end + end + + end) + + end, name) + + end) + + end + + end + + if part == 'InteriorExitPoint' then + + local playerPed = GetPlayerPed(-1) + local coords = GetEntityCoords(playerPed) + local garage = Config.Garages[name] + + if IsPedInAnyVehicle(playerPed, false) then + + local vehicle, distance = ESX.Game.GetClosestVehicle({ + x = coords.x, + y = coords.y, + z = coords.z + }) + + if distance <= 2.0 then + + local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) + + local spawnCoords = { + x = garage.ExteriorSpawnPoint.Pos.x, + y = garage.ExteriorSpawnPoint.Pos.y, + z = garage.ExteriorSpawnPoint.Pos.z + } + + DeleteVehicle(vehicle) + + ESX.Game.Teleport(playerPed, spawnCoords, function() + + TriggerEvent('instance:close') + + ESX.Game.SpawnVehicle(vehicleProps.model, spawnCoords, garage.ExteriorSpawnPoint.Heading, function(vehicle) + TaskWarpPedIntoVehicle(playerPed, vehicle, -1) + ESX.Game.SetVehicleProperties(vehicle, vehicleProps) + end) + + end) + + end + + else + + ESX.Game.Teleport(playerPed, { + x = garage.ExteriorSpawnPoint.Pos.x, + y = garage.ExteriorSpawnPoint.Pos.y, + z = garage.ExteriorSpawnPoint.Pos.z + }, function() + TriggerEvent('instance:close') + end) + + end + + for i=1, #garage.Parkings, 1 do + + local vehicle, distance = ESX.Game.GetClosestVehicle({ + x = garage.Parkings[i].Pos.x, + y = garage.Parkings[i].Pos.y, + z = garage.Parkings[i].Pos.z + }) + + if distance <= 2.0 then + DeleteVehicle(vehicle) + end + + end + + end + + if part == 'Parking' then + + local playerPed = GetPlayerPed(-1) + local garage = Config.Garages[name] + + if IsPedInAnyVehicle(playerPed, false) then + + local vehicle, distance = ESX.Game.GetClosestVehicle() + local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) + + if distance <= 2.0 then + TriggerServerEvent('esx_garage:setParking', name, parking, vehicleProps) + end + + end + + end + +end) + +AddEventHandler('esx_property:hasExitedMarker', function(name, part, parking) + + if part == 'Parking' then + + local playerPed = GetPlayerPed(-1) + local garage = Config.Garages[name] + + if IsPedInAnyVehicle(playerPed, false) then + TriggerServerEvent('esx_garage:setParking', name, parking, false) + end + + end + +end) + +-- Create Blips +Citizen.CreateThread(function() + + for k,v in pairs(Config.Garages) do + + if v.IsClosed then + + local blip = AddBlipForCoord(v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z) + + SetBlipSprite (blip, 357) + SetBlipDisplay(blip, 4) + SetBlipScale (blip, 1.2) + SetBlipColour (blip, 3) + SetBlipAsShortRange(blip, true) + + BeginTextCommandSetBlipName("STRING") + AddTextComponentString("Garage") + EndTextCommandSetBlipName(blip) + + end + + end + +end) + +-- Display markers +Citizen.CreateThread(function() + while true do + + Wait(0) + + local playerPed = GetPlayerPed(-1) + local coords = GetEntityCoords(playerPed) + + for k,v in pairs(Config.Garages) do + + if v.IsClosed then + + if(GetDistanceBetweenCoords(coords, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, true) < Config.DrawDistance) then + DrawMarker(Config.MarkerType, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + end + + if(GetDistanceBetweenCoords(coords, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, true) < Config.DrawDistance) then + DrawMarker(Config.MarkerType, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + end + + end + + if IsPedInAnyVehicle(playerPed, false) then + + for i=1, #v.Parkings, 1 do + + local parking = v.Parkings[i] + + if(GetDistanceBetweenCoords(coords, parking.Pos.x, parking.Pos.y, parking.Pos.z, true) < Config.DrawDistance) then + DrawMarker(Config.MarkerType, parking.Pos.x, parking.Pos.y, parking.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ParkingMarkerSize.x, Config.ParkingMarkerSize.y, Config.ParkingMarkerSize.z, Config.ParkingMarkerColor.r, Config.ParkingMarkerColor.g, Config.ParkingMarkerColor.b, 100, false, true, 2, false, false, false, false) + end + + end + + end + + end + + end +end) + +-- Enter / Exit marker events +Citizen.CreateThread(function() + while true do + + Wait(0) + + local playerPed = GetPlayerPed(-1) + local coords = GetEntityCoords(playerPed) + local isInMarker = false + local currentGarage = nil + local currentPart = nil + local currentParking = nil + + for k,v in pairs(Config.Garages) do + + if v.IsClosed then + + if GetDistanceBetweenCoords(coords, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, true) < Config.MarkerSize.x then + isInMarker = true + currentGarage = k + currentPart = 'ExteriorEntryPoint' + end + + if GetDistanceBetweenCoords(coords, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, true) < Config.MarkerSize.x then + isInMarker = true + currentGarage = k + currentPart = 'InteriorExitPoint' + end + + for i=1, #v.Parkings, 1 do + + local parking = v.Parkings[i] + + if GetDistanceBetweenCoords(coords, parking.Pos.x, parking.Pos.y, parking.Pos.z, true) < Config.ParkingMarkerSize.x then + isInMarker = true + currentGarage = k + currentPart = 'Parking' + currentParking = i + end + + end + + end + + end + + if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastGarage ~= currentGarage or LastPart ~= currentPart) ) then + + HasAlreadyEnteredMarker = true + LastGarage = currentGarage + LastPart = currentPart + LastParking = currentParking + + TriggerEvent('esx_property:hasEnteredMarker', currentGarage, currentPart, currentParking) + end + + if not isInMarker and HasAlreadyEnteredMarker then + + HasAlreadyEnteredMarker = false + + TriggerEvent('esx_property:hasExitedMarker', LastGarage, LastPart, LastParking) + end + + end +end) \ No newline at end of file diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..234498f1 --- /dev/null +++ b/config.lua @@ -0,0 +1,80 @@ +Config = {} +Config.DrawDistance = 100.0 +Config.MarkerType = 1 +Config.MarkerSize = {x = 2.0, y = 2.0, z = 1.0} +Config.MarkerColor = {r = 204, g = 204, b = 0} +Config.ParkingMarkerSize = {x = 3.0, y = 3.0, z = 2.0} +Config.ParkingMarkerColor = {r = 102, g = 102, b = 204} + +Config.Zones = {} + +Config.Garages = { + + MiltonDrive = { + + IsClosed = true, + + ExteriorEntryPoint = { + Pos = {x= -796.542, y = 318.137, z = 84.673}, + }, + + ExteriorSpawnPoint = { + Pos = {x = -796.501, y = 302.271, z = 85.000}, + Heading = 180.0 + }, + + InteriorSpawnPoint = { + Pos = {x = 228.930, y = -1000.698, z = -100.000}, + Heading = 0.0 + }, + + InteriorExitPoint = { + Pos = {x = 224.613, y = -1004.769, z = -100.000}, + }, + + Parkings = { + { + Pos = {x = 224.500, y = -998.695, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -994.630, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -990.255, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -986.628, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -982.496, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 232.500, y = -982.496, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -986.628, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -990.255, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -994.630, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -998.695, z = -100.000}, + Heading = 135.0 + }, + } + + } + +} diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..b4d1f90c --- /dev/null +++ b/server/main.lua @@ -0,0 +1,67 @@ +ESX = nil + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +RegisterServerEvent('esx_garage:setParking') +AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) + + local xPlayer = ESX.GetPlayerFromId(source) + + if vehicleProps == false then + + MySQL.Async.execute( + 'DELETE FROM `user_parkings` WHERE `identifier` = @identifier AND `garage` = @garage AND zone = @zone', + { + ['@identifier'] = xPlayer.identifier, + ['@garage'] = garage; + ['@zone'] = zone + }, function(rowsChanged) + TriggerClientEvent('esx:showNotification', xPlayer.source, 'Véhicule ~g~sorti') + end + ) + + else + + MySQL.Async.execute( + 'INSERT INTO `user_parkings` (`identifier`, `garage`, `zone`, `vehicle`) VALUES (@identifier, @garage, @zone, @vehicle)', + { + ['@identifier'] = xPlayer.identifier, + ['@garage'] = garage; + ['@zone'] = zone, + ['vehicle'] = json.encode(vehicleProps) + }, function(rowsChanged) + TriggerClientEvent('esx:showNotification', xPlayer.source, 'Véhicule ~g~rangé') + end + ) + + end + +end) + +ESX.RegisterServerCallback('esx_vehicleshop:getVehiclesInGarage', function(source, cb, garage) + + local xPlayer = ESX.GetPlayerFromId(source) + + MySQL.Async.fetchAll( + 'SELECT * FROM `user_parkings` WHERE `identifier` = @identifier AND garage = @garage', + { + ['@identifier'] = xPlayer.identifier, + ['@garage'] = garage + }, + function(result) + + local vehicles = {} + + for i=1, #result, 1 do + table.insert(vehicles, { + zone = result[i].zone, + vehicle = json.decode(result[i].vehicle) + }) + end + + cb(vehicles) + + end + ) + +end) \ No newline at end of file From 74c3ac01a1b5731a9a29877f5dc99703369f7cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 4 Aug 2017 11:47:11 +0200 Subject: [PATCH 04/42] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 27ce05e4..f8841adc 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ FXServer ESX Garage ``` git clone https://github.com/FXServer-ESX/fxserver-esx_garage esx_garage ``` -3) Add this in your server.cfg : +3) Import esx_garage.sql in your database +4) Add this in your server.cfg : ``` start esx_garage From bf6ced37b1d3958727a37a68212b7542a834b450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 4 Aug 2017 11:49:21 +0200 Subject: [PATCH 05/42] Add SQL --- esx_garage.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 esx_garage.sql diff --git a/esx_garage.sql b/esx_garage.sql new file mode 100644 index 00000000..7c21f651 --- /dev/null +++ b/esx_garage.sql @@ -0,0 +1,12 @@ +USE `gta5_gamemode_essential`; + +CREATE TABLE `user_parkings` ( + + `id` int(11) NOT NULL AUTO_INCREMENT, + `identifier` varchar(60) DEFAULT NULL, + `garage` varchar(60) DEFAULT NULL, + `zone` int(11) NOT NULL, + `vehicle` longtext, + + PRIMARY KEY (`id`) +); \ No newline at end of file From 42e463eab625357a4b6bc5a8c4a997321c3c72cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 4 Aug 2017 12:06:22 +0200 Subject: [PATCH 06/42] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index f8841adc..01104f79 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ # fxserver-esx_garage FXServer ESX Garage +[REQUIREMENTS] + +- instance => https://github.com/FXServer-ESX/fxserver-instance + [INSTALLATION] 1) CD in your resources/[esx] folder From 533e3f99814b34fd81e595ca77e6cd5ebe7d7e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 4 Aug 2017 15:34:10 +0200 Subject: [PATCH 07/42] Better garage vehicle spawning logic --- client/main.lua | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/client/main.lua b/client/main.lua index 84625a50..01ee5d8a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -96,34 +96,29 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) - Citizen.CreateThread(function() + for i=1, #garage.Parkings, 1 do + for j=1, #vehicles, 1 do - for i=1, #garage.Parkings, 1 do - for j=1, #vehicles, 1 do - - if i == vehicles[j].zone then + if i == vehicles[j].zone then - local vehicleLoaded = false + local spawn = function(j) - ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { - x = garage.Parkings[i].Pos.x, - y = garage.Parkings[i].Pos.y, - z = garage.Parkings[i].Pos.z - }, garage.Parkings[i].Heading, function(vehicle) - ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) - vehicleLoaded = true - end) - - while not vehicleLoaded do - Citizen.Wait(0) - end + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { + x = garage.Parkings[i].Pos.x, + y = garage.Parkings[i].Pos.y, + z = garage.Parkings[i].Pos.z + }, garage.Parkings[i].Heading, function(vehicle) + ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) + end) end - end - end + spawn(j) - end) + end + + end + end end, name) From e73f677ccce1b0b9e7690ed5eb24131ef9cc355d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 4 Aug 2017 22:10:07 +0200 Subject: [PATCH 08/42] Fix garage spawn + add missing event --- client/main.lua | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/client/main.lua b/client/main.lua index 01ee5d8a..ce83c27f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -49,14 +49,12 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) - Citizen.CreateThread(function() + for i=1, #garage.Parkings, 1 do + for j=1, #vehicles, 1 do - for i=1, #garage.Parkings, 1 do - for j=1, #vehicles, 1 do - - if i == vehicles[j].zone then + if i == vehicles[j].zone then - local vehicleLoaded = false + local spawn = function(j) ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { x = garage.Parkings[i].Pos.x, @@ -64,19 +62,16 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) z = garage.Parkings[i].Pos.z }, garage.Parkings[i].Heading, function(vehicle) ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) - vehicleLoaded = true end) - while not vehicleLoaded do - Citizen.Wait(0) - end - end - end - end + spawn(j) - end) + end + + end + end end, name) @@ -220,7 +215,6 @@ AddEventHandler('esx_property:hasExitedMarker', function(name, part, parking) if part == 'Parking' then local playerPed = GetPlayerPed(-1) - local garage = Config.Garages[name] if IsPedInAnyVehicle(playerPed, false) then TriggerServerEvent('esx_garage:setParking', name, parking, false) @@ -274,7 +268,7 @@ Citizen.CreateThread(function() if(GetDistanceBetweenCoords(coords, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, true) < Config.DrawDistance) then DrawMarker(Config.MarkerType, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) - end + end end @@ -299,8 +293,9 @@ end) -- Enter / Exit marker events Citizen.CreateThread(function() + while true do - + Wait(0) local playerPed = GetPlayerPed(-1) @@ -345,6 +340,10 @@ Citizen.CreateThread(function() if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastGarage ~= currentGarage or LastPart ~= currentPart) ) then + if LastGarage ~= currentGarage or LastPart ~= currentPart then + TriggerEvent('esx_property:hasExitedMarker', LastGarage, LastPart, LastParking) + end + HasAlreadyEnteredMarker = true LastGarage = currentGarage LastPart = currentPart From 6d943080d3640c78a363eef49a74e0321358b0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 5 Aug 2017 12:56:56 +0200 Subject: [PATCH 09/42] ESX.Game.DalateVehicle + SQL DELETE statement --- client/main.lua | 6 +++--- server/main.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index ce83c27f..d27e9808 100644 --- a/client/main.lua +++ b/client/main.lua @@ -36,7 +36,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) z = garage.InteriorSpawnPoint.Pos.z } - DeleteVehicle(vehicle) + ESX.Game.DeleteVehicle(vehicle) ESX.Game.Teleport(playerPed, spawnCoords, function() @@ -147,7 +147,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) z = garage.ExteriorSpawnPoint.Pos.z } - DeleteVehicle(vehicle) + ESX.Game.DeleteVehicle(vehicle) ESX.Game.Teleport(playerPed, spawnCoords, function() @@ -183,7 +183,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) }) if distance <= 2.0 then - DeleteVehicle(vehicle) + ESX.Game.DeleteVehicle(vehicle) end end diff --git a/server/main.lua b/server/main.lua index b4d1f90c..ba07b928 100644 --- a/server/main.lua +++ b/server/main.lua @@ -23,7 +23,7 @@ AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) else MySQL.Async.execute( - 'INSERT INTO `user_parkings` (`identifier`, `garage`, `zone`, `vehicle`) VALUES (@identifier, @garage, @zone, @vehicle)', + 'DELETE FROM `user_parkings` WHERE `identifier` = @identifier AND `garage` = @garage AND zone = @zone; INSERT INTO `user_parkings` (`identifier`, `garage`, `zone`, `vehicle`) VALUES (@identifier, @garage, @zone, @vehicle)', { ['@identifier'] = xPlayer.identifier, ['@garage'] = garage; From f769e84a677b69f68b9f7013296e40b981dc0071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 5 Aug 2017 14:22:51 +0200 Subject: [PATCH 10/42] Better zone detection --- client/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index d27e9808..c348aefd 100644 --- a/client/main.lua +++ b/client/main.lua @@ -338,9 +338,9 @@ Citizen.CreateThread(function() end - if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastGarage ~= currentGarage or LastPart ~= currentPart) ) then + if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastGarage ~= currentGarage or LastPart ~= currentPart or LastParking ~= currentParking) ) then - if LastGarage ~= currentGarage or LastPart ~= currentPart then + if LastGarage ~= currentGarage or LastPart ~= currentPart or LastParking ~= currentParking then TriggerEvent('esx_property:hasExitedMarker', LastGarage, LastPart, LastParking) end From fbb16673ba35d7145daeb3d83efe513dfab92442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sun, 6 Aug 2017 14:25:31 +0200 Subject: [PATCH 11/42] Remove DELETE FROM --- server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index ba07b928..b4d1f90c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -23,7 +23,7 @@ AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) else MySQL.Async.execute( - 'DELETE FROM `user_parkings` WHERE `identifier` = @identifier AND `garage` = @garage AND zone = @zone; INSERT INTO `user_parkings` (`identifier`, `garage`, `zone`, `vehicle`) VALUES (@identifier, @garage, @zone, @vehicle)', + 'INSERT INTO `user_parkings` (`identifier`, `garage`, `zone`, `vehicle`) VALUES (@identifier, @garage, @zone, @vehicle)', { ['@identifier'] = xPlayer.identifier, ['@garage'] = garage; From be7dc860f522b98a40af93cc5e63819614e5424c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sun, 6 Aug 2017 14:35:43 +0200 Subject: [PATCH 12/42] Add seat check --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index c348aefd..55822d69 100644 --- a/client/main.lua +++ b/client/main.lua @@ -18,7 +18,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) local coords = GetEntityCoords(playerPed) local garage = Config.Garages[name] - if IsPedInAnyVehicle(playerPed, false) then + if IsPedInAnyVehicle(playerPed, false) and GetPedInVehicleSeat(vehicle, -1) == playerPed then local vehicle, distance = ESX.Game.GetClosestVehicle({ x = coords.x, From d9938db145e4747260ba08aada1e853a6320a4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sun, 6 Aug 2017 14:38:05 +0200 Subject: [PATCH 13/42] Seat check fix --- client/main.lua | 108 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 76 insertions(+), 32 deletions(-) diff --git a/client/main.lua b/client/main.lua index 55822d69..5d861352 100644 --- a/client/main.lua +++ b/client/main.lua @@ -18,7 +18,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) local coords = GetEntityCoords(playerPed) local garage = Config.Garages[name] - if IsPedInAnyVehicle(playerPed, false) and GetPedInVehicleSeat(vehicle, -1) == playerPed then + if IsPedInAnyVehicle(playerPed, false) then local vehicle, distance = ESX.Game.GetClosestVehicle({ x = coords.x, @@ -28,54 +28,98 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) if distance <= 2.0 then - local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) + if GetPedInVehicleSeat(vehicle, -1) == playerPed then - local spawnCoords = { - x = garage.InteriorSpawnPoint.Pos.x, - y = garage.InteriorSpawnPoint.Pos.y, - z = garage.InteriorSpawnPoint.Pos.z - } + local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) - ESX.Game.DeleteVehicle(vehicle) + local spawnCoords = { + x = garage.InteriorSpawnPoint.Pos.x, + y = garage.InteriorSpawnPoint.Pos.y, + z = garage.InteriorSpawnPoint.Pos.z + } - ESX.Game.Teleport(playerPed, spawnCoords, function() + ESX.Game.DeleteVehicle(vehicle) - TriggerEvent('instance:create') + ESX.Game.Teleport(playerPed, spawnCoords, function() - ESX.Game.SpawnLocalVehicle(vehicleProps.model, spawnCoords, garage.InteriorSpawnPoint.Heading, function(vehicle) - TaskWarpPedIntoVehicle(playerPed, vehicle, -1) - ESX.Game.SetVehicleProperties(vehicle, vehicleProps) - end) + TriggerEvent('instance:create') - ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) + ESX.Game.SpawnLocalVehicle(vehicleProps.model, spawnCoords, garage.InteriorSpawnPoint.Heading, function(vehicle) + TaskWarpPedIntoVehicle(playerPed, vehicle, -1) + ESX.Game.SetVehicleProperties(vehicle, vehicleProps) + end) - for i=1, #garage.Parkings, 1 do - for j=1, #vehicles, 1 do + ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) - if i == vehicles[j].zone then - - local spawn = function(j) + for i=1, #garage.Parkings, 1 do + for j=1, #vehicles, 1 do - ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { - x = garage.Parkings[i].Pos.x, - y = garage.Parkings[i].Pos.y, - z = garage.Parkings[i].Pos.z - }, garage.Parkings[i].Heading, function(vehicle) - ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) - end) + if i == vehicles[j].zone then + + local spawn = function(j) + + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { + x = garage.Parkings[i].Pos.x, + y = garage.Parkings[i].Pos.y, + z = garage.Parkings[i].Pos.z + }, garage.Parkings[i].Heading, function(vehicle) + ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) + end) + + end + + spawn(j) end - spawn(j) + end + end + + end, name) + + end) + + else + + ESX.Game.Teleport(playerPed, { + x = garage.InteriorSpawnPoint.Pos.x, + y = garage.InteriorSpawnPoint.Pos.y, + z = garage.InteriorSpawnPoint.Pos.z + }, function() + + TriggerEvent('instance:create') + + ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) + + for i=1, #garage.Parkings, 1 do + for j=1, #vehicles, 1 do + + if i == vehicles[j].zone then + + local spawn = function(j) + + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { + x = garage.Parkings[i].Pos.x, + y = garage.Parkings[i].Pos.y, + z = garage.Parkings[i].Pos.z + }, garage.Parkings[i].Heading, function(vehicle) + ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) + end) + + end + + spawn(j) + + end end - end - end - end, name) + end, name) - end) + end) + + end end From 928810827f5cf857273d61106f2aa409fe7d8a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Mon, 7 Aug 2017 12:17:43 +0200 Subject: [PATCH 14/42] Update esx_garage.sql --- esx_garage.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esx_garage.sql b/esx_garage.sql index 7c21f651..85334297 100644 --- a/esx_garage.sql +++ b/esx_garage.sql @@ -1,4 +1,4 @@ -USE `gta5_gamemode_essential`; +USE `essentialmode`; CREATE TABLE `user_parkings` ( @@ -9,4 +9,4 @@ CREATE TABLE `user_parkings` ( `vehicle` longtext, PRIMARY KEY (`id`) -); \ No newline at end of file +); From 1a24c0e82bcbc663592e1cdd42c09a42e351bbbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 9 Aug 2017 14:11:46 +0200 Subject: [PATCH 15/42] Add LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..30ace6a8 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +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. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + 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 . + +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: + + {project} Copyright (C) {year} {fullname} + 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 +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file From 62a14139699fca1c9a7a3819ab0fc513f3512c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sun, 13 Aug 2017 11:13:15 +0200 Subject: [PATCH 16/42] Temporary fix for getting vehicle handles --- client/main.lua | 185 +++++++++++++++++++++--------------------------- 1 file changed, 82 insertions(+), 103 deletions(-) diff --git a/client/main.lua b/client/main.lua index 5d861352..4a9b9e77 100644 --- a/client/main.lua +++ b/client/main.lua @@ -20,109 +20,102 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) if IsPedInAnyVehicle(playerPed, false) then - local vehicle, distance = ESX.Game.GetClosestVehicle({ - x = coords.x, - y = coords.y, - z = coords.z - }) + local vehicle = GetVehiclePedIsIn(playerPed, false) - if distance <= 2.0 then + if GetPedInVehicleSeat(vehicle, -1) == playerPed then - if GetPedInVehicleSeat(vehicle, -1) == playerPed then + local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) - local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) + local spawnCoords = { + x = garage.InteriorSpawnPoint.Pos.x, + y = garage.InteriorSpawnPoint.Pos.y, + z = garage.InteriorSpawnPoint.Pos.z + } - local spawnCoords = { - x = garage.InteriorSpawnPoint.Pos.x, - y = garage.InteriorSpawnPoint.Pos.y, - z = garage.InteriorSpawnPoint.Pos.z - } + ESX.Game.DeleteVehicle(vehicle) - ESX.Game.DeleteVehicle(vehicle) + ESX.Game.Teleport(playerPed, spawnCoords, function() - ESX.Game.Teleport(playerPed, spawnCoords, function() + TriggerEvent('instance:create') - TriggerEvent('instance:create') + ESX.Game.SpawnLocalVehicle(vehicleProps.model, spawnCoords, garage.InteriorSpawnPoint.Heading, function(vehicle) + TaskWarpPedIntoVehicle(playerPed, vehicle, -1) + ESX.Game.SetVehicleProperties(vehicle, vehicleProps) + end) - ESX.Game.SpawnLocalVehicle(vehicleProps.model, spawnCoords, garage.InteriorSpawnPoint.Heading, function(vehicle) - TaskWarpPedIntoVehicle(playerPed, vehicle, -1) - ESX.Game.SetVehicleProperties(vehicle, vehicleProps) - end) + ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) - ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) + for i=1, #garage.Parkings, 1 do + for j=1, #vehicles, 1 do - for i=1, #garage.Parkings, 1 do - for j=1, #vehicles, 1 do + if i == vehicles[j].zone then + + local spawn = function(j) - if i == vehicles[j].zone then - - local spawn = function(j) - - ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { - x = garage.Parkings[i].Pos.x, - y = garage.Parkings[i].Pos.y, - z = garage.Parkings[i].Pos.z - }, garage.Parkings[i].Heading, function(vehicle) - ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) - end) - - end - - spawn(j) + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { + x = garage.Parkings[i].Pos.x, + y = garage.Parkings[i].Pos.y, + z = garage.Parkings[i].Pos.z + }, garage.Parkings[i].Heading, function(vehicle) + ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) + end) end + spawn(j) + end + end + end - end, name) + end, name) - end) + end) - else + else - ESX.Game.Teleport(playerPed, { - x = garage.InteriorSpawnPoint.Pos.x, - y = garage.InteriorSpawnPoint.Pos.y, - z = garage.InteriorSpawnPoint.Pos.z - }, function() + ESX.Game.Teleport(playerPed, { + x = garage.InteriorSpawnPoint.Pos.x, + y = garage.InteriorSpawnPoint.Pos.y, + z = garage.InteriorSpawnPoint.Pos.z + }, function() - TriggerEvent('instance:create') + TriggerEvent('instance:create') - ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) + ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) - for i=1, #garage.Parkings, 1 do - for j=1, #vehicles, 1 do + for i=1, #garage.Parkings, 1 do + for j=1, #vehicles, 1 do - if i == vehicles[j].zone then - - local spawn = function(j) + if i == vehicles[j].zone then + + local spawn = function(j) - ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { - x = garage.Parkings[i].Pos.x, - y = garage.Parkings[i].Pos.y, - z = garage.Parkings[i].Pos.z - }, garage.Parkings[i].Heading, function(vehicle) - ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) - end) - - end - - spawn(j) + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { + x = garage.Parkings[i].Pos.x, + y = garage.Parkings[i].Pos.y, + z = garage.Parkings[i].Pos.z + }, garage.Parkings[i].Heading, function(vehicle) + ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) + end) end + spawn(j) + end + end + end - end, name) + end, name) - end) - - end + end) end + else ESX.Game.Teleport(playerPed, { @@ -175,36 +168,28 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) if IsPedInAnyVehicle(playerPed, false) then - local vehicle, distance = ESX.Game.GetClosestVehicle({ - x = coords.x, - y = coords.y, - z = coords.z - }) + local vehicle = GetVehiclePedIsIn(playerPed, false) + local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) + + local spawnCoords = { + x = garage.ExteriorSpawnPoint.Pos.x, + y = garage.ExteriorSpawnPoint.Pos.y, + z = garage.ExteriorSpawnPoint.Pos.z + } - if distance <= 2.0 then + ESX.Game.DeleteVehicle(vehicle) - local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) - - local spawnCoords = { - x = garage.ExteriorSpawnPoint.Pos.x, - y = garage.ExteriorSpawnPoint.Pos.y, - z = garage.ExteriorSpawnPoint.Pos.z - } + ESX.Game.Teleport(playerPed, spawnCoords, function() - ESX.Game.DeleteVehicle(vehicle) - - ESX.Game.Teleport(playerPed, spawnCoords, function() - - TriggerEvent('instance:close') - - ESX.Game.SpawnVehicle(vehicleProps.model, spawnCoords, garage.ExteriorSpawnPoint.Heading, function(vehicle) - TaskWarpPedIntoVehicle(playerPed, vehicle, -1) - ESX.Game.SetVehicleProperties(vehicle, vehicleProps) - end) + TriggerEvent('instance:close') + ESX.Game.SpawnVehicle(vehicleProps.model, spawnCoords, garage.ExteriorSpawnPoint.Heading, function(vehicle) + TaskWarpPedIntoVehicle(playerPed, vehicle, -1) + ESX.Game.SetVehicleProperties(vehicle, vehicleProps) end) - end + end) + else @@ -220,13 +205,9 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) for i=1, #garage.Parkings, 1 do - local vehicle, distance = ESX.Game.GetClosestVehicle({ - x = garage.Parkings[i].Pos.x, - y = garage.Parkings[i].Pos.y, - z = garage.Parkings[i].Pos.z - }) + local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) - if distance <= 2.0 then + if DoesEntityExist(vehicle) then ESX.Game.DeleteVehicle(vehicle) end @@ -241,12 +222,10 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) if IsPedInAnyVehicle(playerPed, false) then - local vehicle, distance = ESX.Game.GetClosestVehicle() - local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) + local vehicle = GetVehiclePedIsIn(playerPed, false) + local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) - if distance <= 2.0 then - TriggerServerEvent('esx_garage:setParking', name, parking, vehicleProps) - end + TriggerServerEvent('esx_garage:setParking', name, parking, vehicleProps) end From 9b317e558217ca02cbfba102330b7a6bf66a2034 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Tue, 15 Aug 2017 21:53:10 -0400 Subject: [PATCH 17/42] Multi-language support --- __resource.lua | 6 ++++++ config.lua | 3 ++- locales/en.lua | 6 ++++++ locales/fr.lua | 6 ++++++ server/main.lua | 6 +++--- 5 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 locales/en.lua create mode 100644 locales/fr.lua diff --git a/__resource.lua b/__resource.lua index 40b44860..d6d3babb 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,12 +3,18 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Garage' server_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', '@mysql-async/lib/MySQL.lua', 'config.lua', 'server/main.lua' } client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', 'config.lua', 'client/main.lua' } diff --git a/config.lua b/config.lua index 234498f1..6cfd1130 100644 --- a/config.lua +++ b/config.lua @@ -5,11 +5,12 @@ Config.MarkerSize = {x = 2.0, y = 2.0, z = 1.0} Config.MarkerColor = {r = 204, g = 204, b = 0} Config.ParkingMarkerSize = {x = 3.0, y = 3.0, z = 2.0} Config.ParkingMarkerColor = {r = 102, g = 102, b = 204} +Config.Locale = 'fr' Config.Zones = {} Config.Garages = { - + MiltonDrive = { IsClosed = true, diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..6c670be0 --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,6 @@ +Locales['en'] = { + + ['veh_released'] = 'vehicle ~g~released', + ['veh_stored'] = 'vehicle ~g~stored', + +} diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..576dfa41 --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,6 @@ +Locales['fr'] = { + + ['veh_released'] = 'véhicule ~g~sorti', + ['veh_stored'] = 'véhicule ~g~rangé', + +} diff --git a/server/main.lua b/server/main.lua index b4d1f90c..458539bb 100644 --- a/server/main.lua +++ b/server/main.lua @@ -16,7 +16,7 @@ AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) ['@garage'] = garage; ['@zone'] = zone }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', xPlayer.source, 'Véhicule ~g~sorti') + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('veh_released')) end ) @@ -30,7 +30,7 @@ AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) ['@zone'] = zone, ['vehicle'] = json.encode(vehicleProps) }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', xPlayer.source, 'Véhicule ~g~rangé') + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('veh_stored')) end ) @@ -64,4 +64,4 @@ ESX.RegisterServerCallback('esx_vehicleshop:getVehiclesInGarage', function(sourc end ) -end) \ No newline at end of file +end) From 08086be4f7b1dba70b91311abb4a4c1eb2540c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 16 Aug 2017 20:59:32 +0200 Subject: [PATCH 18/42] Fix delete vehicle issue + spawn a little upper --- client/main.lua | 15 +++++++++------ config.lua | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/client/main.lua b/client/main.lua index 4a9b9e77..cb4e7f0a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -29,7 +29,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) local spawnCoords = { x = garage.InteriorSpawnPoint.Pos.x, y = garage.InteriorSpawnPoint.Pos.y, - z = garage.InteriorSpawnPoint.Pos.z + z = garage.InteriorSpawnPoint.Pos.z + Config.ZDiff } ESX.Game.DeleteVehicle(vehicle) @@ -217,10 +217,11 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) if part == 'Parking' then - local playerPed = GetPlayerPed(-1) - local garage = Config.Garages[name] + local playerPed = GetPlayerPed(-1) + local garage = Config.Garages[name] + local parkingPos = garage.Parkings[parking].Pos - if IsPedInAnyVehicle(playerPed, false) then + if IsPedInAnyVehicle(playerPed, false) and not IsAnyVehicleNearPoint(parkingPos.x, parkingPos.y, parkingPos.z, 1.0) then local vehicle = GetVehiclePedIsIn(playerPed, false) local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) @@ -237,9 +238,11 @@ AddEventHandler('esx_property:hasExitedMarker', function(name, part, parking) if part == 'Parking' then - local playerPed = GetPlayerPed(-1) + local playerPed = GetPlayerPed(-1) + local garage = Config.Garages[name] + local parkingPos = garage.Parkings[parking].Pos - if IsPedInAnyVehicle(playerPed, false) then + if IsPedInAnyVehicle(playerPed, false) and not IsAnyVehicleNearPoint(parkingPos.x, parkingPos.y, parkingPos.z, 1.0) then TriggerServerEvent('esx_garage:setParking', name, parking, false) end diff --git a/config.lua b/config.lua index 6cfd1130..f53456ad 100644 --- a/config.lua +++ b/config.lua @@ -5,6 +5,8 @@ Config.MarkerSize = {x = 2.0, y = 2.0, z = 1.0} Config.MarkerColor = {r = 204, g = 204, b = 0} Config.ParkingMarkerSize = {x = 3.0, y = 3.0, z = 2.0} Config.ParkingMarkerColor = {r = 102, g = 102, b = 204} +Config.ZDiff = 0.5 + Config.Locale = 'fr' Config.Zones = {} From 9c033dcc91e6d8a432eb7f74bd8cff42da84355b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 17 Aug 2017 17:42:24 +0200 Subject: [PATCH 19/42] Use new instance code --- __resource.lua | 4 ++++ client/main.lua | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/__resource.lua b/__resource.lua index d6d3babb..af0cdd5c 100644 --- a/__resource.lua +++ b/__resource.lua @@ -18,3 +18,7 @@ client_scripts { 'config.lua', 'client/main.lua' } + +dependencies { + 'instance' +} \ No newline at end of file diff --git a/client/main.lua b/client/main.lua index cb4e7f0a..3caf6ded 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,6 +10,17 @@ Citizen.CreateThread(function() end end) +TriggerEvent('instance:registerType', 'garage') + +RegisterNetEvent('instance:onCreate') +AddEventHandler('instance:onCreate', function(instance) + + if instance.type == 'garage' then + TriggerEvent('instance:enter', instance) + end + +end) + AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) if part == 'ExteriorEntryPoint' then @@ -36,7 +47,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.Game.Teleport(playerPed, spawnCoords, function() - TriggerEvent('instance:create') + TriggerEvent('instance:create', 'garage') ESX.Game.SpawnLocalVehicle(vehicleProps.model, spawnCoords, garage.InteriorSpawnPoint.Heading, function(vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) @@ -81,7 +92,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) z = garage.InteriorSpawnPoint.Pos.z }, function() - TriggerEvent('instance:create') + TriggerEvent('instance:create', 'garage') ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) @@ -124,7 +135,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) z = garage.InteriorSpawnPoint.Pos.z }, function() - TriggerEvent('instance:create') + TriggerEvent('instance:create', 'garage') ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) From cce446bbaa1a6cb285b795eb5ed12d01713ff113 Mon Sep 17 00:00:00 2001 From: TakumiBR <31086346+TakumiBR@users.noreply.github.com> Date: Thu, 17 Aug 2017 08:48:48 -0700 Subject: [PATCH 20/42] Multi-language support Brazilian Portuguese translation. --- __resource.lua | 6 ++---- locales/br.lua | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 locales/br.lua diff --git a/__resource.lua b/__resource.lua index af0cdd5c..698b69ec 100644 --- a/__resource.lua +++ b/__resource.lua @@ -4,6 +4,7 @@ description 'ESX Garage' server_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', '@mysql-async/lib/MySQL.lua', @@ -13,12 +14,9 @@ server_scripts { client_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', 'client/main.lua' } - -dependencies { - 'instance' -} \ No newline at end of file diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..3c7dccc4 --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,6 @@ +Locales['br'] = { + + ['veh_released'] = 'Veículo ~g~já está disponivel', + ['veh_stored'] = 'Veículo ~g~guardado', + +} From e14306304e3895ec45fe5804d99cdb32c1f3c901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 23 Aug 2017 12:57:42 +0200 Subject: [PATCH 21/42] Use ZDiff everywhere --- client/main.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/client/main.lua b/client/main.lua index 3caf6ded..eda27bcb 100644 --- a/client/main.lua +++ b/client/main.lua @@ -56,6 +56,8 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) + print('') + for i=1, #garage.Parkings, 1 do for j=1, #vehicles, 1 do @@ -66,7 +68,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { x = garage.Parkings[i].Pos.x, y = garage.Parkings[i].Pos.y, - z = garage.Parkings[i].Pos.z + z = garage.Parkings[i].Pos.z + Config.ZDiff }, garage.Parkings[i].Heading, function(vehicle) ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) end) @@ -89,7 +91,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.Game.Teleport(playerPed, { x = garage.InteriorSpawnPoint.Pos.x, y = garage.InteriorSpawnPoint.Pos.y, - z = garage.InteriorSpawnPoint.Pos.z + z = garage.InteriorSpawnPoint.Pos.z + Config.ZDiff }, function() TriggerEvent('instance:create', 'garage') @@ -106,7 +108,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { x = garage.Parkings[i].Pos.x, y = garage.Parkings[i].Pos.y, - z = garage.Parkings[i].Pos.z + z = garage.Parkings[i].Pos.z + Config.ZDiff }, garage.Parkings[i].Heading, function(vehicle) ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) end) @@ -132,7 +134,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.Game.Teleport(playerPed, { x = garage.InteriorSpawnPoint.Pos.x, y = garage.InteriorSpawnPoint.Pos.y, - z = garage.InteriorSpawnPoint.Pos.z + z = garage.InteriorSpawnPoint.Pos.z + Config.ZDiff }, function() TriggerEvent('instance:create', 'garage') @@ -149,7 +151,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { x = garage.Parkings[i].Pos.x, y = garage.Parkings[i].Pos.y, - z = garage.Parkings[i].Pos.z + z = garage.Parkings[i].Pos.z + Config.ZDiff }, garage.Parkings[i].Heading, function(vehicle) ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) end) From 3b45b104417937f48fbda1932f8ed5afd68b3116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 23 Aug 2017 15:53:01 +0200 Subject: [PATCH 22/42] Fix duplicate vehicles in garage --- client/main.lua | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index eda27bcb..0b614c15 100644 --- a/client/main.lua +++ b/client/main.lua @@ -56,8 +56,6 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) - print('') - for i=1, #garage.Parkings, 1 do for j=1, #vehicles, 1 do @@ -65,6 +63,12 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) local spawn = function(j) + local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) + + if DoesEntityExist(vehicle) then + ESX.Game.DeleteVehicle(vehicle) + end + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { x = garage.Parkings[i].Pos.x, y = garage.Parkings[i].Pos.y, @@ -105,6 +109,12 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) local spawn = function(j) + local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) + + if DoesEntityExist(vehicle) then + ESX.Game.DeleteVehicle(vehicle) + end + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { x = garage.Parkings[i].Pos.x, y = garage.Parkings[i].Pos.y, @@ -148,6 +158,12 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) local spawn = function(j) + local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) + + if DoesEntityExist(vehicle) then + ESX.Game.DeleteVehicle(vehicle) + end + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { x = garage.Parkings[i].Pos.x, y = garage.Parkings[i].Pos.y, From a86520b12949afdb1ba0b59b9066c2b5b90de8f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 25 Aug 2017 10:58:14 +0200 Subject: [PATCH 23/42] Fix wrong var name (typo) --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 0b614c15..30bb4c13 100644 --- a/client/main.lua +++ b/client/main.lua @@ -63,7 +63,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) local spawn = function(j) - local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) + local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) if DoesEntityExist(vehicle) then ESX.Game.DeleteVehicle(vehicle) From 13b15c4282fbaee7ca06343b6c9315b215f10464 Mon Sep 17 00:00:00 2001 From: ultratm Date: Sat, 26 Aug 2017 11:22:05 +0200 Subject: [PATCH 24/42] Add German Language --- __resource.lua | 2 ++ locales/de.lua | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 locales/de.lua diff --git a/__resource.lua b/__resource.lua index 698b69ec..f85400fa 100644 --- a/__resource.lua +++ b/__resource.lua @@ -4,6 +4,7 @@ description 'ESX Garage' server_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', @@ -14,6 +15,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', diff --git a/locales/de.lua b/locales/de.lua new file mode 100644 index 00000000..929d5eab --- /dev/null +++ b/locales/de.lua @@ -0,0 +1,6 @@ +Locales['de'] = { + + ['veh_released'] = 'Fahrzeug ~g~genommen', + ['veh_stored'] = 'vehicle ~g~geparkt', + +} From 7255dcab2742dd0e50a41493ee4a9d3609fb3ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sun, 27 Aug 2017 11:04:30 +0200 Subject: [PATCH 25/42] Fix mistake --- client/main.lua | 4 ++++ config.lua | 17 +++++++++-------- server/main.lua | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 8 deletions(-) diff --git a/client/main.lua b/client/main.lua index 30bb4c13..e594e2cb 100644 --- a/client/main.lua +++ b/client/main.lua @@ -257,6 +257,10 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) TriggerServerEvent('esx_garage:setParking', name, parking, vehicleProps) + if Config.EnableOwnedVehicles then + TriggerServerEvent('esx_garage:updateOwnedVehicle', vehicleProps) + end + end end diff --git a/config.lua b/config.lua index f53456ad..6bce9fc5 100644 --- a/config.lua +++ b/config.lua @@ -1,11 +1,12 @@ -Config = {} -Config.DrawDistance = 100.0 -Config.MarkerType = 1 -Config.MarkerSize = {x = 2.0, y = 2.0, z = 1.0} -Config.MarkerColor = {r = 204, g = 204, b = 0} -Config.ParkingMarkerSize = {x = 3.0, y = 3.0, z = 2.0} -Config.ParkingMarkerColor = {r = 102, g = 102, b = 204} -Config.ZDiff = 0.5 +Config = {} +Config.DrawDistance = 100.0 +Config.MarkerType = 1 +Config.MarkerSize = {x = 2.0, y = 2.0, z = 1.0} +Config.MarkerColor = {r = 204, g = 204, b = 0} +Config.ParkingMarkerSize = {x = 3.0, y = 3.0, z = 2.0} +Config.ParkingMarkerColor = {r = 102, g = 102, b = 204} +Config.ZDiff = 0.5 +Config.EnableOwnedVehicles = true Config.Locale = 'fr' diff --git a/server/main.lua b/server/main.lua index 458539bb..1a07fd5a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -38,6 +38,49 @@ AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) end) +RegisterServerEvent('esx_vehicleshop:updateOwnedVehicle') +AddEventHandler('esx_vehicleshop:updateOwnedVehicle', function(vehicleProps) + + local _source = source + local xPlayer = ESX.GetPlayerFromId(source) + + MySQL.Async.fetchAll( + 'SELECT * FROM owned_vehicles WHERE owner = @owner', + { + ['@owner'] = xPlayer.identifier + }, + function(results) + + local foundVehicleId = nil + + for i=1, #result, 1 do + + local vehicle = json.decode(result[i].vehicle) + + if vehicle.plate == vehicleProps.plate then + foundVehicleId = result[i].id + break + end + + end + + if foundVehicleId ~= nil then + + MySQL.Async.execute( + 'UPDATE owned_vehicles SET vehicle = @vehicle WHERE id = @id', + { + ['@vehicle'] = json.encode(vehicleProps), + ['@id'] = foundVehicleId + } + ) + + end + + end + ) + +end) + ESX.RegisterServerCallback('esx_vehicleshop:getVehiclesInGarage', function(source, cb, garage) local xPlayer = ESX.GetPlayerFromId(source) From 70904e7faf79642098ddea415880bf1fc6af69b4 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Mon, 28 Aug 2017 02:58:00 +0300 Subject: [PATCH 26/42] Save modifications to car + get modified car from /pv menu --- server/main.lua | 78 ++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/server/main.lua b/server/main.lua index 1a07fd5a..cc60d34a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -38,48 +38,48 @@ AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) end) -RegisterServerEvent('esx_vehicleshop:updateOwnedVehicle') -AddEventHandler('esx_vehicleshop:updateOwnedVehicle', function(vehicleProps) +RegisterServerEvent('esx_garage:updateOwnedVehicle') + AddEventHandler('esx_garage:updateOwnedVehicle', function(vehicleProps) + + local _source = source + local xPlayer = ESX.GetPlayerFromId(source) + + MySQL.Async.fetchAll( + 'SELECT * FROM owned_vehicles WHERE owner = @owner', + { + ['@owner'] = xPlayer.identifier + }, + function(result) + + local foundVehicleId = nil + + for i=1, #result, 1 do + + local vehicle = json.decode(result[i].vehicle) + + if vehicle.plate == vehicleProps.plate then + foundVehicleId = result[i].id + break + end + + end + + if foundVehicleId ~= nil then - local _source = source - local xPlayer = ESX.GetPlayerFromId(source) - - MySQL.Async.fetchAll( - 'SELECT * FROM owned_vehicles WHERE owner = @owner', - { - ['@owner'] = xPlayer.identifier - }, - function(results) - - local foundVehicleId = nil - - for i=1, #result, 1 do - - local vehicle = json.decode(result[i].vehicle) - - if vehicle.plate == vehicleProps.plate then - foundVehicleId = result[i].id - break - end - - end - - if foundVehicleId ~= nil then - - MySQL.Async.execute( - 'UPDATE owned_vehicles SET vehicle = @vehicle WHERE id = @id', - { + MySQL.Async.execute( + 'UPDATE owned_vehicles SET vehicle = @vehicle WHERE id = @id', + { ['@vehicle'] = json.encode(vehicleProps), ['@id'] = foundVehicleId - } - ) - - end - - end - ) - -end) + } + ) + + end + + end + ) + + end) ESX.RegisterServerCallback('esx_vehicleshop:getVehiclesInGarage', function(source, cb, garage) From 433d7655c1875187f04f5677176107d33a100fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 12 Sep 2017 12:12:41 +0200 Subject: [PATCH 27/42] Add health check --- client/main.lua | 180 +++++++++++++++++++++++++----------------------- config.lua | 19 ++--- 2 files changed, 104 insertions(+), 95 deletions(-) diff --git a/client/main.lua b/client/main.lua index e594e2cb..ab2e88f4 100644 --- a/client/main.lua +++ b/client/main.lua @@ -31,114 +31,122 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) if IsPedInAnyVehicle(playerPed, false) then - local vehicle = GetVehiclePedIsIn(playerPed, false) - - if GetPedInVehicleSeat(vehicle, -1) == playerPed then - - local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) - - local spawnCoords = { - x = garage.InteriorSpawnPoint.Pos.x, - y = garage.InteriorSpawnPoint.Pos.y, - z = garage.InteriorSpawnPoint.Pos.z + Config.ZDiff - } - - ESX.Game.DeleteVehicle(vehicle) - - ESX.Game.Teleport(playerPed, spawnCoords, function() - - TriggerEvent('instance:create', 'garage') - - ESX.Game.SpawnLocalVehicle(vehicleProps.model, spawnCoords, garage.InteriorSpawnPoint.Heading, function(vehicle) - TaskWarpPedIntoVehicle(playerPed, vehicle, -1) - ESX.Game.SetVehicleProperties(vehicle, vehicleProps) - end) - - ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) - - for i=1, #garage.Parkings, 1 do - for j=1, #vehicles, 1 do - - if i == vehicles[j].zone then - - local spawn = function(j) - - local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) - - if DoesEntityExist(vehicle) then - ESX.Game.DeleteVehicle(vehicle) - end - - ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { - x = garage.Parkings[i].Pos.x, - y = garage.Parkings[i].Pos.y, - z = garage.Parkings[i].Pos.z + Config.ZDiff - }, garage.Parkings[i].Heading, function(vehicle) - ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) - end) - - end - - spawn(j) - - end - - end - end - - end, name) - - end) + local vehicle = GetVehiclePedIsIn(playerPed, false) + local maxHealth = GetEntityMaxHealth(vehicle) + local health = GetEntityHealth(vehicle) + local healthPercent = (health / maxHealth) * 100 + if healthPercent < Config.MinimumHealthPercent then + ESX.ShowNotification('Vous devez d\'abord réparer votre véhicule') else - ESX.Game.Teleport(playerPed, { - x = garage.InteriorSpawnPoint.Pos.x, - y = garage.InteriorSpawnPoint.Pos.y, - z = garage.InteriorSpawnPoint.Pos.z + Config.ZDiff - }, function() + if GetPedInVehicleSeat(vehicle, -1) == playerPed then - TriggerEvent('instance:create', 'garage') + local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) - ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) + local spawnCoords = { + x = garage.InteriorSpawnPoint.Pos.x, + y = garage.InteriorSpawnPoint.Pos.y, + z = garage.InteriorSpawnPoint.Pos.z + Config.ZDiff + } - for i=1, #garage.Parkings, 1 do - for j=1, #vehicles, 1 do + ESX.Game.DeleteVehicle(vehicle) - if i == vehicles[j].zone then - - local spawn = function(j) + ESX.Game.Teleport(playerPed, spawnCoords, function() - local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) + TriggerEvent('instance:create', 'garage') + + ESX.Game.SpawnLocalVehicle(vehicleProps.model, spawnCoords, garage.InteriorSpawnPoint.Heading, function(vehicle) + TaskWarpPedIntoVehicle(playerPed, vehicle, -1) + ESX.Game.SetVehicleProperties(vehicle, vehicleProps) + end) + + ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) + + for i=1, #garage.Parkings, 1 do + for j=1, #vehicles, 1 do + + if i == vehicles[j].zone then + + local spawn = function(j) + + local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) + + if DoesEntityExist(vehicle) then + ESX.Game.DeleteVehicle(vehicle) + end + + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { + x = garage.Parkings[i].Pos.x, + y = garage.Parkings[i].Pos.y, + z = garage.Parkings[i].Pos.z + Config.ZDiff + }, garage.Parkings[i].Heading, function(vehicle) + ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) + end) - if DoesEntityExist(vehicle) then - ESX.Game.DeleteVehicle(vehicle) end - ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { - x = garage.Parkings[i].Pos.x, - y = garage.Parkings[i].Pos.y, - z = garage.Parkings[i].Pos.z + Config.ZDiff - }, garage.Parkings[i].Heading, function(vehicle) - ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) - end) + spawn(j) end - spawn(j) + end + end + + end, name) + + end) + + else + + ESX.Game.Teleport(playerPed, { + x = garage.InteriorSpawnPoint.Pos.x, + y = garage.InteriorSpawnPoint.Pos.y, + z = garage.InteriorSpawnPoint.Pos.z + Config.ZDiff + }, function() + + TriggerEvent('instance:create', 'garage') + + ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) + + for i=1, #garage.Parkings, 1 do + for j=1, #vehicles, 1 do + + if i == vehicles[j].zone then + + local spawn = function(j) + + local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) + + if DoesEntityExist(vehicle) then + ESX.Game.DeleteVehicle(vehicle) + end + + ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { + x = garage.Parkings[i].Pos.x, + y = garage.Parkings[i].Pos.y, + z = garage.Parkings[i].Pos.z + Config.ZDiff + }, garage.Parkings[i].Heading, function(vehicle) + ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) + end) + + end + + spawn(j) + + end end - end - end - end, name) + end, name) - end) + end) + + end end - else ESX.Game.Teleport(playerPed, { diff --git a/config.lua b/config.lua index 6bce9fc5..15cb02a5 100644 --- a/config.lua +++ b/config.lua @@ -1,12 +1,13 @@ -Config = {} -Config.DrawDistance = 100.0 -Config.MarkerType = 1 -Config.MarkerSize = {x = 2.0, y = 2.0, z = 1.0} -Config.MarkerColor = {r = 204, g = 204, b = 0} -Config.ParkingMarkerSize = {x = 3.0, y = 3.0, z = 2.0} -Config.ParkingMarkerColor = {r = 102, g = 102, b = 204} -Config.ZDiff = 0.5 -Config.EnableOwnedVehicles = true +Config = {} +Config.DrawDistance = 100.0 +Config.MarkerType = 1 +Config.MarkerSize = {x = 2.0, y = 2.0, z = 1.0} +Config.MarkerColor = {r = 204, g = 204, b = 0} +Config.ParkingMarkerSize = {x = 3.0, y = 3.0, z = 2.0} +Config.ParkingMarkerColor = {r = 102, g = 102, b = 204} +Config.ZDiff = 0.5 +Config.EnableOwnedVehicles = true +Config.MinimumHealthPercent = 0 Config.Locale = 'fr' From 1afadd6be464da985feaf68ef779d05e9f587aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:17:17 +0200 Subject: [PATCH 28/42] Update LICENSE.txt --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 30ace6a8..c72a6b14 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -631,8 +631,8 @@ 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. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + fxserver-esx_garage + Copyright (C) 2015 Jérémie N'gadi 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: - {project} Copyright (C) {year} {fullname} + fxserver-esx_garage Copyright (C) 2015 Jérémie N'gadi 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. From 79dc266a9e893f03bb66af270200b0b9d28af6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:25:22 +0200 Subject: [PATCH 29/42] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index f85400fa..1cbc832f 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,8 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Garage' +version '1.0.0' + server_scripts { '@es_extended/locale.lua', 'locales/de.lua', From c728ca6215f630773435dcfab9b743079d176b62 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 22 Feb 2018 02:00:36 +0100 Subject: [PATCH 30/42] Fix message pack Error --- server/main.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index cc60d34a..44d172a1 100644 --- a/server/main.lua +++ b/server/main.lua @@ -5,7 +5,8 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_garage:setParking') AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) - local xPlayer = ESX.GetPlayerFromId(source) + local _source = _source + local xPlayer = ESX.GetPlayerFromId(_source) if vehicleProps == false then @@ -83,7 +84,8 @@ RegisterServerEvent('esx_garage:updateOwnedVehicle') ESX.RegisterServerCallback('esx_vehicleshop:getVehiclesInGarage', function(source, cb, garage) - local xPlayer = ESX.GetPlayerFromId(source) + local _source = _source + local xPlayer = ESX.GetPlayerFromId(_source) MySQL.Async.fetchAll( 'SELECT * FROM `user_parkings` WHERE `identifier` = @identifier AND garage = @garage', From 77ceed00b1e2504146681b008a5686e4c574c420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20J=2E=20F=C3=A9lix?= <36583033+dunof@users.noreply.github.com> Date: Tue, 27 Feb 2018 04:17:55 -0300 Subject: [PATCH 31/42] Some fixes This preventing me from get some console erros and have the cars saved in instances. --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index 44d172a1..82a3e278 100644 --- a/server/main.lua +++ b/server/main.lua @@ -5,7 +5,7 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_garage:setParking') AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) - local _source = _source + local _source = source local xPlayer = ESX.GetPlayerFromId(_source) if vehicleProps == false then @@ -84,7 +84,7 @@ RegisterServerEvent('esx_garage:updateOwnedVehicle') ESX.RegisterServerCallback('esx_vehicleshop:getVehiclesInGarage', function(source, cb, garage) - local _source = _source + local _source = source local xPlayer = ESX.GetPlayerFromId(_source) MySQL.Async.fetchAll( From a79726fb5df5f2dadb6ee99c5feb75fff29ba2d3 Mon Sep 17 00:00:00 2001 From: MHL1337 Date: Sun, 15 Apr 2018 18:07:59 +0200 Subject: [PATCH 32/42] Minor upgrades -Added Swedish translation -Uppdated __resource.lua -Upgraded esx_garage.sql with support for netr_garages --- __resource.lua | 2 ++ esx_garage.sql | 1 + locales/sv.lua | 6 ++++++ 3 files changed, 9 insertions(+) create mode 100644 locales/sv.lua diff --git a/__resource.lua b/__resource.lua index 1cbc832f..0d56cbbe 100644 --- a/__resource.lua +++ b/__resource.lua @@ -10,6 +10,7 @@ server_scripts { 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/sv.lua', '@mysql-async/lib/MySQL.lua', 'config.lua', 'server/main.lua' @@ -21,6 +22,7 @@ client_scripts { 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/sv.lua', 'config.lua', 'client/main.lua' } diff --git a/esx_garage.sql b/esx_garage.sql index 85334297..f503c3f7 100644 --- a/esx_garage.sql +++ b/esx_garage.sql @@ -5,6 +5,7 @@ CREATE TABLE `user_parkings` ( `id` int(11) NOT NULL AUTO_INCREMENT, `identifier` varchar(60) DEFAULT NULL, `garage` varchar(60) DEFAULT NULL, + `plate` varchar(60) DEFAULT NULL, `zone` int(11) NOT NULL, `vehicle` longtext, diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..c2d6dfb4 --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,6 @@ +Locales['sv'] = { + + ['veh_released'] = 'fordon ~g~uthämtat', + ['veh_stored'] = 'fordon ~g~förvarats', + +} From 0ddf00cf9239e11954bbdc757730baf10629edf3 Mon Sep 17 00:00:00 2001 From: MHL1337 Date: Sun, 15 Apr 2018 20:42:36 +0200 Subject: [PATCH 33/42] Removed plate --- esx_garage.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/esx_garage.sql b/esx_garage.sql index f503c3f7..85334297 100644 --- a/esx_garage.sql +++ b/esx_garage.sql @@ -5,7 +5,6 @@ CREATE TABLE `user_parkings` ( `id` int(11) NOT NULL AUTO_INCREMENT, `identifier` varchar(60) DEFAULT NULL, `garage` varchar(60) DEFAULT NULL, - `plate` varchar(60) DEFAULT NULL, `zone` int(11) NOT NULL, `vehicle` longtext, From 60222d0a3c7b07a170aec19951a287296791a8d7 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 24 Jul 2018 15:23:18 +0200 Subject: [PATCH 34/42] Updated to support new vehicle system --- client/main.lua | 2 +- server/main.lua | 125 +++++++++++++++--------------------------------- 2 files changed, 39 insertions(+), 88 deletions(-) diff --git a/client/main.lua b/client/main.lua index ab2e88f4..811f29ef 100644 --- a/client/main.lua +++ b/client/main.lua @@ -175,7 +175,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.Game.SpawnLocalVehicle(vehicles[j].vehicle.model, { x = garage.Parkings[i].Pos.x, y = garage.Parkings[i].Pos.y, - z = garage.Parkings[i].Pos.z + Config.ZDiff + z = garage.Parkings[i].Pos.z + Config.ZDiff }, garage.Parkings[i].Heading, function(vehicle) ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) end) diff --git a/server/main.lua b/server/main.lua index 82a3e278..98106e6e 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,109 +4,60 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_garage:setParking') AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) - local _source = source local xPlayer = ESX.GetPlayerFromId(_source) if vehicleProps == false then - MySQL.Async.execute( - 'DELETE FROM `user_parkings` WHERE `identifier` = @identifier AND `garage` = @garage AND zone = @zone', - { - ['@identifier'] = xPlayer.identifier, - ['@garage'] = garage; - ['@zone'] = zone - }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('veh_released')) - end - ) - + MySQL.Async.execute('DELETE FROM `user_parkings` WHERE `identifier` = @identifier AND `garage` = @garage AND zone = @zone', + { + ['@identifier'] = xPlayer.identifier, + ['@garage'] = garage; + ['@zone'] = zone + }, function(rowsChanged) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('veh_released')) + end) else - - MySQL.Async.execute( - 'INSERT INTO `user_parkings` (`identifier`, `garage`, `zone`, `vehicle`) VALUES (@identifier, @garage, @zone, @vehicle)', - { - ['@identifier'] = xPlayer.identifier, - ['@garage'] = garage; - ['@zone'] = zone, - ['vehicle'] = json.encode(vehicleProps) - }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('veh_stored')) - end - ) - + MySQL.Async.execute('INSERT INTO `user_parkings` (`identifier`, `garage`, `zone`, `vehicle`) VALUES (@identifier, @garage, @zone, @vehicle)', + { + ['@identifier'] = xPlayer.identifier, + ['@garage'] = garage; + ['@zone'] = zone, + ['vehicle'] = json.encode(vehicleProps) + }, function(rowsChanged) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('veh_stored')) + end) end - end) RegisterServerEvent('esx_garage:updateOwnedVehicle') - AddEventHandler('esx_garage:updateOwnedVehicle', function(vehicleProps) - - local _source = source - local xPlayer = ESX.GetPlayerFromId(source) - - MySQL.Async.fetchAll( - 'SELECT * FROM owned_vehicles WHERE owner = @owner', - { - ['@owner'] = xPlayer.identifier - }, - function(result) - - local foundVehicleId = nil - - for i=1, #result, 1 do - - local vehicle = json.decode(result[i].vehicle) - - if vehicle.plate == vehicleProps.plate then - foundVehicleId = result[i].id - break - end - - end - - if foundVehicleId ~= nil then - - MySQL.Async.execute( - 'UPDATE owned_vehicles SET vehicle = @vehicle WHERE id = @id', - { - ['@vehicle'] = json.encode(vehicleProps), - ['@id'] = foundVehicleId - } - ) - - end - - end - ) - - end) +AddEventHandler('esx_garage:updateOwnedVehicle', function(vehicleProps) + MySQL.Async.execute('UPDATE owned_vehicles SET vehicle = @vehicle WHERE plate = @plate', { + ['@plate'] = vehicleProps.plate, + ['@vehicle'] = json.encode(vehicleProps) + }) +end) ESX.RegisterServerCallback('esx_vehicleshop:getVehiclesInGarage', function(source, cb, garage) - local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - MySQL.Async.fetchAll( - 'SELECT * FROM `user_parkings` WHERE `identifier` = @identifier AND garage = @garage', - { - ['@identifier'] = xPlayer.identifier, - ['@garage'] = garage - }, - function(result) - - local vehicles = {} - - for i=1, #result, 1 do - table.insert(vehicles, { - zone = result[i].zone, - vehicle = json.decode(result[i].vehicle) - }) - end - - cb(vehicles) + MySQL.Async.fetchAll('SELECT * FROM `user_parkings` WHERE `identifier` = @identifier AND garage = @garage', + { + ['@identifier'] = xPlayer.identifier, + ['@garage'] = garage + }, function(result) + local vehicles = {} + for i=1, #result, 1 do + table.insert(vehicles, { + zone = result[i].zone, + vehicle = json.decode(result[i].vehicle) + }) end - ) + + cb(vehicles) + + end) end) From 54249dd7c95d09d5a31412727da4116f4f4549d9 Mon Sep 17 00:00:00 2001 From: MajorMarcin Date: Fri, 27 Jul 2018 20:15:28 +0200 Subject: [PATCH 35/42] add pl --- __resource.lua | 2 ++ locales/pl.lua | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 locales/pl.lua diff --git a/__resource.lua b/__resource.lua index 0d56cbbe..a48059d9 100644 --- a/__resource.lua +++ b/__resource.lua @@ -11,6 +11,7 @@ server_scripts { 'locales/en.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/pl.lua', '@mysql-async/lib/MySQL.lua', 'config.lua', 'server/main.lua' @@ -23,6 +24,7 @@ client_scripts { 'locales/en.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..ac8be44c --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,4 @@ +Locales['pl'] = { + ['veh_released'] = 'pojazd ~g~wyprowadzony~s~ z garażu', + ['veh_stored'] = 'pojazd ~g~oddany~s~ do garażu', +} From c4d4a46ce0fa34032886bf19c13ed4d7d67309ee Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 29 Jul 2018 15:07:38 +0200 Subject: [PATCH 36/42] Minor changes --- client/main.lua | 48 +++++++++++++++++++++--------------------------- config.lua | 18 +++++++++--------- locales/br.lua | 7 +++---- locales/de.lua | 3 +-- locales/en.lua | 7 +++---- locales/fr.lua | 2 +- locales/sv.lua | 7 +++---- server/main.lua | 3 +-- 8 files changed, 42 insertions(+), 53 deletions(-) diff --git a/client/main.lua b/client/main.lua index 811f29ef..8905d391 100644 --- a/client/main.lua +++ b/client/main.lua @@ -14,18 +14,16 @@ TriggerEvent('instance:registerType', 'garage') RegisterNetEvent('instance:onCreate') AddEventHandler('instance:onCreate', function(instance) - if instance.type == 'garage' then TriggerEvent('instance:enter', instance) end - end) AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) if part == 'ExteriorEntryPoint' then - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) local garage = Config.Garages[name] @@ -37,7 +35,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) local healthPercent = (health / maxHealth) * 100 if healthPercent < Config.MinimumHealthPercent then - ESX.ShowNotification('Vous devez d\'abord réparer votre véhicule') + ESX.ShowNotification(_U('veh_health')) else if GetPedInVehicleSeat(vehicle, -1) == playerPed then @@ -199,7 +197,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) if part == 'InteriorExitPoint' then - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) local garage = Config.Garages[name] @@ -221,7 +219,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) TriggerEvent('instance:close') ESX.Game.SpawnVehicle(vehicleProps.model, spawnCoords, garage.ExteriorSpawnPoint.Heading, function(vehicle) - TaskWarpPedIntoVehicle(playerPed, vehicle, -1) + TaskWarpPedIntoVehicle(playerPed, vehicle, -1) ESX.Game.SetVehicleProperties(vehicle, vehicleProps) end) @@ -230,11 +228,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) else - ESX.Game.Teleport(playerPed, { - x = garage.ExteriorSpawnPoint.Pos.x, - y = garage.ExteriorSpawnPoint.Pos.y, - z = garage.ExteriorSpawnPoint.Pos.z - }, function() + ESX.Game.Teleport(playerPed,garage.ExteriorSpawnPoint.Pos.x, function() TriggerEvent('instance:close') end) @@ -254,13 +248,13 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) if part == 'Parking' then - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() local garage = Config.Garages[name] local parkingPos = garage.Parkings[parking].Pos if IsPedInAnyVehicle(playerPed, false) and not IsAnyVehicleNearPoint(parkingPos.x, parkingPos.y, parkingPos.z, 1.0) then - local vehicle = GetVehiclePedIsIn(playerPed, false) + local vehicle = GetVehiclePedIsIn(playerPed, false) local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) TriggerServerEvent('esx_garage:setParking', name, parking, vehicleProps) @@ -279,11 +273,11 @@ AddEventHandler('esx_property:hasExitedMarker', function(name, part, parking) if part == 'Parking' then - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() local garage = Config.Garages[name] local parkingPos = garage.Parkings[parking].Pos - if IsPedInAnyVehicle(playerPed, false) and not IsAnyVehicleNearPoint(parkingPos.x, parkingPos.y, parkingPos.z, 1.0) then + if IsPedInAnyVehicle(playerPed, false) and not IsAnyVehicleNearPoint(parkingPos.x, parkingPos.y, parkingPos.z, 1.0) then TriggerServerEvent('esx_garage:setParking', name, parking, false) end @@ -300,15 +294,15 @@ Citizen.CreateThread(function() local blip = AddBlipForCoord(v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z) - SetBlipSprite (blip, 357) - SetBlipDisplay(blip, 4) - SetBlipScale (blip, 1.2) - SetBlipColour (blip, 3) - SetBlipAsShortRange(blip, true) - + SetBlipSprite (blip, 357) + SetBlipDisplay(blip, 4) + SetBlipScale (blip, 1.2) + SetBlipColour (blip, 3) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") - AddTextComponentString("Garage") - EndTextCommandSetBlipName(blip) + AddTextComponentString("Garage") + EndTextCommandSetBlipName(blip) end @@ -320,9 +314,9 @@ end) Citizen.CreateThread(function() while true do - Wait(0) + Citizen.Wait(0) - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) for k,v in pairs(Config.Garages) do @@ -339,7 +333,7 @@ Citizen.CreateThread(function() end - if IsPedInAnyVehicle(playerPed, false) then + if IsPedInAnyVehicle(playerPed, false) then for i=1, #v.Parkings, 1 do @@ -365,7 +359,7 @@ Citizen.CreateThread(function() Wait(0) - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) local isInMarker = false local currentGarage = nil diff --git a/config.lua b/config.lua index 15cb02a5..9758563f 100644 --- a/config.lua +++ b/config.lua @@ -42,39 +42,39 @@ Config.Garages = { Pos = {x = 224.500, y = -998.695, z = -100.000}, Heading = 225.0 }, - { + { Pos = {x = 224.500, y = -994.630, z = -100.000}, Heading = 225.0 }, - { + { Pos = {x = 224.500, y = -990.255, z = -100.000}, Heading = 225.0 }, - { + { Pos = {x = 224.500, y = -986.628, z = -100.000}, Heading = 225.0 }, - { + { Pos = {x = 224.500, y = -982.496, z = -100.000}, Heading = 225.0 }, - { + { Pos = {x = 232.500, y = -982.496, z = -100.000}, Heading = 135.0 }, - { + { Pos = {x = 232.500, y = -986.628, z = -100.000}, Heading = 135.0 }, - { + { Pos = {x = 232.500, y = -990.255, z = -100.000}, Heading = 135.0 }, - { + { Pos = {x = 232.500, y = -994.630, z = -100.000}, Heading = 135.0 }, - { + { Pos = {x = 232.500, y = -998.695, z = -100.000}, Heading = 135.0 }, diff --git a/locales/br.lua b/locales/br.lua index 3c7dccc4..a062da61 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,6 +1,5 @@ Locales['br'] = { - - ['veh_released'] = 'Veículo ~g~já está disponivel', - ['veh_stored'] = 'Veículo ~g~guardado', - + ['veh_released'] = 'veículo ~g~já está disponivel', + ['veh_stored'] = 'veículo ~g~guardado', + ['veh_health'] = 'you\'ll have to repair the vehicle before storing it.', } diff --git a/locales/de.lua b/locales/de.lua index 929d5eab..a0c3103e 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,6 +1,5 @@ Locales['de'] = { - ['veh_released'] = 'Fahrzeug ~g~genommen', ['veh_stored'] = 'vehicle ~g~geparkt', - + ['veh_health'] = 'you\'ll have to repair the vehicle before storing it.', } diff --git a/locales/en.lua b/locales/en.lua index 6c670be0..8e6fa877 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,6 +1,5 @@ Locales['en'] = { - - ['veh_released'] = 'vehicle ~g~released', - ['veh_stored'] = 'vehicle ~g~stored', - + ['veh_released'] = 'the vehicle has been ~g~released', + ['veh_stored'] = 'the vehicle has been ~g~stored', + ['veh_health'] = 'you\'ll have to repair the vehicle before storing it.', } diff --git a/locales/fr.lua b/locales/fr.lua index 576dfa41..359f5020 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -2,5 +2,5 @@ Locales['fr'] = { ['veh_released'] = 'véhicule ~g~sorti', ['veh_stored'] = 'véhicule ~g~rangé', - + ['veh_health'] = 'vous devez d\'abord réparer votre véhicule!', } diff --git a/locales/sv.lua b/locales/sv.lua index c2d6dfb4..c6e4955c 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,6 +1,5 @@ Locales['sv'] = { - - ['veh_released'] = 'fordon ~g~uthämtat', - ['veh_stored'] = 'fordon ~g~förvarats', - + ['veh_released'] = 'fordonet har ~y~släppts~s~ från ditt garage', + ['veh_stored'] = 'fordonet har ~g~lagrats~s~ i ditt garage', + ['veh_health'] = 'fordonet är i ett dåligt skick för att lämnas i garage.', } diff --git a/server/main.lua b/server/main.lua index 98106e6e..97453643 100644 --- a/server/main.lua +++ b/server/main.lua @@ -39,8 +39,7 @@ AddEventHandler('esx_garage:updateOwnedVehicle', function(vehicleProps) end) ESX.RegisterServerCallback('esx_vehicleshop:getVehiclesInGarage', function(source, cb, garage) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) MySQL.Async.fetchAll('SELECT * FROM `user_parkings` WHERE `identifier` = @identifier AND garage = @garage', { From 60cece3a0cbf8d9360842bfcc4ee0c2117cbd080 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:53:33 -0400 Subject: [PATCH 37/42] Repo Update --- .editorconfig | 9 +++++++++ LICENSE.txt => LICENSE | 0 2 files changed, 9 insertions(+) create mode 100644 .editorconfig rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9b425256 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 4 +indent_style = tab +end_of_line = crlf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 6f232d9250950f4d0846a240711eef141f4e7c45 Mon Sep 17 00:00:00 2001 From: aprilkae <39036878+aprilkae@users.noreply.github.com> Date: Mon, 13 Aug 2018 22:35:31 -0400 Subject: [PATCH 38/42] updated to allow re-using garages and exit on foot - updated to fix bug where you can't exit garages on foot - updated to allow you to re-use the same garage in multiple locations without randomly spawning at another location (see config for additional garage locations) --- client/main.lua | 99 ++++++++++------- config.lua | 277 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 333 insertions(+), 43 deletions(-) diff --git a/client/main.lua b/client/main.lua index 8905d391..a109a772 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,7 +1,8 @@ -ESX = nil -local LastGarage = nil -local LastPart = nil -local LastParking = nil +ESX = nil +local LastGarage = nil +local LastPart = nil +local LastParking = nil +local thisGarage = nil Citizen.CreateThread(function() while ESX == nil do @@ -19,13 +20,20 @@ AddEventHandler('instance:onCreate', function(instance) end end) -AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) +AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) if part == 'ExteriorEntryPoint' then local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) local garage = Config.Garages[name] + thisGarage = garage + + for i=1, #Config.Garages, 1 do + if Config.Garages[i].name ~= name then + Config.Garages[i].disabled = true + end + end if IsPedInAnyVehicle(playerPed, false) then @@ -199,7 +207,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) - local garage = Config.Garages[name] + local garage = thisGarage if IsPedInAnyVehicle(playerPed, false) then @@ -221,6 +229,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.Game.SpawnVehicle(vehicleProps.model, spawnCoords, garage.ExteriorSpawnPoint.Heading, function(vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) ESX.Game.SetVehicleProperties(vehicle, vehicleProps) + ESX.Game.SetVehicleEngineOn(vehicle, (not GetIsVehicleEngineRunning(vehicle)), false, true) end) end) @@ -228,7 +237,11 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) else - ESX.Game.Teleport(playerPed,garage.ExteriorSpawnPoint.Pos.x, function() + ESX.Game.Teleport(playerPed,{ + x = garage.ExteriorSpawnPoint.Pos.x, + y = garage.ExteriorSpawnPoint.Pos.y, + z = garage.ExteriorSpawnPoint.Pos.z + }, function() TriggerEvent('instance:close') end) @@ -243,13 +256,21 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) end end + + for i=1, #Config.Garages, 1 do + if Config.Garages[i].name ~= name then + Config.Garages[i].disabled = false + end + end + + thisGarage = nil end if part == 'Parking' then local playerPed = PlayerPedId() - local garage = Config.Garages[name] + local garage = thisGarage local parkingPos = garage.Parkings[parking].Pos if IsPedInAnyVehicle(playerPed, false) and not IsAnyVehicleNearPoint(parkingPos.x, parkingPos.y, parkingPos.z, 1.0) then @@ -274,13 +295,13 @@ AddEventHandler('esx_property:hasExitedMarker', function(name, part, parking) if part == 'Parking' then local playerPed = PlayerPedId() - local garage = Config.Garages[name] + local garage = thisGarage local parkingPos = garage.Parkings[parking].Pos if IsPedInAnyVehicle(playerPed, false) and not IsAnyVehicleNearPoint(parkingPos.x, parkingPos.y, parkingPos.z, 1.0) then TriggerServerEvent('esx_garage:setParking', name, parking, false) end - + end end) @@ -323,11 +344,11 @@ Citizen.CreateThread(function() if v.IsClosed then - if(GetDistanceBetweenCoords(coords, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, true) < Config.DrawDistance) then + if(not v.disabled and GetDistanceBetweenCoords(coords, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, true) < Config.DrawDistance) then DrawMarker(Config.MarkerType, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) end - if(GetDistanceBetweenCoords(coords, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, true) < Config.DrawDistance) then + if(not v.disabled and GetDistanceBetweenCoords(coords, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, true) < Config.DrawDistance) then DrawMarker(Config.MarkerType, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) end @@ -339,7 +360,7 @@ Citizen.CreateThread(function() local parking = v.Parkings[i] - if(GetDistanceBetweenCoords(coords, parking.Pos.x, parking.Pos.y, parking.Pos.z, true) < Config.DrawDistance) then + if(not v.disabled and GetDistanceBetweenCoords(coords, parking.Pos.x, parking.Pos.y, parking.Pos.z, true) < Config.DrawDistance) then DrawMarker(Config.MarkerType, parking.Pos.x, parking.Pos.y, parking.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.ParkingMarkerSize.x, Config.ParkingMarkerSize.y, Config.ParkingMarkerSize.z, Config.ParkingMarkerColor.r, Config.ParkingMarkerColor.g, Config.ParkingMarkerColor.b, 100, false, true, 2, false, false, false, false) end @@ -357,7 +378,7 @@ Citizen.CreateThread(function() while true do - Wait(0) + Citizen.Wait(1) local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) @@ -365,37 +386,35 @@ Citizen.CreateThread(function() local currentGarage = nil local currentPart = nil local currentParking = nil - + for k,v in pairs(Config.Garages) do + if v.IsClosed then - if v.IsClosed then + if (not v.disabled and GetDistanceBetweenCoords(coords, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, true) < Config.MarkerSize.x) then + isInMarker = true + currentGarage = k + currentPart = 'ExteriorEntryPoint' + end - if GetDistanceBetweenCoords(coords, v.ExteriorEntryPoint.Pos.x, v.ExteriorEntryPoint.Pos.y, v.ExteriorEntryPoint.Pos.z, true) < Config.MarkerSize.x then - isInMarker = true - currentGarage = k - currentPart = 'ExteriorEntryPoint' - end + if (not v.disabled and GetDistanceBetweenCoords(coords, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, true) < Config.MarkerSize.x) then + isInMarker = true + currentGarage = k + currentPart = 'InteriorExitPoint' + end + + for i=1, #v.Parkings, 1 do - if GetDistanceBetweenCoords(coords, v.InteriorExitPoint.Pos.x, v.InteriorExitPoint.Pos.y, v.InteriorExitPoint.Pos.z, true) < Config.MarkerSize.x then - isInMarker = true - currentGarage = k - currentPart = 'InteriorExitPoint' - end + local parking = v.Parkings[i] - for i=1, #v.Parkings, 1 do + if (not v.disabled and GetDistanceBetweenCoords(coords, parking.Pos.x, parking.Pos.y, parking.Pos.z, true) < Config.ParkingMarkerSize.x) then + isInMarker = true + currentGarage = k + currentPart = 'Parking' + currentParking = i + end - local parking = v.Parkings[i] - - if GetDistanceBetweenCoords(coords, parking.Pos.x, parking.Pos.y, parking.Pos.z, true) < Config.ParkingMarkerSize.x then - isInMarker = true - currentGarage = k - currentPart = 'Parking' - currentParking = i - end - - end - - end + end + end end @@ -410,7 +429,7 @@ Citizen.CreateThread(function() LastPart = currentPart LastParking = currentParking - TriggerEvent('esx_property:hasEnteredMarker', currentGarage, currentPart, currentParking) + TriggerEvent('esx_garage:hasEnteredMarker', currentGarage, currentPart, currentParking) end if not isInMarker and HasAlreadyEnteredMarker then diff --git a/config.lua b/config.lua index 9758563f..c2f93ab3 100644 --- a/config.lua +++ b/config.lua @@ -9,7 +9,7 @@ Config.ZDiff = 0.5 Config.EnableOwnedVehicles = true Config.MinimumHealthPercent = 0 -Config.Locale = 'fr' +Config.Locale = 'en' Config.Zones = {} @@ -18,7 +18,7 @@ Config.Garages = { MiltonDrive = { IsClosed = true, - + ExteriorEntryPoint = { Pos = {x= -796.542, y = 318.137, z = 84.673}, }, @@ -80,6 +80,277 @@ Config.Garages = { }, } - } + }, + + IntegrityWay = { + + IsClosed = true, + + ExteriorEntryPoint = { + Pos = {x= -37.01, y = -702.82, z = 31.34}, + }, + + ExteriorSpawnPoint = { + Pos = {x = -34.79, y = -697.73, z = 32.34}, + Heading = 350.42 + }, + + InteriorSpawnPoint = { + Pos = {x = 228.930, y = -1000.698, z = -100.000}, + Heading = 0.0 + }, + + InteriorExitPoint = { + Pos = {x = 224.613, y = -1004.769, z = -100.000}, + }, + + Parkings = { + { + Pos = {x = 224.500, y = -998.695, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -994.630, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -990.255, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -986.628, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -982.496, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 232.500, y = -982.496, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -986.628, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -990.255, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -994.630, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -998.695, z = -100.000}, + Heading = 135.0 + }, + } + + }, + + DidionWay = { + + IsClosed = true, + + ExteriorEntryPoint = { + Pos = {x= -259.88, y = 395.19, z = 109.02}, + }, + + ExteriorSpawnPoint = { + Pos = {x = -259.82, y = 397.33, z = 109.01}, + Heading = 12.15 + }, + + InteriorSpawnPoint = { + Pos = {x = 202.27, y = -1004.1, z =-100.00}, + Heading = 0.0 + }, + + InteriorExitPoint = { + Pos = {x = 196.69, y = -1006.26, z = -100.000}, + }, + + Parkings = { + { + Pos = {x = 193.06, y = -995.95, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 192.61, y = -1000.16, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 192.06, y = -1003.64, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 205.85, y = -1002.17, z = -100.000}, + Heading = 105.0 + }, + { + Pos = {x =201.98, y = -996.98, z = -100.000}, + Heading = 175.0 + }, + { + Pos = {x = 198.33, y = -996.42, z = -100.000}, + Heading = 175.0 + }, + } + + }, + + VinewoodEstate2650 = { + + IsClosed = true, + + ExteriorEntryPoint = { + Pos = {x= -102.79, y = 824.03, z = 234.73}, + }, + + ExteriorSpawnPoint = { + Pos = {x = -106.94, y =833.55, z = 234.72}, + Heading = 346.42 + }, + + InteriorSpawnPoint = { + Pos = {x = 228.930, y = -1000.698, z = -100.000}, + Heading = 0.0 + }, + + InteriorExitPoint = { + Pos = {x = 224.613, y = -1004.769, z = -100.000}, + }, + + Parkings = { + { + Pos = {x = 224.500, y = -998.695, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -994.630, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -990.255, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -986.628, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 224.500, y = -982.496, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 232.500, y = -982.496, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -986.628, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -990.255, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -994.630, z = -100.000}, + Heading = 135.0 + }, + { + Pos = {x = 232.500, y = -998.695, z = -100.000}, + Heading = 135.0 + }, + } + + }, + + ImaginationCt265 = { + + IsClosed = true, + + ExteriorEntryPoint = { + Pos = {x=-1129.65, y = -1072.38, z = 1.15}, + }, + + ExteriorSpawnPoint = { + Pos = {x = -1126.48, y =-1069.065, z =1.1}, + Heading = 15.87 + }, + + InteriorSpawnPoint = { + Pos = {x = 174.11, y = -1007.15, z = -100.000}, + Heading = 0.0 + }, + + InteriorExitPoint = { + Pos = {x = 171.71, y = -1007.4, z = -100.000}, + }, + + Parkings = { + { + Pos = {x = 176.07, y = -1001.51, z = -100.000}, + Heading = 173.03 + }, + { + Pos = {x = 170.73, y = -1002.39, z = -100.000}, + Heading = 173.03 + }, + } + + }, + + SteeleWay1150 = { + + IsClosed = true, + + ExteriorEntryPoint = { + Pos = {x= -924.81, y = 211.54, z = 66.46}, + }, + + ExteriorSpawnPoint = { + Pos = {x =-931.5, y = 210.98, z = 66.46}, + Heading = 12.15 + }, + + InteriorSpawnPoint = { + Pos = {x = 202.27, y = -1004.1, z =-100.00}, + Heading = 0.0 + }, + + InteriorExitPoint = { + Pos = {x = 196.69, y = -1006.26, z = -100.000}, + }, + + Parkings = { + { + Pos = {x = 193.06, y = -995.95, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 192.61, y = -1000.16, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 192.06, y = -1003.64, z = -100.000}, + Heading = 225.0 + }, + { + Pos = {x = 205.85, y = -1002.17, z = -100.000}, + Heading = 105.0 + }, + { + Pos = {x =201.98, y = -996.98, z = -100.000}, + Heading = 175.0 + }, + { + Pos = {x = 198.33, y = -996.42, z = -100.000}, + Heading = 175.0 + }, + } + + }, } From c5376b64c6e311cb4ed160afe76831b157a9ff42 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 16:05:49 +0100 Subject: [PATCH 39/42] Minor cleanup (#32) * Update for newest ESX * Minor cleanup * Update readme * Link fix in readme * I forgot this * And this * Minor cleanup 2 --- README.md | 8 +++---- client/main.lua | 57 ++++--------------------------------------------- server/main.lua | 5 ++--- 3 files changed, 10 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index 01104f79..8b6bdf76 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -# fxserver-esx_garage -FXServer ESX Garage +# esx_garage +ESX Garage [REQUIREMENTS] -- instance => https://github.com/FXServer-ESX/fxserver-instance +- instance => https://github.com/ESX-Org/instance [INSTALLATION] 1) CD in your resources/[esx] folder 2) Clone the repository ``` -git clone https://github.com/FXServer-ESX/fxserver-esx_garage esx_garage +git clone https://github.com/ESX-Org/esx_garage esx_garage ``` 3) Import esx_garage.sql in your database 4) Add this in your server.cfg : diff --git a/client/main.lua b/client/main.lua index a109a772..4f0cd4b0 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,8 +1,5 @@ -ESX = nil -local LastGarage = nil -local LastPart = nil -local LastParking = nil -local thisGarage = nil +ESX = nil +local LastGarage, LastPart, LastParking, thisGarage = nil, nil, nil, nil Citizen.CreateThread(function() while ESX == nil do @@ -21,9 +18,7 @@ AddEventHandler('instance:onCreate', function(instance) end) AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) - if part == 'ExteriorEntryPoint' then - local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) local garage = Config.Garages[name] @@ -36,7 +31,6 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) end if IsPedInAnyVehicle(playerPed, false) then - local vehicle = GetVehiclePedIsIn(playerPed, false) local maxHealth = GetEntityMaxHealth(vehicle) local health = GetEntityHealth(vehicle) @@ -45,7 +39,6 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) if healthPercent < Config.MinimumHealthPercent then ESX.ShowNotification(_U('veh_health')) else - if GetPedInVehicleSeat(vehicle, -1) == playerPed then local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) @@ -73,7 +66,6 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) for j=1, #vehicles, 1 do if i == vehicles[j].zone then - local spawn = function(j) local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) @@ -89,22 +81,15 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) }, garage.Parkings[i].Heading, function(vehicle) ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) end) - end spawn(j) - end - end end - end, name) - end) - else - ESX.Game.Teleport(playerPed, { x = garage.InteriorSpawnPoint.Pos.x, y = garage.InteriorSpawnPoint.Pos.y, @@ -119,7 +104,6 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) for j=1, #vehicles, 1 do if i == vehicles[j].zone then - local spawn = function(j) local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) @@ -139,22 +123,14 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) end spawn(j) - end - end end - end, name) - end) - end - end - else - ESX.Game.Teleport(playerPed, { x = garage.InteriorSpawnPoint.Pos.x, y = garage.InteriorSpawnPoint.Pos.y, @@ -169,7 +145,6 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) for j=1, #vehicles, 1 do if i == vehicles[j].zone then - local spawn = function(j) local vehicle = GetClosestVehicle(garage.Parkings[i].Pos.x, garage.Parkings[i].Pos.y, garage.Parkings[i].Pos.z, 2.0, 0, 71) @@ -185,26 +160,18 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) }, garage.Parkings[i].Heading, function(vehicle) ESX.Game.SetVehicleProperties(vehicle, vehicles[j].vehicle) end) - end spawn(j) - end - end end - end, name) - end) - end - end if part == 'InteriorExitPoint' then - local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) local garage = thisGarage @@ -231,10 +198,8 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) ESX.Game.SetVehicleProperties(vehicle, vehicleProps) ESX.Game.SetVehicleEngineOn(vehicle, (not GetIsVehicleEngineRunning(vehicle)), false, true) end) - end) - else ESX.Game.Teleport(playerPed,{ @@ -244,7 +209,6 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) }, function() TriggerEvent('instance:close') end) - end for i=1, #garage.Parkings, 1 do @@ -264,7 +228,6 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) end thisGarage = nil - end if part == 'Parking' then @@ -283,11 +246,8 @@ AddEventHandler('esx_garage:hasEnteredMarker', function(name, part, parking) if Config.EnableOwnedVehicles then TriggerServerEvent('esx_garage:updateOwnedVehicle', vehicleProps) end - end - end - end) AddEventHandler('esx_property:hasExitedMarker', function(name, part, parking) @@ -301,9 +261,7 @@ AddEventHandler('esx_property:hasExitedMarker', function(name, part, parking) if IsPedInAnyVehicle(playerPed, false) and not IsAnyVehicleNearPoint(parkingPos.x, parkingPos.y, parkingPos.z, 1.0) then TriggerServerEvent('esx_garage:setParking', name, parking, false) end - end - end) -- Create Blips @@ -375,9 +333,7 @@ end) -- Enter / Exit marker events Citizen.CreateThread(function() - while true do - Citizen.Wait(1) local playerPed = PlayerPedId() @@ -403,7 +359,6 @@ Citizen.CreateThread(function() end for i=1, #v.Parkings, 1 do - local parking = v.Parkings[i] if (not v.disabled and GetDistanceBetweenCoords(coords, parking.Pos.x, parking.Pos.y, parking.Pos.z, true) < Config.ParkingMarkerSize.x) then @@ -412,10 +367,8 @@ Citizen.CreateThread(function() currentPart = 'Parking' currentParking = i end - end end - end if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastGarage ~= currentGarage or LastPart ~= currentPart or LastParking ~= currentParking) ) then @@ -433,11 +386,9 @@ Citizen.CreateThread(function() end if not isInMarker and HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = false - + TriggerEvent('esx_property:hasExitedMarker', LastGarage, LastPart, LastParking) end - end -end) \ No newline at end of file +end) diff --git a/server/main.lua b/server/main.lua index 97453643..5b02e5f2 100644 --- a/server/main.lua +++ b/server/main.lua @@ -15,7 +15,7 @@ AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) ['@garage'] = garage; ['@zone'] = zone }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('veh_released')) + xPlayer.showNotification(_U('veh_released')) end) else MySQL.Async.execute('INSERT INTO `user_parkings` (`identifier`, `garage`, `zone`, `vehicle`) VALUES (@identifier, @garage, @zone, @vehicle)', @@ -25,7 +25,7 @@ AddEventHandler('esx_garage:setParking', function(garage, zone, vehicleProps) ['@zone'] = zone, ['vehicle'] = json.encode(vehicleProps) }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('veh_stored')) + xPlayer.showNotification(_U('veh_stored')) end) end end) @@ -58,5 +58,4 @@ ESX.RegisterServerCallback('esx_vehicleshop:getVehiclesInGarage', function(sourc cb(vehicles) end) - end) From 9ccfd3fd412d080db2de315ec9cb0d3efefbd00c Mon Sep 17 00:00:00 2001 From: BackrndSource Date: Sun, 19 Jan 2020 16:06:14 +0100 Subject: [PATCH 40/42] Added Spanish translation (#25) * Create es.lua * Update __resource.lua --- __resource.lua | 2 ++ locales/es.lua | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 locales/es.lua diff --git a/__resource.lua b/__resource.lua index a48059d9..bbb62299 100644 --- a/__resource.lua +++ b/__resource.lua @@ -9,6 +9,7 @@ server_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/es.lua', 'locales/fr.lua', 'locales/sv.lua', 'locales/pl.lua', @@ -22,6 +23,7 @@ client_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/es.lua', 'locales/fr.lua', 'locales/sv.lua', 'locales/pl.lua', diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..37ac19f4 --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,5 @@ +Locales['es'] = { + ['veh_released'] = 'has sacado tu vehículo', + ['veh_stored'] = 'has guardado tu vehículo', + ['veh_health'] = 'debes de reparar tu vehículo antes de guardarlo', +} From bf5e11bd9922ea6ab954e3ac238478d2c2b01f1d Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 16:57:02 +0100 Subject: [PATCH 41/42] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (88%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 88% rename from __resource.lua rename to fxmanifest.lua index bbb62299..f26eec32 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Garage' From 6ae703b18965452d148541c061f830469c8a8bd9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:50:21 +0200 Subject: [PATCH 42/42] Update esx_garage.sql --- esx_garage.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esx_garage.sql b/esx_garage.sql index 85334297..de14f5bb 100644 --- a/esx_garage.sql +++ b/esx_garage.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; CREATE TABLE `user_parkings` (