Weapon attachment rework

qbcore-framework · Nov 3, 2023 · fbc05f6 · fbc05f6
1 parent 02695ab
commit fbc05f6
Show file tree

Hide file tree

Showing 42 changed files with 969 additions and 1,998 deletions.
diff --git a/client/main.lua b/client/main.lua
@@ -117,19 +117,18 @@ end
 ---@return table attachments
 local function FormatWeaponAttachments(itemdata)
     local attachments = {}
-    itemdata.name = itemdata.name:upper()
-    if itemdata.info.attachments ~= nil and next(itemdata.info.attachments) ~= nil then
-        for _, v in pairs(itemdata.info.attachments) do
-            if exports['qb-weapons']:getConfigWeaponAttachments(itemdata.name) then
-                for key, value in pairs(exports['qb-weapons']:getConfigWeaponAttachments(itemdata.name)) do
-                    if value.component == v.component then
-                        local item = value.item
-                        attachments[#attachments + 1] = {
-                            attachment = key,
-                            label = QBCore.Shared.Items[item].label
-                            --label = value.label
-                        }
-                    end
+    local weaponName = itemdata.name
+    local WeaponAttachments = exports['qb-weapons']:getConfigWeaponAttachments()
+    for attachmentType, weapons in pairs(WeaponAttachments) do
+        local componentHash = weapons[weaponName]
+        if componentHash then
+            for _, attachmentData in pairs(itemdata.info.attachments) do
+                if attachmentData.component == componentHash then
+                    local label = QBCore.Shared.Items[attachmentType] and QBCore.Shared.Items[attachmentType].label or 'Unknown'
+                    attachments[#attachments + 1] = {
+                        attachment = attachmentType,
+                        label = label
+                    }
                 end
             end
         end
@@ -588,6 +587,10 @@ RegisterNetEvent('inventory:client:UseWeapon', function(weaponData, shootbool)
             end
         end
 
+        if weaponData.info.tint then
+            SetPedWeaponTintIndex(ped, weaponHash, weaponData.info.tint)
+        end
+
         currentWeapon = weaponName
     end
 end)
