refactor(weapons): adjust jerry can weight and durability loss

Resolves #1659.
overextended · Jun 7, 2024 · 81554df · 81554df
1 parent 9f4b1a4
commit 81554df
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/data/weapons.lua b/data/weapons.lua
@@ -227,6 +227,7 @@ return {
 		['WEAPON_FIREEXTINGUISHER'] = {
 			label = 'Fire Extinguisher',
 			weight = 8616,
+            durability = 0.006
 		},
 
 		['WEAPON_FIREWORK'] = {
@@ -458,8 +459,8 @@ return {
 		},
 
 		['WEAPON_PETROLCAN'] = {
-			label = 'Gas Can',
-			weight = 12000,
+			label = 'Jerry Can',
+			weight = 4000,
 		},
 
 		['WEAPON_GADGETPISTOL'] = {

diff --git a/modules/inventory/server.lua b/modules/inventory/server.lua
@@ -432,6 +432,10 @@ function Inventory.SlotWeight(item, slot, ignoreCount)
 		end
 	end
 
+    if item.hash == `WEAPON_PETROLCAN` then
+        weight += 15000 * (slot.metadata.ammo / 100)
+    end
+
 	if slot.metadata.components then
 		for i = #slot.metadata.components, 1, -1 do
 			local componentWeight = Items(slot.metadata.components[i])?.weight
@@ -2538,6 +2542,10 @@ local function updateWeapon(source, action, value, slot, specialAmmo)
                 weapon.metadata.durability = 0
             end
 
+            if item.hash == `WEAPON_PETROLCAN` then
+                weapon.weight = Inventory.SlotWeight(item, weapon)
+            end
+
 			if action ~= 'throw' then
 				inventory:syncSlotsWithPlayer({
 					{ item = weapon }