Merge pull request #823 from bitpredator/dev

Dev
bitpredator · Sep 12, 2024 · 73ec431 · 73ec431
2 parents 17ff2fb + 6c5a1f7
commit 73ec431
Show file tree

Hide file tree

Showing 5 changed files with 755 additions and 746 deletions.
diff --git a/server-data/resources/[esx]/bpt_society/fxmanifest.lua b/server-data/resources/[esx]/bpt_society/fxmanifest.lua
@@ -4,7 +4,7 @@ game("gta5")
 
 description("ESX Society")
 lua54("yes")
-version("1.0.1")
+version("1.0.2")
 
 shared_script("@es_extended/imports.lua")
 

diff --git a/server-data/resources/[esx]/bpt_society/server/main.lua b/server-data/resources/[esx]/bpt_society/server/main.lua
@@ -405,10 +405,10 @@ ESX.RegisterServerCallback("bpt_society:getVehiclesInGarage", function(_, cb, so
 end)
 
 ESX.RegisterServerCallback("bpt_society:isBoss", function(source, cb, job)
-    cb(isPlayerBoss(source, job))
+    cb(IsPlayerBoss(source, job))
 end)
 
-function isPlayerBoss(playerId, job)
+function IsPlayerBoss(playerId, job)
     local xPlayer = ESX.GetPlayerFromId(playerId)
 
     if xPlayer.job.name == job and xPlayer.job.grade_name == "boss" then

diff --git a/server-data/resources/[ox]/ox_inventory/data/shops.lua b/server-data/resources/[ox]/ox_inventory/data/shops.lua
@@ -129,6 +129,8 @@ return {
 		},
 		inventory = {
 			{ name = "pickaxe", price = 30 },
+			{ name = "water", price = 100 },
+			{ name = "burger", price = 70 },
 		},
 		locations = {
 			vec3(2571.151611, 2720.690186, 42.911377),