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

This reverts commit 2ea03601f5.

media/lua/client/TOC/TimedActions/WashYourselfOverride.lua

@@ -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
@@ -37,4 +43,38 @@ function ISWashYourself:perform()
     og_ISWashYourself_perform(self)
 
 
+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