diff --git a/media/clothing/clothingItems/Amputation_ForeArm_L.xml b/media/clothing/clothingItems/Amputation_ForeArm_L.xml index 392375a..e8acf55 100644 --- a/media/clothing/clothingItems/Amputation_ForeArm_L.xml +++ b/media/clothing/clothingItems/Amputation_ForeArm_L.xml @@ -1,7 +1,7 @@ - Amputation_Left_LowerArm_Male - Amputation_Left_LowerArm_Female + Amputation\Amputation_Left_LowerArm_Male + Amputation\Amputation_Left_LowerArm_Female d3816fe0-48e1-4cf5-a8e4-48c72595edb4 false false diff --git a/media/clothing/clothingItems/Amputation_ForeArm_R.xml b/media/clothing/clothingItems/Amputation_ForeArm_R.xml index 0ae81a9..1021cdf 100644 --- a/media/clothing/clothingItems/Amputation_ForeArm_R.xml +++ b/media/clothing/clothingItems/Amputation_ForeArm_R.xml @@ -1,7 +1,7 @@ - Amputation_Right_LowerArm_Male - Amputation_Right_LowerArm_Female + Amputation\Amputation_Right_LowerArm_Male + Amputation\Amputation_Right_LowerArm_Female e6f80efd-22e5-49e0-8b24-537519d42b37 false false diff --git a/media/clothing/clothingItems/Amputation_Hand_L.xml b/media/clothing/clothingItems/Amputation_Hand_L.xml index cdcf365..c9c68a2 100644 --- a/media/clothing/clothingItems/Amputation_Hand_L.xml +++ b/media/clothing/clothingItems/Amputation_Hand_L.xml @@ -1,7 +1,7 @@ - Amputation_Left_Hand_Male - Amputation_Left_Hand_Female + Amputation\Amputation_Left_Hand_Male + Amputation\Amputation_Left_Hand_Female 2de93af2-b7a8-4c04-84d1-28d92cce8a0f false false diff --git a/media/clothing/clothingItems/Amputation_Hand_R.xml b/media/clothing/clothingItems/Amputation_Hand_R.xml index d08510d..e372545 100644 --- a/media/clothing/clothingItems/Amputation_Hand_R.xml +++ b/media/clothing/clothingItems/Amputation_Hand_R.xml @@ -1,6 +1,6 @@ - Amputation_Right_Hand_Male - Amputation_Right_Hand_Female + Amputation\Amputation_Right_Hand_Male + Amputation\Amputation_Right_Hand_Female f114e53a-b92e-4639-8d8c-2b43ab981885 false false diff --git a/media/clothing/clothingItems/Amputation_UpperArm_L.xml b/media/clothing/clothingItems/Amputation_UpperArm_L.xml index e9994ae..1a4cc81 100644 --- a/media/clothing/clothingItems/Amputation_UpperArm_L.xml +++ b/media/clothing/clothingItems/Amputation_UpperArm_L.xml @@ -1,7 +1,7 @@ - Amputation_Left_UpperArm_Male - Amputation_Left_UpperArm_Female + Amputation\Amputation_Left_UpperArm_Male + Amputation\Amputation_Left_UpperArm_Female 646cafa5-3fa1-41af-9ca0-aa57cca3b36d false false diff --git a/media/clothing/clothingItems/Amputation_UpperArm_R.xml b/media/clothing/clothingItems/Amputation_UpperArm_R.xml index 5e4d657..b593768 100644 --- a/media/clothing/clothingItems/Amputation_UpperArm_R.xml +++ b/media/clothing/clothingItems/Amputation_UpperArm_R.xml @@ -1,7 +1,7 @@ - Amputation_Right_UpperArm_Male - Amputation_Right_UpperArm_Female + Amputation\Amputation_Right_UpperArm_Male + Amputation\Amputation_Right_UpperArm_Female db8ccad2-b76f-44bd-93ab-1eefa25beade false false diff --git a/media/clothing/clothingItems/Prost_Hook_L.xml b/media/clothing/clothingItems/Prost_Hook_L.xml new file mode 100644 index 0000000..a41004b --- /dev/null +++ b/media/clothing/clothingItems/Prost_Hook_L.xml @@ -0,0 +1,11 @@ + + + Prosthesis\hookArm_L_F + Prosthesis\hookArm_L_F + 05338f5e-e984-49c2-be79-81af9ae8e818 + + false + false + metal_base + metal_base + diff --git a/media/fileGuidTable.xml b/media/fileGuidTable.xml index ab64963..6165ede 100644 --- a/media/fileGuidTable.xml +++ b/media/fileGuidTable.xml @@ -26,4 +26,11 @@ 646cafa5-3fa1-41af-9ca0-aa57cca3b36d + + + media/clothing/clothingItems/Prost_Hook_L.xml + 05338f5e-e984-49c2-be79-81af9ae8e818 + + + \ No newline at end of file diff --git a/media/lua/client/Handlers/TOC_ItemsHandler.lua b/media/lua/client/Handlers/TOC_ItemsHandler.lua index da3b08c..217acda 100644 --- a/media/lua/client/Handlers/TOC_ItemsHandler.lua +++ b/media/lua/client/Handlers/TOC_ItemsHandler.lua @@ -1,10 +1,8 @@ local StaticData = require("TOC_StaticData") local CommonMethods = require("TOC_Common") -local PlayerHandler = require("Handlers/TOC_PlayerHandler") --------------------------- - --- Submodule to handle spawning the correct items after certain actions (ie: cutting a hand) ---@class ItemsHandler local ItemsHandler = {} @@ -87,7 +85,6 @@ function ItemsHandler.DeleteAllOldAmputationItems(playerObj) end end - ---Spawns and equips the correct amputation item to the player. function ItemsHandler.SpawnAmputationItem(playerObj, limbName) print("Clothing name " .. StaticData.AMPUTATION_CLOTHING_ITEM_BASE .. limbName) @@ -110,6 +107,9 @@ function ISInventoryPane:refreshContainer() -- Search into the container and remove the reference to the amputation item og_ISInventoryPane_refreshContainer(self) + + if TOC_DEBUG.disablePaneMod then return end + for i=1, #self.itemslist do local cItem = self.itemslist[i] if cItem and cItem.cat == "Amputation" then diff --git a/media/lua/client/TOC_Debug.lua b/media/lua/client/TOC_Debug.lua index e69de29..dae82af 100644 --- a/media/lua/client/TOC_Debug.lua +++ b/media/lua/client/TOC_Debug.lua @@ -0,0 +1,7 @@ +TOC_DEBUG = {} +TOC_DEBUG.disablePaneMod = false + + +function TOC_DEBUG.togglePaneMod() + TOC_DEBUG.disablePaneMod = not TOC_DEBUG.disablePaneMod +end \ No newline at end of file diff --git a/media/lua/client/UI/TOC_ProsthesisBuilderUI.lua b/media/lua/client/UI/TOC_ProsthesisBuilderUI.lua new file mode 100644 index 0000000..a3fa86f --- /dev/null +++ b/media/lua/client/UI/TOC_ProsthesisBuilderUI.lua @@ -0,0 +1 @@ +-- TODO Separate UI to craft prosthesis... No just use the crafting menu you mook \ No newline at end of file diff --git a/media/lua/shared/NPCs/TOC_BodyLocations.lua b/media/lua/shared/NPCs/TOC_BodyLocations.lua index ced59fc..6f68bef 100644 --- a/media/lua/shared/NPCs/TOC_BodyLocations.lua +++ b/media/lua/shared/NPCs/TOC_BodyLocations.lua @@ -14,3 +14,7 @@ end AddBodyLocationBefore("TOC_ArmRight", "Shoes") AddBodyLocationBefore("TOC_ArmLeft", "Shoes") + +AddBodyLocationBefore("TOC_ArmProstRight", "Shoes") +AddBodyLocationBefore("TOC_ArmProstLeft", "Shoes") + diff --git a/media/models_X/Amputation_Left_Hand_Female.fbx b/media/models_X/Amputation/Amputation_Left_Hand_Female.fbx similarity index 100% rename from media/models_X/Amputation_Left_Hand_Female.fbx rename to media/models_X/Amputation/Amputation_Left_Hand_Female.fbx diff --git a/media/models_X/Amputation_Left_Hand_Male.fbx b/media/models_X/Amputation/Amputation_Left_Hand_Male.fbx similarity index 100% rename from media/models_X/Amputation_Left_Hand_Male.fbx rename to media/models_X/Amputation/Amputation_Left_Hand_Male.fbx diff --git a/media/models_X/Amputation_Left_LowerArm_Female.fbx b/media/models_X/Amputation/Amputation_Left_LowerArm_Female.fbx similarity index 100% rename from media/models_X/Amputation_Left_LowerArm_Female.fbx rename to media/models_X/Amputation/Amputation_Left_LowerArm_Female.fbx diff --git a/media/models_X/Amputation_Left_LowerArm_Male.fbx b/media/models_X/Amputation/Amputation_Left_LowerArm_Male.fbx similarity index 100% rename from media/models_X/Amputation_Left_LowerArm_Male.fbx rename to media/models_X/Amputation/Amputation_Left_LowerArm_Male.fbx diff --git a/media/models_X/Amputation_Left_UpperArm_Female.fbx b/media/models_X/Amputation/Amputation_Left_UpperArm_Female.fbx similarity index 100% rename from media/models_X/Amputation_Left_UpperArm_Female.fbx rename to media/models_X/Amputation/Amputation_Left_UpperArm_Female.fbx diff --git a/media/models_X/Amputation_Left_UpperArm_Male.fbx b/media/models_X/Amputation/Amputation_Left_UpperArm_Male.fbx similarity index 100% rename from media/models_X/Amputation_Left_UpperArm_Male.fbx rename to media/models_X/Amputation/Amputation_Left_UpperArm_Male.fbx diff --git a/media/models_X/Amputation_Right_Hand_Female.fbx b/media/models_X/Amputation/Amputation_Right_Hand_Female.fbx similarity index 100% rename from media/models_X/Amputation_Right_Hand_Female.fbx rename to media/models_X/Amputation/Amputation_Right_Hand_Female.fbx diff --git a/media/models_X/Amputation_Right_Hand_Male.fbx b/media/models_X/Amputation/Amputation_Right_Hand_Male.fbx similarity index 100% rename from media/models_X/Amputation_Right_Hand_Male.fbx rename to media/models_X/Amputation/Amputation_Right_Hand_Male.fbx diff --git a/media/models_X/Amputation_Right_LowerArm_Female.fbx b/media/models_X/Amputation/Amputation_Right_LowerArm_Female.fbx similarity index 100% rename from media/models_X/Amputation_Right_LowerArm_Female.fbx rename to media/models_X/Amputation/Amputation_Right_LowerArm_Female.fbx diff --git a/media/models_X/Amputation_Right_LowerArm_Male.fbx b/media/models_X/Amputation/Amputation_Right_LowerArm_Male.fbx similarity index 100% rename from media/models_X/Amputation_Right_LowerArm_Male.fbx rename to media/models_X/Amputation/Amputation_Right_LowerArm_Male.fbx diff --git a/media/models_X/Amputation_Right_UpperArm_Female.fbx b/media/models_X/Amputation/Amputation_Right_UpperArm_Female.fbx similarity index 100% rename from media/models_X/Amputation_Right_UpperArm_Female.fbx rename to media/models_X/Amputation/Amputation_Right_UpperArm_Female.fbx diff --git a/media/models_X/Amputation_Right_UpperArm_Male.fbx b/media/models_X/Amputation/Amputation_Right_UpperArm_Male.fbx similarity index 100% rename from media/models_X/Amputation_Right_UpperArm_Male.fbx rename to media/models_X/Amputation/Amputation_Right_UpperArm_Male.fbx diff --git a/media/models_X/Prosthesis/hookArm_L_F.fbx b/media/models_X/Prosthesis/hookArm_L_F.fbx new file mode 100644 index 0000000..46d27cc Binary files /dev/null and b/media/models_X/Prosthesis/hookArm_L_F.fbx differ diff --git a/media/scripts/TOC_items.txt b/media/scripts/TOC_items.txt index dd743dd..282b0c6 100644 --- a/media/scripts/TOC_items.txt +++ b/media/scripts/TOC_items.txt @@ -8,6 +8,7 @@ module TOC item Amputation_Hand_R { Type = Clothing, + DisplayCategory = Amputation, DisplayName = Amputated right hand, ClothingItem = Amputation_Hand_R, @@ -27,6 +28,7 @@ module TOC item Amputation_ForeArm_R { Type = Clothing, + DisplayCategory = Amputation, DisplayName = Amputated right forearm, ClothingItem = Amputation_ForeArm_R, @@ -45,6 +47,7 @@ module TOC item Amputation_UpperArm_R { Type = Clothing, + DisplayCategory = Amputation, DisplayName = Amputated entire right arm, ClothingItem = Amputation_UpperArm_R, @@ -62,6 +65,7 @@ module TOC item Amputation_Hand_L { Type = Clothing, + DisplayCategory = Amputation, DisplayName = Amputated left hand, ClothingItem = Amputation_Hand_L, @@ -100,10 +104,30 @@ module TOC item Amputation_UpperArm_L { Type = Clothing, + DisplayCategory = Amputation, DisplayName = Amputated entire left arm, ClothingItem = Amputation_UpperArm_L, BodyLocation = TOC_ArmLeft, + Weight = 0, + CombatSpeedModifier = 0.7, + BloodLocation = UpperArms;UpperBody, + Insulation = 1.0, + WindResistance = 1.0, + WaterResistance = 1.0, + Icon = genericAmputation, + CanHaveHoles = false, + } + /****************** Clothing that look like a cut limb ******************/ + + item Prosthesis_Hook_L + { + Type = Clothing, + DisplayCategory = Prosthesis, + DisplayName = Hook Arm Test, + ClothingItem = Prost_Hook_L, + BodyLocation = TOC_ArmProstLeft, + Weight = 0, CombatSpeedModifier = 0.7, BloodLocation = UpperArms;UpperBody, diff --git a/OLD_MEDIA/textures/Prosthesis/metal_base.png b/media/textures/metal_base.png similarity index 100% rename from OLD_MEDIA/textures/Prosthesis/metal_base.png rename to media/textures/metal_base.png