diff --git a/media/clothing/clothingItems/Amputation_Left_Hand.xml b/media/clothing/clothingItems/Amputation_Left_Hand.xml index e8cd154..f07f22d 100644 --- a/media/clothing/clothingItems/Amputation_Left_Hand.xml +++ b/media/clothing/clothingItems/Amputation_Left_Hand.xml @@ -7,6 +7,7 @@ false false 4 + none Amputations\skin01b Amputations\skin02b Amputations\skin03b diff --git a/media/clothing/clothingItems/Amputation_Left_LowerArm.xml b/media/clothing/clothingItems/Amputation_Left_LowerArm.xml index 5c02dff..727f0e4 100644 --- a/media/clothing/clothingItems/Amputation_Left_LowerArm.xml +++ b/media/clothing/clothingItems/Amputation_Left_LowerArm.xml @@ -8,6 +8,7 @@ false 3 4 + none Amputations\skin01b Amputations\skin02b Amputations\skin03b diff --git a/media/clothing/clothingItems/Amputation_Left_UpperArm.xml b/media/clothing/clothingItems/Amputation_Left_UpperArm.xml index fa2d2f3..c80f229 100644 --- a/media/clothing/clothingItems/Amputation_Left_UpperArm.xml +++ b/media/clothing/clothingItems/Amputation_Left_UpperArm.xml @@ -8,6 +8,7 @@ false 3 4 + none Amputations\skin01b Amputations\skin02b Amputations\skin03b diff --git a/media/clothing/clothingItems/Amputation_Right_LowerArm.xml b/media/clothing/clothingItems/Amputation_Right_LowerArm.xml index f84bb87..44c31ef 100644 --- a/media/clothing/clothingItems/Amputation_Right_LowerArm.xml +++ b/media/clothing/clothingItems/Amputation_Right_LowerArm.xml @@ -8,6 +8,7 @@ false 5 6 + none Amputations\skin01b Amputations\skin02b Amputations\skin03b diff --git a/media/clothing/clothingItems/Amputation_Right_UpperArm.xml b/media/clothing/clothingItems/Amputation_Right_UpperArm.xml index ee4516f..a4b4bcf 100644 --- a/media/clothing/clothingItems/Amputation_Right_UpperArm.xml +++ b/media/clothing/clothingItems/Amputation_Right_UpperArm.xml @@ -8,6 +8,7 @@ false 5 6 + none Amputations\skin01b Amputations\skin02b Amputations\skin03b diff --git a/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHook.xml b/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHook.xml index 940459c..c273030 100644 --- a/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHook.xml +++ b/media/clothing/clothingItems/Prost_Left_LowerArm_MetalHook.xml @@ -7,5 +7,7 @@ false false 4 - Clothes\metal + Clothes\metal_male + Clothes\metal_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 86d00c6..d331934 100644 --- a/media/clothing/clothingItems/Prost_Left_LowerArm_WoodenHook.xml +++ b/media/clothing/clothingItems/Prost_Left_LowerArm_WoodenHook.xml @@ -6,5 +6,7 @@ false false false - Clothes\wood + Clothes\wood_male + Clothes\wood_female + \ No newline at end of file diff --git a/media/lua/client/TOC_ClientOptions.lua b/media/lua/client/TOC_ClientOptions.lua index eff2f17..6e9d69c 100644 --- a/media/lua/client/TOC_ClientOptions.lua +++ b/media/lua/client/TOC_ClientOptions.lua @@ -20,7 +20,9 @@ if ModOptions and ModOptions.getInstance then ModOptions:loadFile() local roll_up_sleeves = settings:getData("roll_up_sleeves_on_amputated_limbs") - + + -- Run it now since we're in the menu, presumably + TocSetSleeves(options.roll_up_sleeves_on_amputated_limbs) diff --git a/media/lua/client/TOC_main.lua b/media/lua/client/TOC_main.lua index 53d17b8..ab16564 100644 --- a/media/lua/client/TOC_main.lua +++ b/media/lua/client/TOC_main.lua @@ -385,6 +385,11 @@ function TheOnlyCure.EquipProsthesis(part_name, prosthesis_base_name) toc_data.Limbs[part_name].is_prosthesis_equipped = true toc_data.Limbs[part_name].equipped_prosthesis = toc_data.Prosthesis[prosthesis_base_name][part_name] + if player:isFemale() then + added_prosthesis:getVisual():setTextureChoice(1) + else + added_prosthesis:getVisual():setTextureChoice(0) + end player:setWornItem(added_prosthesis:getBodyLocation(), added_prosthesis) diff --git a/media/models_X/Amputation_Left_LowerArm_Female.fbx b/media/models_X/Amputation_Left_LowerArm_Female.fbx index 5c36c7a..3620327 100644 Binary files a/media/models_X/Amputation_Left_LowerArm_Female.fbx and b/media/models_X/Amputation_Left_LowerArm_Female.fbx differ diff --git a/media/models_X/Prost_Left_LowerArm_Hook_Female.fbx b/media/models_X/Prost_Left_LowerArm_Hook_Female.fbx index c104ae8..dd381bb 100644 Binary files a/media/models_X/Prost_Left_LowerArm_Hook_Female.fbx and b/media/models_X/Prost_Left_LowerArm_Hook_Female.fbx differ diff --git a/media/models_X/Prost_Right_LowerArm_Hook_Female.fbx b/media/models_X/Prost_Right_LowerArm_Hook_Female.fbx index bb9bcf5..7ec95a3 100644 Binary files a/media/models_X/Prost_Right_LowerArm_Hook_Female.fbx and b/media/models_X/Prost_Right_LowerArm_Hook_Female.fbx differ diff --git a/media/scripts/TOC_items.txt b/media/scripts/TOC_items.txt index ad1f467..ea36331 100644 --- a/media/scripts/TOC_items.txt +++ b/media/scripts/TOC_items.txt @@ -21,6 +21,7 @@ imports WindResistance = 1.0, WaterResistance = 1.0, Icon = genericAmputation, + CanHaveHoles = false, } item Amputation_Right_LowerArm @@ -38,6 +39,7 @@ imports WindResistance = 1.0, WaterResistance = 1.0, Icon = genericAmputation, + CanHaveHoles = false, } item Amputation_Right_UpperArm @@ -54,6 +56,7 @@ imports WindResistance = 1.0, WaterResistance = 1.0, Icon = genericAmputation, + CanHaveHoles = false, } item Amputation_Left_Hand @@ -72,6 +75,7 @@ imports WindResistance = 1.0, WaterResistance = 1.0, Icon = genericAmputation, + CanHaveHoles = false, } item Amputation_Left_LowerArm @@ -89,6 +93,7 @@ imports WindResistance = 1.0, WaterResistance = 1.0, Icon = genericAmputation, + CanHaveHoles = false, } @@ -106,6 +111,7 @@ imports WindResistance = 1.0, WaterResistance = 1.0, Icon = genericAmputation, + CanHaveHoles = false, } /************************ Other items ************************/ @@ -157,6 +163,8 @@ imports Icon = woodenHook, Tooltip = Tooltip_equip_prothesis_hand, WaterResistance = 15, + CanHaveHoles = false, + } item Prost_Left_Hand_WoodenHook @@ -171,6 +179,8 @@ imports Icon = woodenHook, Tooltip = Tooltip_equip_prothesis_hand, WaterResistance = 15, + CanHaveHoles = false, + } item Prost_Right_Hand_MetalHook @@ -185,6 +195,7 @@ imports Icon = metalHook, Tooltip = Tooltip_equip_prothesis_hand, WaterResistance = 13, + CanHaveHoles = false, } item Prost_Left_Hand_MetalHook @@ -199,6 +210,7 @@ imports Icon = metalHook, Tooltip = Tooltip_equip_prothesis_hand, WaterResistance = 13, + CanHaveHoles = false, } item Prost_Right_Hand_MetalHand @@ -213,6 +225,7 @@ imports Icon = metalHand, Tooltip = Tooltip_equip_prothesis_hand, WaterResistance = 11, + CanHaveHoles = false, } item Prost_Left_Hand_MetalHand @@ -227,6 +240,7 @@ imports Icon = metalHand, Tooltip = Tooltip_equip_prothesis_hand", WaterResistance = 11, + CanHaveHoles = false, } item Prost_Right_LowerArm_WoodenHook @@ -241,6 +255,7 @@ imports Icon = woodenHook, Tooltip = Tooltip_equip_prothesis_fore, WaterResistance = 16, + CanHaveHoles = false, } item Prost_Left_LowerArm_WoodenHook @@ -256,6 +271,7 @@ imports Icon = woodenHook, Tooltip = Tooltip_equip_prothesis_fore, WaterResistance = 16, + CanHaveHoles = false, } item Prost_Right_LowerArm_MetalHook @@ -270,6 +286,7 @@ imports Icon = metalHook, Tooltip = Tooltip_equip_prothesis_fore, WaterResistance = 14, + CanHaveHoles = false, } item Prost_Left_LowerArm_MetalHook @@ -285,6 +302,7 @@ imports Icon = metalHook, Tooltip = Tooltip_equip_prothesis_fore, WaterResistance = 14, + CanHaveHoles = false, } item Prost_Right_LowerArm_MetalHand @@ -299,6 +317,7 @@ imports Icon = metalHand, Tooltip = Tooltip_equip_prothesis_fore, WaterResistance = 12, + CanHaveHoles = false, } item Prost_Left_LowerArm_MetalHand @@ -313,6 +332,7 @@ imports Icon = metalHand, Tooltip = Tooltip_equip_prothesis_fore, WaterResistance = 12, + CanHaveHoles = false, } /************************ Prothese items ************************/ diff --git a/media/textures/Clothes/metal_female.png b/media/textures/Clothes/metal_female.png new file mode 100644 index 0000000..74090ae Binary files /dev/null and b/media/textures/Clothes/metal_female.png differ diff --git a/media/textures/Clothes/metal_male.png b/media/textures/Clothes/metal_male.png new file mode 100644 index 0000000..504f91f Binary files /dev/null and b/media/textures/Clothes/metal_male.png differ diff --git a/media/textures/Clothes/wood_female.png b/media/textures/Clothes/wood_female.png new file mode 100644 index 0000000..c592f55 Binary files /dev/null and b/media/textures/Clothes/wood_female.png differ diff --git a/media/textures/Clothes/wood_male.png b/media/textures/Clothes/wood_male.png new file mode 100644 index 0000000..943b477 Binary files /dev/null and b/media/textures/Clothes/wood_male.png differ diff --git a/models_stuff/Icosphere-Recovered.psd b/models_stuff/Icosphere-Recovered.psd new file mode 100644 index 0000000..87ad1b8 Binary files /dev/null and b/models_stuff/Icosphere-Recovered.psd differ diff --git a/models_stuff/RIGHT_forearm_hook_male.blend b/models_stuff/RIGHT_forearm_hook_male.blend index 3f0b7c3..065f067 100644 Binary files a/models_stuff/RIGHT_forearm_hook_male.blend and b/models_stuff/RIGHT_forearm_hook_male.blend differ diff --git a/models_stuff/RIGHT_forearm_hook_male.blend1 b/models_stuff/RIGHT_forearm_hook_male.blend1 new file mode 100644 index 0000000..3f0b7c3 Binary files /dev/null and b/models_stuff/RIGHT_forearm_hook_male.blend1 differ diff --git a/models_stuff/texture-female-hook.psd b/models_stuff/texture-female-hook.psd new file mode 100644 index 0000000..2ab9ece Binary files /dev/null and b/models_stuff/texture-female-hook.psd differ diff --git a/models_stuff/working_LEFT_forearm_hook_female.blend b/models_stuff/working_LEFT_forearm_hook_female.blend new file mode 100644 index 0000000..16b9835 Binary files /dev/null and b/models_stuff/working_LEFT_forearm_hook_female.blend differ diff --git a/models_stuff/working_right_forearm_hook_female.blend b/models_stuff/working_right_forearm_hook_female.blend new file mode 100644 index 0000000..93b131f Binary files /dev/null and b/models_stuff/working_right_forearm_hook_female.blend differ