HRiggs/The-Only-Cure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed disabling of Interact Key

Browse Source
This commit is contained in:
ZioPao
2024-05-15 13:13:27 +02:00
parent 80c8b22faa
commit 5f64ead354
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/lua/client/TOC/Controllers/LocalPlayerController.lua
View File

@@ -202,17 +202,13 @@ function LocalPlayerController.HandleDamage(character)
LocalPlayerController.hasBeenDamaged = false LocalPlayerController.hasBeenDamaged = false
end end
---Setup HandleDamage, triggered by OnPlayerGetDamage ---Setup HandleDamage, triggered by OnPlayerGetDamage. To prevent a spam caused by this awful event, we use a bool lock
---@param character IsoPlayer|IsoGameCharacter ---@param character IsoPlayer|IsoGameCharacter
---@param damageType string ---@param damageType string
---@param damageAmount number ---@param damageAmount number
function LocalPlayerController.OnGetDamage(character, damageType, damageAmount) function LocalPlayerController.OnGetDamage(character, damageType, damageAmount)
-- TODO Check if other players in the online triggers this
if LocalPlayerController.hasBeenDamaged == false then if LocalPlayerController.hasBeenDamaged == false then
-- Start checks -- Start checks
-- TODO Add a timer before we can re-enable this bool?
LocalPlayerController.hasBeenDamaged = true LocalPlayerController.hasBeenDamaged = true
LocalPlayerController.HandleDamage(character) LocalPlayerController.HandleDamage(character)
end end

13
media/lua/client/TOC/Handlers/CachedDataHandler.lua
View File

@@ -133,16 +133,21 @@ function CachedDataHandler.CalculateBothHandsFeasibility()
CachedDataHandler.CalculateHandFeasibility("Hand_L") CachedDataHandler.CalculateHandFeasibility("Hand_L")
CachedDataHandler.CalculateHandFeasibility("Hand_R") CachedDataHandler.CalculateHandFeasibility("Hand_R")
local interactStr = "Interact" local interactStr = "Interact"
if CachedDataHandler.interactKey == nil or CachedDataHandler.interactKey == 0 then
CachedDataHandler.interactKey = getCore():getKey(interactStr)
end
if not CachedDataHandler.GetBothHandsFeasibility() then if not CachedDataHandler.GetBothHandsFeasibility() then
TOC_DEBUG.print("Disabling interact key") TOC_DEBUG.print("Disabling interact key")
TOC_DEBUG.print("Cached current key for interact: " .. tostring(CachedDataHandler.interactKey))
-- Cache the current key
CachedDataHandler.interactKey = getCore():getKey(interactStr)
getCore():addKeyBinding(interactStr, Keyboard.KEY_NONE) getCore():addKeyBinding(interactStr, Keyboard.KEY_NONE)
else else
TOC_DEBUG.print("Re-enabling interact key") TOC_DEBUG.print("Re-enabling interact key")
TOC_DEBUG.print("Cached current key for interact: " .. tostring(CachedDataHandler.interactKey))
if not CachedDataHandler.interactKey then CachedDataHandler.interactKey = getCore():getKey(interactStr) end
getCore():addKeyBinding(interactStr, CachedDataHandler.interactKey) getCore():addKeyBinding(interactStr, CachedDataHandler.interactKey)
end end
end end