diff --git a/media/clothing/clothingItems/Prost_Left_Hand_MetalHand.xml b/media/clothing/clothingItems/Prost_Left_Hand_MetalHand.xml index 7bf438a..4db2fd1 100644 --- a/media/clothing/clothingItems/Prost_Left_Hand_MetalHand.xml +++ b/media/clothing/clothingItems/Prost_Left_Hand_MetalHand.xml @@ -6,5 +6,5 @@ false false false - Clothes\metal + Prosthesis\metal_base \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_Left_Hand_MetalHook.xml b/media/clothing/clothingItems/Prost_Left_Hand_MetalHook.xml index a061661..7297042 100644 --- a/media/clothing/clothingItems/Prost_Left_Hand_MetalHook.xml +++ b/media/clothing/clothingItems/Prost_Left_Hand_MetalHook.xml @@ -6,5 +6,5 @@ false false false - Clothes\metal + Prosthesis\metal_base \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_Left_Hand_WoodenHook.xml b/media/clothing/clothingItems/Prost_Left_Hand_WoodenHook.xml index f54e1c8..edf6e4e 100644 --- a/media/clothing/clothingItems/Prost_Left_Hand_WoodenHook.xml +++ b/media/clothing/clothingItems/Prost_Left_Hand_WoodenHook.xml @@ -6,5 +6,5 @@ false false false - Clothes\wood + Prosthesis\wood_base \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHand.xml b/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHand.xml index dd0a562..36fda02 100644 --- a/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHand.xml +++ b/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHand.xml @@ -6,5 +6,5 @@ false false false - Clothes\metal + Prosthesis\metal_base \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHook.xml b/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHook.xml index 80ea2c4..2469008 100644 --- a/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHook.xml +++ b/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHook.xml @@ -7,6 +7,6 @@ false false 4 - Clothes\metal_male - Clothes\metal_female + Prosthesis\metal_hook_male + Prosthesis\metal_hook_female \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_Left_LowerArm_WoodenHook.xml b/media/clothing/clothingItems/Prost_Left_LowerArm_WoodenHook.xml index 77af0eb..73ba86d 100644 --- a/media/clothing/clothingItems/Prost_Left_LowerArm_WoodenHook.xml +++ b/media/clothing/clothingItems/Prost_Left_LowerArm_WoodenHook.xml @@ -6,6 +6,6 @@ false false false - Clothes\wood_male - Clothes\wood_female + Prosthesis\wood_hook_male + Prosthesis\wood_hook_female \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_Right_Hand_MetalHand.xml b/media/clothing/clothingItems/Prost_Right_Hand_MetalHand.xml index 2b16e52..07117fa 100644 --- a/media/clothing/clothingItems/Prost_Right_Hand_MetalHand.xml +++ b/media/clothing/clothingItems/Prost_Right_Hand_MetalHand.xml @@ -6,5 +6,5 @@ false false false - Clothes\metal + Prosthesis\metal_base \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_Right_Hand_MetalHook.xml b/media/clothing/clothingItems/Prost_Right_Hand_MetalHook.xml index 339f8fd..d1d11e0 100644 --- a/media/clothing/clothingItems/Prost_Right_Hand_MetalHook.xml +++ b/media/clothing/clothingItems/Prost_Right_Hand_MetalHook.xml @@ -6,5 +6,5 @@ false false false - Clothes\metal + Prosthesis\metal_base \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_Right_Hand_WoodenHook.xml b/media/clothing/clothingItems/Prost_Right_Hand_WoodenHook.xml index d1bd664..7460b5c 100644 --- a/media/clothing/clothingItems/Prost_Right_Hand_WoodenHook.xml +++ b/media/clothing/clothingItems/Prost_Right_Hand_WoodenHook.xml @@ -6,5 +6,5 @@ false false false - Clothes\wood + Prosthesis\wood_base \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_Right_LowerArm_MetalHand.xml b/media/clothing/clothingItems/Prost_Right_LowerArm_MetalHand.xml index d3e1d78..d0be176 100644 --- a/media/clothing/clothingItems/Prost_Right_LowerArm_MetalHand.xml +++ b/media/clothing/clothingItems/Prost_Right_LowerArm_MetalHand.xml @@ -6,5 +6,5 @@ false false false - Clothes\metal + Prosthesis\metal_base \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_Right_LowerArm_MetalHook.xml b/media/clothing/clothingItems/Prost_Right_LowerArm_MetalHook.xml index eb3084f..1a3822b 100644 --- a/media/clothing/clothingItems/Prost_Right_LowerArm_MetalHook.xml +++ b/media/clothing/clothingItems/Prost_Right_LowerArm_MetalHook.xml @@ -6,6 +6,6 @@ false false false - Clothes\metal_male - Clothes\metal_female + Prosthesis\metal_hook_male + Prosthesis\metal_hook_female \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_Right_LowerArm_WoodenHook.xml b/media/clothing/clothingItems/Prost_Right_LowerArm_WoodenHook.xml index 2e32121..9696c10 100644 --- a/media/clothing/clothingItems/Prost_Right_LowerArm_WoodenHook.xml +++ b/media/clothing/clothingItems/Prost_Right_LowerArm_WoodenHook.xml @@ -6,6 +6,6 @@ false false false - Clothes\wood_male - Clothes\wood_female + Prosthesis\wood_hook_male + Prosthesis\wood_hook_female \ No newline at end of file diff --git a/media/lua/client/TOC_Update.lua b/media/lua/client/TOC_Update.lua index 081436c..089af83 100644 --- a/media/lua/client/TOC_Update.lua +++ b/media/lua/client/TOC_Update.lua @@ -64,53 +64,65 @@ local function SetHealthStatusForBodyPart(part_data, part_name, player) -- TODO Implement this - - -- Set max health for body part - if part_data[part_name].is_cicatrized and body_part:getHealth() > 80 then - body_part:SetHealth(80) - elseif body_part:getHealth() > 40 then - body_part:SetHealth(40) - end - - -- Cicatrization check - if part_data[part_name].is_cut and not part_data[part_name].is_cicatrized then - if part_data[part_name].cicatrization_time < 0 then - part_data[part_name].is_cicatrized = true - - -- TODO make this random if the player gets it or not - - if (not player:HasTrait("Brave")) and ZombRand(1, 11) > 5 then - player:getTraits():add("Brave") - - end - - if (not player:HasTrait("Insensitive")) and ZombRand(1, 11) > 5 then - player:getTraits():add("Insensitive") - end - - -- if the player gets attacked and damaged in a cut area we have to reset it here since it doesn't make any sense - body_part:setBleeding(false); - body_part:setDeepWounded(false) - body_part:setBleedingTime(0) - body_part:setDeepWoundTime(0) - body_part:SetBitten(false) - body_part:setBiteTime(0) - part_data.is_infected = false + if part_data[part_name].is_cut then + + -- if the player gets attacked and damaged in a cut area we have to reset it here since it doesn't make any sense + -- this is using map 1:1, so it doesn't affect the wound caused by the amputation + body_part:setBleeding(false); + body_part:setDeepWounded(false) + body_part:setBleedingTime(0) + body_part:setDeepWoundTime(0) + body_part:SetBitten(false) + body_part:setBiteTime(0) + part_data.is_infected = false + -- Set max health for body part + if part_data[part_name].is_cicatrized and body_part:getHealth() > 80 then + body_part:SetHealth(80) + elseif body_part:getHealth() > 40 then + body_part:SetHealth(40) end + + + -- Cicatrization check + if not part_data[part_name].is_cicatrized then + if part_data[part_name].cicatrization_time < 0 then + part_data[part_name].is_cicatrized = true + + -- TODO make this random if the player gets it or not + + if (not player:HasTrait("Brave")) and ZombRand(1, 11) > 5 then + player:getTraits():add("Brave") + + end + + if (not player:HasTrait("Insensitive")) and ZombRand(1, 11) > 5 then + player:getTraits():add("Insensitive") + end + + -- if the player gets attacked and damaged in a cut area we have to reset it here since it doesn't make any sense + body_part:setBleeding(false); + body_part:setDeepWounded(false) + body_part:setBleedingTime(0) + body_part:setDeepWoundTime(0) + body_part:SetBitten(false) + body_part:setBiteTime(0) + part_data.is_infected = false + + + end + end + + -- Phantom Pain + if part_data[part_name].is_amputation_shown and ZombRand(1, 100) < 10 then + local added_pain + if part_data[part_name].is_cauterized then added_pain = 60 else added_pain = 30 end + body_part:setAdditionalPain(ZombRand(1, added_pain)) + end + + -- TODO Add phantom pain to depended parts end - - -- Phantom Pain - if part_data[part_name].is_amputation_shown and ZombRand(1, 100) < 10 then - local added_pain - if part_data[part_name].is_cauterized then added_pain = 60 else added_pain = 30 end - body_part:setAdditionalPain(ZombRand(1, added_pain)) - end - - -- TODO Add phantom pain to depended parts - - end diff --git a/media/textures/Clothes/Empty/vide.png b/media/textures/Clothes/Empty/vide.png deleted file mode 100644 index fdea3bd..0000000 Binary files a/media/textures/Clothes/Empty/vide.png and /dev/null differ diff --git a/media/textures/Clothes/Empty/vide2.png b/media/textures/Clothes/Empty/vide2.png deleted file mode 100644 index 5af60f1..0000000 Binary files a/media/textures/Clothes/Empty/vide2.png and /dev/null differ diff --git a/media/textures/Clothes/Untitled-1.png b/media/textures/Clothes/Untitled-1.png deleted file mode 100644 index 089fc69..0000000 Binary files a/media/textures/Clothes/Untitled-1.png and /dev/null differ diff --git a/media/textures/Prosthesis/metal_base.png b/media/textures/Prosthesis/metal_base.png new file mode 100644 index 0000000..e1346bc Binary files /dev/null and b/media/textures/Prosthesis/metal_base.png differ diff --git a/media/textures/Prosthesis/metal_hook_female.png b/media/textures/Prosthesis/metal_hook_female.png new file mode 100644 index 0000000..74090ae Binary files /dev/null and b/media/textures/Prosthesis/metal_hook_female.png differ diff --git a/media/textures/Prosthesis/metal_hook_male.png b/media/textures/Prosthesis/metal_hook_male.png new file mode 100644 index 0000000..0f65450 Binary files /dev/null and b/media/textures/Prosthesis/metal_hook_male.png differ diff --git a/media/textures/Prosthesis/wood_base.png b/media/textures/Prosthesis/wood_base.png new file mode 100644 index 0000000..b214afb Binary files /dev/null and b/media/textures/Prosthesis/wood_base.png differ diff --git a/media/textures/Prosthesis/wood_hook_female.png b/media/textures/Prosthesis/wood_hook_female.png new file mode 100644 index 0000000..c592f55 Binary files /dev/null and b/media/textures/Prosthesis/wood_hook_female.png differ diff --git a/media/textures/Prosthesis/wood_hook_male.png b/media/textures/Prosthesis/wood_hook_male.png new file mode 100644 index 0000000..b711530 Binary files /dev/null and b/media/textures/Prosthesis/wood_hook_male.png differ