From b035c5aa56e40daa96b2a2ed6d747b75debe226d Mon Sep 17 00:00:00 2001 From: Dolu <47056777+dolutattoo@users.noreply.github.com> Date: Mon, 17 Apr 2023 06:11:18 +0200 Subject: [PATCH] feat(client/addKeybind): add defaultMapper field (#219) This allow other mapper input like `MOUSE_BUTTON` for example. See: https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/ --- imports/addKeybind/client.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/imports/addKeybind/client.lua b/imports/addKeybind/client.lua index ea6c61d..7e19b7b 100644 --- a/imports/addKeybind/client.lua +++ b/imports/addKeybind/client.lua @@ -3,6 +3,7 @@ if cache.game == 'redm' then return end ---@class KeybindProps ---@field name string ---@field description string +---@field defaultMapper? string (see: https://docs.fivem.net/docs/game-references/input-mapper-parameter-ids/) ---@field defaultKey? string ---@field disabled? boolean ---@field disable? fun(self: CKeybind, toggle: boolean) @@ -49,6 +50,7 @@ end ---@return CKeybind function lib.addKeybind(data) if not data.defaultKey then data.defaultKey = '' end + if not data.defaultMapper then data.defaultMapper = 'keyboard' end RegisterCommand('+' .. data.name, function() if not data.onPressed or data.disabled or IsPauseMenuActive() then return end @@ -60,7 +62,7 @@ function lib.addKeybind(data) data:onReleased() end) - RegisterKeyMapping('+' .. data.name, data.description, 'keyboard', data.defaultKey) + RegisterKeyMapping('+' .. data.name, data.description, data.defaultMapper, data.defaultKey) SetTimeout(500, function() TriggerEvent('chat:removeSuggestion', ('/+%s'):format(data.name))