Skip to content

Commit

Permalink
Description for txAdmin
Browse files Browse the repository at this point in the history
  • Loading branch information
GhzGarage committed Feb 11, 2024
1 parent 90202a6 commit a2f5045
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 24 deletions.
7 changes: 3 additions & 4 deletions fxmanifest.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
fx_version 'cerulean'
game 'gta5'

description 'QB-Diving'
lua54 'yes'
author 'Kakarot'
description 'Allows players to dive and search for materials underwater to sell'
version '1.2.1'

shared_script {
Expand All @@ -18,5 +19,3 @@ client_scripts {
'@PolyZone/BoxZone.lua',
'client/main.lua'
}

lua54 'yes'
40 changes: 20 additions & 20 deletions server/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ local function hasCoral(src)
availableCoral = {}
for _, v in pairs(Config.CoralTypes) do
local item = Player.Functions.GetItemByName(v.item)
if item then availableCoral[#availableCoral+1] = v end
if item then availableCoral[#availableCoral + 1] = v end
end
return next(availableCoral)
end
Expand All @@ -32,15 +32,15 @@ end
RegisterNetEvent('qb-diving:server:CallCops', function(coords)
for _, Player in pairs(QBCore.Functions.GetQBPlayers()) do
if Player then
if Player.PlayerData.job.type == "leo" and Player.PlayerData.job.onduty then
local msg = Lang:t("info.cop_msg")
if Player.PlayerData.job.type == 'leo' and Player.PlayerData.job.onduty then
local msg = Lang:t('info.cop_msg')
TriggerClientEvent('qb-diving:client:CallCops', Player.PlayerData.source, coords, msg)
local alertData = {
title = Lang:t("info.cop_title"),
title = Lang:t('info.cop_title'),
coords = coords,
description = msg
}
TriggerClientEvent("qb-phone:client:addPoliceAlert", -1, alertData)
TriggerClientEvent('qb-phone:client:addPoliceAlert', -1, alertData)
end
end
end
Expand All @@ -56,11 +56,11 @@ RegisterNetEvent('qb-diving:server:SellCoral', function()
local price = item.amount * v.price
local reward = getItemPrice(item.amount, price)
Player.Functions.RemoveItem(item.name, item.amount)
Player.Functions.AddMoney('cash', reward, "sold-coral")
TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item.name], "remove")
Player.Functions.AddMoney('cash', reward, 'sold-coral')
TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item.name], 'remove')
end
else
TriggerClientEvent('QBCore:Notify', src, Lang:t("error.no_coral"), 'error')
TriggerClientEvent('QBCore:Notify', src, Lang:t('error.no_coral'), 'error')
end
end)

Expand All @@ -73,13 +73,13 @@ RegisterNetEvent('qb-diving:server:TakeCoral', function(area, coral, bool)
local ItemData = QBCore.Shared.Items[Config.CoralTypes[coralType].item]
if amount > 1 then
for _ = 1, amount, 1 do
Player.Functions.AddItem(ItemData["name"], 1)
TriggerClientEvent('inventory:client:ItemBox', src, ItemData, "add")
Player.Functions.AddItem(ItemData['name'], 1)
TriggerClientEvent('inventory:client:ItemBox', src, ItemData, 'add')
Wait(250)
end
else
Player.Functions.AddItem(ItemData["name"], amount)
TriggerClientEvent('inventory:client:ItemBox', src, ItemData, "add")
Player.Functions.AddItem(ItemData['name'], amount)
TriggerClientEvent('inventory:client:ItemBox', src, ItemData, 'add')
end
if (Config.CoralLocations[area].TotalCoral - 1) == 0 then
for _, v in pairs(Config.CoralLocations[currentDivingArea].coords.Coral) do
Expand All @@ -101,10 +101,10 @@ RegisterNetEvent('qb-diving:server:TakeCoral', function(area, coral, bool)
end)

RegisterNetEvent('qb-diving:server:removeItemAfterFill', function()
local src = source
local Player = QBCore.Functions.GetPlayer(src)
Player.Functions.RemoveItem("diving_fill", 1)
TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items["diving_fill"], "remove")
local src = source
local Player = QBCore.Functions.GetPlayer(src)
Player.Functions.RemoveItem('diving_fill', 1)
TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items['diving_fill'], 'remove')
end)

-- Callbacks
Expand All @@ -115,10 +115,10 @@ end)

-- Items

QBCore.Functions.CreateUseableItem("diving_gear", function(source)
TriggerClientEvent("qb-diving:client:UseGear", source)
QBCore.Functions.CreateUseableItem('diving_gear', function(source)
TriggerClientEvent('qb-diving:client:UseGear', source)
end)

QBCore.Functions.CreateUseableItem("diving_fill", function(source)
TriggerClientEvent("qb-diving:client:setoxygenlevel", source)
QBCore.Functions.CreateUseableItem('diving_fill', function(source)
TriggerClientEvent('qb-diving:client:setoxygenlevel', source)
end)

0 comments on commit a2f5045

Please sign in to comment.