Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjustments #40

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Adjustments #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
134c0b9
Adjustments
DosKit Jan 31, 2024
1433c46
Version Bump
DosKit Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,9 @@ RegisterNetEvent('inventory:client:CheckOpenState', function(type, id, label)
end
end)

RegisterNetEvent('inventory:client:ItemBox', function(itemData, type, amount)
SendNUIMessage({
action = "itemBox",
item = itemData,
type = type,
amount = amount or 1,
})
RegisterNetEvent('inventory:client:ItemBox', function(idata, itype, amount)
local idata = type(idata) == 'string' and sharedItems[idata] or idata
SendNUIMessage({action = "itemBox", item = idata, type = itype, amount = amount or 1})
end)

AddEventHandler('inventory:client:requiredItems', function(items)
Expand Down Expand Up @@ -368,31 +364,31 @@ CreateThread(function()
DisableControlAction(0, 0x26E9DC00)
DisableControlAction(0, 0xAC4BD4F1) -- Disable Weapon Wheel and Item Wheel
DisableControlAction(0, 0xB238FE0B) -- Disable Quick Select for Weapons
if IsDisabledControlPressed(0, 0xE6F612E4) and IsInputDisabled(0) then -- 1 slot
if IsDisabledControlPressed(0, 0xE6F612E4) and IsInputDisabled(0) and PlayerData.items[1] then -- 1 slot
if not PlayerData.metadata["isdead"] and not PlayerData.metadata["inlaststand"] and not PlayerData.metadata["ishandcuffed"] then
TriggerServerEvent("inventory:server:UseItemSlot", 1)
end
end

if IsDisabledControlPressed(0, 0x1CE6D9EB) and IsInputDisabled(0) then -- 2 slot
if IsDisabledControlPressed(0, 0x1CE6D9EB) and IsInputDisabled(0) and PlayerData.items[2] then -- 2 slot
if not PlayerData.metadata["isdead"] and not PlayerData.metadata["inlaststand"] and not PlayerData.metadata["ishandcuffed"] then
TriggerServerEvent("inventory:server:UseItemSlot", 2)
end
end

if IsDisabledControlPressed(0, 0x4F49CC4C) and IsInputDisabled(0) then -- 3 slot
if IsDisabledControlPressed(0, 0x4F49CC4C) and IsInputDisabled(0) and PlayerData.items[3] then -- 3 slot
if not PlayerData.metadata["isdead"] and not PlayerData.metadata["inlaststand"] and not PlayerData.metadata["ishandcuffed"] then
TriggerServerEvent("inventory:server:UseItemSlot", 3)
end
end

if IsDisabledControlPressed(0, 0x8F9F9E58) and IsInputDisabled(0) then -- 4 slot
if IsDisabledControlPressed(0, 0x8F9F9E58) and IsInputDisabled(0) and PlayerData.items[4] then -- 4 slot
if not PlayerData.metadata["isdead"] and not PlayerData.metadata["inlaststand"] and not PlayerData.metadata["ishandcuffed"] then
TriggerServerEvent("inventory:server:UseItemSlot", 4)
end
end

if IsDisabledControlPressed(0, 0xAB62E997) and IsInputDisabled(0) then -- 5 slot
if IsDisabledControlPressed(0, 0xAB62E997) and IsInputDisabled(0) and PlayerData.items[5] then -- 5 slot
if not PlayerData.metadata["isdead"] and not PlayerData.metadata["inlaststand"] and not PlayerData.metadata["ishandcuffed"] then
TriggerServerEvent("inventory:server:UseItemSlot", 5)
end
Expand Down Expand Up @@ -424,4 +420,4 @@ CreateThread(function()
end
Wait(500)
end
end)
end)
4 changes: 2 additions & 2 deletions fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ game 'rdr3'
rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'

description 'QBR-Inventory'
version '1.0.1'
version '1.0.2'

shared_scripts {
'@qbr-core/shared/locale.lua',
Expand Down Expand Up @@ -33,4 +33,4 @@ files {
'html/*.ttf'
}

lua54 'yes'
lua54 'yes'