diff --git a/client/events.lua b/client/events.lua index b4f91d0..b183bfb 100644 --- a/client/events.lua +++ b/client/events.lua @@ -117,19 +117,6 @@ RegisterNetEvent('QBCore:Command:GoToMarker', function() end) -- Vehicle Commands -RegisterNetEvent('QBCore:Client:VehicleInfo', function(info) - local plate = QBCore.Functions.GetPlate(info.vehicle) - local data = { - vehicle = NetToVeh(info.netid), - seat = info.seat, - name = info.modelName, - plate = plate, - driver = GetPedInVehicleSeat(info.vehicle, -1), - inseat = GetPedInVehicleSeat(info.vehicle, info.seat), - haskeys = exports['qb-vehiclekeys']:HasKeys(plate) - } - TriggerEvent('QBCore:Client:'..info.event..'Vehicle', data) -end) RegisterNetEvent('QBCore:Command:SpawnVehicle', function(vehName) local ped = PlayerPedId() diff --git a/fxmanifest.lua b/fxmanifest.lua index 1b2f859..d2e2ff5 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version 'cerulean' game 'gta5' description 'QB-Core' -version '1.2.0' +version '1.2.1' shared_scripts { 'config.lua', diff --git a/server/events.lua b/server/events.lua index 6bd9e22..32c0eb1 100644 --- a/server/events.lua +++ b/server/events.lua @@ -195,50 +195,6 @@ RegisterNetEvent('QBCore:ToggleDuty', function() TriggerClientEvent('QBCore:Client:SetDuty', src, Player.PlayerData.job.onduty) end) --- BaseEvents - --- Vehicles -RegisterServerEvent('baseevents:enteringVehicle', function(veh,seat,modelName,netid) - local src = source - local data = { - vehicle = veh, - seat = seat, - name = modelName, - netid = netid, - event = 'Entering' - } - TriggerClientEvent('QBCore:Client:VehicleInfo', src, data) -end) - -RegisterServerEvent('baseevents:enteredVehicle', function(veh,seat,modelName,netid) - local src = source - local data = { - vehicle = veh, - seat = seat, - name = modelName, - netid = netid, - event = 'Entered' - } - TriggerClientEvent('QBCore:Client:VehicleInfo', src, data) -end) - -RegisterServerEvent('baseevents:enteringAborted', function() - local src = source - TriggerClientEvent('QBCore:Client:AbortVehicleEntering', src) -end) - -RegisterServerEvent('baseevents:leftVehicle', function(veh,seat,modelName,netid) - local src = source - local data = { - vehicle = veh, - seat = seat, - name = modelName, - netid = netid, - event = 'Left' - } - TriggerClientEvent('QBCore:Client:VehicleInfo', src, data) -end) - -- Items -- This event is exploitable and should not be used. It has been deprecated, and will be removed soon. diff --git a/shared/jobs.lua b/shared/jobs.lua index 9f6615d..398b026 100644 --- a/shared/jobs.lua +++ b/shared/jobs.lua @@ -1,6 +1,9 @@ QBShared = QBShared or {} QBShared.ForceJobDefaultDutyAtLogin = true -- true: Force duty state to jobdefaultDuty | false: set duty state from database last saved -QBShared.Jobs = { +QBShared.QBJobsStatus = false -- true: integrate qb-jobs into the whole of qb-core | false: treat qb-jobs as an add-on resource. +QBShared.Jobs = {} -- All of below has been migrated into qb-jobs +if not QBShared.QBJobsStatus then + QBShared.Jobs = { ['unemployed'] = { label = 'Civilian', defaultDuty = true, @@ -125,7 +128,7 @@ QBShared.Jobs = { }, }, }, - ['bus'] = { + ['bus'] = { label = 'Bus', defaultDuty = true, offDutyPay = false, @@ -281,4 +284,5 @@ QBShared.Jobs = { }, }, }, -} + } +end diff --git a/shared/locations.lua b/shared/locations.lua index 7c97fed..1317991 100644 --- a/shared/locations.lua +++ b/shared/locations.lua @@ -10,33 +10,25 @@ QBShared.Locations = { ['pizzaria'] = vector4(790.4561, -758.4601, 26.7424, 270.2329), ['catcafe'] = vector4(-580.8388, -1072.7872, 22.3296, 359.0078), ['carmeet'] = vector4(958.8237, -1699.6659, 29.5574, 71.2731), - ['davispd'] = vector4(382.5791, -1591.1827, 29.2828, 145.0991), ['popsdiner'] = vector4(1595.9753, 6448.6421, 25.3170, 28.3026), - ['davisfirestation'] = vector4(216.7576, -1638.3801, 29.5151, 137.8174), ['harmony'] = vector4(1183.0693, 2648.5313, 37.8363, 194.0603), ['haters'] = vector4(-1117.1525, -1439.4297, 5.1075, 103.4411), ['hayes'] = vector4(-1435.7040, -445.7360, 35.5964, 220.1762), ['pdm'] = vector4(-48.2113, -1105.4769, 27.2634, 339.5899), ['bennys'] = vector4(-47.5289, -1042.6086, 28.3532, 247.9748), - ['impound'] = vector4(-190.5874, -1156.1343, 23.0482, 158.9385), ['lamesaauto'] = vector4(720.4776, -1092.1934, 22.2866, 310.1469), - ['lamesapd'] = vector4(824.3735, -1290.0670, 28.2364, 266.1293), ['lostmc'] = vector4(982.6339, -104.7095, 74.8488, 30.8738), ['pillbox'] = vector4(298.1153, -584.2825, 43.2609, 252.7553), - ['mrpd'] = vector4(432.0686, -981.6853, 30.7119, 267.3501), ['mirrorparkhouse1'] = vector4(945.9535, -652.9119, 58.0228, 90.5541), ['pacificbank'] = vector4(229.9529, 214.3890, 105.5561, 294.6791), ['paletoliquor'] = vector4(-154.2287, 6328.8682, 31.5665, 133.1992), - ['paletopd'] = vector4(-436.0935, 6015.2026, 31.4892, 132.9752), ['paletogasstation'] = vector4(120.2420, 6625.4722, 31.9580, 36.5687), ['pinkcage'] = vector4(323.9055, -203.2524, 54.0866, 186.8505), ['ponsonbys1'] = vector4(-165.2497, -304.3988, 38.07126, 0.0), ['ponsonbys2'] = vector4(-1448.1, -236.8420, 48.15098, 0.0), ['ponsonbys3'] = vector4(-709.8120, -150.6267, 35.75312, 0.0), - ['prison'] = vector4(1847.1284, 2586.0696, 45.6726, 91.7828), ['rangerstation'] = vector4(387.3204, 790.1508, 187.6927, 4.7656), ['recordastudio'] = vector4(473.3006, -109.4360, 62.7418, 350.8488), - ['sandypd'] = vector4(1839.7510, 3667.9907, 33.8787, 29.1744), ['suburban1'] = vector4(124.9756, -217.6290, 55.81879, 0.0), ['suburban2'] = vector4(617.4776, 2757.4810, 43.34935, 0.0), ['suburban3'] = vector4(-1195.8690, -773.5746, 18.58485, 0.0), @@ -51,8 +43,5 @@ QBShared.Locations = { -- Unclejust ['digitalden'] = vector4(-656.28, -849.92, 24.51, 167.42), ['ifruitstore1'] = vector4(-646.78, -288.17, 35.49, 297.73), - ['ifruitstore2'] = vector4(-778.7451, -598.2717, 30.2772, 181.0197), - ['taxijob'] = vector4(908.7, -166.45, 74.13, 54.88), - ['vineyard'] = vector4(-1892.29, 2038.47, 140.86, 339.23), - ['weazelnews'] = vector4(-604.82, -933.22, 23.86, 292.3), + ['ifruitstore2'] = vector4(-778.7451, -598.2717, 30.2772, 181.0197) } \ No newline at end of file diff --git a/shared/vehicles.lua b/shared/vehicles.lua index 32f9dbf..8b396fb 100644 --- a/shared/vehicles.lua +++ b/shared/vehicles.lua @@ -3,15 +3,15 @@ QBShared.VehicleHashes = {} QBShared.Vehicles = { --- Compacts - ['asbo'] = { - ['name'] = 'Asbo', - ['brand'] = 'Maxwell', - ['model'] = 'asbo', - ['price'] = 4000, - ['category'] = 'compacts', - ['categoryLabel'] = 'Compacts', - ['hash'] = `asbo`, - ['shop'] = {'pdm'}, + ['asbo'] = { -- This has to match the spawn code of the vehicle + ['name'] = 'Asbo', -- This is the display of the vehicle + ['brand'] = 'Maxwell', -- This is the vehicle's brand (Ford, Chevrolet, BMW, Mercedes, etc) + ['model'] = 'asbo', -- This must match the spawn code of the vehicle + ['price'] = 4000, -- The price that the vehicle sells for + ['category'] = 'compacts', -- This must match "VehicleClass" in vehicles.meta for the vehicle and must also exist in https://docs.fivem.net/natives/?_0x29439776AAA00A62 + ['categoryLabel'] = 'Compacts', -- Customize for your Vehicle Shop headings (can even include spaces) + ['hash'] = `asbo`, -- This has to match the spawn code of the vehicle and must be surrounded by backticks. Example of a Backtick: ` + ['shop'] = {'pdm'}, -- Can be a single shop or multiple shops. For multiple shops for example {'shopname1','shopname2','shopname3'} }, ['blista'] = { ['name'] = 'Blista', @@ -5075,7 +5075,7 @@ QBShared.Vehicles = { ['price'] = 100000, ['category'] = 'commercial', ["categoryLabel"] = 'Commercial', - ['hash'] = `Hauler`, + ['hash'] = `hauler`, ['shop'] = 'truck', }, ['packer'] = { @@ -5115,7 +5115,7 @@ QBShared.Vehicles = { ['price'] = 100000, ['category'] = 'commercial', ["categoryLabel"] = 'Commercial', - ['hash'] = `Phantom`, + ['hash'] = `phantom`, ['shop'] = 'truck', }, ['phantom3'] = { @@ -5125,7 +5125,7 @@ QBShared.Vehicles = { ['price'] = 110000, ['category'] = 'commercial', ["categoryLabel"] = 'Commercial', - ['hash'] = `Phantom Custom`, + ['hash'] = `phantom3`, ['shop'] = 'truck', }, ['benson'] = { @@ -5245,7 +5245,7 @@ QBShared.Vehicles = { ['price'] = 45000, ['category'] = 'vans', ["categoryLabel"] = 'Vans', - ['hash'] = `boxville4`, + ['hash'] = `boxville5`, ['shop'] = 'truck', }, ['pony'] = { @@ -5309,7 +5309,7 @@ QBShared.Vehicles = { ['shop'] = 'truck', }, ['dump'] = { - ['name'] = 'HVY Dump Truck (Off Road)', + ['name'] = 'Dump Truck (Off Road)', ['brand'] = 'HVY', ['model'] = 'dump', ['price'] = 30000, @@ -5349,7 +5349,7 @@ QBShared.Vehicles = { ['shop'] = 'truck', }, ['mixer2'] = { - ['name'] = 'Mixer2', + ['name'] = 'Cement Mixer 2', ['brand'] = 'HVY', ['model'] = 'mixer2', ['price'] = 30000, @@ -5359,7 +5359,7 @@ QBShared.Vehicles = { ['shop'] = 'truck', }, ['rubble'] = { - ['name'] = 'Jobuilt Dump Truck (Street Legal)', + ['name'] = 'Dump Truck (Street Legal)', ['brand'] = 'Jobuilt', ['model'] = 'rubble', ['price'] = 30000, @@ -5369,7 +5369,7 @@ QBShared.Vehicles = { ['shop'] = 'truck', }, ['tiptruck'] = { - ['name'] = 'Brute Dump Truck (Street Legal)', + ['name'] = 'Dump Truck (Street Legal)', ['brand'] = 'Brute', ['model'] = 'tiptruck', ['price'] = 30000, @@ -5379,7 +5379,7 @@ QBShared.Vehicles = { ['shop'] = 'truck', }, ['tiptruck2'] = { - ['name'] = 'MTL Dump Truck (Street Legal)', + ['name'] = 'Dump Truck (Street Legal)', ['brand'] = 'MTL', ['model'] = 'tiptruck2', ['price'] = 30000,