diff --git a/media/lua/client/TOC_HelperFunctions.lua b/media/lua/client/TOC_HelperFunctions.lua index 25d42cb..23ab9ed 100644 --- a/media/lua/client/TOC_HelperFunctions.lua +++ b/media/lua/client/TOC_HelperFunctions.lua @@ -135,6 +135,8 @@ end -- end function CheckIfItemIsProsthesis(item) + + -- TODO find a cleaner way local item_full_type = item:getFullType() local prosthesis_list = GetProsthesisList() @@ -150,16 +152,10 @@ end function CheckIfItemIsInstalledProsthesis(item) local item_full_type = item:getFullType() - local installable_prosthesis_list = GetInstallableProsthesisList() - - print("Checking for " .. item_full_type) - - for _, v in pairs(installable_prosthesis_list)do - print(v) - if (v == item_full_type) then - return true - end + if string.find(item_full_type, "TOC.Prost_") then + return true + else + return false end - return false end \ No newline at end of file diff --git a/media/lua/client/TOC_OverridenFunctions.lua b/media/lua/client/TOC_OverridenFunctions.lua index 10636c5..a1b6974 100644 --- a/media/lua/client/TOC_OverridenFunctions.lua +++ b/media/lua/client/TOC_OverridenFunctions.lua @@ -95,6 +95,8 @@ end local og_ISInventoryPaneGetActualItems = ISInventoryPane.getActualItems function ISInventoryPane.getActualItems(items) + -- TODO add an exception for installed prosthesis, make them unequippable automatically from here and get the correct obj + local ret = og_ISInventoryPaneGetActualItems(items) -- This is gonna be slower than just overriding the function but hey it's more compatible diff --git a/media/scripts/TOC_items.txt b/media/scripts/TOC_items.txt index 380e835..c019926 100644 --- a/media/scripts/TOC_items.txt +++ b/media/scripts/TOC_items.txt @@ -150,7 +150,7 @@ imports Weight = 1, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_woodenHook, + DisplayName = Right Hand - Wooden Hook, ClothingItem = Prost_Right_Hand_WoodenHook, BodyLocation = ArmRight_Prot, BloodLocation = Hands, @@ -164,7 +164,7 @@ imports Weight = 1, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_woodenHook, + DisplayName = Left Hand - Wooden Hook, ClothingItem = Prost_Left_Hand_WoodenHook, BodyLocation = ArmLeft_Prot, BloodLocation = Hands, @@ -178,7 +178,7 @@ imports Weight = 0.5, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_metalHook, + DisplayName = Right Hand - Metal Hook, ClothingItem = Prost_Right_Hand_MetalHook, BodyLocation = ArmRight_Prot, BloodLocation = Hands, @@ -192,7 +192,7 @@ imports Weight = 0.5, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_metalHook, + DisplayName = Left Hand - Metal Hook, ClothingItem = Prost_Left_Hand_MetalHook, BodyLocation = ArmLeft_Prot, BloodLocation = Hands, @@ -206,7 +206,7 @@ imports Weight = 0.3, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_metalHand, + DisplayName = Right Hand - Metal Hand, ClothingItem = Prost_Right_Hand_MetalHand, BodyLocation = ArmRight_Prot, BloodLocation = Hands, @@ -220,7 +220,7 @@ imports Weight = 0.3, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_metalHand, + DisplayName = Left Hand - Metal Hand, ClothingItem = Prost_Left_Hand_MetalHand, BodyLocation = ArmLeft_Prot, BloodLocation = Hands, @@ -234,7 +234,7 @@ imports Weight = 2, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_woodenHook, + DisplayName = Right Forearm - Wooden Hook, ClothingItem = Prost_Right_LowerArm_WoodenHook, BodyLocation = ArmRight_Prot, BloodLocation = LowerArms;Hands, @@ -248,7 +248,7 @@ imports Weight = 2, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_woodenHook, + DisplayName = Left Forearm - Wooden Hook, ClothingItem = Prost_Left_LowerArm_WoodenHook, BodyLocation = ArmLeft_Prot, BloodLocation = LowerArms;Hands, @@ -263,7 +263,7 @@ imports Weight = 1.5, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_metalHook, + DisplayName = Right Forearm - Metal Hook, ClothingItem = Prost_Right_LowerArm_MetalHook, BodyLocation = ArmRight_Prot, BloodLocation = LowerArms;Hands, @@ -277,7 +277,7 @@ imports Weight = 1.5, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_metalHook, + DisplayName = Left Forearm - Metal Hook, ClothingItem = Prost_Left_LowerArm_MetalHook, BodyLocation = ArmLeft_Prot, BloodLocation = LowerArms;Hands, @@ -292,7 +292,7 @@ imports Weight = 1.2, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_metalHand, + DisplayName = Right Forearm - Metal Hand, ClothingItem = Prost_Right_LowerArm_MetalHand, BodyLocation = ArmRight_Prot, BloodLocation = LowerArms;Hands, @@ -306,7 +306,7 @@ imports Weight = 1.2, Type = Clothing, DisplayCategory = Prosthesis, - DisplayName = DisplayName_metalHand, + DisplayName = Left Forearm - Metal Hand, ClothingItem = Prost_Left_LowerArm_MetalHand, BodyLocation = ArmLeft_Prot, BloodLocation = LowerArms;Hands,