@@ -784,19 +787,23 @@ end)
 
 RegisterNUICallback('RemoveAttachment', function(data, cb)
     local ped = PlayerPedId()
-    local WeaponData = QBCore.Shared.Items[data.WeaponData.name]
-    local Attachment = exports['qb-weapons']:getConfigWeaponAttachments(WeaponData.name:upper())[data.AttachmentData.attachment]
+    local WeaponData = data.WeaponData
+    local allAttachments = exports['qb-weapons']:getConfigWeaponAttachments()
+    local Attachment = allAttachments[data.AttachmentData.attachment][WeaponData.name]
+
     QBCore.Functions.TriggerCallback('weapons:server:RemoveAttachment', function(NewAttachments)
         if NewAttachments ~= false then
             local Attachies = {}
-            RemoveWeaponComponentFromPed(ped, joaat(data.WeaponData.name), joaat(Attachment.component))
+            RemoveWeaponComponentFromPed(ped, joaat(WeaponData.name), joaat(Attachment))
+
             for _, v in pairs(NewAttachments) do
-                for _, pew in pairs(exports['qb-weapons']:getConfigWeaponAttachments(WeaponData.name:upper())) do
-                    if v.component == pew.component then
-                        local item = pew.item
+                for attachmentType, weapons in pairs(allAttachments) do
+                    local componentHash = weapons[WeaponData.name]
+                    if componentHash and v.component == componentHash then
+                        local label = QBCore.Shared.Items[attachmentType] and QBCore.Shared.Items[attachmentType].label or 'Unknown'
                         Attachies[#Attachies + 1] = {
-                            attachment = pew.item,
-                            label = QBCore.Shared.Items[item].label,
+                            attachment = attachmentType,
+                            label = label,
                         }
                     end
                 end
@@ -807,10 +814,10 @@ RegisterNUICallback('RemoveAttachment', function(data, cb)
             }
             cb(DJATA)
         else
-            RemoveWeaponComponentFromPed(ped, joaat(data.WeaponData.name), joaat(Attachment.component))
+            RemoveWeaponComponentFromPed(ped, joaat(WeaponData.name), joaat(Attachment))
             cb({})
         end
-    end, data.AttachmentData, data.WeaponData)
+    end, data.AttachmentData, WeaponData)
 end)
 
 RegisterNUICallback('getCombineItem', function(data, cb)

diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -1,6 +1,6 @@
 fx_version 'cerulean'
 game 'gta5'
-
+lua54 'yes'
 description 'QB-Inventory'
 version '1.2.4'
 
@@ -34,5 +34,3 @@ files {
 }
 
 dependency 'qb-weapons'
-
-lua54 'yes'
diff --git a/html/images/advscope_attachment.png b/html/images/advscope_attachment.png
diff --git a/html/images/barrel_attachment.png b/html/images/barrel_attachment.png
diff --git a/html/images/bellend_muzzle_brake.png b/html/images/bellend_muzzle_brake.png
diff --git a/html/images/boomcamo_attachment.png b/html/images/boomcamo_attachment.png
diff --git a/html/images/brushcamo_attachment.png b/html/images/brushcamo_attachment.png
diff --git a/html/images/pistol_extendedclip.png → html/images/clip_attachment.png b/html/images/pistol_extendedclip.png → html/images/clip_attachment.png
diff --git a/html/images/comp_attachment.png b/html/images/comp_attachment.png
diff --git a/html/images/digicamo_attachment.png b/html/images/digicamo_attachment.png
diff --git a/html/images/rifle_drummag.png → html/images/drum_attachment.png b/html/images/rifle_drummag.png → html/images/drum_attachment.png
diff --git a/html/images/fat_end_muzzle_brake.png b/html/images/fat_end_muzzle_brake.png
diff --git a/html/images/smg_flashlight.png → html/images/flashlight_attachment.png b/html/images/smg_flashlight.png → html/images/flashlight_attachment.png
diff --git a/html/images/flat_muzzle_brake.png b/html/images/flat_muzzle_brake.png
diff --git a/html/images/geocamo_attachment.png b/html/images/geocamo_attachment.png
diff --git a/html/images/grip_attachment.png b/html/images/grip_attachment.png
diff --git a/html/images/heavy_duty_muzzle_brake.png b/html/images/heavy_duty_muzzle_brake.png
diff --git a/html/images/holoscope_attachment.png b/html/images/holoscope_attachment.png
diff --git a/html/images/largescope_attachment.png b/html/images/largescope_attachment.png
diff --git a/html/images/leopardcamo_attachment.png b/html/images/leopardcamo_attachment.png
diff --git a/html/images/medscope_attachment.png b/html/images/medscope_attachment.png
diff --git a/html/images/nvscope_attachment.png b/html/images/nvscope_attachment.png
diff --git a/html/images/patriotcamo_attachment.png b/html/images/patriotcamo_attachment.png
diff --git a/html/images/perseuscamo_attachment.png b/html/images/perseuscamo_attachment.png
diff --git a/html/images/precision_muzzle_brake.png b/html/images/precision_muzzle_brake.png
diff --git a/html/images/sessantacamo_attachment.png b/html/images/sessantacamo_attachment.png
diff --git a/html/images/skullcamo_attachment.png b/html/images/skullcamo_attachment.png
diff --git a/html/images/slanted_muzzle_brake.png b/html/images/slanted_muzzle_brake.png
diff --git a/html/images/smallscope_attachment.png b/html/images/smallscope_attachment.png
diff --git a/html/images/smg_scope.png b/html/images/smg_scope.png
diff --git a/html/images/snspistol_part_1.png b/html/images/snspistol_part_1.png
diff --git a/html/images/snspistol_part_2.png b/html/images/snspistol_part_2.png
diff --git a/html/images/snspistol_part_3.png b/html/images/snspistol_part_3.png
diff --git a/html/images/split_end_muzzle_brake.png b/html/images/split_end_muzzle_brake.png
diff --git a/html/images/squared_muzzle_brake.png b/html/images/squared_muzzle_brake.png
diff --git a/html/images/pistol_suppressor.png → html/images/suppressor_attachment.png b/html/images/pistol_suppressor.png → html/images/suppressor_attachment.png
diff --git a/html/images/tactical_muzzle_brake.png b/html/images/tactical_muzzle_brake.png
diff --git a/html/images/thermalscope_attachment.png b/html/images/thermalscope_attachment.png
diff --git a/html/images/woodcamo_attachment.png b/html/images/woodcamo_attachment.png
diff --git a/html/images/zebracamo_attachment.png b/html/images/zebracamo_attachment.png