starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-31 02:08:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add society garage support

Browse Source
This commit is contained in:
Jérémie N'gadi
2017-09-09 17:00:11 +02:00
parent b8dab5f332
commit aa4cfef3d9
4 changed files with 173 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+136 -77
View File
@@ -23,8 +23,8 @@ local CurrentAction = nil
local CurrentActionMsg = ''
local CurrentActionData = {}
local IsHandcuffed = false
local IsDragged = false
local CopPed = 0
local IsDragged = false
local CopPed = 0
Citizen.CreateThread(function()
while ESX == nil do
@@ -52,7 +52,7 @@ function OpenCloakroomMenu()
local elements = {
{label = _U('citizen_wear'), value = 'citizen_wear'},
{label = _U('police_wear'), value = 'police_wear'}
}
}
ESX.UI.Menu.CloseAll()
@@ -328,84 +328,134 @@ end
function OpenVehicleSpawnerMenu(station, partNum)
local elements = {}
local vehicles = Config.PoliceStations[station].Vehicles
for i=1, #Config.PoliceStations[station].AuthorizedVehicles, 1 do
local vehicle = Config.PoliceStations[station].AuthorizedVehicles[i]
table.insert(elements, {label = vehicle.label, value = vehicle.name})
end
ESX.UI.Menu.CloseAll()
ESX.UI.Menu.Open(
'default', GetCurrentResourceName(), 'vehicle_spawner',
{
title = _U('vehicle_menu'),
align = 'top-left',
elements = elements,
},
function(data, menu)
if Config.EnableSocietyOwnedVehicles then
menu.close()
local elements = {}
local model = data.current.value
ESX.TriggerServerCallback('esx_society:getVehiclesInGarage', function(garageVehicles)
local vehicle = GetClosestVehicle(vehicles[partNum].SpawnPoint.x, vehicles[partNum].SpawnPoint.y, vehicles[partNum].SpawnPoint.z, 3.0, 0, 71)
if not DoesEntityExist(vehicle) then
local playerPed = GetPlayerPed(-1)
if Config.MaxInService == -1 then
ESX.Game.SpawnVehicle(model, {
x = vehicles[partNum].SpawnPoint.x,
y = vehicles[partNum].SpawnPoint.y,
z = vehicles[partNum].SpawnPoint.z
}, vehicles[partNum].Heading, function(vehicle)
TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
SetVehicleMaxMods(vehicle)
end)
else
ESX.TriggerServerCallback('esx_service:enableService', function(canTakeService, maxInService, inServiceCount)
if canTakeService then
ESX.Game.SpawnVehicle(model, {
x = vehicles[partNum].SpawnPoint.x,
y = vehicles[partNum].SpawnPoint.y,
z = vehicles[partNum].SpawnPoint.z
}, vehicles[partNum].Heading, function(vehicle)
TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
SetVehicleMaxMods(vehicle)
end)
else
ESX.ShowNotification(_U('service_max') .. inServiceCount .. '/' .. maxInService)
end
end, 'police')
end
else
ESX.ShowNotification(_U('vehicle_out'))
for i=1, #garageVehicles, 1 do
table.insert(elements, {label = GetDisplayNameFromVehicleModel(garageVehicles[i].model) .. ' [' .. garageVehicles[i].plate .. ']', value = garageVehicles[i]})
end
end,
function(data, menu)
ESX.UI.Menu.Open(
'default', GetCurrentResourceName(), 'vehicle_spawner',
{
title = _U('vehicle_menu'),
align = 'top-left',
elements = elements,
},
function(data, menu)
menu.close()
menu.close()
CurrentAction = 'menu_vehicle_spawner'
CurrentActionMsg = _U('vehicle_spawner')
CurrentActionData = {station = station, partNum = partNum}
local vehicleProps = data.current.value
ESX.Game.SpawnVehicle(vehicleProps.model, vehicles[partNum].SpawnPoint, 270.0, function(vehicle)
ESX.Game.SetVehicleProperties(vehicle, vehicleProps)
local playerPed = GetPlayerPed(-1)
TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
end)
TriggerServerEvent('esx_society:removeVehicleFromGarage', 'police', vehicleProps)
end,
function(data, menu)
menu.close()
CurrentAction = 'menu_vehicle_spawner'
CurrentActionMsg = _U('vehicle_spawner')
CurrentActionData = {station = station, partNum = partNum}
end
)
end, 'police')
else
local elements = {}
for i=1, #Config.PoliceStations[station].AuthorizedVehicles, 1 do
local vehicle = Config.PoliceStations[station].AuthorizedVehicles[i]
table.insert(elements, {label = vehicle.label, value = vehicle.name})
end
)
ESX.UI.Menu.Open(
'default', GetCurrentResourceName(), 'vehicle_spawner',
{
title = _U('vehicle_menu'),
align = 'top-left',
elements = elements,
},
function(data, menu)
menu.close()
local model = data.current.value
local vehicle = GetClosestVehicle(vehicles[partNum].SpawnPoint.x, vehicles[partNum].SpawnPoint.y, vehicles[partNum].SpawnPoint.z, 3.0, 0, 71)
if not DoesEntityExist(vehicle) then
local playerPed = GetPlayerPed(-1)
if Config.MaxInService == -1 then
ESX.Game.SpawnVehicle(model, {
x = vehicles[partNum].SpawnPoint.x,
y = vehicles[partNum].SpawnPoint.y,
z = vehicles[partNum].SpawnPoint.z
}, vehicles[partNum].Heading, function(vehicle)
TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
SetVehicleMaxMods(vehicle)
end)
else
ESX.TriggerServerCallback('esx_service:enableService', function(canTakeService, maxInService, inServiceCount)
if canTakeService then
ESX.Game.SpawnVehicle(model, {
x = vehicles[partNum].SpawnPoint.x,
y = vehicles[partNum].SpawnPoint.y,
z = vehicles[partNum].SpawnPoint.z
}, vehicles[partNum].Heading, function(vehicle)
TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
SetVehicleMaxMods(vehicle)
end)
else
ESX.ShowNotification(_U('service_max') .. inServiceCount .. '/' .. maxInService)
end
end, 'police')
end
else
ESX.ShowNotification(_U('vehicle_out'))
end
end,
function(data, menu)
menu.close()
CurrentAction = 'menu_vehicle_spawner'
CurrentActionMsg = _U('vehicle_spawner')
CurrentActionData = {station = station, partNum = partNum}
end
)
end
end
@@ -1715,15 +1765,24 @@ Citizen.CreateThread(function()
if CurrentAction == 'delete_vehicle' then
if
GetEntityModel(vehicle) == GetHashKey('police') or
GetEntityModel(vehicle) == GetHashKey('police2') or
GetEntityModel(vehicle) == GetHashKey('police3') or
GetEntityModel(vehicle) == GetHashKey('police4') or
GetEntityModel(vehicle) == GetHashKey('policeb') or
GetEntityModel(vehicle) == GetHashKey('policet')
then
TriggerServerEvent('esx_service:disableService', 'police')
if Config.EnableSocietyOwnedVehicles then
local vehicleProps = ESX.Game.GetVehicleProperties(CurrentActionData.vehicle)
TriggerServerEvent('esx_society:putVehicleInGarage', 'police', vehicleProps)
else
if
GetEntityModel(vehicle) == GetHashKey('police') or
GetEntityModel(vehicle) == GetHashKey('police2') or
GetEntityModel(vehicle) == GetHashKey('police3') or
GetEntityModel(vehicle) == GetHashKey('police4') or
GetEntityModel(vehicle) == GetHashKey('policeb') or
GetEntityModel(vehicle) == GetHashKey('policet')
then
TriggerServerEvent('esx_service:disableService', 'police')
end
end
ESX.Game.DeleteVehicle(CurrentActionData.vehicle)
config.lua
+12 -11
View File
@@ -1,14 +1,15 @@
Config = {}
Config.DrawDistance = 100.0
Config.MarkerType = 1
Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0}
Config.MarkerColor = {r = 50, g = 50, b = 204}
Config.EnablePlayerManagement = false
Config.EnableArmoryManagement = false
Config.EnableGCIdentity = false
Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds
Config.MaxInService = -1
Config.Locale = 'fr'
Config = {}
Config.DrawDistance = 100.0
Config.MarkerType = 1
Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0}
Config.MarkerColor = {r = 50, g = 50, b = 204}
Config.EnablePlayerManagement = false
Config.EnableArmoryManagement = false
Config.EnableGCIdentity = false
Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds
Config.EnableSocietyOwnedVehicles = false
Config.MaxInService = -1
Config.Locale = 'fr'
Config.PoliceStations = {
de_config.lua
+13 -9
View File
@@ -1,12 +1,16 @@
Config = {}
Config.DrawDistance = 100.0
Config.MarkerType = 1
Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0}
Config.MarkerColor = {r = 50, g = 50, b = 204}
Config.EnablePlayerManagement = false
Config.EnableArmoryManagement = false
Config.MaxInService = -1
Config.Locale = 'de'
Config = {}
Config.DrawDistance = 100.0
Config.MarkerType = 1
Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0}
Config.MarkerColor = {r = 50, g = 50, b = 204}
Config.EnablePlayerManagement = false
Config.EnableArmoryManagement = false
Config.EnableGCIdentity = false
Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds
Config.EnableSocietyOwnedVehicles = false
Config.MaxInService = -1
Config.Locale = 'de'
Config.PoliceStations = {
en_config.lua
+12 -11
View File
@@ -1,14 +1,15 @@
Config = {}
Config.DrawDistance = 100.0
Config.MarkerType = 1
Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0}
Config.MarkerColor = {r = 50, g = 50, b = 204}
Config.EnablePlayerManagement = false
Config.EnableArmoryManagement = false
Config.EnableGCIdentity = false
Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds
Config.MaxInService = -1
Config.Locale = 'en'
Config = {}
Config.DrawDistance = 100.0
Config.MarkerType = 1
Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0}
Config.MarkerColor = {r = 50, g = 50, b = 204}
Config.EnablePlayerManagement = false
Config.EnableArmoryManagement = false
Config.EnableGCIdentity = false
Config.EnableNonFreemodePeds = false -- turn this on if you want custom peds
Config.EnableSocietyOwnedVehicles = false
Config.MaxInService = -1
Config.Locale = 'en'
Config.PoliceStations = {