From e295a67b42fa3dffd32985733b7eb064e3ab5749 Mon Sep 17 00:00:00 2001 From: Pao Date: Sat, 4 Feb 2023 03:01:45 +0100 Subject: [PATCH] Cleaned master --- media/lua/client/TOC_ProsthesisMethods.lua | 138 ------- modular_prosthesis_item.txt | 401 --------------------- python_helpers/main.py | 117 ------ 3 files changed, 656 deletions(-) delete mode 100644 modular_prosthesis_item.txt delete mode 100644 python_helpers/main.py diff --git a/media/lua/client/TOC_ProsthesisMethods.lua b/media/lua/client/TOC_ProsthesisMethods.lua index 8815726..a5c74c5 100644 --- a/media/lua/client/TOC_ProsthesisMethods.lua +++ b/media/lua/client/TOC_ProsthesisMethods.lua @@ -61,141 +61,3 @@ function TheOnlyCure.UnequipProsthesis(patient, part_name, equipped_prosthesis) end - ---------------------------------------------------------------------------------------------- --- TEST MODULAR SYSTEM ---------------------------------------------------------------------------------------------- - -function TocModular() - - - -- Should affect comfort, so mobility (equal speed of actions) - local prost_straps = { - "leather_strap", - - "sheet_strap" - } - - -- A better base has a better resistance. During use it's gonna break sooner or later so a leather base is the best inbetween - local prost_base_forearm = { - "leather_base_forearm", -- Good resistance and speed - "wood_base_forearm", -- Shitty resistance and low speed - "metal_base_forearm" -- Really high resistance and very low speed - } - - local prost_base_hand = { - "wood_base_hand", - "metal_base_hand" - } - - - - local prost_top = { - "metal_hook", -- Decent action speed (around 0.75), good durability, restores hand - "metal_knife", -- Doesn't count as an hand, but substitute the primary attack... Gonna need a way to disable it to make LIR work (retractable) - "wooden_hook", -- Shitty action speed (around 0.3), bad durability, restores hand - "metal_hand" -- Good action speed, amazing durability, restores hand - } - - - - - local TOC_straps = { - leather_strap = { - time_modifier = 1, - durability = 1, - }, - sheet_strap = { - time_modifier = 0.3, - durability = 0.4 - } - } - - local TOC_base_lowerarm = { - leather_base = { - durability = 1, - time_modifier = 1 - }, - wood_base = { - durability = 1, - time_modifier = 1, - }, - metal_base = { - durability = 1, - time_modifier = 1, - } - } - - - local TOC_base_hand = { - wood_base = { - durability = 1, - time_modifier = 1, - }, - metal_base = { - durability = 1, - time_modifier = 1, - } - } - - - - - - local TOC_top = { - metal_hook = { - type = "Normal", -- restores functioning hand - durability = 1, - time_modifier = 1, - }, - wooden_hook = { - type = "Normal", - durability = 1, - time_modifier = 1, - }, - - metal_hand = { - type = "Normal", - durability = 1, - time_modifier = 1, - }, - - metal_knife = { - type = "Attack" - } - - - } - - - - - -- We need A LOT of recipes... or use another menu from the toc one - - -- RECIPES FOR FOREARM = 24 RECIPES in total - -- Would be 48 items in TOC_items since we need them for both sides - - - -- RECIPES FOR HAND = 8 RECIPES in total - -- Would be in total 16 items - - - - -- TOTAL = 64 ITEMS and 32 RECIPES - - -- Leather strap + leather base forearm + metal hook - - - - - - - -- Base Item that can be crafted\found - - -- Different type of hooks - - -- Addons that can be added to the base item - - - -- Equip and unequip pretty much the same - -end \ No newline at end of file diff --git a/modular_prosthesis_item.txt b/modular_prosthesis_item.txt deleted file mode 100644 index fb9c904..0000000 --- a/modular_prosthesis_item.txt +++ /dev/null @@ -1,401 +0,0 @@ - -/* LOWERARM POSSIBLE PROSTHESIS COMBINATIONS */ - - - -/* Leather strap, leather base, metal hand */ -item ProstLowerArm_LeatherStrap_LeatherBase_MetalHand - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Leather strap, Wooden base, metal hand */ -item ProstLowerArm_LeatherStrap_WoodenBase_MetalHand - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Leather strap, Metal base, metal hand */ -item ProstLowerArm_LeatherStrap_MetalBase_MetalHand - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Leather strap, leather base, Metal Hook */ -item ProstLowerArm_LeatherStrap_LeatherBase_MetalHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Leather strap, Wooden base, Metal Hook */ -item ProstLowerArm_LeatherStrap_WoodenBase_MetalHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Leather strap, Metal base, Metal Hook */ -item ProstLowerArm_LeatherStrap_MetalBase_Metalook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - - -/* Leather strap, leather base, Metal Knife */ -item ProstLowerArm_LeatherStrap_LeatherBase_MetalKnife - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Leather strap, Wooden base, Metal Knife */ -item ProstLowerArm_LeatherStrap_WoodenBase_MetalKnife - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Leather strap, Metal base, Metal Knife */ -item ProstLowerArm_LeatherStrap_MetalBase_MetalKnife - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - - - - -/* Leather strap, leather base, Wooden Hook */ -item ProstLowerArm_LeatherStrap_LeatherBase_WoodenHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Leather strap, Wooden base, Wooden Hook */ -item ProstLowerArm_LeatherStrap_WoodenBase_WoodenHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Leather strap, Metal base, Wooden Hook */ -item ProstLowerArm_LeatherStrap_MetalBase_WoodenHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - - - - -/* Sheet strap, leather base, metal hand */ -item ProstLowerArm_LeatherStrap_LeatherBase_MetalHand - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Sheet strap, Wooden base, metal hand */ -item ProstLowerArm_SheetStrap_WoodenBase_MetalHand - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Sheet strap, Metal base, metal hand */ -item ProstLowerArm_SheetStrap_MetalBase_MetalHand - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Sheet strap, leather base, Metal Hook */ -item ProstLowerArm_SheetStrap_LeatherBase_MetalHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Sheet strap, Wooden base, Metal Hook */ -item ProstLowerArm_SheetStrap_WoodenBase_MetalHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Sheet strap, Metal base, Metal Hook */ -item ProstLowerArm_SheetStrap_MetalBase_Metalook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - - -/* Sheet strap, leather base, Metal Knife */ -item ProstLowerArm_SheetStrap_LeatherBase_MetalKnife - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Sheet strap, Wooden base, Metal Knife */ -item ProstLowerArm_SheetStrap_WoodenBase_MetalKnife - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Sheet strap, Metal base, Metal Knife */ -item ProstLowerArm_SheetStrap_MetalBase_MetalKnife - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - - - - -/* Sheet strap, leather base, Wooden Hook */ -item ProstLowerArm_SheetStrap_LeatherBase_WoodenHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Sheet strap, Wooden base, Wooden Hook */ -item ProstLowerArm_SheetStrap_WoodenBase_WoodenHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - -/* Sheet strap, Metal base, Wooden Hook */ -item ProstLowerArm_SheetStrap_MetalBase_WoodenHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - - - - -/* HANDS POSSIBLE PROSTHESIS COMBINATIONS */ - -/* Wooden Base, Metal Hand */ -item ProstHand_WoodenBase_MetalHand - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } -/* Wooden Base, Metal Hook */ -item ProstHand_WoodenBase_MetalHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } -/* Wooden Base, Metal Knife */ -item ProstHand_WoodenBase_MetalKnife - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } -/* Wooden Base, Wooden Hook */ -item ProstHand_WoodenBase_WoodenHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } - - - - -/* Metal Base, Metal Hand */ -item ProstHand_MetalBase_MetalHand - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } -/* Metal Base, Metal Hook */ -item ProstHand_MetalBase_MetalHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } -/* Metal Base, Metal Knife */ -item ProstHand_MetalBase_MetalKnife - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } -/* Metal Base, Wooden Hook */ -item ProstHand_MetalBase_WoodenHook - { - Weight = 1, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = DisplayName_WoodenHook, - Icon = woodenHook, - Tooltip = Tooltip_prosthesic_limb, - WorldStaticModel = TOC.WoodenHook, - } \ No newline at end of file diff --git a/python_helpers/main.py b/python_helpers/main.py deleted file mode 100644 index 5360261..0000000 --- a/python_helpers/main.py +++ /dev/null @@ -1,117 +0,0 @@ -import lxml.etree as gfg - - -def generate_clothing_item(): - root = gfg.Element("clothingItem") - - m_MaleModel = gfg.Element("m_MaleModel") - m_MaleModel.text = "TEST TEXT FROM SOMETHING" - root.append(m_MaleModel) - - m_FemaleModel = gfg.Element("m_FemaleModel") - m_FemaleModel.text = "TEST TEXT FROM SOMETHING FEMALE" - root.append(m_FemaleModel) - - m_GUID = gfg.Element("m_GUID") - m_GUID.text = "get guid" - root.append(m_GUID) - - m_Static = gfg.Element("m_Static") - m_Static.text = "false" - - m_AllowRandomTint = gfg.Element("m_AllowRandomTint") - m_AllowRandomTint.text = "false" - - # TODO Defined by the amount of textures that we're gonna pass - for x in range(2): - - textureChoices = gfg.Element("textureChoices") - textureChoices.text = "Texture path" - - tree = gfg.ElementTree(root) - - with open("Test_Name.xml", "wb") as file: - tree.write(file, encoding='utf-8', xml_declaration=True, pretty_print=True ) - - -def generate_recipe(recipe_name, recipe_items, result_name, time, skill_required, tooltip): - # TODO Simple txt, so strings should be fine. - print("Generating recipe") - - root_element = f"recipe {recipe_name}\n" - root_element += "\t{\n" - - for item in recipe_items: - root_element += f"\t\t{item},\n" - - root_element += f"\n\n\t\tResult: {result_name},\n" - root_element += f"\t\tTime: {time:.2f},\n" - root_element += "\t\tNeedToBeLearn: true,\n" - root_element += "\t\tCanBeDoneFromFloor: false,\n" - root_element += "\t\tOnGiveXP: NoXP_OnGiveXP,\n" - root_element += f"\t\tSkillRequired: {skill_required[0]}={skill_required[1]},\n" - root_element += "\t\tCategory: Surgeon,\n" - root_element += f"\t\tTooltip: {tooltip},\n" - - root_element += "\t}" - - - with open("Test_recipe.txt", "wt") as file: - file.write(root_element) - file.close() - - - -def generate_item(item_name, weight, item_type, display_category, display_name, icon, tooltip, can_have_holes, clothing_item=None, body_location = None, blood_location = None): - # TODO This is a txt, so we're gonna use simple strings I guess - print("Generating item") - - root_element = f"item {item_name}\n" - root_element += "\t{\n" - - root_element += f"\t\tWeight = {weight},\n" - root_element += f"\t\tType = {item_type},\n" - root_element += f"\t\tDisplayCategory = {display_category},\n" - root_element += f"\t\tDisplayName = {display_name},\n" - - if item_type == "Clothing": - root_element += f"\t\tClothingItem = {clothing_item},\n" - root_element += f"\t\tBodyLocation = {body_location},\n" - root_element += f"\t\tBloodLocation = {blood_location},\n" - - root_element += f"\t\tIcon = {icon},\n" - root_element += f"\t\tTooltip = {tooltip},\n" - root_element += f"\t\tCanHaveHoles = {can_have_holes},\n" - - root_element += "\t}" - - - - with open("Test_Item.txt", "wt") as file: - file.write(root_element) - file.close() - - - -#generate_clothing_item() - - -recipe_name = "Test Recipe" -recipe_items = ["Ass", "Penis", "Shit=3"] -result_name = "Cum sock" -time = 10 -skill_required = ["Carpentry", "4"] -tooltip = "tooltip_test" - -generate_recipe(recipe_name, recipe_items, result_name, time, skill_required, tooltip) - - -item_name = "Ass Ass Ass" -weight = 100 -item_type = "Clothing" -display_category = "Prosthesis" -display_name = "Ass cock" -clothing_item = "ClothingItemSomethingProst" -body_location = "TOC_ArmRightProsthesis" - -generate_item(item_name, weight, item_type, display_category, display_name, "test_icon", "test_tooltip", "false", clothing_item, body_location, "Hands") \ No newline at end of file