From 3a3d58e8a0846790dc41540a4ac3adc320413821 Mon Sep 17 00:00:00 2001 From: ZioPao Date: Fri, 29 Mar 2024 01:09:13 +0100 Subject: [PATCH] Fixed Interact Key bug --- media/lua/client/TOC/Handlers/CachedDataHandler.lua | 2 ++ media/lua/client/TOC/Zombies/ZombiesAmputation.lua | 8 ++++++++ media/lua/server/TOC/Distributions.lua | 9 +++------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/media/lua/client/TOC/Handlers/CachedDataHandler.lua b/media/lua/client/TOC/Handlers/CachedDataHandler.lua index a2a1ad8..e769070 100644 --- a/media/lua/client/TOC/Handlers/CachedDataHandler.lua +++ b/media/lua/client/TOC/Handlers/CachedDataHandler.lua @@ -135,6 +135,8 @@ function CachedDataHandler.CalculateBothHandsFeasibility() getCore():addKeyBinding(interactStr, Keyboard.KEY_NONE) else TOC_DEBUG.print("Re-enabling interact key") + + if not CachedDataHandler.interactKey then CachedDataHandler.interactKey = getCore():getKey(interactStr) end getCore():addKeyBinding(interactStr, CachedDataHandler.interactKey) end end diff --git a/media/lua/client/TOC/Zombies/ZombiesAmputation.lua b/media/lua/client/TOC/Zombies/ZombiesAmputation.lua index 8cf3ad8..d52f42d 100644 --- a/media/lua/client/TOC/Zombies/ZombiesAmputation.lua +++ b/media/lua/client/TOC/Zombies/ZombiesAmputation.lua @@ -60,13 +60,21 @@ end ---@param player IsoGameCharacter ---@param zombie IsoZombie +---@param handWeapon HandWeapon function HandleZombiesAmputations(player, zombie, handWeapon, damage) if not instanceof(zombie, "IsoZombie") or not instanceof(player, "IsoPlayer") then return end if player ~= getPlayer() then return end + + -- TODO Check type of weapon. No hands, only knifes or such + if damage < 3 or ZombRand(0,100) < 25 then return end + TOC_DEBUG.print(handWeapon:getName()) + + local zombieInv = zombie:getInventory() + -- Check left or right local leftItem = zombieInv:containsEval(PredicateAmputationItemLeft) diff --git a/media/lua/server/TOC/Distributions.lua b/media/lua/server/TOC/Distributions.lua index 769d87c..8be146b 100644 --- a/media/lua/server/TOC/Distributions.lua +++ b/media/lua/server/TOC/Distributions.lua @@ -1,25 +1,22 @@ require('Items/Distributions') require('Items/SuburbsDistributions') - ---SuburbsDistributions = SuburbsDistributions or {} - -- Insert Prosts and various items in the Medical Clinic loot table local prosthesisLoot = { [1] = { name = "TOC.Prost_HookArm_L", - chance = 10 + chance = 3 }, [2] = { name = "TOC.Prost_NormalArm_L", - chance = 10 + chance = 2 }, [3] = { name = "TOC.Surg_Arm_Tourniquet_L", - chance = 25 + chance = 20 } }