From 15dea9f57a2a2ee4f56d99f63a1ab35c7ecf7321 Mon Sep 17 00:00:00 2001 From: Pao Date: Sun, 26 Feb 2023 23:30:58 +0100 Subject: [PATCH] even more fixes --- media/lua/client/ActionsMethods/JCIO_CutLimb.lua | 8 ++++---- media/lua/client/ActionsMethods/JCIO_OperateLimb.lua | 2 +- media/lua/client/JCIO_CommonFunctions.lua | 2 +- media/lua/client/JCIO_Init.lua | 5 ++--- media/lua/client/JCIO_OverridenFunctions.lua | 2 +- media/lua/client/JCIO_ProsthesisHandler.lua | 10 +++++----- media/lua/client/JCIO_Update.lua | 11 ++++++++--- 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/media/lua/client/ActionsMethods/JCIO_CutLimb.lua b/media/lua/client/ActionsMethods/JCIO_CutLimb.lua index 4471979..49d9728 100644 --- a/media/lua/client/ActionsMethods/JCIO_CutLimb.lua +++ b/media/lua/client/ActionsMethods/JCIO_CutLimb.lua @@ -154,7 +154,7 @@ JCIO.CutLimb = function(partName, surgeonFactor, bandageTable, painkillerTable) local player = getPlayer() local jcioModData = player:getModData().JCIO - local partsParameters = jcioModData.limbParameters + local limbParameters = JCIO.limbParameters local limbsData = jcioModData.limbs @@ -221,12 +221,12 @@ JCIO.CutLimb = function(partName, surgeonFactor, bandageTable, painkillerTable) if limbsData[partName].isCut == false then limbsData[partName].isCut = true limbsData[partName].isAmputationShown = true - limbsData[partName].cicatrizationTime = partsParameters[partName].cicatrizationBaseTime - surgeonFactor * 50 + limbsData[partName].cicatrizationTime = limbParameters[partName].cicatrizationBaseTime - surgeonFactor * 50 - for _, depended_v in pairs(limbsData[partName].depends_on) do + for _, depended_v in pairs(limbParameters[partName].dependsOn) do limbsData[depended_v].isCut = true limbsData[depended_v].isAmputationShown = false - limbsData[depended_v].cicatrizationTime = partsParameters[partName].cicatrizationBaseTime - + limbsData[depended_v].cicatrizationTime = limbParameters[partName].cicatrizationBaseTime - surgeonFactor * 50 local canHealDependedV = limbsData[depended_v].isInfected and diff --git a/media/lua/client/ActionsMethods/JCIO_OperateLimb.lua b/media/lua/client/ActionsMethods/JCIO_OperateLimb.lua index 4c055d0..d0a1552 100644 --- a/media/lua/client/ActionsMethods/JCIO_OperateLimb.lua +++ b/media/lua/client/ActionsMethods/JCIO_OperateLimb.lua @@ -46,7 +46,7 @@ function JCIO.OperateLimb(partName, surgeonFactor, useOven) local jcioModData = player:getModData().JCIO - local limbParameters = jcioModData.limbParameters + local limbParameters = JCIO.limbParameters local limbsData = jcioModData.limbs if useOven then diff --git a/media/lua/client/JCIO_CommonFunctions.lua b/media/lua/client/JCIO_CommonFunctions.lua index 382563d..c52ea24 100644 --- a/media/lua/client/JCIO_CommonFunctions.lua +++ b/media/lua/client/JCIO_CommonFunctions.lua @@ -74,7 +74,7 @@ function GetProsthesisList() end function JCIO_Common.FindAmputatedClothingName(partName) - return "TOC.Amputation_" .. partName + return "JCIO.Amputation_" .. partName end function JCIO_Common.GetPartNameFromBodyPartType(bodyPartType) diff --git a/media/lua/client/JCIO_Init.lua b/media/lua/client/JCIO_Init.lua index d702236..aaffdf7 100644 --- a/media/lua/client/JCIO_Init.lua +++ b/media/lua/client/JCIO_Init.lua @@ -37,10 +37,9 @@ end JCIO.CutLimbForTrait = function(player, jcioModData, partName) - local limbParameters = jcioModData.limbParameters local limbsData = jcioModData.limbs - local amputationClothingItem = player:getInventory():AddItem("TOC.Amputation_" .. partName) + local amputationClothingItem = player:getInventory():AddItem("JCIO.Amputation_" .. partName) JCIO_Visuals.SetTextureForAmputation(amputationClothingItem, player, true) player:setWornItem(amputationClothingItem:getBodyLocation(), amputationClothingItem) @@ -49,7 +48,7 @@ JCIO.CutLimbForTrait = function(player, jcioModData, partName) limbsData[partName].isAmputationShown = true limbsData[partName].isCicatrized = true - for _, v in pairs(limbParameters[partName].dependsOn) do + for _, v in pairs(JCIO.limbParameters[partName].dependsOn) do limbsData[v].isCut = true limbsData[v].isOperated = true limbsData[v].isAmputationShown = false diff --git a/media/lua/client/JCIO_OverridenFunctions.lua b/media/lua/client/JCIO_OverridenFunctions.lua index 8ae9918..b96a02c 100644 --- a/media/lua/client/JCIO_OverridenFunctions.lua +++ b/media/lua/client/JCIO_OverridenFunctions.lua @@ -16,7 +16,7 @@ function ISBaseTimedAction:adjustMaxTime(maxTime) local modData = getPlayer():getModData() - local limbParameters = modData.JCIO.limbParameters + local limbParameters = JCIO.limbParameters local limbsData = modData.JCIO.limbs local modifiedMaxTime = originalMaxTime diff --git a/media/lua/client/JCIO_ProsthesisHandler.lua b/media/lua/client/JCIO_ProsthesisHandler.lua index 6b58f63..ca0bbd3 100644 --- a/media/lua/client/JCIO_ProsthesisHandler.lua +++ b/media/lua/client/JCIO_ProsthesisHandler.lua @@ -81,9 +81,9 @@ function GenerateEquippedProsthesis(prosthesis_item, inventory, limb) local equipped_prosthesis = inventory:AddItem(prosthesis_name) equipped_prosthesis:setCondition(prosthesis_item:getCondition()) - equipped_prosthesis:getModData().TOC = { - base_durability = durability_base, - top_durability = durability_top, + equipped_prosthesis:getModData().JCIO = { + baseDurability = durability_base, + topDurability = durability_top, } return equipped_prosthesis @@ -159,12 +159,12 @@ function ProsthesisRecipes.OnDisassembleProsthesis(item, result_items, player, s local player_inv = player:getInventory() - local part_base = player_inv:AddItem("TOC.ProstPart" .. base_name) + local part_base = player_inv:AddItem("JCIO.ProstPart" .. base_name) part_base:setCondition(durability_base) - local part_top = player_inv:AddItem("TOC.ProstPart" .. top_name) + local part_top = player_inv:AddItem("JCIO.ProstPart" .. top_name) part_top:setCondition(durability_top) diff --git a/media/lua/client/JCIO_Update.lua b/media/lua/client/JCIO_Update.lua index c061e79..022d3c9 100644 --- a/media/lua/client/JCIO_Update.lua +++ b/media/lua/client/JCIO_Update.lua @@ -34,7 +34,12 @@ local function CheckIfPlayerIsInfected(player, limbsData) end end end -local function ManagePhantomPain(player, limbsData) +local function ManagePhantomPain(player, jcioModData) + + local limbsData = jcioModData.limbs + local limbParameters = JCIO.limbParameters + + local body_damage = player:getBodyDamage() for _, partName in pairs(JCIO_Common.GetPartNames()) do @@ -44,7 +49,7 @@ local function ManagePhantomPain(player, limbsData) local added_pain if limbsData[partName].isCauterized then added_pain = 60 else added_pain = 30 end body_part:setAdditionalPain(ZombRand(1, added_pain)) - for _, depended_v in pairs(limbsData[partName].dependsOn) do + for _, depended_v in pairs(limbParameters[partName].dependsOn) do if limbsData[depended_v].isCauterized then added_pain = 60 else added_pain = 30 end body_part:setAdditionalPain(ZombRand(1, added_pain)) end @@ -229,7 +234,7 @@ JCIO.UpdateEveryOneMinute = function() local jcioModData = player:getModData().JCIO if jcioModData ~= nil then - ManagePhantomPain(player, jcioModData.limbs) + ManagePhantomPain(player, jcioModData) end