Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: update readme, event names #18

Merged
merged 1 commit into from
Apr 16, 2024
Merged

refactor: update readme, event names #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
# qb-jewelery
Jewelry Robbery For QB-Core
# qbx_jewelery
Jewelry Robbery For QBOX

## Dependencies
- [qb-core](https://github.com/QBCore-Remastered/qb-core) (Required)
- [ox_target](https://github.com/overextended/ox_target) (Required)
- [ox_lib](https://github.com/overextended/ox_lib) (Required)

# Server.cfg Convar Update
- Global DrawTextUi Option
```
setr UseTarget false
```

- Global Target Option
```
setr UseTarget true
```
- [qbx_core](https://github.com/Qbox-project/qbx_core)
- [ox_target](https://github.com/overextended/ox_target)
- [ox_lib](https://github.com/overextended/ox_lib)

# DrawTextUi Previews
![preview](https://i.imgur.com/VLbhNpB.jpeg)

Expand Down
40 changes: 20 additions & 20 deletions client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ local function createElectricalBox()
if config.useTarget then
exports.ox_target:addLocalEntity(electricalBoxEntity, {
{
name = 'qb-jewelery:electricalBox',
name = 'qbx_jewelery:electricalBox',
icon = 'fab fa-usb',
label = locale('text.electricalTarget'),
distance = 1.6,
items = sharedConfig.doorlock.requiredItem,
onSelect = function()
lib.callback('qb-jewelery:callback:electricalbox', false, function(CanHack)
lib.callback('qbx_jewelery:callback:electricalbox', false, function(CanHack)
if not CanHack then return end
TriggerEvent('qb-jewelery:client:electricalHandler')
TriggerEvent('qbx_jewelery:client:electricalHandler')
end)
end
}
Expand All @@ -42,7 +42,7 @@ end

local function removeElectricalBox()
if config.useTarget then
exports.ox_target:removeLocalEntity(electricalBoxEntity, 'qb-jewelery:electricalBox')
exports.ox_target:removeLocalEntity(electricalBoxEntity, 'qbx_jewelery:electricalBox')
end
if electricalBoxEntity ~= nil and DoesEntityExist(electricalBoxEntity) then
DeleteObject(electricalBoxEntity)
Expand All @@ -68,10 +68,10 @@ if not config.useTarget then
lib.showTextUI(locale('text.electrical'), {position = 'left-center'})
end
if IsControlJustPressed(0, 38) then
lib.callback('qb-jewelery:callback:electricalbox', false, function(CanHack)
lib.callback('qbx_jewelery:callback:electricalbox', false, function(CanHack)
if not CanHack then return end
isHacking = true
TriggerEvent('qb-jewelery:client:electricalHandler')
TriggerEvent('qbx_jewelery:client:electricalHandler')
end)
end
end
Expand All @@ -84,7 +84,7 @@ if not config.useTarget then
end)
end

AddEventHandler('qb-jewelery:client:electricalHandler', function()
AddEventHandler('qbx_jewelery:client:electricalHandler', function()
local animDictBox = 'anim@scripted@player@mission@tun_control_tower@male@'
lib.requestAnimDict(animDictBox)
local playerCoords = GetEntityCoords(cache.ped)
Expand All @@ -109,15 +109,15 @@ AddEventHandler('qb-jewelery:client:electricalHandler', function()
NetworkStartSynchronisedScene(leavingScene)
isHacking = false
if result == 0 then -- Failed
TriggerServerEvent('qb-jewellery:server:failedhackdoor')
TriggerServerEvent('qbx_jewelery:server:failedhackdoor')
exports.qbx_core:Notify(reason, 'error')
elseif result == 1 then -- Succeeded
TriggerServerEvent('qb-jewellery:server:succeshackdoor')
TriggerServerEvent('qbx_jewelery:server:succeshackdoor')
elseif result == 2 then -- Timed out
TriggerServerEvent('qb-jewellery:server:failedhackdoor')
TriggerServerEvent('qbx_jewelery:server:failedhackdoor')
exports.qbx_core:Notify(reason, 'error')
elseif result == -1 then -- Some error
TriggerServerEvent('qb-jewellery:server:failedhackdoor')
TriggerServerEvent('qbx_jewelery:server:failedhackdoor')
exports.qbx_core:Notify('Failed hack', 'error')
print('Error occured', reason)
end
Expand Down Expand Up @@ -158,9 +158,9 @@ if config.useTarget then
distance = 0.6,
onSelect = function()
closestVitrine = i
lib.callback('qb-jewelery:callback:cabinet', false, function(CanSmash)
lib.callback('qbx_jewelery:callback:cabinet', false, function(CanSmash)
if not CanSmash then return end
TriggerEvent('qb-jewelery:client:cabinetHandler')
TriggerEvent('qbx_jewelery:client:cabinetHandler')
end, closestVitrine)
end
}
Expand Down Expand Up @@ -190,12 +190,12 @@ else
lib.showTextUI(locale('text.cabinet'), {position = 'left-center'})
end
if IsControlJustPressed(0, 38) then
lib.callback('qb-jewelery:callback:cabinet', false, function(CanSmash)
lib.callback('qbx_jewelery:callback:cabinet', false, function(CanSmash)
if not CanSmash then return end

isSmashing = true
if hasShownText then hasShownText = false lib.hideTextUI() end
TriggerEvent('qb-jewelery:client:cabinetHandler')
TriggerEvent('qbx_jewelery:client:cabinetHandler')
end, closestVitrine)
end
end
Expand All @@ -205,7 +205,7 @@ else
end)
end

AddEventHandler('qb-jewelery:client:cabinetHandler', function()
AddEventHandler('qbx_jewelery:client:cabinetHandler', function()
local animDictCabinet = 'missheist_jewel'
local animNameSmashFront = {
'smash_case_tray_b',
Expand Down Expand Up @@ -244,10 +244,10 @@ AddEventHandler('qb-jewelery:client:cabinetHandler', function()
Wait(GetAnimDuration(animDictCabinet, animName) * 850)
ClearPedTasks(cache.ped)
isSmashing = false
TriggerServerEvent('qb-jewelery:server:endcabinet')
TriggerServerEvent('qbx_jewelery:server:endcabinet')
end)

RegisterNetEvent('qb-jewelery:client:synceffects', function(closestVitrines, originalPlayer)
RegisterNetEvent('qbx_jewelery:client:synceffects', function(closestVitrines, originalPlayer)
closestVitrine = closestVitrines
Wait(1500)
if sharedConfig.vitrines[closestVitrine].rayFire == 'DES_Jewel_Cab4' then
Expand All @@ -262,11 +262,11 @@ RegisterNetEvent('qb-jewelery:client:synceffects', function(closestVitrines, ori
playSmashAudio(sharedConfig.vitrines[closestVitrine].coords)
end)

RegisterNetEvent('qb-jewelery:client:syncconfig', function(vitrines)
RegisterNetEvent('qbx_jewelery:client:syncconfig', function(vitrines)
sharedConfig.vitrines = vitrines
end)

RegisterNetEvent('qb-jewelery:client:alarm', function()
RegisterNetEvent('qbx_jewelery:client:alarm', function()
PrepareAlarm('JEWEL_STORE_HEIST_ALARMS')
Wait(100)
StartAlarm('JEWEL_STORE_HEIST_ALARMS', false)
Expand Down
24 changes: 12 additions & 12 deletions server/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ local startedVitrine = {}
local alarmFired
local ITEMS = exports.ox_inventory:Items()

lib.callback.register('qb-jewelery:callback:electricalbox', function(source)
lib.callback.register('qbx_jewelery:callback:electricalbox', function(source)
local player = exports.qbx_core:GetPlayer(source)
local playerCoords = GetEntityCoords(GetPlayerPed(source))
local amount = exports.qbx_core:GetDutyCountType('leo')
Expand All @@ -26,7 +26,7 @@ lib.callback.register('qb-jewelery:callback:electricalbox', function(source)
end
return
end

if #(playerCoords - vector3(sharedConfig.electrical.x, sharedConfig.electrical.y, sharedConfig.electrical.z)) > 2 then return end

electricalBusy = true
Expand All @@ -39,7 +39,7 @@ lib.callback.register('qb-jewelery:callback:electricalbox', function(source)
return true
end)

lib.callback.register('qb-jewelery:callback:cabinet', function(source, closestVitrine)
lib.callback.register('qbx_jewelery:callback:cabinet', function(source, closestVitrine)
local playerPed = GetPlayerPed(source)
local playerCoords = GetEntityCoords(playerPed)
local allPlayers = exports.qbx_core:GetQBPlayers()
Expand All @@ -66,7 +66,7 @@ lib.callback.register('qb-jewelery:callback:cabinet', function(source, closestVi
for k in pairs(allPlayers) do
if k ~= source then
if #(GetEntityCoords(GetPlayerPed(k)) - sharedConfig.vitrines[closestVitrine].coords) < 20 then
TriggerClientEvent('qb-jewelery:client:synceffects', k, closestVitrine, source)
TriggerClientEvent('qbx_jewelery:client:synceffects', k, closestVitrine, source)
end
end
end
Expand All @@ -78,7 +78,7 @@ local function fireAlarm()

TriggerEvent('police:server:policeAlert', locale('notify.police'), 1, source)
TriggerEvent('qb-scoreboard:server:SetActivityBusy', 'jewellery', true)
TriggerClientEvent('qb-jewelery:client:alarm', -1)
TriggerClientEvent('qbx_jewelery:client:alarm', -1)
alarmFired = true

SetTimeout(config.timeOut, function()
Expand All @@ -90,12 +90,12 @@ local function fireAlarm()
for i = 1, #sharedConfig.vitrines do
sharedConfig.vitrines[i].isOpened = false
end
TriggerClientEvent('qb-jewelery:client:syncconfig', -1, sharedConfig.vitrines)

TriggerClientEvent('qbx_jewelery:client:syncconfig', -1, sharedConfig.vitrines)
end)
end

RegisterNetEvent('qb-jewelery:server:endcabinet', function()
RegisterNetEvent('qbx_jewelery:server:endcabinet', function()
local player = exports.qbx_core:GetPlayer(source)
local playerCoords = GetEntityCoords(GetPlayerPed(source))
local closestVitrine = startedVitrine[source]
Expand All @@ -114,16 +114,16 @@ RegisterNetEvent('qb-jewelery:server:endcabinet', function()
player.Functions.AddItem(RandomItem.name, math.random(RandomItem.min, RandomItem.max))
end

TriggerClientEvent('qb-jewelery:client:syncconfig', -1, sharedConfig.vitrines)
TriggerClientEvent('qbx_jewelery:client:syncconfig', -1, sharedConfig.vitrines)
fireAlarm()
end)

RegisterNetEvent('qb-jewellery:server:failedhackdoor', function()
RegisterNetEvent('qbx_jewelery:server:failedhackdoor', function()
electricalBusy = false
startedElectrical[source] = false
end)

RegisterNetEvent('qb-jewellery:server:succeshackdoor', function()
RegisterNetEvent('qbx_jewelery:server:succeshackdoor', function()
local doorEntrance = exports.ox_doorlock:getDoorFromName(sharedConfig.doorlock.name)
local playerCoords = GetEntityCoords(GetPlayerPed(source))

Expand All @@ -138,5 +138,5 @@ RegisterNetEvent('qb-jewellery:server:succeshackdoor', function()
end)

AddEventHandler('playerJoining', function(source)
TriggerClientEvent('qb-jewelery:client:syncconfig', source, sharedConfig.vitrines)
TriggerClientEvent('qbx_jewelery:client:syncconfig', source, sharedConfig.vitrines)
end)