HRiggs/The-Only-Cure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing stuff

Browse Source
This commit is contained in:
Pao
2023-03-19 22:47:06 +01:00
parent bf5a762ed2
commit 436d668096
62 changed files with 1228 additions and 1254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/clothing/clothingItems/Prost_Left_Hand_MetalHand.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Left_Hand_MetalHand_Male</m_MaleModel>
<m_FemaleModel>Prost_Left_Hand_MetalHand_Female</m_FemaleModel>
<m_GUID>2101af26-54b9-455b-abc0-7533ce37f84b</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\metal_base</textureChoices>
</clothingItem>

10
media/clothing/clothingItems/Prost_Left_Hand_MetalHook.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Left_Hand_Hook_Male</m_MaleModel>
<m_FemaleModel>Prost_Left_Hand_Hook_Female</m_FemaleModel>
<m_GUID>6b4f4e13-d51f-48ab-80b0-6e0923650fc4</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\metal_base</textureChoices>
</clothingItem>

10
media/clothing/clothingItems/Prost_Left_Hand_WoodenHook.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Left_Hand_Hook_Male</m_MaleModel>
<m_FemaleModel>Prost_Left_Hand_Hook_Female</m_FemaleModel>
<m_GUID>0def629e-fe4f-4485-bdae-2d6032e150be</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\wood_base</textureChoices>
</clothingItem>

10
media/clothing/clothingItems/Prost_Left_LowerArm_LeatherBase_MetalHook.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<clothingItem>
<m_MaleModel>Prost_Left_LowerArm_LeatherBase_MetalHook_Male</m_MaleModel>
<m_FemaleModel>Prost_Left_LowerArm_LeatherBase_MetalHook_Female</m_FemaleModel>
<m_GUID>129ee688-d4bb-4297-8eb2-f88974001217</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\metal_hook_male</textureChoices>
<textureChoices>Prosthesis\metal_hook_female</textureChoices>
</clothingItem>

10
media/clothing/clothingItems/Prost_Left_LowerArm_MetalHand.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Left_LowerArm_MetalHand_Male</m_MaleModel>
<m_FemaleModel>Prost_Left_LowerArm_MetalHand_Female</m_FemaleModel>
<m_GUID>0405a4c0-f71b-45a8-9edc-489fc81dca39</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\metal_base</textureChoices>
</clothingItem>

11
media/clothing/clothingItems/Prost_Left_LowerArm_MetalHook.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Left_LowerArm_Hook_Male</m_MaleModel>
<m_FemaleModel>Prost_Left_LowerArm_Hook_Female</m_FemaleModel>
<m_GUID>129ee688-d4bb-4297-8eb2-f88974001217</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\metal_hook_male</textureChoices>
<textureChoices>Prosthesis\metal_hook_female</textureChoices>
</clothingItem>

11
media/clothing/clothingItems/Prost_Left_LowerArm_WoodenHook.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Left_LowerArm_Hook_Male</m_MaleModel>
<m_FemaleModel>Prost_Left_LowerArm_Hook_Female</m_FemaleModel>
<m_GUID>aea8e02a-cba0-48d0-9eb0-7087651306b0</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\wood_hook_male</textureChoices>
<textureChoices>Prosthesis\wood_hook_female</textureChoices>
</clothingItem>

10
media/clothing/clothingItems/Prost_Right_Hand_MetalHand.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Right_Hand_MetalHand_Male</m_MaleModel>
<m_FemaleModel>Prost_Right_Hand_MetalHand_Female</m_FemaleModel>
<m_GUID>731c280a-9682-4e2e-84cf-470bf00dd02f</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\metal_base</textureChoices>
</clothingItem>

10
media/clothing/clothingItems/Prost_Right_Hand_MetalHook.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Right_Hand_Hook_Male</m_MaleModel>
<m_FemaleModel>Prost_Right_Hand_Hook_Female</m_FemaleModel>
<m_GUID>dd7b749b-7e81-4547-91b0-81b1a1e9f7b8</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\metal_base</textureChoices>
</clothingItem>

10
media/clothing/clothingItems/Prost_Right_Hand_WoodenHook.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Right_Hand_Hook_Male</m_MaleModel>
<m_FemaleModel>Prost_Right_Hand_Hook_Female</m_FemaleModel>
<m_GUID>1fcc7523-d577-4cb0-a019-f077ef281d3a</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\wood_base</textureChoices>
</clothingItem>

