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

even more fixes

Browse Source
This commit is contained in:
Pao
2023-02-26 23:30:58 +01:00
parent ba11ff2314
commit 15dea9f57a
7 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/lua/client/ActionsMethods/JCIO_CutLimb.lua
View File

@@ -154,7 +154,7 @@ JCIO.CutLimb = function(partName, surgeonFactor, bandageTable, painkillerTable)
local player = getPlayer() local player = getPlayer()
local jcioModData = player:getModData().JCIO local jcioModData = player:getModData().JCIO
local partsParameters = jcioModData.limbParameters local limbParameters = JCIO.limbParameters
local limbsData = jcioModData.limbs local limbsData = jcioModData.limbs
@@ -221,12 +221,12 @@ JCIO.CutLimb = function(partName, surgeonFactor, bandageTable, painkillerTable)
if limbsData[partName].isCut == false then if limbsData[partName].isCut == false then
limbsData[partName].isCut = true limbsData[partName].isCut = true
limbsData[partName].isAmputationShown = 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].isCut = true
limbsData[depended_v].isAmputationShown = false limbsData[depended_v].isAmputationShown = false
limbsData[depended_v].cicatrizationTime = partsParameters[partName].cicatrizationBaseTime - limbsData[depended_v].cicatrizationTime = limbParameters[partName].cicatrizationBaseTime -
surgeonFactor * 50 surgeonFactor * 50
local canHealDependedV = limbsData[depended_v].isInfected and local canHealDependedV = limbsData[depended_v].isInfected and

2
media/lua/client/ActionsMethods/JCIO_OperateLimb.lua
View File

@@ -46,7 +46,7 @@ function JCIO.OperateLimb(partName, surgeonFactor, useOven)
local jcioModData = player:getModData().JCIO local jcioModData = player:getModData().JCIO
local limbParameters = jcioModData.limbParameters local limbParameters = JCIO.limbParameters
local limbsData = jcioModData.limbs local limbsData = jcioModData.limbs
if useOven then if useOven then

2
media/lua/client/JCIO_CommonFunctions.lua
View File

@@ -74,7 +74,7 @@ function GetProsthesisList()
end end
function JCIO_Common.FindAmputatedClothingName(partName) function JCIO_Common.FindAmputatedClothingName(partName)
return "TOC.Amputation_" .. partName return "JCIO.Amputation_" .. partName
end end
function JCIO_Common.GetPartNameFromBodyPartType(bodyPartType) function JCIO_Common.GetPartNameFromBodyPartType(bodyPartType)

5
media/lua/client/JCIO_Init.lua
View File

@@ -37,10 +37,9 @@ end
JCIO.CutLimbForTrait = function(player, jcioModData, partName) JCIO.CutLimbForTrait = function(player, jcioModData, partName)
local limbParameters = jcioModData.limbParameters
local limbsData = jcioModData.limbs 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) JCIO_Visuals.SetTextureForAmputation(amputationClothingItem, player, true)
player:setWornItem(amputationClothingItem:getBodyLocation(), amputationClothingItem) player:setWornItem(amputationClothingItem:getBodyLocation(), amputationClothingItem)
@@ -49,7 +48,7 @@ JCIO.CutLimbForTrait = function(player, jcioModData, partName)
limbsData[partName].isAmputationShown = true limbsData[partName].isAmputationShown = true
limbsData[partName].isCicatrized = 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].isCut = true
limbsData[v].isOperated = true limbsData[v].isOperated = true
limbsData[v].isAmputationShown = false limbsData[v].isAmputationShown = false

2
media/lua/client/JCIO_OverridenFunctions.lua
View File

@@ -16,7 +16,7 @@ function ISBaseTimedAction:adjustMaxTime(maxTime)
local modData = getPlayer():getModData() local modData = getPlayer():getModData()
local limbParameters = modData.JCIO.limbParameters local limbParameters = JCIO.limbParameters
local limbsData = modData.JCIO.limbs local limbsData = modData.JCIO.limbs
local modifiedMaxTime = originalMaxTime local modifiedMaxTime = originalMaxTime

10
media/lua/client/JCIO_ProsthesisHandler.lua
View File

@@ -81,9 +81,9 @@ function GenerateEquippedProsthesis(prosthesis_item, inventory, limb)
local equipped_prosthesis = inventory:AddItem(prosthesis_name) local equipped_prosthesis = inventory:AddItem(prosthesis_name)
equipped_prosthesis:setCondition(prosthesis_item:getCondition()) equipped_prosthesis:setCondition(prosthesis_item:getCondition())
equipped_prosthesis:getModData().TOC = { equipped_prosthesis:getModData().JCIO = {
base_durability = durability_base, baseDurability = durability_base,
top_durability = durability_top, topDurability = durability_top,
} }
return equipped_prosthesis return equipped_prosthesis
@@ -159,12 +159,12 @@ function ProsthesisRecipes.OnDisassembleProsthesis(item, result_items, player, s
local player_inv = player:getInventory() 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) 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) part_top:setCondition(durability_top)

11
media/lua/client/JCIO_Update.lua
View File

@@ -34,7 +34,12 @@ local function CheckIfPlayerIsInfected(player, limbsData)
end end
end 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() local body_damage = player:getBodyDamage()
for _, partName in pairs(JCIO_Common.GetPartNames()) do for _, partName in pairs(JCIO_Common.GetPartNames()) do
@@ -44,7 +49,7 @@ local function ManagePhantomPain(player, limbsData)
local added_pain local added_pain
if limbsData[partName].isCauterized then added_pain = 60 else added_pain = 30 end if limbsData[partName].isCauterized then added_pain = 60 else added_pain = 30 end
body_part:setAdditionalPain(ZombRand(1, added_pain)) 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 if limbsData[depended_v].isCauterized then added_pain = 60 else added_pain = 30 end
body_part:setAdditionalPain(ZombRand(1, added_pain)) body_part:setAdditionalPain(ZombRand(1, added_pain))
end end
@@ -229,7 +234,7 @@ JCIO.UpdateEveryOneMinute = function()
local jcioModData = player:getModData().JCIO local jcioModData = player:getModData().JCIO
if jcioModData ~= nil then if jcioModData ~= nil then
ManagePhantomPain(player, jcioModData.limbs) ManagePhantomPain(player, jcioModData)
end end