-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: errors caused by new core and general cleanup
* Fixing errors caused by new core - Updated config - Updated client/main - Updated locales * Remove trailing whitespace * Remove diagnostic comments * Refactoring - Adjusted names - Adjusted garage for vehicles - Added function to spawn helicopter - Added ability to turn on/off blip - Hopefully fixed some linter errors * Refactoring - Added missing helicopter teleport - Added locales - Minor refactoring * Refactoring * chore: updates per request * refactor: update as per requested changes * refactor: change requests
- Loading branch information
Showing
9 changed files
with
663 additions
and
530 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| return { | ||
| useTarget = GetConvar('UseTarget', 'false') == 'true', | ||
| debugPoly = false, | ||
| useBlips = true, | ||
| locations = { | ||
| mainEntrance = {coords = vec4(-598.4, -929.85, 24.0, 271.5)}, | ||
| inside = {coords = vec4(-77.55, -833.75, 243.0, 67.5)}, | ||
| outside = {coords = vec4(-598.25, -929.86, 23.86, 86.5)}, | ||
| vehicleStorage = {coords = vec4(-557.0, -925.25, 24.0, 270.0)}, | ||
| roofEntrance = {coords = vec4(-80.45, -832.7, 243.0, 72.0)}, | ||
| roofExit = {coords = vec4(-568.5, -927.75, 37.0, 85.25)}, | ||
| helicopterStorage = {coords = vec4(-583.08, -930.55, 36.83, 89.26)} | ||
| }, | ||
| authorizedVehicles = { | ||
| [0] = {rumpo = 'Rumpo'}, -- Grade 0 | ||
| [1] = {rumpo = 'Rumpo'}, -- Grade 1 | ||
| [2] = {rumpo = 'Rumpo'}, -- Grade 2 | ||
| [3] = {rumpo = 'Rumpo'}, -- Grade 3 | ||
| [4] = {rumpo = 'Rumpo'} -- Grade 4 | ||
| }, | ||
| authorizedhelicopters = { | ||
| [0] = {frogger = 'Frogger'}, -- Grade 0 | ||
| [1] = {frogger = 'Frogger'}, -- Grade 1 | ||
| [2] = {frogger = 'Frogger'}, -- Grade 2 | ||
| [3] = {frogger = 'Frogger'}, -- Grade 3 | ||
| [4] = {frogger = 'Frogger'} -- Grade 4 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,31 @@ | ||
| fx_version 'cerulean' | ||
| game 'gta5' | ||
|
|
||
| description 'QB-NewsJob' | ||
| description 'QBX_NewsJob' | ||
| repository 'https://github.com/Qbox-project/qbx_newsjob' | ||
| version '1.0.1' | ||
|
|
||
| shared_scripts { | ||
| 'config.lua', | ||
| '@qb-core/shared/locale.lua', | ||
| '@ox_lib/init.lua', | ||
| '@qbx_core/modules/utils.lua', | ||
| '@qbx_core/shared/locale.lua', | ||
| 'locales/en.lua', | ||
| 'locales/*.lua', | ||
| '@ox_lib/init.lua' | ||
| } | ||
|
|
||
| client_scripts { | ||
| '@qbx_core/modules/playerdata.lua', | ||
| 'client/main.lua', | ||
| 'client/camera.lua' | ||
| } | ||
|
|
||
| server_script 'server/main.lua' | ||
| server_script { | ||
| 'server/main.lua' | ||
| } | ||
|
|
||
| files { | ||
| 'config/client.lua', | ||
| } | ||
|
|
||
| lua54 'yes' | ||
| lua54 'yes' | ||
| use_experimental_fxv2_oal 'yes' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,45 @@ | ||
| local QBCore = exports['qbx-core']:GetCoreObject() | ||
| local function checkReporterJob(source) | ||
| local Player = exports.qbx_core:GetPlayer(source) | ||
| return Player.PlayerData.job.name == 'reporter' | ||
| end | ||
|
|
||
| QBCore.Commands.Add("newscam", "Grab a news camera", {}, false, function(source, _) | ||
| local Player = QBCore.Functions.GetPlayer(source) | ||
| if Player.PlayerData.job.name == "reporter" then | ||
| TriggerClientEvent("Cam:ToggleCam", source) | ||
| lib.addCommand('newscam', { | ||
| help = Lang:t('info.newscam'), | ||
| }, function(source) | ||
| if not checkReporterJob(source) then | ||
| TriggerClientEvent('ox_lib:notify', source, { description = Lang:t('error.no_access'), type = 'error' }) | ||
| return | ||
| end | ||
| TriggerClientEvent('qbx_newsjob:client:toggleCam', source) | ||
| end) | ||
|
|
||
| QBCore.Commands.Add("newsmic", "Grab a news microphone", {}, false, function(source, _) | ||
| local Player = QBCore.Functions.GetPlayer(source) | ||
| if Player.PlayerData.job.name == "reporter" then | ||
| TriggerClientEvent("Mic:ToggleMic", source) | ||
| lib.addCommand('newsmic', { | ||
| help = Lang:t('info.newsmic'), | ||
| }, function(source) | ||
| if not checkReporterJob(source) then | ||
| TriggerClientEvent('ox_lib:notify', source, { description = Lang:t('error.no_access'), type = 'error' }) | ||
| return | ||
| end | ||
| TriggerClientEvent('qbx_newsjob:client:toggleMic', source) | ||
| end) | ||
|
|
||
| QBCore.Commands.Add("newsbmic", "Grab a Boom microphone", {}, false, function(source, _) | ||
| local Player = QBCore.Functions.GetPlayer(source) | ||
| if Player.PlayerData.job.name == "reporter" then | ||
| TriggerClientEvent("Mic:ToggleBMic", source) | ||
| lib.addCommand('newsbmic', { | ||
| help = Lang:t('info.newsbmic'), | ||
| }, function(source) | ||
| if not checkReporterJob(source) then | ||
| TriggerClientEvent('ox_lib:notify', source, { description = Lang:t('error.no_access'), type = 'error' }) | ||
| return | ||
| end | ||
| TriggerClientEvent('qbx_newsjob:client:toggleBMic', source) | ||
| end) | ||
|
|
||
| lib.callback.register('qbx_newsjob:server:spawnVehicle', function(source, model, coords, plate) | ||
| local netId = SpawnVehicle(source, model, coords) | ||
| if not netId or netId == 0 then return end | ||
| local veh = NetworkGetEntityFromNetworkId(netId) | ||
| if not veh or veh == 0 then return end | ||
| SetEntityHeading(veh, coords.w) | ||
| SetVehicleNumberPlateText(veh, plate) | ||
| TriggerClientEvent('vehiclekeys:client:SetOwner', source, plate) | ||
| return netId | ||
| end) |