starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 16:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
ElPumpo
2019-05-31 12:53:53 +02:00
parent 9dd05579f9
commit 9f600e3787
2 changed files with 231 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+182 -244
View File
@@ -1,15 +1,3 @@
local Keys = {
["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57,
["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177,
["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18,
["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182,
["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81,
["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70,
["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178,
["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173,
["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118
}
local HasAlreadyEnteredMarker, LastZone = false, nil
local CurrentAction, CurrentActionMsg, CurrentActionData = nil, '', {}
local CurrentlyTowedVehicle, Blips, NPCOnJob, NPCTargetTowable, NPCTargetTowableZone = nil, {}, false, nil, nil
@@ -80,7 +68,6 @@ function StopNPCJob(cancel)
end
function OpenMechanicActionsMenu()
local elements = {
{label = _U('vehicle_list'), value = 'vehicle_list'},
{label = _U('work_wear'), value = 'cloakroom'},
@@ -101,7 +88,6 @@ function OpenMechanicActionsMenu()
elements = elements
}, function(data, menu)
if data.current.value == 'vehicle_list' then
if Config.EnableSocietyOwnedVehicles then
local elements = {}
@@ -177,9 +163,7 @@ function OpenMechanicActionsMenu()
end)
end
elseif data.current.value == 'cloakroom' then
menu.close()
ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin)
if skin.sex == 0 then
@@ -188,14 +172,11 @@ function OpenMechanicActionsMenu()
TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_female)
end
end)
elseif data.current.value == 'cloakroom2' then
menu.close()
ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin)
TriggerEvent('skinchanger:loadSkin', skin)
end)
elseif data.current.value == 'put_stock' then
OpenPutStocksMenu()
elseif data.current.value == 'get_stock' then
@@ -205,7 +186,6 @@ function OpenMechanicActionsMenu()
menu.close()
end)
end
end, function(data, menu)
menu.close()
@@ -216,9 +196,7 @@ function OpenMechanicActionsMenu()
end
function OpenMechanicHarvestMenu()
if Config.EnablePlayerManagement and ESX.PlayerData.job and ESX.PlayerData.job.grade_name ~= 'recrue' then
local elements = {
{label = _U('gas_can'), value = 'gaz_bottle'},
{label = _U('repair_tools'), value = 'fix_tool'},
@@ -247,7 +225,6 @@ function OpenMechanicHarvestMenu()
CurrentActionMsg = _U('harvest_menu')
CurrentActionData = {}
end)
else
ESX.ShowNotification(_U('not_experienced_enough'))
end
@@ -255,7 +232,6 @@ end
function OpenMechanicCraftMenu()
if Config.EnablePlayerManagement and ESX.PlayerData.job and ESX.PlayerData.job.grade_name ~= 'recrue' then
local elements = {
{label = _U('blowtorch'), value = 'blow_pipe'},
{label = _U('repair_kit'), value = 'fix_kit'},
@@ -285,14 +261,12 @@ function OpenMechanicCraftMenu()
CurrentActionMsg = _U('craft_menu')
CurrentActionData = {}
end)
else
ESX.ShowNotification(_U('not_experienced_enough'))
end
end
function OpenMobileMechanicActionsMenu()
ESX.UI.Menu.CloseAll()
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'mobile_mechanic_actions', {
@@ -306,12 +280,10 @@ function OpenMobileMechanicActionsMenu()
{label = _U('imp_veh'), value = 'del_vehicle'},
{label = _U('flat_bed'), value = 'dep_vehicle'},
{label = _U('place_objects'), value = 'object_spawner'}
}
}, function(data, menu)
}}, function(data, menu)
if isBusy then return end
if data.current.value == 'billing' then
ESX.UI.Menu.Open('dialog', GetCurrentResourceName(), 'billing', {
title = _U('invoice_amount')
}, function(data, menu)
@@ -331,229 +303,207 @@ function OpenMobileMechanicActionsMenu()
end, function(data, menu)
menu.close()
end)
elseif data.current.value == 'hijack_vehicle' then
local playerPed = PlayerPedId()
local vehicle = ESX.Game.GetVehicleInDirection()
local coords = GetEntityCoords(playerPed)
local playerPed = PlayerPedId()
local vehicle = ESX.Game.GetVehicleInDirection()
local coords = GetEntityCoords(playerPed)
if IsPedSittingInAnyVehicle(playerPed) then
ESX.ShowNotification(_U('inside_vehicle'))
return
end
if DoesEntityExist(vehicle) then
isBusy = true
TaskStartScenarioInPlace(playerPed, 'WORLD_HUMAN_WELDING', 0, true)
Citizen.CreateThread(function()
Citizen.Wait(10000)
SetVehicleDoorsLocked(vehicle, 1)
SetVehicleDoorsLockedForAllPlayers(vehicle, false)
ClearPedTasksImmediately(playerPed)
ESX.ShowNotification(_U('vehicle_unlocked'))
isBusy = false
end)
else
ESX.ShowNotification(_U('no_vehicle_nearby'))
end
elseif data.current.value == 'fix_vehicle' then
local playerPed = PlayerPedId()
local vehicle = ESX.Game.GetVehicleInDirection()
local coords = GetEntityCoords(playerPed)
if IsPedSittingInAnyVehicle(playerPed) then
ESX.ShowNotification(_U('inside_vehicle'))
return
end
if DoesEntityExist(vehicle) then
isBusy = true
TaskStartScenarioInPlace(playerPed, 'PROP_HUMAN_BUM_BIN', 0, true)
Citizen.CreateThread(function()
Citizen.Wait(20000)
SetVehicleFixed(vehicle)
SetVehicleDeformationFixed(vehicle)
SetVehicleUndriveable(vehicle, false)
SetVehicleEngineOn(vehicle, true, true)
ClearPedTasksImmediately(playerPed)
ESX.ShowNotification(_U('vehicle_repaired'))
isBusy = false
end)
else
ESX.ShowNotification(_U('no_vehicle_nearby'))
end
elseif data.current.value == 'clean_vehicle' then
local playerPed = PlayerPedId()
local vehicle = ESX.Game.GetVehicleInDirection()
local coords = GetEntityCoords(playerPed)
if IsPedSittingInAnyVehicle(playerPed) then
ESX.ShowNotification(_U('inside_vehicle'))
return
end
if DoesEntityExist(vehicle) then
isBusy = true
TaskStartScenarioInPlace(playerPed, 'WORLD_HUMAN_MAID_CLEAN', 0, true)
Citizen.CreateThread(function()
Citizen.Wait(10000)
SetVehicleDirtLevel(vehicle, 0)
ClearPedTasksImmediately(playerPed)
ESX.ShowNotification(_U('vehicle_cleaned'))
isBusy = false
end)
else
ESX.ShowNotification(_U('no_vehicle_nearby'))
end
elseif data.current.value == 'del_vehicle' then
local playerPed = PlayerPedId()
if IsPedSittingInAnyVehicle(playerPed) then
local vehicle = GetVehiclePedIsIn(playerPed, false)
if GetPedInVehicleSeat(vehicle, -1) == playerPed then
ESX.ShowNotification(_U('vehicle_impounded'))
ESX.Game.DeleteVehicle(vehicle)
else
ESX.ShowNotification(_U('must_seat_driver'))
if IsPedSittingInAnyVehicle(playerPed) then
ESX.ShowNotification(_U('inside_vehicle'))
return
end
else
local vehicle = ESX.Game.GetVehicleInDirection()
if DoesEntityExist(vehicle) then
ESX.ShowNotification(_U('vehicle_impounded'))
ESX.Game.DeleteVehicle(vehicle)
isBusy = true
TaskStartScenarioInPlace(playerPed, 'WORLD_HUMAN_WELDING', 0, true)
Citizen.CreateThread(function()
Citizen.Wait(10000)
SetVehicleDoorsLocked(vehicle, 1)
SetVehicleDoorsLockedForAllPlayers(vehicle, false)
ClearPedTasksImmediately(playerPed)
ESX.ShowNotification(_U('vehicle_unlocked'))
isBusy = false
end)
else
ESX.ShowNotification(_U('must_near'))
ESX.ShowNotification(_U('no_vehicle_nearby'))
end
end
elseif data.current.value == 'fix_vehicle' then
local playerPed = PlayerPedId()
local vehicle = ESX.Game.GetVehicleInDirection()
local coords = GetEntityCoords(playerPed)
elseif data.current.value == 'dep_vehicle' then
if IsPedSittingInAnyVehicle(playerPed) then
ESX.ShowNotification(_U('inside_vehicle'))
return
end
local playerPed = PlayerPedId()
local vehicle = GetVehiclePedIsIn(playerPed, true)
if DoesEntityExist(vehicle) then
isBusy = true
TaskStartScenarioInPlace(playerPed, 'PROP_HUMAN_BUM_BIN', 0, true)
Citizen.CreateThread(function()
Citizen.Wait(20000)
local towmodel = GetHashKey('flatbed')
local isVehicleTow = IsVehicleModel(vehicle, towmodel)
SetVehicleFixed(vehicle)
SetVehicleDeformationFixed(vehicle)
SetVehicleUndriveable(vehicle, false)
SetVehicleEngineOn(vehicle, true, true)
ClearPedTasksImmediately(playerPed)
if isVehicleTow then
local targetVehicle = ESX.Game.GetVehicleInDirection()
ESX.ShowNotification(_U('vehicle_repaired'))
isBusy = false
end)
else
ESX.ShowNotification(_U('no_vehicle_nearby'))
end
elseif data.current.value == 'clean_vehicle' then
local playerPed = PlayerPedId()
local vehicle = ESX.Game.GetVehicleInDirection()
local coords = GetEntityCoords(playerPed)
if CurrentlyTowedVehicle == nil then
if targetVehicle ~= 0 then
if not IsPedInAnyVehicle(playerPed, true) then
if vehicle ~= targetVehicle then
AttachEntityToEntity(targetVehicle, vehicle, 20, -0.5, -5.0, 1.0, 0.0, 0.0, 0.0, false, false, false, false, 20, true)
CurrentlyTowedVehicle = targetVehicle
ESX.ShowNotification(_U('vehicle_success_attached'))
if IsPedSittingInAnyVehicle(playerPed) then
ESX.ShowNotification(_U('inside_vehicle'))
return
end
if NPCOnJob then
if NPCTargetTowable == targetVehicle then
ESX.ShowNotification(_U('please_drop_off'))
Config.Zones.VehicleDelivery.Type = 1
if DoesEntityExist(vehicle) then
isBusy = true
TaskStartScenarioInPlace(playerPed, 'WORLD_HUMAN_MAID_CLEAN', 0, true)
Citizen.CreateThread(function()
Citizen.Wait(10000)
if Blips['NPCTargetTowableZone'] then
RemoveBlip(Blips['NPCTargetTowableZone'])
Blips['NPCTargetTowableZone'] = nil
SetVehicleDirtLevel(vehicle, 0)
ClearPedTasksImmediately(playerPed)
ESX.ShowNotification(_U('vehicle_cleaned'))
isBusy = false
end)
else
ESX.ShowNotification(_U('no_vehicle_nearby'))
end
elseif data.current.value == 'del_vehicle' then
local playerPed = PlayerPedId()
if IsPedSittingInAnyVehicle(playerPed) then
local vehicle = GetVehiclePedIsIn(playerPed, false)
if GetPedInVehicleSeat(vehicle, -1) == playerPed then
ESX.ShowNotification(_U('vehicle_impounded'))
ESX.Game.DeleteVehicle(vehicle)
else
ESX.ShowNotification(_U('must_seat_driver'))
end
else
local vehicle = ESX.Game.GetVehicleInDirection()
if DoesEntityExist(vehicle) then
ESX.ShowNotification(_U('vehicle_impounded'))
ESX.Game.DeleteVehicle(vehicle)
else
ESX.ShowNotification(_U('must_near'))
end
end
elseif data.current.value == 'dep_vehicle' then
local playerPed = PlayerPedId()
local vehicle = GetVehiclePedIsIn(playerPed, true)
local towmodel = GetHashKey('flatbed')
local isVehicleTow = IsVehicleModel(vehicle, towmodel)
if isVehicleTow then
local targetVehicle = ESX.Game.GetVehicleInDirection()
if CurrentlyTowedVehicle == nil then
if targetVehicle ~= 0 then
if not IsPedInAnyVehicle(playerPed, true) then
if vehicle ~= targetVehicle then
AttachEntityToEntity(targetVehicle, vehicle, 20, -0.5, -5.0, 1.0, 0.0, 0.0, 0.0, false, false, false, false, 20, true)
CurrentlyTowedVehicle = targetVehicle
ESX.ShowNotification(_U('vehicle_success_attached'))
if NPCOnJob then
if NPCTargetTowable == targetVehicle then
ESX.ShowNotification(_U('please_drop_off'))
Config.Zones.VehicleDelivery.Type = 1
if Blips['NPCTargetTowableZone'] then
RemoveBlip(Blips['NPCTargetTowableZone'])
Blips['NPCTargetTowableZone'] = nil
end
Blips['NPCDelivery'] = AddBlipForCoord(Config.Zones.VehicleDelivery.Pos.x, Config.Zones.VehicleDelivery.Pos.y, Config.Zones.VehicleDelivery.Pos.z)
SetBlipRoute(Blips['NPCDelivery'], true)
end
Blips['NPCDelivery'] = AddBlipForCoord(Config.Zones.VehicleDelivery.Pos.x, Config.Zones.VehicleDelivery.Pos.y, Config.Zones.VehicleDelivery.Pos.z)
SetBlipRoute(Blips['NPCDelivery'], true)
end
else
ESX.ShowNotification(_U('cant_attach_own_tt'))
end
else
ESX.ShowNotification(_U('cant_attach_own_tt'))
end
else
ESX.ShowNotification(_U('no_veh_att'))
end
else
ESX.ShowNotification(_U('no_veh_att'))
AttachEntityToEntity(CurrentlyTowedVehicle, vehicle, 20, -0.5, -12.0, 1.0, 0.0, 0.0, 0.0, false, false, false, false, 20, true)
DetachEntity(CurrentlyTowedVehicle, true, true)
if NPCOnJob then
if NPCTargetDeleterZone then
if CurrentlyTowedVehicle == NPCTargetTowable then
ESX.Game.DeleteVehicle(NPCTargetTowable)
TriggerServerEvent('esx_mechanicjob:onNPCJobMissionCompleted')
StopNPCJob()
NPCTargetDeleterZone = false
else
ESX.ShowNotification(_U('not_right_veh'))
end
else
ESX.ShowNotification(_U('not_right_place'))
end
end
CurrentlyTowedVehicle = nil
ESX.ShowNotification(_U('veh_det_succ'))
end
else
ESX.ShowNotification(_U('imp_flatbed'))
end
elseif data.current.value == 'object_spawner' then
local playerPed = PlayerPedId()
AttachEntityToEntity(CurrentlyTowedVehicle, vehicle, 20, -0.5, -12.0, 1.0, 0.0, 0.0, 0.0, false, false, false, false, 20, true)
DetachEntity(CurrentlyTowedVehicle, true, true)
if IsPedSittingInAnyVehicle(playerPed) then
ESX.ShowNotification(_U('inside_vehicle'))
return
end
if NPCOnJob then
if NPCTargetDeleterZone then
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'mobile_mechanic_actions_spawn', {
title = _U('objects'),
align = 'top-left',
elements = {
{label = _U('roadcone'), value = 'prop_roadcone02a'},
{label = _U('toolbox'), value = 'prop_toolchest_01'}
}}, function(data2, menu2)
local model = data2.current.value
local coords = GetEntityCoords(playerPed)
local forward = GetEntityForwardVector(playerPed)
local x, y, z = table.unpack(coords + forward * 1.0)
if CurrentlyTowedVehicle == NPCTargetTowable then
ESX.Game.DeleteVehicle(NPCTargetTowable)
TriggerServerEvent('esx_mechanicjob:onNPCJobMissionCompleted')
StopNPCJob()
NPCTargetDeleterZone = false
else
ESX.ShowNotification(_U('not_right_veh'))
end
else
ESX.ShowNotification(_U('not_right_place'))
end
if model == 'prop_roadcone02a' then
z = z - 2.0
elseif model == 'prop_toolchest_01' then
z = z - 2.0
end
CurrentlyTowedVehicle = nil
ESX.ShowNotification(_U('veh_det_succ'))
end
else
ESX.ShowNotification(_U('imp_flatbed'))
end
elseif data.current.value == 'object_spawner' then
local playerPed = PlayerPedId()
if IsPedSittingInAnyVehicle(playerPed) then
ESX.ShowNotification(_U('inside_vehicle'))
return
end
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'mobile_mechanic_actions_spawn', {
title = _U('objects'),
align = 'top-left',
elements = {
{label = _U('roadcone'), value = 'prop_roadcone02a'},
{label = _U('toolbox'), value = 'prop_toolchest_01'}
}
}, function(data2, menu2)
local model = data2.current.value
local coords = GetEntityCoords(playerPed)
local forward = GetEntityForwardVector(playerPed)
local x, y, z = table.unpack(coords + forward * 1.0)
if model == 'prop_roadcone02a' then
z = z - 2.0
elseif model == 'prop_toolchest_01' then
z = z - 2.0
end
ESX.Game.SpawnObject(model, {
x = x,
y = y,
z = z
}, function(obj)
SetEntityHeading(obj, GetEntityHeading(playerPed))
PlaceObjectOnGroundProperly(obj)
ESX.Game.SpawnObject(model, {x = x, y = y, z = z}, function(obj)
SetEntityHeading(obj, GetEntityHeading(playerPed))
PlaceObjectOnGroundProperly(obj)
end)
end, function(data2, menu2)
menu2.close()
end)
end, function(data2, menu2)
menu2.close()
end)
end
end
end, function(data, menu)
menu.close()
end)
@@ -561,7 +511,6 @@ end
function OpenGetStocksMenu()
ESX.TriggerServerCallback('esx_mechanicjob:getStockItems', function(items)
local elements = {}
for i=1, #items, 1 do
@@ -571,13 +520,11 @@ function OpenGetStocksMenu()
})
end
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'stocks_menu',
{
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'stocks_menu', {
title = _U('mechanic_stock'),
align = 'top-left',
elements = elements
}, function(data, menu)
local itemName = data.current.value
ESX.UI.Menu.Open('dialog', GetCurrentResourceName(), 'stocks_menu_get_item_count', {
@@ -598,17 +545,13 @@ function OpenGetStocksMenu()
end, function(data2, menu2)
menu2.close()
end)
end, function(data, menu)
menu.close()
end)
end)
end
function OpenPutStocksMenu()
ESX.TriggerServerCallback('esx_mechanicjob:getPlayerInventory', function(inventory)
local elements = {}
@@ -629,7 +572,6 @@ function OpenPutStocksMenu()
align = 'top-left',
elements = elements
}, function(data, menu)
local itemName = data.current.value
ESX.UI.Menu.Open('dialog', GetCurrentResourceName(), 'stocks_menu_put_item_count', {
@@ -653,19 +595,16 @@ function OpenPutStocksMenu()
end, function(data, menu)
menu.close()
end)
end)
end
RegisterNetEvent('esx_mechanicjob:onHijack')
AddEventHandler('esx_mechanicjob:onHijack', function()
local playerPed = PlayerPedId()
local coords = GetEntityCoords(playerPed)
if IsAnyVehicleNearPoint(coords.x, coords.y, coords.z, 5.0) then
local vehicle = nil
local vehicle
if IsPedInAnyVehicle(playerPed, false) then
vehicle = GetVehiclePedIsIn(playerPed, false)
@@ -696,7 +635,6 @@ AddEventHandler('esx_mechanicjob:onHijack', function()
ClearPedTasksImmediately(playerPed)
end
end)
end
end
end)
@@ -707,7 +645,7 @@ AddEventHandler('esx_mechanicjob:onCarokit', function()
local coords = GetEntityCoords(playerPed)
if IsAnyVehicleNearPoint(coords.x, coords.y, coords.z, 5.0) then
local vehicle = nil
local vehicle
if IsPedInAnyVehicle(playerPed, false) then
vehicle = GetVehiclePedIsIn(playerPed, false)
@@ -734,7 +672,7 @@ AddEventHandler('esx_mechanicjob:onFixkit', function()
local coords = GetEntityCoords(playerPed)
if IsAnyVehicleNearPoint(coords.x, coords.y, coords.z, 5.0) then
local vehicle = nil
local vehicle
if IsPedInAnyVehicle(playerPed, false) then
vehicle = GetVehiclePedIsIn(playerPed, false)
@@ -767,7 +705,7 @@ AddEventHandler('esx:setJob', function(job)
end)
AddEventHandler('esx_mechanicjob:hasEnteredMarker', function(zone)
if zone == NPCJobTargetTowable then
if zone == 'NPCJobTargetTowable' then
elseif zone =='VehicleDelivery' then
NPCTargetDeleterZone = true
@@ -995,7 +933,7 @@ Citizen.CreateThread(function()
if CurrentAction then
ESX.ShowHelpNotification(CurrentActionMsg)
if IsControlJustReleased(0, Keys['E']) and ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then
if IsControlJustReleased(0, 38) and ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then
if CurrentAction == 'mechanic_actions_menu' then
OpenMechanicActionsMenu()
@@ -1032,11 +970,11 @@ Citizen.CreateThread(function()
end
end
if IsControlJustReleased(0, Keys['F6']) and not isDead and ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then
if IsControlJustReleased(0, 167) and not isDead and ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then
OpenMobileMechanicActionsMenu()
end
if IsControlJustReleased(0, Keys['DELETE']) and not isDead and ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then
if IsControlJustReleased(0, 178) and not isDead and ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic' then
if NPCOnJob then
if GetGameTimer() - NPCLastCancel > 5 * 60000 then
StopNPCJob(true)