[WIP] Re-enable GTA weapon wheel in ox_inventory

[Copilot]

Thanks for asking me to work on this. I will get started on it and keep this PR's description up to date as I form a plan and make progress.

Original prompt

Re-enable GTA Weapon Wheel in ox_inventory

Problem

The current version of ox_inventory manages weapons through the inventory system, which disables the native GTA weapon wheel. This change re-enables the GTA weapon wheel by preventing the inventory from managing weapons.

Solution

Apply the following modifications to restore weapon wheel functionality:

1. modules/utils/client.lua

• Remove the notifySuppressed notification suppression system (lines 82-90)
• Keep all other functionality intact

2. client.lua - Major changes:

• After line 8 (after local currentWeapon): Add weapon wheel enablement code:

  • Set local EnableWeaponWheel = true
  • Override Weapon.Disarm(), Weapon.ClearAll(), and Weapon.Equip() to be no-ops

• Line 39: Remove Utils.WeaponWheel() call in ped cache handler

• Line 44: Change plyState:set('canUseWeapons', false, false) to plyState:set('canUseWeapons', true, true)

• Line 516: Change weapon equip check from:

  if EnableWeaponWheel or not plyState.canUseWeapons then return end

• Line 726-730: In OnPlayerData() function, remove the Utils.WeaponWheel() call at the end

• Line 1159: In dead state bag handler, remove Utils.WeaponWheel() call

• Line 1170-1180: In seat cache handler, remove both Utils.WeaponWheel() calls (lines 1175 and 1179)

• Line 1401: Add early return check:

  if EnableWeaponWheel then return end

  This should be placed after the parachute check and before local weaponHash = GetSelectedPedWeapon(playerPed)

• Line 1468-1471: Change weapon wheel control logic from:

  if not EnableWeaponWheel then
      HudWeaponWheelIgnoreSelection()
      DisableControlAction(0, 37, true)
  end

• Line 1569: Change plyState:set('canUseWeapons', true, false) to ensure weapons are enabled

3. modules/weapon/client.lua

• No changes needed (keep original)

Expected Behavior

After these changes:

• The native GTA weapon wheel will be functional
• ox_inventory will NOT manage weapons
• Players can use the default GTA weapon system
• Inventory will still function normally for all other items

This pull request was created as a result of the following prompt from Copilot chat.

Re-enable GTA Weapon Wheel in ox_inventory

Problem

The current version of ox_inventory manages weapons through the inventory system, which disables the native GTA weapon wheel. This change re-enables the GTA weapon wheel by preventing the inventory from managing weapons.

Solution

Apply the following modifications to restore weapon wheel functionality:

1. modules/utils/client.lua

• Remove the notifySuppressed notification suppression system (lines 82-90)
• Keep all other functionality intact

2. client.lua - Major changes:

• After line 8 (after local currentWeapon): Add weapon wheel enablement code:

  • Set local EnableWeaponWheel = true
  • Override Weapon.Disarm(), Weapon.ClearAll(), and Weapon.Equip() to be no-ops

• Line 39: Remove Utils.WeaponWheel() call in ped cache handler

• Line 44: Change plyState:set('canUseWeapons', false, false) to plyState:set('canUseWeapons', true, true)

• Line 516: Change weapon equip check from:

  if EnableWeaponWheel or not plyState.canUseWeapons then return end

• Line 726-730: In OnPlayerData() function, remove the Utils.WeaponWheel() call at the end

• Line 1159: In dead state bag handler, remove Utils.WeaponWheel() call

• Line 1170-1180: In seat cache handler, remove both Utils.WeaponWheel() calls (lines 1175 and 1179)

• Line 1401: Add early return check:

  if EnableWeaponWheel then return end

  This should be placed after the parachute check and before local weaponHash = GetSelectedPedWeapon(playerPed)

• Line 1468-1471: Change weapon wheel control logic from:

  if not EnableWeaponWheel then
      HudWeaponWheelIgnoreSelection()
      DisableControlAction(0, 37, true)
  end

• Line 1569: Change plyState:set('canUseWeapons', true, false) to ensure weapons are enabled

3. modules/weapon/client.lua

• No changes needed (keep original)

Expected Behavior

After these changes:

• The native GTA weapon wheel will be functional
• ox_inventory will NOT manage weapons
• Players can use the default GTA weapon system
• Inventory will still function normally for all other items

---

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

[Whisperisgod]

hahaha

[unitysync]

LGTM. Can we get this merged?

[SSnowly]

what the fuck