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

Revert "Revert "Added tests for blood on limbs""

Browse Source 
This reverts commit 2ea03601f5.
This commit is contained in:
ZioPao
2024-05-05 18:03:39 +02:00
parent 2ea03601f5
commit 0d9ee4203c
3 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/lua/client/TOC/Handlers/ProsthesisHandler.lua
View File

@@ -145,8 +145,8 @@ end
local og_ISClothingExtraAction_perform = ISClothingExtraAction.perform
function ISClothingExtraAction:perform()
--local extraItem = InventoryItemFactory.CreateItem(self.extra)
local isProst = ProsthesisHandler.SearchAndSetupProsthesis(self.item, true)
local extraItem = InventoryItemFactory.CreateItem(self.extra)
local isProst = ProsthesisHandler.SearchAndSetupProsthesis(extraItem, true)
local group
if isProst then
group = BodyLocations.getGroup("Human")

40
media/lua/client/TOC/Tests.lua
View File

@@ -156,28 +156,30 @@ end)
TestFramework.registerTestModule("Various", "Visuals", function()
local Tests = {}
function Tests.AddBloodRightForearm()
function Tests.AddBloodLeftForearm()
local playerObj = getPlayer()
-- local wornItems = playerObj:getWornItems()
-- local limbName = "ForeArm_R"
-- local fullType = StaticData.AMPUTATION_CLOTHING_ITEM_BASE .. limbName
local limbName = "ForeArm_L"
local fullType = StaticData.AMPUTATION_CLOTHING_ITEM_BASE .. limbName
-- for i = 1, wornItems:size() do
-- local it = wornItems:get(i - 1)
-- if it then
-- local wornItem = wornItems:get(i - 1):getItem()
-- TOC_DEBUG.print(wornItem:getFullType())
-- if wornItem:getFullType() == fullType then
-- TOC_DEBUG.print("Found amputation item for " .. limbName)
-- -- change it here
-- wornItem:setBloodLevel
-- wornItem:getVisual():setTextureChoice(texId)
-- playerObj:resetModelNextFrame() -- necessary to update the model
-- return
-- end
-- end
-- end
local item = playerObj:getInventory():FindAndReturn(fullType)
if instanceof(item, "Clothing") then
---@cast item Clothing
print("Found limb to add blood onto")
item:setBloodLevel(100)
local coveredParts = BloodClothingType.getCoveredParts(item:getBloodClothingType())
if coveredParts then
for j=0,coveredParts:size()-1 do
item:setBlood(coveredParts:get(j), 100)
item:setDirt(coveredParts:get(j), 100)
end
end
end
playerObj:resetModelNextFrame()
end
return Tests

40
media/lua/client/TOC/TimedActions/WashYourselfOverride.lua
View File

@@ -3,6 +3,7 @@ local StaticData = require("TOC/StaticData")
-- Since amputations are actually clothing items, we need to override ISWashYourself to account for that
-- TODO Clean this up
local og_ISWashYourself_perform = ISWashYourself.perform
function ISWashYourself:perform()
@@ -29,6 +30,11 @@ function ISWashYourself:perform()
foundItem:setBloodLevel(0)
foundItem:setDirtyness(0) -- TODO Integrate with other dirtyness
local coveredParts = BloodClothingType.getCoveredParts(foundItem:getBloodClothingType())
for j=0, coveredParts:size() - 1 do
foundItem:setBlood(coveredParts:get(j), 0)
foundItem:setDirt(coveredParts:get(j), 0)
end
end
end
@@ -38,3 +44,37 @@ function ISWashYourself:perform()
end
local og_ISWashYourself_GetRequiredWater = ISWashYourself.GetRequiredWater
---@param character IsoPlayer
---@return integer
function ISWashYourself.GetRequiredWater(character)
local units = og_ISWashYourself_GetRequiredWater(character)
local amputatedLimbs = CachedDataHandler.GetAmputatedLimbs(character:getUsername())
local plInv = character:getInventory()
for limbName, _ in pairs(amputatedLimbs) do
TOC_DEBUG.print("Checking if " .. limbName .. " is in inventory and washing it")
-- get clothing item
local item = plInv:FindAndReturn(StaticData.AMPUTATION_CLOTHING_ITEM_BASE .. limbName)
if item and instanceof(item, "Clothing") then
local coveredParts = BloodClothingType.getCoveredParts(item:getBloodClothingType())
if coveredParts then
for i=1,coveredParts:size() do
local part = coveredParts:get(i-1)
if item:getBlood(part) > 0 then
units = units + 1
end
end
end
end
end
return units
end