From 6c84ab14b73dc7a04e026e51be54faea332c6314 Mon Sep 17 00:00:00 2001 From: ZioPao Date: Tue, 7 Nov 2023 17:36:04 +0100 Subject: [PATCH] Fixed Tests --- .../client/Handlers/TOC_AmputationHandler.lua | 1 + media/lua/client/TOC_Test.lua | 19 +++++++++++++------ media/lua/client/UI/TOC_HealthPanel.lua | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/media/lua/client/Handlers/TOC_AmputationHandler.lua b/media/lua/client/Handlers/TOC_AmputationHandler.lua index 5dcce41..e5fbbf0 100644 --- a/media/lua/client/Handlers/TOC_AmputationHandler.lua +++ b/media/lua/client/Handlers/TOC_AmputationHandler.lua @@ -109,6 +109,7 @@ end ---Returns the correct index for the textures of the amputation ---@param isCicatrized boolean ---@return number +---@private function AmputationHandler:getAmputationTexturesIndex(isCicatrized) local textureString = self.patient:getHumanVisual():getSkinTexture() local isHairy = string.find(textureString, "a$") diff --git a/media/lua/client/TOC_Test.lua b/media/lua/client/TOC_Test.lua index 5fbcfd8..f81144c 100644 --- a/media/lua/client/TOC_Test.lua +++ b/media/lua/client/TOC_Test.lua @@ -3,6 +3,7 @@ local TestFramework = require("TestFramework/TestFramework") local TestUtils = require("TestFramework/TestUtils") local PlayerHandler = require("Handlers/TOC_PlayerHandler") +local AmputationHandler = require("Handlers/TOC_AmputationHandler") @@ -17,32 +18,38 @@ TestFramework.registerTestModule("Functionality", "Amputation", function() end function Tests.CutLeftHand() - PlayerHandler.ForceCutLimb("Hand_L") + local handler = AmputationHandler:new("Hand_L") + handler:execute() return PlayerHandler.modDataHandler:getIsCut("Hand_L") end function Tests.CutLeftForearm() - PlayerHandler.ForceCutLimb("ForeArm_L") + local handler = AmputationHandler:new("ForeArm_L") + handler:execute() return PlayerHandler.modDataHandler:getIsCut("ForeArm_L") and PlayerHandler.modDataHandler:getIsCut("Hand_L") end function Tests.CutLeftUpperarm() - PlayerHandler.ForceCutLimb("UpperArm_L") + local handler = AmputationHandler:new("UpperArm_L") + handler:execute() return PlayerHandler.modDataHandler:getIsCut("UpperArm_L") and PlayerHandler.modDataHandler:getIsCut("ForeArm_L") and PlayerHandler.modDataHandler:getIsCut("Hand_L") end function Tests.CutRightHand() - PlayerHandler.ForceCutLimb("Hand_R") + local handler = AmputationHandler:new("Hand_R") + handler:execute() return PlayerHandler.modDataHandler:getIsCut("Hand_R") end function Tests.CutRightForearm() - PlayerHandler.ForceCutLimb("ForeArm_R") + local handler = AmputationHandler:new("ForeArm_R") + handler:execute() return PlayerHandler.modDataHandler:getIsCut("ForeArm_R") and PlayerHandler.modDataHandler:getIsCut("Hand_R") end function Tests.CutRightUpperarm() - PlayerHandler.ForceCutLimb("UpperArm_R") + local handler = AmputationHandler:new("UpperArm_R") + handler:execute() return PlayerHandler.modDataHandler:getIsCut("UpperArm_R") and PlayerHandler.modDataHandler:getIsCut("ForeArm_R") and PlayerHandler.modDataHandler:getIsCut("Hand_R") end diff --git a/media/lua/client/UI/TOC_HealthPanel.lua b/media/lua/client/UI/TOC_HealthPanel.lua index 154a074..0d40b83 100644 --- a/media/lua/client/UI/TOC_HealthPanel.lua +++ b/media/lua/client/UI/TOC_HealthPanel.lua @@ -1,4 +1,4 @@ -local PlayerHandler = require("TOC_PlayerHandler") +local PlayerHandler = require("Handlers/TOC_PlayerHandler") local StaticData = require("TOC_StaticData") local CommonMethods = require("TOC_Common")