10
media/clothing/clothingItems/Prost_Right_LowerArm_LeatherBase_MetalHook.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<clothingItem>
<m_MaleModel>Prost_Right_LowerArm_Hook_Male</m_MaleModel>
<m_FemaleModel>Prost_Right_LowerArm_Hook_Female</m_FemaleModel>
<m_GUID>1eb56768-d7ef-46e4-ac07-91d0e43d15fb</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\metal_hook_male</textureChoices>
<textureChoices>Prosthesis\metal_hook_female</textureChoices>
</clothingItem>

10
media/clothing/clothingItems/Prost_Right_LowerArm_MetalHand.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Right_LowerArm_MetalHand_Male</m_MaleModel>
<m_FemaleModel>Prost_Right_LowerArm_MetalHand_Female</m_FemaleModel>
<m_GUID>27758f1e-6298-42eb-b027-b9be31465c11</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\metal_base</textureChoices>
</clothingItem>

11
media/clothing/clothingItems/Prost_Right_LowerArm_MetalHook.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Right_LowerArm_Hook_Male</m_MaleModel>
<m_FemaleModel>Prost_Right_LowerArm_Hook_Female</m_FemaleModel>
<m_GUID>1eb56768-d7ef-46e4-ac07-91d0e43d15fb</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\metal_hook_male</textureChoices>
<textureChoices>Prosthesis\metal_hook_female</textureChoices>
</clothingItem>

11
media/clothing/clothingItems/Prost_Right_LowerArm_WoodenHook.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<clothingItem>
<m_MaleModel>Prost_Right_LowerArm_Hook_Male</m_MaleModel>
<m_FemaleModel>Prost_Right_LowerArm_Hook_Female</m_FemaleModel>
<m_GUID>714b78a7-8895-4f48-a29d-b6f12909db0e</m_GUID>
<m_Static>false</m_Static>
<m_AllowRandomHue>false</m_AllowRandomHue>
<m_AllowRandomTint>false</m_AllowRandomTint>
<textureChoices>Prosthesis\wood_hook_male</textureChoices>
<textureChoices>Prosthesis\wood_hook_female</textureChoices>
</clothingItem>

8
media/lua/client/ActionsMethods/TOC_LocalActions.lua
View File

@@ -32,12 +32,12 @@ function TOC_LocalActions.Operate(_, player, partName, useOven)
end
end
-- TODO This is gonna get deleted
function TOC_LocalActions.EquipProsthesis(_, player, partName)
local surgeonInv = player:getInventory()
local prosthesisToEquip = surgeonInv:getItemFromType('TOC.MetalHand') or
surgeonInv:getItemFromType('TOC.MetalHook') or
surgeonInv:getItemFromType('TOC.WoodenHook')
-- TODO Find a better way to filter objects. Disabled for now and only gets LeatherBase
local prosthesisToEquip = surgeonInv:getItemFromType('TOC.ProstNormal_LeatherBase_MetalHook')
if prosthesisToEquip then
ISTimedActionQueue.add(TOC_InstallProsthesisAction:new(player, player, prosthesisToEquip, partName))
else

4
media/lua/client/TOC_ProsthesisHandler.lua
View File

@@ -78,6 +78,10 @@ function GenerateEquippedProsthesis(prosthesisItem, inventory, limb)
-- durability_top, speed_top = GetProsthesisStats(top_table, prosthesis_name)
end
local equippedProsthesisName = TocFindCorrectClothingProsthesis()
local equippedProsthesis = inventory:AddItem(prosthesisName)
equippedProsthesis:setCondition(prosthesisItem:getCondition())

BIN
media/models_X/Prost_Left_LowerArm_Hook_Male.fbx
View File

Binary file not shown.

BIN
media/models_X/Prost_Right_LowerArm_Hook_Male.fbx
View File

Binary file not shown.

BIN
media/models_X/WorldItems/MetalHook.fbx Normal file
View File

Binary file not shown.

BIN
media/models_X/WorldItems/Prostetic1_.fbx Normal file
View File

Binary file not shown.

BIN
media/models_X/WorldItems/Prosthetic1_Hook.fbx Normal file
View File

Binary file not shown.

1066
media/scripts/TOC_items.txt
View File

File diff suppressed because it is too large Load Diff

2
media/scripts/TOC_models.txt
View File

@@ -2,7 +2,7 @@ module TOC
{
model MetalHook
{
mesh = WorldItems/hook,
mesh = WorldItems/Prosthetic1_Hook,
texture = WorldItems/metal,
scale = 0.15,
}