diff --git a/media/lua/client/TOC_main.lua b/media/lua/client/TOC_main.lua index 17b0141..1aee229 100644 --- a/media/lua/client/TOC_main.lua +++ b/media/lua/client/TOC_main.lua @@ -354,6 +354,7 @@ function TheOnlyCure.EquipProsthesis(part_name, prosthesis_base_name) player:setWornItem(added_prosthesis:getBodyLocation(), added_prosthesis) + end end diff --git a/media/lua/client/TimedActions/ISInstallProsthesis.lua b/media/lua/client/TimedActions/ISInstallProsthesis.lua index 7d6647a..8204aa7 100644 --- a/media/lua/client/TimedActions/ISInstallProsthesis.lua +++ b/media/lua/client/TimedActions/ISInstallProsthesis.lua @@ -15,6 +15,7 @@ function ISInstallProsthesis:start() self.item:setJobDelta(0.0) + self:setActionAnim("WearClothing") self:setAnimVariable("WearClothingLocation", "Jacket") diff --git a/media/lua/client/TimedActions/ISUninstallProsthesis.lua b/media/lua/client/TimedActions/ISUninstallProsthesis.lua index 9265e9d..20c86c3 100644 --- a/media/lua/client/TimedActions/ISUninstallProsthesis.lua +++ b/media/lua/client/TimedActions/ISUninstallProsthesis.lua @@ -28,6 +28,9 @@ function ISUninstallProsthesis:start() elseif self.item:IsInventoryContainer() and self.item:canBeEquipped() ~= "" then self:setAnimVariable("WearClothingLocation", "Jacket") end + + self.character:setPrimaryHandItem(nil) + self.character:setSecondaryHandItem(self.item) end function ISUninstallProsthesis:stop() diff --git a/media/models_X/Prost_Left_LowerArm_Hook_Female.fbx b/media/models_X/Prost_Left_LowerArm_Hook_Female.fbx index cf58b1d..348ef7e 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 4dc30e6..bb9bcf5 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/models_X/WorldItems/hook.fbx b/media/models_X/WorldItems/hook.fbx new file mode 100644 index 0000000..79cd759 Binary files /dev/null and b/media/models_X/WorldItems/hook.fbx differ diff --git a/media/scripts/TOC_items.txt b/media/scripts/TOC_items.txt index 10b05a2..ad1f467 100644 --- a/media/scripts/TOC_items.txt +++ b/media/scripts/TOC_items.txt @@ -317,7 +317,6 @@ imports /************************ Prothese items ************************/ -/* TODO make it clothing same as amputations */ item WoodenHook { Weight = 1, @@ -326,6 +325,7 @@ item WoodenHook DisplayName = DisplayName_woodenHook, Icon = woodenHook, Tooltip = Tooltip_prosthesic_limb, + WorldStaticModel = TOC.WoodenHook, } item MetalHook @@ -336,6 +336,8 @@ item MetalHook DisplayName = DisplayName_metalHook, Icon = metalHook, Tooltip = Tooltip_prosthesic_limb, + WorldStaticModel = TOC.MetalHook, + } item MetalHand diff --git a/media/scripts/TOC_models_item.txt b/media/scripts/TOC_models_item.txt new file mode 100644 index 0000000..e11ed82 --- /dev/null +++ b/media/scripts/TOC_models_item.txt @@ -0,0 +1,16 @@ +module TOC +{ + model WoodenHook + { + mesh = WorldItems/hook, + texture = WorldItems/metal, + scale = 0.15, + } + + model WoodenHook + { + mesh = WorldItems/hook, + texture = WorldItems/wood, + scale = 0.15, + } +} \ No newline at end of file diff --git a/media/textures/WorldItems/metal.png b/media/textures/WorldItems/metal.png new file mode 100644 index 0000000..1888a32 Binary files /dev/null and b/media/textures/WorldItems/metal.png differ diff --git a/media/textures/WorldItems/wood.png b/media/textures/WorldItems/wood.png new file mode 100644 index 0000000..a028265 Binary files /dev/null and b/media/textures/WorldItems/wood.png differ