diff --git a/media/clothing/clothingItems/Amputation_Left_Hand.xml b/media/clothing/clothingItems/Amputation_Left_Hand.xml index 3ac7028..d48ca40 100644 --- a/media/clothing/clothingItems/Amputation_Left_Hand.xml +++ b/media/clothing/clothingItems/Amputation_Left_Hand.xml @@ -8,15 +8,28 @@ false 4 none - Amputations\skin01b - Amputations\skin02b - Amputations\skin03b - Amputations\skin04b - Amputations\skin05b + + Amputations\skin01_b + Amputations\skin02_b + Amputations\skin03_b + Amputations\skin04_b + Amputations\skin05_b - Amputations\skin01 - Amputations\skin02 - Amputations\skin03 - Amputations\skin04 - Amputations\skin05 + Amputations\skin01_hairy_b + Amputations\skin02_hairy_b + Amputations\skin03_hairy_b + Amputations\skin04_hairy_b + Amputations\skin05_hairy_b + + Body\MaleBody01 + Body\MaleBody02 + Body\MaleBody03 + Body\MaleBody04 + Body\MaleBody05 + + Body\MaleBody01a + Body\MaleBody02a + Body\MaleBody03a + Body\MaleBody04 + Body\MaleBody05a \ No newline at end of file diff --git a/media/clothing/clothingItems/Amputation_Left_LowerArm.xml b/media/clothing/clothingItems/Amputation_Left_LowerArm.xml index e1bce3e..0dc74a7 100644 --- a/media/clothing/clothingItems/Amputation_Left_LowerArm.xml +++ b/media/clothing/clothingItems/Amputation_Left_LowerArm.xml @@ -9,15 +9,29 @@ 3 4 none - Amputations\skin01b - Amputations\skin02b - Amputations\skin03b - Amputations\skin04b - Amputations\skin05b + + Amputations\skin01_b + Amputations\skin02_b + Amputations\skin03_b + Amputations\skin04_b + Amputations\skin05_b + + Amputations\skin01_hairy_b + Amputations\skin02_hairy_b + Amputations\skin03_hairy_b + Amputations\skin04_hairy_b + Amputations\skin05_hairy_b + + Body\MaleBody01 + Body\MaleBody02 + Body\MaleBody03 + Body\MaleBody04 + Body\MaleBody05 + + Body\MaleBody01a + Body\MaleBody02a + Body\MaleBody03a + Body\MaleBody04 + Body\MaleBody05a - Amputations\skin01 - Amputations\skin02 - Amputations\skin03 - Amputations\skin04 - Amputations\skin05 \ No newline at end of file diff --git a/media/clothing/clothingItems/Amputation_Left_UpperArm.xml b/media/clothing/clothingItems/Amputation_Left_UpperArm.xml index 47033a3..a4fa58e 100644 --- a/media/clothing/clothingItems/Amputation_Left_UpperArm.xml +++ b/media/clothing/clothingItems/Amputation_Left_UpperArm.xml @@ -9,15 +9,28 @@ 3 4 none - Amputations\skin01b - Amputations\skin02b - Amputations\skin03b - Amputations\skin04b - Amputations\skin05b + + Amputations\skin01_b + Amputations\skin02_b + Amputations\skin03_b + Amputations\skin04_b + Amputations\skin05_b - Amputations\skin01 - Amputations\skin02 - Amputations\skin03 - Amputations\skin04 - Amputations\skin05 + Amputations\skin01_hairy_b + Amputations\skin02_hairy_b + Amputations\skin03_hairy_b + Amputations\skin04_hairy_b + Amputations\skin05_hairy_b + + Body\MaleBody01 + Body\MaleBody02 + Body\MaleBody03 + Body\MaleBody04 + Body\MaleBody05 + + Body\MaleBody01a + Body\MaleBody02a + Body\MaleBody03a + Body\MaleBody04 + Body\MaleBody05a \ No newline at end of file diff --git a/media/clothing/clothingItems/Amputation_Right_Hand.xml b/media/clothing/clothingItems/Amputation_Right_Hand.xml index ae56a63..72f858d 100644 --- a/media/clothing/clothingItems/Amputation_Right_Hand.xml +++ b/media/clothing/clothingItems/Amputation_Right_Hand.xml @@ -7,15 +7,28 @@ false 6 none - Amputations\skin01b - Amputations\skin02b - Amputations\skin03b - Amputations\skin04b - Amputations\skin05b + + Amputations\skin01_b + Amputations\skin02_b + Amputations\skin03_b + Amputations\skin04_b + Amputations\skin05_b - Amputations\skin01 - Amputations\skin02 - Amputations\skin03 - Amputations\skin04 - Amputations\skin05 + Amputations\skin01_hairy_b + Amputations\skin02_hairy_b + Amputations\skin03_hairy_b + Amputations\skin04_hairy_b + Amputations\skin05_hairy_b + + Body\MaleBody01 + Body\MaleBody02 + Body\MaleBody03 + Body\MaleBody04 + Body\MaleBody05 + + Body\MaleBody01a + Body\MaleBody02a + Body\MaleBody03a + Body\MaleBody04 + Body\MaleBody05a \ No newline at end of file diff --git a/media/clothing/clothingItems/Amputation_Right_LowerArm.xml b/media/clothing/clothingItems/Amputation_Right_LowerArm.xml index 77723ae..56f8830 100644 --- a/media/clothing/clothingItems/Amputation_Right_LowerArm.xml +++ b/media/clothing/clothingItems/Amputation_Right_LowerArm.xml @@ -9,15 +9,27 @@ 5 6 - Amputations\skin01b - Amputations\skin02b - Amputations\skin03b - Amputations\skin04b - Amputations\skin05b - - Amputations\skin01 - Amputations\skin02 - Amputations\skin03 - Amputations\skin04 - Amputations\skin05 + Amputations\skin01_b + Amputations\skin02_b + Amputations\skin03_b + Amputations\skin04_b + Amputations\skin05_b + + Amputations\skin01_hairy_b + Amputations\skin02_hairy_b + Amputations\skin03_hairy_b + Amputations\skin04_hairy_b + Amputations\skin05_hairy_b + + Body\MaleBody01 + Body\MaleBody02 + Body\MaleBody03 + Body\MaleBody04 + Body\MaleBody05 + + Body\MaleBody01a + Body\MaleBody02a + Body\MaleBody03a + Body\MaleBody04 + Body\MaleBody05a \ No newline at end of file diff --git a/media/clothing/clothingItems/Amputation_Right_UpperArm.xml b/media/clothing/clothingItems/Amputation_Right_UpperArm.xml index 76b9af1..b5e0b8e 100644 --- a/media/clothing/clothingItems/Amputation_Right_UpperArm.xml +++ b/media/clothing/clothingItems/Amputation_Right_UpperArm.xml @@ -9,15 +9,28 @@ 5 6 none - Amputations\skin01b - Amputations\skin02b - Amputations\skin03b - Amputations\skin04b - Amputations\skin05b - Amputations\skin01 - Amputations\skin02 - Amputations\skin03 - Amputations\skin04 - Amputations\skin05 + Amputations\skin01_b + Amputations\skin02_b + Amputations\skin03_b + Amputations\skin04_b + Amputations\skin05_b + + Amputations\skin01_hairy_b + Amputations\skin02_hairy_b + Amputations\skin03_hairy_b + Amputations\skin04_hairy_b + Amputations\skin05_hairy_b + + Body\MaleBody01 + Body\MaleBody02 + Body\MaleBody03 + Body\MaleBody04 + Body\MaleBody05 + + Body\MaleBody01a + Body\MaleBody02a + Body\MaleBody03a + Body\MaleBody04 + Body\MaleBody05a \ No newline at end of file diff --git a/media/lua/client/TOC_Visuals.lua b/media/lua/client/TOC_Visuals.lua index cf8f23f..7ef6238 100644 --- a/media/lua/client/TOC_Visuals.lua +++ b/media/lua/client/TOC_Visuals.lua @@ -2,14 +2,20 @@ function TocSetCorrectTextureForAmputation(item, player, cicatrized) local human_visual = player:getHumanVisual() local texture_string = human_visual:getSkinTexture() + local is_hairy = string.find(texture_string, "a$") -- Hairy bodies - if string.find(texture_string, "a$") then + if is_hairy then texture_string = texture_string:sub(1, -2) -- Removes b at the end to make it compatible end local matched_index = string.match(texture_string, "%d$") + if is_hairy then + matched_index = matched_index + 5 + end + + if cicatrized then matched_index = matched_index + 5 -- to use the cicatrized texture end diff --git a/media/textures/Amputations/skin01.png b/media/textures/Amputations/skin01.png deleted file mode 100644 index b79b38d..0000000 Binary files a/media/textures/Amputations/skin01.png and /dev/null differ diff --git a/media/textures/Amputations/skin01_b.png b/media/textures/Amputations/skin01_b.png new file mode 100644 index 0000000..fe6a69f Binary files /dev/null and b/media/textures/Amputations/skin01_b.png differ diff --git a/media/textures/Amputations/skin01_hairy_b.png b/media/textures/Amputations/skin01_hairy_b.png new file mode 100644 index 0000000..363a50b Binary files /dev/null and b/media/textures/Amputations/skin01_hairy_b.png differ diff --git a/media/textures/Amputations/skin01b.png b/media/textures/Amputations/skin01b.png deleted file mode 100644 index 856e1e2..0000000 Binary files a/media/textures/Amputations/skin01b.png and /dev/null differ diff --git a/media/textures/Amputations/skin02.png b/media/textures/Amputations/skin02.png deleted file mode 100644 index a9881de..0000000 Binary files a/media/textures/Amputations/skin02.png and /dev/null differ diff --git a/media/textures/Amputations/skin02_b.png b/media/textures/Amputations/skin02_b.png new file mode 100644 index 0000000..f3ad262 Binary files /dev/null and b/media/textures/Amputations/skin02_b.png differ diff --git a/media/textures/Amputations/skin02_hairy_b.png b/media/textures/Amputations/skin02_hairy_b.png new file mode 100644 index 0000000..382c15b Binary files /dev/null and b/media/textures/Amputations/skin02_hairy_b.png differ diff --git a/media/textures/Amputations/skin02b.png b/media/textures/Amputations/skin02b.png deleted file mode 100644 index a92dd71..0000000 Binary files a/media/textures/Amputations/skin02b.png and /dev/null differ diff --git a/media/textures/Amputations/skin03.png b/media/textures/Amputations/skin03.png deleted file mode 100644 index 1d2992f..0000000 Binary files a/media/textures/Amputations/skin03.png and /dev/null differ diff --git a/media/textures/Amputations/skin03_b.png b/media/textures/Amputations/skin03_b.png new file mode 100644 index 0000000..66e64a7 Binary files /dev/null and b/media/textures/Amputations/skin03_b.png differ diff --git a/media/textures/Amputations/skin03_hairy_b.png b/media/textures/Amputations/skin03_hairy_b.png new file mode 100644 index 0000000..32dfd14 Binary files /dev/null and b/media/textures/Amputations/skin03_hairy_b.png differ diff --git a/media/textures/Amputations/skin03b.png b/media/textures/Amputations/skin03b.png deleted file mode 100644 index db2dcfa..0000000 Binary files a/media/textures/Amputations/skin03b.png and /dev/null differ diff --git a/media/textures/Amputations/skin04.png b/media/textures/Amputations/skin04.png deleted file mode 100644 index 402bd89..0000000 Binary files a/media/textures/Amputations/skin04.png and /dev/null differ diff --git a/media/textures/Amputations/skin04_b.png b/media/textures/Amputations/skin04_b.png new file mode 100644 index 0000000..840c908 Binary files /dev/null and b/media/textures/Amputations/skin04_b.png differ diff --git a/media/textures/Amputations/skin04_hairy_b.png b/media/textures/Amputations/skin04_hairy_b.png new file mode 100644 index 0000000..0737e7b Binary files /dev/null and b/media/textures/Amputations/skin04_hairy_b.png differ diff --git a/media/textures/Amputations/skin04b.png b/media/textures/Amputations/skin04b.png deleted file mode 100644 index 7e0b0c0..0000000 Binary files a/media/textures/Amputations/skin04b.png and /dev/null differ diff --git a/media/textures/Amputations/skin05.png b/media/textures/Amputations/skin05.png deleted file mode 100644 index cde47df..0000000 Binary files a/media/textures/Amputations/skin05.png and /dev/null differ diff --git a/media/textures/Amputations/skin05_b.png b/media/textures/Amputations/skin05_b.png new file mode 100644 index 0000000..4b43655 Binary files /dev/null and b/media/textures/Amputations/skin05_b.png differ diff --git a/media/textures/Amputations/skin05_hairy_b.png b/media/textures/Amputations/skin05_hairy_b.png new file mode 100644 index 0000000..bbb974d Binary files /dev/null and b/media/textures/Amputations/skin05_hairy_b.png differ diff --git a/media/textures/Amputations/skin05b.png b/media/textures/Amputations/skin05b.png deleted file mode 100644 index b993ce0..0000000 Binary files a/media/textures/Amputations/skin05b.png and /dev/null differ diff --git a/models_stuff/textures/MaleBody01.png b/models_stuff/textures/MaleBody01.png new file mode 100644 index 0000000..0f12fff Binary files /dev/null and b/models_stuff/textures/MaleBody01.png differ diff --git a/models_stuff/textures/MaleBody02.png b/models_stuff/textures/MaleBody02.png new file mode 100644 index 0000000..b66a231 Binary files /dev/null and b/models_stuff/textures/MaleBody02.png differ diff --git a/models_stuff/textures/MaleBody03.png b/models_stuff/textures/MaleBody03.png new file mode 100644 index 0000000..c3a08fb Binary files /dev/null and b/models_stuff/textures/MaleBody03.png differ diff --git a/models_stuff/textures/MaleBody04.png b/models_stuff/textures/MaleBody04.png new file mode 100644 index 0000000..5c3f42b Binary files /dev/null and b/models_stuff/textures/MaleBody04.png differ diff --git a/models_stuff/textures/MaleBody05.png b/models_stuff/textures/MaleBody05.png new file mode 100644 index 0000000..12a7a95 Binary files /dev/null and b/models_stuff/textures/MaleBody05.png differ diff --git a/models_stuff/textures/bodies_textures.psd b/models_stuff/textures/bodies_textures.psd new file mode 100644 index 0000000..45c6d3e Binary files /dev/null and b/models_stuff/textures/bodies_textures.psd differ