Merge pull request #850 from bitpredator/dev

chore: modified item images and various corrections

server-data/resources/[bpt_addons]/bpt_crafting/bpt_crafting.sql

@@ -15,6 +15,7 @@ INSERT INTO `bpt_items` (`name`, `label`) VALUES
 	('cottonforbandages', 'cottonforbandages'),
 	('cotton', 'cotton'),
 	('ironsheet', 'ironsheet'),
+	('steelsheet', 'steelsheet'),
 	('garbage', 'garbage'),
 	('WEAPON_APPISTOL', 'WEAPON APPISTOL'),
 	('iron', 'iron'),
@@ -57,5 +58,6 @@ INSERT INTO `bpt_items` (`name`, `label`) VALUES
 	('diamond', 'Diamond'),
 	('marijuana_extract', 'Marijuana extract'),
 	('medikit', 'Medikit'),
-	('salmon_fillet', 'Salmon Fillet')
+	('salmon_fillet', 'Salmon Fillet'),
+	('armour', 'armour'),
 ;

server-data/resources/[bpt_addons]/bpt_crafting/config.lua

@@ -169,6 +169,22 @@ Config = {
             },
         },
 
+        ["steelsheet"] = {
+            Level = 0,
+            Category = "manufacturing",
+            isGun = false,
+            Jobs = { "import" },
+            JobGrades = {},
+            Amount = 5,
+            SuccessRate = 100,
+            requireBlueprint = false,
+            Time = 60,
+            Ingredients = {
+                ["steel"] = 1,
+                ["hammer"] = 1,
+            },
+        },
+
         ["diamond_tip"] = {
             Level = 0,
             Category = "tools",
@@ -440,6 +456,23 @@ Config = {
             },
         },
 
