Skip to content

Commit

Permalink
fix: remove carwash and fireworks
Browse files Browse the repository at this point in the history
  • Loading branch information
mafewtm committed Nov 11, 2023
1 parent 2f02f65 commit 30e061b
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 248 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Base scripts for QBox Core Framework :building_construction:
- Adjusting npc/vehicle/parked vehicle spawn rates
- Infinite ammo for fire extinguisher and petrol can
- Removal of GTA's default huds (weapon wheel, cash etc.)
- Fireworks
- Automatically engine on after entering vehicle
- Discord rich presence
- Crouch and prone
Expand Down
70 changes: 0 additions & 70 deletions client/carwash.lua

This file was deleted.

101 changes: 0 additions & 101 deletions client/fireworks.lua

This file was deleted.

19 changes: 0 additions & 19 deletions config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,6 @@ ConsumablesAlcohol = {
['vodka'] = math.random(20, 40),
}

ConsumablesFireworks = {
'firework1',
'firework2',
'firework3',
'firework4'
}

Config.BlacklistedScenarios = {
['TYPES'] = {
'WORLD_VEHICLE_MILITARY_PLANES_SMALL',
Expand Down Expand Up @@ -162,15 +155,3 @@ Config.Teleports = {
},
},
}

Config.CarWash = {
dirtLevel = 0.1, -- threshold for the dirt level to be counted as dirty
defaultPrice = 20, -- default price for carwash
locations = {
vector3(25.29, -1391.96, 29.33),
vector3(174.18, -1736.66, 29.35),
vector3(-74.56, 6427.87, 31.44),
vector3(1363.22, 3592.7, 34.92),
vector3(-699.62, -932.7, 19.01)
}
}
2 changes: 1 addition & 1 deletion fxmanifest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ fx_version 'cerulean'
game 'gta5'

description 'Collection of small scripts'
repository 'https://github.com/Qbox-project/qbx-smallresources'
repository 'https://github.com/Qbox-project/qbx_smallresources'
version '1.1.0'

shared_scripts {
Expand Down
41 changes: 0 additions & 41 deletions server/consumables.lua
Original file line number Diff line number Diff line change
Expand Up @@ -104,28 +104,6 @@ RegisterNetEvent('qb-smallpenis:server:AddParachute', function()
player.Functions.AddItem('parachute', 1)
end)

----------- / Firework

exports.qbx_core:CreateUseableItem('firework1', function(source, item)
local src = source
TriggerClientEvent('fireworks:client:UseFirework', src, item.name, 'proj_indep_firework')
end)

exports.qbx_core:CreateUseableItem('firework2', function(source, item)
local src = source
TriggerClientEvent('fireworks:client:UseFirework', src, item.name, 'proj_indep_firework_v2')
end)

exports.qbx_core:CreateUseableItem('firework3', function(source, item)
local src = source
TriggerClientEvent('fireworks:client:UseFirework', src, item.name, 'proj_xmas_firework')
end)

exports.qbx_core:CreateUseableItem('firework4', function(source, item)
local src = source
TriggerClientEvent('fireworks:client:UseFirework', src, item.name, 'scr_indep_fireworks')
end)

----------- / Lockpicking

exports.qbx_core:CreateUseableItem('lockpick', function(source)
Expand Down Expand Up @@ -231,25 +209,6 @@ RegisterNetEvent('consumables:server:drinkAlcohol', function(item)
player.Functions.RemoveItem(foundItem, 1)
end)

RegisterNetEvent('consumables:server:UseFirework', function(item)
local player = exports.qbx_core:GetPlayer(source)

if not player then return end

local foundItem = nil

for i = 1, #ConsumablesFireworks do
if ConsumablesFireworks[i] == item then
foundItem = ConsumablesFireworks[i]
break
end
end

if not foundItem then return end

player.Functions.RemoveItem(foundItem, 1)
end)

RegisterNetEvent('consumables:server:addThirst', function(amount)
local player = exports.qbx_core:GetPlayer(source)

Expand Down
15 changes: 0 additions & 15 deletions server/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,3 @@ RegisterNetEvent('seatbelt:DoHarnessDamage', function(hp, data)
exports.ox_inventory:SetMetadata(src, harness.slot, harness.metadata)
end
end)

RegisterNetEvent('qb-carwash:server:washCar', function()
local src = source
local player = exports.qbx_core:GetPlayer(src)

if not player then return end

if player.Functions.RemoveMoney('cash', Config.CarWash.defaultPrice, 'car-washed') then
TriggerClientEvent('qb-carwash:client:washCar', src)
elseif player.Functions.RemoveMoney('bank', Config.CarWash.defaultPrice, 'car-washed') then
TriggerClientEvent('qb-carwash:client:washCar', src)
else
TriggerClientEvent('QBCore:Notify', src, 'You dont have enough money..', 'error')
end
end)

0 comments on commit 30e061b

Please sign in to comment.