+        ["armour"] = {
+            Level = 10,
+            Category = "ammu",
+            isGun = false,
+            Jobs = { "ammu" },
+            JobGrades = {},
+            Amount = 1,
+            SuccessRate = 100,
+            requireBlueprint = false,
+            Time = 60,
+            Ingredients = {
+                ["steelsheet"] = 1,
+                ["ironsheet"] = 1,
+                ["hammer"] = 1,
+            },
+        },
+
         ["bread"] = {
             Level = 0,
             Category = "baker",
@@ -526,6 +559,7 @@ Config = {
                 "cottonforbandages",
                 "hammer",
                 "ironsheet",
+                "steelsheet",
                 "recycled_paper",
                 "paper",
                 "recycled_plastic",
@@ -560,6 +594,7 @@ Config = {
                 "WEAPON_KNUCKLE",
                 "WEAPON_NIGHTSTICK",
                 "WEAPON_PISTOL",
+                "armour",
             },
             radius = 1.0,
         },

server-data/resources/[bpt_addons]/bpt_crafting/localization/bpt_crafting_it.sql

@@ -15,6 +15,7 @@ INSERT INTO `bpt_items` (`name`, `label`) VALUES
 	('cottonforbandages', 'cotone per bende'),
 	('cotton', 'cotone'),
 	('ironsheet', 'lamiera di ferro'),
+	('steelsheet', 'lamiera di acciaio'),
 	('garbage', 'rifiuti'),
 	('WEAPON_APPISTOL', 'pistola AP'),
 	('iron', 'Ferro'),
@@ -54,8 +55,9 @@ INSERT INTO `bpt_items` (`name`, `label`) VALUES
 	('marijuana', 'marijuana'),
 	('cannabis', 'Cannabis'),
 	('diamond_tip', 'Punta di diamante'),
-	('diamond', 'Diamond'),
+	('diamond', 'Diamante'),
 	('marijuana_extract', 'Estratto di marijuana'),
 	('medikit', 'Medikit'),
-	('salmon_fillet', 'Filetto di salmone')
+	('salmon_fillet', 'Filetto di salmone'),
+	('armour', 'giubbotto antiproiettile')
 ;

server-data/resources/[ox]/ox_inventory/client.lua

@@ -1485,7 +1485,7 @@ RegisterNetEvent('ox_inventory:setPlayerInventory', function(currentDrops, inven
 
 							TriggerServerEvent('ox_inventory:updateWeapon', 'throw', nil, weapon.slot)
 
-							plyState.invBusy = false
+							plyState:set('invBusy', false, true)
 							currentWeapon = nil
 
 							RemoveWeaponFromPed(playerPed, weapon.hash)
@@ -1500,7 +1500,7 @@ RegisterNetEvent('ox_inventory:setPlayerInventory', function(currentDrops, inven
 		end
 	end)
 
-	plyState:set('invBusy', false, false)
+	plyState:set('invBusy', false, true)
 	plyState:set('invOpen', false, false)
 	plyState:set('invHotkeys', true, false)
 	plyState:set('canUseWeapons', true, false)
@@ -1609,7 +1609,10 @@ local function giveItemToTarget(serverId, slotId, count)
     end
 
     Utils.PlayAnim(0, 'mp_common', 'givetake1_a', 1.0, 1.0, 2000, 50, 0.0, 0, 0, 0)
-    TriggerServerEvent('ox_inventory:giveItem', slotId, serverId, count or 0)
+	local notification = lib.callback.await('ox_inventory:giveItem', false, slotId, serverId, count or 0)
+    if notification then
+        lib.notify({ type = 'error', description = locale(table.unpack(notification)) })
+    end
 end
 
 exports('giveItemToTarget', giveItemToTarget)

server-data/resources/[ox]/ox_inventory/data/items.lua

@@ -208,6 +208,14 @@ return {
 		consume = 0,
 	},
 
+	["steelsheet"]  = {
+		label = "lamiera di acciaio",
+		weight = 60,
+		stack = true,
+		close = false,
+		consume = 0,
+	},
+
 	["identification"] = {
 		label = "Identification",
 	},
@@ -733,4 +741,10 @@ return {
 		stack = true,
 		close = true,
 	},
+
+	["stevo_policebadge"] = {
+		label = "Police Badge",
+		weight = 250,
+		stack = false,
+	},
 }

server-data/resources/[ox]/ox_inventory/data/shops.lua

@@ -98,25 +98,11 @@ return {
 			{ name = "water", price = 100 },
 			{ name = "cola", price = 80 },
 			{ name = "burger", price = 70 },
-		},
-		locations = {
-			vec3(25.846155, -1346.782471, 29.482056),
-		},
-	},
-
-	Fishingshop = {
-		name = "Fishing shop",
-		blip = {
-			id = 68,
-			colour = 69,
-			scale = 0.8,
-		},
-		inventory = {
 			{ name = "fishingrod", price = 100 },
 			{ name = "fishbait", price = 80 },
 		},
 		locations = {
-			vec3(-327.639557, -2793.745117, 5.201416),
+			vec3(25.846155, -1346.782471, 29.482056),
 		},
 	},
 

server-data/resources/[ox]/ox_inventory/modules/bridge/esx/client.lua

@@ -44,7 +44,7 @@ local Weapon = require("modules.weapon.client")
 
 RegisterNetEvent("esx_policejob:handcuff", function()
     PlayerData.cuffed = not PlayerData.cuffed
-    LocalPlayer.state:set("invBusy", PlayerData.cuffed, false)
+    LocalPlayer.state:set('invBusy', PlayerData.cuffed, true)
 
     if not PlayerData.cuffed then
         return
@@ -55,5 +55,5 @@ end)
 
 RegisterNetEvent("esx_policejob:unrestrain", function()
     PlayerData.cuffed = false
-    LocalPlayer.state:set("invBusy", PlayerData.cuffed, false)
+    LocalPlayer.state:set('invBusy', PlayerData.cuffed, true)
 end)

server-data/resources/[ox]/ox_inventory/modules/bridge/server.lua

@@ -51,9 +51,8 @@ end
 local success, result = pcall(lib.load, ('modules.bridge.%s.server'):format(shared.framework))
 
 if not success then
-    lib.print.error(result)
     lib = nil
-    return
+	error(result, 0)
 end
 
 if server.convertInventory then exports('ConvertItems', server.convertInventory) end

server-data/resources/[ox]/ox_inventory/modules/inventory/server.lua

@@ -433,7 +433,7 @@ function Inventory.SlotWeight(item, slot, ignoreCount)
 	end
 
     if item.hash == `WEAPON_PETROLCAN` then
-        weight += 15000 * (slot.metadata.ammo / 100)
+        slot.metadata.weight = 15000 * (slot.metadata.ammo / 100)
     end
 
 	if slot.metadata.components then
@@ -2403,8 +2403,8 @@ RegisterServerEvent('ox_inventory:closeInventory', function()
 	end
 end)
 
-RegisterServerEvent('ox_inventory:giveItem', function(slot, target, count)
-	local fromInventory = Inventories[source]
+local function giveItem(playerId, slot, target, count)
+	local fromInventory = Inventories[playerId]
 	local toInventory = Inventories[target]
 
 	if count <= 0 then count = 1 end
@@ -2414,18 +2414,23 @@ RegisterServerEvent('ox_inventory:giveItem', function(slot, target, count)
 
 		if not data then return end
 
+		local targetState = Player(target).state
+        if targetState.invBusy then
+            return { 'cannot_give', count, data.label }
+        end
+
 		local item = Items(data.name)
 
 		if not item or data.count < count or not Inventory.CanCarryItem(toInventory, item, count, data.metadata) or #(GetEntityCoords(fromInventory.player.ped) - GetEntityCoords(toInventory.player.ped)) > 15 then
-			return TriggerClientEvent('ox_lib:notify', fromInventory.id, { type = 'error', description = locale('cannot_give', count, data.label) })
+			return { 'cannot_give', count, data.label }
 		end
 
 		local toSlot = Inventory.GetSlotForItem(toInventory, data.name, data.metadata)
 		local fromRef = ('%s:%s'):format(fromInventory.id, slot)
 		local toRef = ('%s:%s'):format(toInventory.id, toSlot)
 
 		if activeSlots[fromRef] or activeSlots[toRef] then
-			return TriggerClientEvent('ox_lib:notify', fromInventory.id, { type = 'error', description = locale('cannot_give', count, data.label) })
+			return { 'cannot_give', count, data.label }
 		end
 
 		activeSlots[fromRef] = true
@@ -2458,9 +2463,12 @@ RegisterServerEvent('ox_inventory:giveItem', function(slot, target, count)
 			end
 		end
 
-		return TriggerClientEvent('ox_lib:notify', fromInventory.id, { type = 'error', description = locale('cannot_give', count, data.label) })
+		return { 'cannot_give', count, data.label }
 	end
-end)
+end
+
+lib.callback.register('ox_inventory:giveItem', giveItem)
+RegisterServerEvent('ox_inventory:giveItem', function(...) giveItem(source, ...) end)
 
 local function updateWeapon(source, action, value, slot, specialAmmo)
 	local inventory = Inventories[source]

server-data/resources/[ox]/ox_inventory/modules/items/server.lua

@@ -50,6 +50,7 @@ local Inventory
 
 CreateThread(function()
 	Inventory = require 'modules.inventory.server'
+	if not lib then return end
 
 	if shared.framework == 'esx' then
 		local success, items = pcall(MySQL.query.await, 'SELECT * FROM items')

server-data/resources/[ox]/ox_inventory/modules/shops/client.lua

@@ -149,7 +149,7 @@ local function refreshShops()
 							scenario = target.scenario,
 							label = label,
 							groups = shop.groups,
-							icon = shop.icon,
+							icon = shop.icon or 'fas fa-shopping-basket',
 							iconColor = target.iconColor,
 							onEnter = onEnterShop,
 							onExit = onExitShop,

server-data/resources/[ox]/ox_inventory/server.lua

@@ -1,5 +1,9 @@
 if not lib then return end
 
+require 'modules.bridge.server'
+require 'modules.shops.server'
+require 'modules.pefcl.server'
+
 if GetConvar('inventory:versioncheck', 'true') == 'true' then
 	lib.versionCheck('overextended/ox_inventory')
 end
@@ -9,10 +13,6 @@ local db = require 'modules.mysql.server'
 local Items = require 'modules.items.server'
 local Inventory = require 'modules.inventory.server'
 
-require 'modules.shops.server'
-require 'modules.pefcl.server'
-require 'modules.bridge.server'
-
 ---@param player table
 ---@param data table?
 --- player requires source, identifier, and name