fix: relayed amputations

Updated string constants for prosthetic limbs and body locations.

.gitignore

@@ -0,0 +1,2 @@
+dev_stuff/gen_amp_textures/.venv
+dev_stuff/gen_amp_textures/output

.vscode/tasks.json

@@ -9,12 +9,7 @@
             "options": {"statusbar": {"label": "$(combine) Assemble Mod - B42"}},
             "command": "python ${config:zomboid_user_folder}/PaosCrap/make_workshop_pack.py \"42\" \"picch\" \"${workspaceFolderBasename}\" \"\"",
         },
-        {
+        
-            "label": "Create Workshop folder",
-            "type": "shell",
-            "options": {"statusbar": {"label": "$(combine) Assemble Mod - B41"}},
-            "command": "python ${config:zomboid_user_folder}/PaosCrap/make_workshop_pack.py \"41\" \"picch\" \"${workspaceFolderBasename}\" \"\"",
-        },
         {
             "label": "Create Workshop folder",
             "type": "shell",
@@ -33,24 +28,27 @@
             "presentation": {
                 "group": "groupZomboid"
             },
-            "command": "\"${config:zomboid_folder_b42}\\ProjectZomboid64 - nosteam-debug 42.bat\"",
+            "command": "\"${config:zomboid_folder_b42}\\ProjectZomboid64_Debug_NoSteam.bat\"",
             "options": {"statusbar": {"label": "$(run) Zomboid client (42)"}},
             "problemMatcher": [
                 "$eslint-stylish"
             ]
+            
         },
         {
-            "label": "Run Zomboid Debug No Steam (41)",
+            "label": "Run Zomboid Debug No Steam (42) - 2nd Instance",
             "type": "shell",
             "presentation": {
                 "group": "groupZomboid"
             },
-            "command": "\"${config:zomboid_folder_b41}\\ProjectZomboid64 - nosteam-debug.bat\"",
+            "command": "\"${config:zomboid_folder_b42}\\ProjectZomboid64_Debug_NoSteam.bat\"",
-            "options": {"statusbar": {"label": "$(run) Zomboid client (41)"}},
+            "options": {"statusbar": {"label": "$(run) Zomboid client (42) - 2nd Instance"}},
             "problemMatcher": [
                 "$eslint-stylish"
             ]
+            
         },
+
         // {
         //     "label": "Run Zomboid Debug No Steam",
         //     "type": "shell",
@@ -84,15 +82,15 @@
         //         "Run Zomboid Debug No Steam", "Run Zomboid Debug No Steam 2"],
         //     "problemMatcher": []
         // },
-        // {
+        {
-        //     "label": "Run Zomboid Test Server",
+            "label": "Run Zomboid Test Server",
-        //     "options": {"statusbar": {"label": "$(run) Zomboid Server (TOC)"}},
+            "options": {"statusbar": {"label": "$(run) Zomboid Server (TOC)"}},
-        //     "type": "shell",
+            "type": "shell",
-        //     "command":"\"${config:zomboid_server_folder}\\StartServer64_nosteam_custom.bat\" TOC",
+            "command":"\"${config:zomboid_server_folder}\\StartServer64_nosteam_custom.bat\" TOC",
-        //     "problemMatcher": [
+            "problemMatcher": [
-        //         "$eslint-stylish"
+                "$eslint-stylish"
-        //     ]
+            ]
-        // },
+        },
         // {
         //     "label": "Run Zomboid Test Server 2",
         //     "options": {"statusbar": {"label": "$(run) Zomboid Server (TOC+FH+BH)"}},

42/media/clothing/clothingItems/Amputation_ForeArm_L.xml

@@ -7,9 +7,10 @@
     <m_AllowRandomHue>false</m_AllowRandomHue>
     <m_AllowRandomTint>false</m_AllowRandomTint>
 
-	<m_Masks>3</m_Masks>
 	<m_Masks>4</m_Masks>
+	<m_Masks>3</m_Masks>
 
+    <!-- <m_UnderlayMasksFolder>media/textures/Amputations/Masks</m_UnderlayMasksFolder> -->
 
     
     <!-- HUMAN -->

42/media/clothing/clothingItems/Amputation_ForeArm_R.xml

@@ -10,6 +10,8 @@
     <m_Masks>5</m_Masks>
     <m_Masks>6</m_Masks>
     
+    <!-- <m_UnderlayMasksFolder>media/textures/Amputations/Masks</m_UnderlayMasksFolder> -->
+
     <!-- HUMAN -->
     <textureChoices>Amputations\Human\Forearm\skin01_b</textureChoices>
     <textureChoices>Amputations\Human\Forearm\skin02_b</textureChoices>

42/media/clothing/clothingItems/Amputation_Hand_L.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<clothingItem>
+    <m_MaleModel>Amputation\Amputation_Left_Hand_Male</m_MaleModel>
+    <m_FemaleModel>Amputation\Amputation_Left_Hand_Female</m_FemaleModel>
+    <m_GUID>2de93af2-b7a8-4c04-84d1-28d92cce8a0f</m_GUID>
+    <m_Static>false</m_Static>
+    <m_AllowRandomHue>false</m_AllowRandomHue>
+    <m_AllowRandomTint>false</m_AllowRandomTint>
+    <m_Masks>4</m_Masks>
+    <!-- <m_MasksFolder>none</m_MasksFolder> -->
+    
+    <!-- HUMAN -->
+    <textureChoices>Amputations\Human\Hand\skin01_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin02_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin03_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin04_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin05_b</textureChoices>
+
+    <textureChoices>Amputations\Human\Hand\skin01_hairy_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin02_hairy_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin03_hairy_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin04_hairy_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin05_hairy_b</textureChoices>
+
+    <!-- HUMAN AFTER CICATRIZATION -->
+
+    <textureChoices>Body\MaleBody01</textureChoices>
+    <textureChoices>Body\MaleBody02</textureChoices>
+    <textureChoices>Body\MaleBody03</textureChoices>
+    <textureChoices>Body\MaleBody04</textureChoices>
+    <textureChoices>Body\MaleBody05</textureChoices>
+
+    <textureChoices>Body\MaleBody01a</textureChoices>
+    <textureChoices>Body\MaleBody02a</textureChoices>
+    <textureChoices>Body\MaleBody03a</textureChoices>
+    <textureChoices>Body\MaleBody04</textureChoices>
+    <textureChoices>Body\MaleBody05a</textureChoices>
+    
+</clothingItem>

42/media/clothing/clothingItems/Amputation_Hand_R.xml

@@ -0,0 +1,37 @@
+<clothingItem>
+    <m_MaleModel>Amputation\Amputation_Right_Hand_Male</m_MaleModel>
+    <m_FemaleModel>Amputation\Amputation_Right_Hand_Female</m_FemaleModel>
+    <m_GUID>f114e53a-b92e-4639-8d8c-2b43ab981885</m_GUID>
+    <m_Static>false</m_Static>
+    <m_AllowRandomHue>false</m_AllowRandomHue>
+    <m_AllowRandomTint>false</m_AllowRandomTint>
+    <m_Masks>6</m_Masks>
+    <!-- <m_MasksFolder>none</m_MasksFolder> -->
+    
+    <!-- HUMAN -->
+    <textureChoices>Amputations\Human\Hand\skin01_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin02_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin03_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin04_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin05_b</textureChoices>
+
+    <textureChoices>Amputations\Human\Hand\skin01_hairy_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin02_hairy_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin03_hairy_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin04_hairy_b</textureChoices>
+    <textureChoices>Amputations\Human\Hand\skin05_hairy_b</textureChoices>
+
+    <!-- HUMAN AFTER CICATRIZATION -->
+
+    <textureChoices>Body\MaleBody01</textureChoices>
+    <textureChoices>Body\MaleBody02</textureChoices>
+    <textureChoices>Body\MaleBody03</textureChoices>
+    <textureChoices>Body\MaleBody04</textureChoices>
+    <textureChoices>Body\MaleBody05</textureChoices>
+
+    <textureChoices>Body\MaleBody01a</textureChoices>
+    <textureChoices>Body\MaleBody02a</textureChoices>
+    <textureChoices>Body\MaleBody03a</textureChoices>
+    <textureChoices>Body\MaleBody04</textureChoices>
+    <textureChoices>Body\MaleBody05a</textureChoices>
+</clothingItem>

42/media/clothing/clothingItems/Amputation_UpperArm_L.xml

@@ -9,6 +9,8 @@
     <m_Masks>3</m_Masks>
     <m_Masks>4</m_Masks>
     
+    <!-- <m_UnderlayMasksFolder>media/textures/Amputations/Masks</m_UnderlayMasksFolder> -->
+
     <!-- HUMAN -->
     <textureChoices>Amputations\Human\Upperarm\skin01_b</textureChoices>
     <textureChoices>Amputations\Human\Upperarm\skin02_b</textureChoices>

42/media/clothing/clothingItems/Amputation_UpperArm_R.xml

@@ -8,6 +8,7 @@
     <m_AllowRandomTint>false</m_AllowRandomTint>
     <m_Masks>5</m_Masks>
     <m_Masks>6</m_Masks>
+    <!-- <m_UnderlayMasksFolder>media/textures/Amputations/Masks</m_UnderlayMasksFolder> -->
 
     <!-- HUMAN -->
     <textureChoices>Amputations\Human\Upperarm\skin01_b</textureChoices>

42/media/lua/client/TOC-42/Controllers/LimitActionsController.lua

@@ -1,10 +0,0 @@
-local LimitActionsController = require("TOC/Controllers/LimitActionsController")     -- declared in common
-local OverridenMethodsArchive = require("TOC/OverridenMethodsArchive")
-
-local og_ISClothingExtraAction_isValid = OverridenMethodsArchive.Get("ISClothingExtraAction_isValid")
----@diagnostic disable-next-line: duplicate-set-field
-function ISClothingExtraAction:isValid()
-    TOC_DEBUG.print("Inside ISClothingExtraAction:isValid 42")
-    TOC_DEBUG.print(OverridenMethodsArchive.Get("ISClothingExtraAction_isValid"))
-    return LimitActionsController.WrapClothingAction(self, og_ISClothingExtraAction_isValid, instanceItem(self.extra))
-end

42/media/lua/client/TOC-42/Handlers/ProsthesisHandler.lua

@@ -1,40 +0,0 @@
-local ProsthesisHandler = require("TOC/Handlers/ProsthesisHandler")     -- declared in common
-local OverridenMethodsArchive = require("TOC/OverridenMethodsArchive")
-
-
-
-local og_ISClothingExtraAction_isValid = OverridenMethodsArchive.Get("ISClothingExtraAction_isValid")
----@diagnostic disable-next-line: duplicate-set-field
-function ISClothingExtraAction:isValid()
-    local isEquippable = og_ISClothingExtraAction_isValid(self)
-    -- self.extra is a string, not the item
-    local testItem = instanceItem(self.extra)
-    return ProsthesisHandler.Validate(testItem, isEquippable)
-end
-
-
-local og_ISClothingExtraAction_perform = OverridenMethodsArchive.Get("ISClothingExtraAction_perform")
-function ISClothingExtraAction:perform()
-    local extraItem = instanceItem(self.extra)
-    ProsthesisHandler.SearchAndSetupProsthesis(extraItem, true)
-    og_ISClothingExtraAction_perform(self)
-end
-
-
-local og_ISUnequipAction_complete = ISUnequipAction.complete
-function ISUnequipAction:complete()
-    -- Horrendous workaround. For B42, as of now, it will basically happen two times, once with :perform and once with :complete. Shouldn't
-    -- matter for performance but it's really ugly.
-    local isProst = ProsthesisHandler.SearchAndSetupProsthesis(self.item, false)
-    local group
-    if isProst then
-        group = BodyLocations.getGroup("Human")
-        group:setMultiItem("TOC_ArmProst", false)
-    end
-    og_ISUnequipAction_complete(self)
-
-    if isProst then
-        group:setMultiItem("TOC_ArmProst", true)
-    end
-
-end

42/media/lua/client/TOC/ClientRelayCommands.lua

@@ -12,7 +12,7 @@ local ClientRelayCommands = {}
 local function InitAmputationHandler(limbName, surgeonNum)
 
     -- TODO Pretty unclean
-    local surgeonPl = getSpecificPlayer(surgeonNum)
+    local surgeonPl = getSpecificPlayer(surgeonNum)     -- fix broken, getOnlineID not working anymore
     local handler = AmputationHandler:new(limbName, surgeonPl)
     return handler
 end
@@ -46,6 +46,14 @@ function ClientRelayCommands.ReceiveApplyFromServer()
 end
 
 
+--* WEAR AMPUTATION ITEM *--
+function ClientRelayCommands.ReceiveWearAmputation(args)
+    local itemName = args.itemName
+    local clothingItem = getPlayer():getInventory():FindAndReturn(itemName)
+    getPlayer():setWornItem(clothingItem:getBodyLocation(), clothingItem)
+
+end
+
 --* TRIGGERED BY ADMINS *--
 
 function ClientRelayCommands.ReceiveExecuteInitialization()

42/media/lua/client/TOC/Controllers/LimitActionsController.lua

@@ -36,11 +36,12 @@ end
 
 
 
-
+-- We need to override when the player changes key binds manually to be sure that TOC changes are re-applied
-
+local og_MainOptions_apply = MainOptions.apply
-
+function MainOptions:apply(closeAfter)
-
+    og_MainOptions_apply(self, closeAfter)
-
+    CachedDataHandler.OverrideBothHandsFeasibility()
+end
 
 
 --------------------------------------------
@@ -396,7 +397,7 @@ end
 local og_ISClothingExtraAction_isValid = OverridenMethodsArchive.Save("ISClothingExtraAction_isValid", ISClothingExtraAction.isValid)
 ---@diagnostic disable-next-line: duplicate-set-field
 function ISClothingExtraAction:isValid()
-    return LimitActionsController.WrapClothingAction(self, og_ISClothingExtraAction_isValid, InventoryItemFactory.CreateItem(self.extra))
+    return LimitActionsController.WrapClothingAction(self, og_ISClothingExtraAction_isValid, instanceItem(self.extra))
 end
 
 

42/media/lua/client/TOC/Controllers/LocalPlayerController.lua

@@ -1,8 +1,11 @@
 local DataController = require("TOC/Controllers/DataController")
 local CommonMethods = require("TOC/CommonMethods")
 local CachedDataHandler = require("TOC/Handlers/CachedDataHandler")
+local CommandsData = require("TOC/CommandsData")
+
 local StaticData = require("TOC/StaticData")
 require("TOC/Events")
+local TOC = require("TOC/Registries")
 -----------
 
 
@@ -37,8 +40,7 @@ function LocalPlayerController.InitializePlayer(isForced)
 
     -- Since isForced is used to reset an existing player data, we're gonna clean their ISHealthPanel table too
     if isForced then
-        local ItemsController = require("TOC/Controllers/ItemsController")
+        sendClientCommand(CommandsData.modules.TOC_ITEMS, "DeleteAllOldAmputationItems", {playerNum = playerObj:getOnlineID()})
-        ItemsController.Player.DeleteAllOldAmputationItems(playerObj)
         CachedDataHandler.Setup(username)
     end
 
@@ -56,7 +58,7 @@ function LocalPlayerController.ManageTraits()
 
     local AmputationHandler = require("TOC/Handlers/AmputationHandler")
     for k, v in pairs(StaticData.TRAITS_BP) do
-        if playerObj:HasTrait(k) then
+        if playerObj:hasTrait(TOC.traits[k]) then
             -- Once we find one, we should be done since they're exclusive
             TOC_DEBUG.print("Player has amputation trait " .. k .. ", executing it")
             local tempHandler = AmputationHandler:new(v, playerObj)
@@ -93,7 +95,8 @@ function LocalPlayerController.HealArea(bodyPart)
     bodyPart:setBleedingTime(0)
 
     bodyPart:SetBitten(false)
-    bodyPart:setBiteTime(0)
+    --bodyPart:setBiteTime(0)
+    bodyPart:SetInfected(false)
 
     bodyPart:setCut(false)
     bodyPart:setCutTime(0)
@@ -110,14 +113,14 @@ end
 ---@param bodyPart BodyPart
 ---@param limbName string
 ---@param dcInst DataController
-function LocalPlayerController.HealZombieInfection(bodyDamage, bodyPart, limbName, dcInst)
+function LocalPlayerController.HealZombieInfection(bodyDamage, limbName, dcInst)
+    -- FIX Different in B42.13, to be set with stats?
     if bodyDamage:isInfected() == false then return end
 
     bodyDamage:setInfected(false)
     bodyDamage:setInfectionMortalityDuration(-1)
     bodyDamage:setInfectionTime(-1)
-    bodyDamage:setInfectionLevel(-1)
+    --bodyPart:SetInfected(false)
-    bodyPart:SetInfected(false)
 
     dcInst:setIsInfected(limbName, false)
     dcInst:apply()
@@ -183,7 +186,7 @@ function LocalPlayerController.HandleDamage(character)
             -- Special case for bites\zombie infections
             if bodyPart:IsInfected() then
                 TOC_DEBUG.print("Healed from zombie infection - " .. limbName)
-                LocalPlayerController.HealZombieInfection(bd, bodyPart, limbName, dcInst)
+                LocalPlayerController.HealZombieInfection(bd, limbName, dcInst)
             end
         else
             if (bodyPart:bitten() or bodyPart:IsInfected()) and not dcInst:getIsInfected(limbName) then
@@ -317,9 +320,10 @@ function LocalPlayerController.HandleSetCicatrization(dcInst, playerObj, limbNam
     dcInst:setIsCicatrized(limbName, true)
     dcInst:setCicatrizationTime(limbName, 0)
 
-    -- Set visuals for the amputation
+    -- -- Set visuals for the amputation
-    local ItemsController = require("TOC/Controllers/ItemsController")
+    sendClientCommand(CommandsData.modules.TOC_ITEMS, "OverrideAmputationItemVisuals", 
-    ItemsController.Player.OverrideAmputationItemVisuals(playerObj, limbName, true)
+    {playerNum = playerObj:getOnlineID(), limbName = limbName, isCicatrized = true})
+
 end
 
 --* Object drop handling when amputation occurs

42/media/lua/client/TOC/Controllers/TourniquetController.lua

@@ -64,18 +64,18 @@ end
 ---@param obj any  self 
 ---@param wrappedFunc function
 function TourniquetController.WrapClothingAction(obj, wrappedFunc)
-    local isTourniquet = TourniquetController.IsItemTourniquet(obj.item:getFullType())
+    -- local isTourniquet = TourniquetController.IsItemTourniquet(obj.item:getFullType())
-    local group
+    -- local group
-    if isTourniquet then
+    -- if isTourniquet then
-        group = BodyLocations.getGroup("Human")
+    --     group = BodyLocations.getGroup("Human")
-        group:setMultiItem(TourniquetController.bodyLoc, false)
+    --     group:setMultiItem(TourniquetController.bodyLoc, false)
-    end
+    -- end
 
     local ogValue = wrappedFunc(obj)
 
-    if isTourniquet then
+    -- if isTourniquet then
-        group:setMultiItem(TourniquetController.bodyLoc, true)
+    --     group:setMultiItem(TourniquetController.bodyLoc, true)
-    end
+    -- end
 
     return ogValue      -- Needed for isValid
 end

42/media/lua/client/TOC/Handlers/AmputationHandler.lua

@@ -1,5 +1,8 @@
+-- TODO Move this to server side for 42.13
+
+
 local DataController = require("TOC/Controllers/DataController")
-local ItemsController = require("TOC/Controllers/ItemsController")
+local CommandsData = require("TOC/CommandsData")
 local CachedDataHandler = require("TOC/Handlers/CachedDataHandler")
 local LocalPlayerController = require("TOC/Controllers/LocalPlayerController")
 local StaticData = require("TOC/StaticData")
@@ -152,11 +155,11 @@ function AmputationHandler:damageAfterAmputation(surgeonFactor)
     bodyPart:setBleedingTime(baseDamage - surgeonFactor)
     bodyPart:setDeepWounded(true)
     bodyPart:setDeepWoundTime(baseDamage - surgeonFactor)
-    patientStats:setEndurance(surgeonFactor)
+    patientStats:set(CharacterStat.ENDURANCE, surgeonFactor)
-    patientStats:setStress(baseDamage - surgeonFactor)
+    patientStats:set(CharacterStat.STRESS, baseDamage - surgeonFactor)
 end
 
----Execute the amputation. This method doesn't check if the upper limb has been amputated or not, so if
+--- Execute the amputation. This method doesn't check if the upper limb has been amputated or not, so if
 --- somehow the method gets triggered and we're trying to cut off a part that doesn't really exist anymore,
 --- it will still be executed. This is by design, additional checks must be made BEFORE running the AmputationHandler
 ---@param damagePlayer boolean
@@ -174,8 +177,13 @@ function AmputationHandler:execute(damagePlayer)
     LocalPlayerController.HealArea(bodyPart)
 
     -- Give the player the correct amputation item
-    ItemsController.Player.DeleteOldAmputationItem(self.patientPl, self.limbName)
+
-    ItemsController.Player.SpawnAmputationItem(self.patientPl, self.limbName)
+    -- FIX This can be done in a single step instead of this crap
+    sendClientCommand(CommandsData.modules.TOC_ITEMS, "DeleteOldAmputationItem", 
+    {playerNum = self.patientPl:getOnlineID(), limbName = self.limbName})
+    sendClientCommand(CommandsData.modules.TOC_ITEMS, "SpawnAmputationItem", 
+    {playerNum = self.patientPl:getOnlineID(), limbName = self.limbName})
+
 
     -- Add it to the list of cut limbs on this local client
     local username = self.patientPl:getUsername()
@@ -190,8 +198,13 @@ function AmputationHandler:execute(damagePlayer)
     -- Cache highest amputation and hand feasibility
     CachedDataHandler.CalculateCacheableValues(username)
 
+    -- TODO Test this again for 42.13
     -- If the part was actually infected, heal the player, if they were in time (infectionLevel < 20)
-    if bd:getInfectionLevel() < 20 and bodyPart:IsInfected() and not dcInst:getIsIgnoredPartInfected() then
+    local infectionLevel = self.patientPl:getStats():get(CharacterStat.ZOMBIE_INFECTION)
+
+
+
+    if infectionLevel < 20 and bodyPart:IsInfected() and not dcInst:getIsIgnoredPartInfected() then
         LocalPlayerController.HealZombieInfection(bd, bodyPart, self.limbName, dcInst)
     end
 
@@ -203,7 +216,7 @@ function AmputationHandler:execute(damagePlayer)
     triggerEvent("OnAmputatedLimb", self.limbName)
 end
 
----Deletes the instance
+---Delete the instance
 function AmputationHandler:close()
     AmputationHandler.instance = nil
 end

42/media/lua/client/TOC/Handlers/CachedDataHandler.lua

@@ -23,7 +23,7 @@ end
 function CachedDataHandler.CalculateCacheableValues(username)
     CachedDataHandler.CalculateHighestAmputatedLimbs(username)
     if getPlayer():getUsername() == username then
-        CachedDataHandler.CalculateBothHandsFeasibility()
+        CachedDataHandler.OverrideBothHandsFeasibility()
     end
 end
 
@@ -130,14 +130,13 @@ function CachedDataHandler.GetHandFeasibility(side)
 
     -- FIX horrendous workaround, but with a forced init we run the caching too early and it breaks this, setting it to nil.
     if CachedDataHandler.handFeasibility[side] == nil then
-        CachedDataHandler.CalculateBothHandsFeasibility()
+        CachedDataHandler.OverrideBothHandsFeasibility()
     end
 
     return CachedDataHandler.handFeasibility[side]
 end
 
-
+function CachedDataHandler.OverrideBothHandsFeasibility()
-function CachedDataHandler.CalculateBothHandsFeasibility()
     CachedDataHandler.CalculateHandFeasibility("Hand_L")
     CachedDataHandler.CalculateHandFeasibility("Hand_R")
     local interactStr = "Interact"
@@ -151,13 +150,23 @@ function CachedDataHandler.CalculateBothHandsFeasibility()
     if not CachedDataHandler.GetBothHandsFeasibility() then
         TOC_DEBUG.print("Disabling interact key")
         TOC_DEBUG.print("Cached current key for interact: " .. tostring(CachedDataHandler.interactKey))
-        getCore():addKeyBinding(interactStr, Keyboard.KEY_NONE)
-    else
-        TOC_DEBUG.print("Re-enabling interact key")
-        TOC_DEBUG.print("Cached current key for interact: " .. tostring(CachedDataHandler.interactKey))
 
+        if StaticData.COMPAT_42 then
+		    getCore():addKeyBinding(interactStr, Keyboard.KEY_NONE, 0, false, false, false)
+        else
+            getCore():addKeyBinding(interactStr, Keyboard.KEY_NONE)
+
+        end
+    else
+        --TOC_DEBUG.print("Re-enabling interact key")
+        --TOC_DEBUG.print("Cached current key for interact: " .. tostring(CachedDataHandler.interactKey))
+
+        if StaticData.COMPAT_42 then
+		    getCore():addKeyBinding(interactStr, CachedDataHandler.interactKey, 0, false, false, false)
+        else
             getCore():addKeyBinding(interactStr, CachedDataHandler.interactKey)
         end
+    end
 end
 
 function CachedDataHandler.GetBothHandsFeasibility()
@@ -165,3 +174,4 @@ function CachedDataHandler.GetBothHandsFeasibility()
 end
 
 return CachedDataHandler
+

42/media/lua/client/TOC/Handlers/ProsthesisHandler.lua

@@ -9,21 +9,20 @@ local OverridenMethodsArchive = require("TOC/OverridenMethodsArchive")
 ---@class ProsthesisHandler
 local ProsthesisHandler = {}
 
-local bodyLocArmProst = StaticData.MOD_BODYLOCS_BASE_IND_STR.TOC_ArmProst
+local bodylocArmProstBaseline = "toc:toc_armprost"
-local bodyLocLegProst = StaticData.MOD_BODYLOCS_BASE_IND_STR.TOC_LegProst
+--local bodyLocLegProst = "TOC_LegProst"
 
 ---Check if the following item is a prosthesis or not
 ---@param item InventoryItem?
 ---@return boolean
 function ProsthesisHandler.CheckIfProst(item)
     -- TODO Won't be correct when prost for legs are gonna be in
-    --TOC_DEBUG.print("Checking if item is prost")
     if item == nil then
-        --TOC_DEBUG.print("Not prost")
+        TOC_DEBUG.print("Not prost")
 
         return false
     end
-    return item:getBodyLocation():contains(bodyLocArmProst)
+    return item:getBodyLocation():toString():contains(bodylocArmProstBaseline)
 end
 
 ---Get the grouping for the prosthesis
@@ -33,13 +32,10 @@ function ProsthesisHandler.GetGroup(item)
     local fullType = item:getFullType()
     local side = CommonMethods.GetSide(fullType)
 
-
     local bodyLocation = item:getBodyLocation()
     local position
-    if bodyLocation == bodyLocArmProst then
+    if bodyLocation:toString():contains(bodylocArmProstBaseline) then
         position = "Top_"
-    elseif bodyLocation == bodyLocLegProst then
-        position = "Bottom_"
     else
         TOC_DEBUG.print("Something is wrong, no position in this item")
         position = nil
@@ -86,7 +82,7 @@ function ProsthesisHandler.SearchAndSetupProsthesis(item, isEquipping)
     dcInst:apply()
 
     -- Calculates hands feasibility once again
-    CachedDataHandler.CalculateBothHandsFeasibility()
+    CachedDataHandler.OverrideBothHandsFeasibility()
     return true
 end
 
@@ -167,15 +163,15 @@ function ISUnequipAction:perform()
     ]]
 
     local isProst = ProsthesisHandler.SearchAndSetupProsthesis(self.item, false)
-    local group
+    -- local group
-    if isProst then
+    -- if isProst then
-        group = BodyLocations.getGroup("Human")
+    --     group = BodyLocations.getGroup("Human")
-        group:setMultiItem("TOC_ArmProst", false)
+    --     group:setMultiItem("TOC_ArmProst", false)
-    end
+    -- end
     og_ISUnequipAction_perform(self)
 
     if isProst then
-        group:setMultiItem("TOC_ArmProst", true)
+        -- group:setMultiItem("TOC_ArmProst", true)
 
         -- we need to fetch the limbname associated to the prosthesis
         local side = CommonMethods.GetSide(self.item:getFullType())

42/media/lua/client/TOC/Main.lua

@@ -6,7 +6,7 @@ require("TOC/Events")
 
 ---@class Main
 local Main = {
-    _version = "2.1.6"
+    _version = "2.3"
 }
 
 function Main.Start()

42/media/lua/client/TOC/TimedActions/CleanWoundAction.lua

@@ -87,7 +87,7 @@ function CleanWoundAction:perform()
 
     TOC_DEBUG.print("CleanWound for " .. self.otherPlayer:getUsername())
 
-    if self.character:HasTrait("Hemophobic") then
+    if self.character:hasTrait("Hemophobic") then
         self.character:getStats():setPanic(self.character:getStats():getPanic() + 15)
     end
 

42/media/lua/client/TOC/TimedActions/CutLimbAction.lua

@@ -24,9 +24,7 @@ local CutLimbAction = ISBaseTimedAction:derive("CutLimbAction")
 ---@param bandageItem InventoryItem?
 ---@return CutLimbAction
 function CutLimbAction:new(surgeon, patient, limbName, item, stitchesItem, bandageItem)
-    local o = {}
+    local o = ISBaseTimedAction.new(self, surgeon)
-    setmetatable(o, self)
-    self.__index = self
 
     -- We need to follow ISBaseTimedAction. self.character is gonna be the surgeon
     o.character = surgeon
@@ -43,12 +41,21 @@ function CutLimbAction:new(surgeon, patient, limbName, item, stitchesItem, banda
     o.stopOnWalk = true
     o.stopOnRun = true
 
-    o.maxTime = 1000 - (surgeon:getPerkLevel(Perks.Doctor) * 50)
+    o.maxTime = o:getDuration()
-    if o.character:isTimedActionInstant() then o.maxTime = 1 end
 
     return o
 end
 
+function CutLimbAction:getDuration()
+    if self.character:isTimedActionInstant() then
+        return 1
+    else
+        local baseTime = 1000
+        local perkLevel = self.character:getPerkLevel(Perks.Doctor)
+        return baseTime - (perkLevel * 50)
+    end
+end
+
 function CutLimbAction:isValid()
     return not ISHealthPanel.DidPatientMove(self.character,self.patient, self.patientX, self.patientY)
 end
@@ -89,6 +96,16 @@ function CutLimbAction:start()
 
 end
 
+-- function CutLimbAction:serverStart()
+
+--     emulateAnimEvent(self.netAction, 200, "")
+
+-- end
+
+-- function CutLimbAction:animEvent(event, parameter)
+
+-- end
+
 function CutLimbAction:waitToStart()
     if self.character == self.patient then
         return false
@@ -117,22 +134,30 @@ function CutLimbAction:stop()
 end
 
 function CutLimbAction:perform()
-    -- Stop the sound
     self:stopSound()
-
-    if self.patient == self.character then
-        TOC_DEBUG.print("patient and surgeon are the same, executing on the client")
-        local handler = AmputationHandler:new(self.limbName)
-        handler:execute(true)
-    else
-        TOC_DEBUG.print("patient and surgeon not the same, sending relay to server")
-        -- Other player
-        ---@type relayExecuteAmputationActionParams
-        local params = {patientNum = self.patient:getOnlineID(), limbName = self.limbName}
-        sendClientCommand(CommandsData.modules.TOC_RELAY, CommandsData.server.Relay.RelayExecuteAmputationAction, params )
-    end
-
     ISBaseTimedAction.perform(self)
 end
 
+function CutLimbAction:complete()
+    -- TODO AmputationHandler runs client side, by doing this this would run on the server. AM I missing something?
+    local handler = AmputationHandler:new(self.limbName, self.character)
+    handler:execute(true)
+end
+
+-- function CutLimbAction:perform()
+--     -- Stop the sound
+--     if self.patient == self.character then
+--         TOC_DEBUG.print("patient and surgeon are the same, executing on the client")
+--         local handler = AmputationHandler:new(self.limbName)
+--         handler:execute(true)
+--     else
+--         TOC_DEBUG.print("patient and surgeon not the same, sending relay to server")
+--         -- Other player
+--         ---@type relayExecuteAmputationActionParams
+--         local params = {patientNum = self.patient:getOnlineID(), limbName = self.limbName}
+--         sendClientCommand(CommandsData.modules.TOC_RELAY, CommandsData.server.Relay.RelayExecuteAmputationAction, params )
+--     end
+
+-- end
+
 return CutLimbAction

42/media/lua/client/TOC/UI/HealthPanel.lua

@@ -143,26 +143,6 @@ function ISHealthPanel:render()
 end
 
 
--- local og_ISHealthPanel_update = ISHealthPanel.update
--- function ISHealthPanel:update()
---     og_ISHealthPanel_update(self)
---     -- TODO Listen for changes on other player side instead of looping this
-
-
---     -- FIX Re-enable it, just for test
---     if self.character then
---         local locPlUsername = getPlayer():getUsername()
---         local remPlUsername = self.character:getUsername()
---         if locPlUsername ~= remPlUsername and self:isReallyVisible() then
---             -- Request update for TOC DATA
---             local key = CommandsData.GetKey(remPlUsername)
---             --ModData.request(key)
---         end
---     end
--- end
-
-
-
 -- We need to override this to force the alpha to 1
 local og_ISCharacterInfoWindow_render = ISCharacterInfoWindow.prerender
 function ISCharacterInfoWindow:prerender()

42/media/lua/client/TOC/UI/Interactions/HealthPanelBaseHandler.lua

@@ -33,7 +33,8 @@ function BaseHandler:checkItems()
     local containers = ISInventoryPaneContextMenu.getContainers(self:getDoctor())
     local done = {}
     local childContainers = {}
-    for i=1,containers:size() do
+    if containers ~= nil then
+        for i=1, containers:size() do
             local container = containers:get(i-1)
             done[container] = true
             table.wipe(childContainers)
@@ -45,6 +46,7 @@ function BaseHandler:checkItems()
                 end
             end
         end
+    end
 end
 
 function BaseHandler:checkContainerItems(container, childContainers)
@@ -101,7 +103,7 @@ function BaseHandler:getItemOfTag(items, type)
 end
 
 function BaseHandler:getAllItemsOfType(items, type)
-    local items = {}
+    items = {}
     for _,item in ipairs(items) do
         if item:getFullType() == type then
             table.insert(items, item)

42/media/lua/client/TOC/UI/SurgeryInteractions.lua

@@ -68,9 +68,10 @@ local function AddStoveContextMenu(playerNum, context, worldObjects, test)
 
 
             -- Notifications, in case the player can't do the action
-            local isPlayerCourageous = pl:HasTrait("Brave") or pl:HasTrait("Desensitized") or pl:getPerkLevel(Perks.Strength) > 5
+            local isPlayerCourageous = pl:hasTrait(CharacterTrait.BRAVE) or pl:hasTrait(CharacterTrait.DESENSITIZED) or pl:getPerkLevel(Perks.Strength) > 5
-            local isTempHighEnough = stoveObj:getCurrentTemperature() >= 250
+            local isTempHighEnough = stoveObj:getCurrentTemperature()-1 >= 2.50
             local isLimbFree = not dcInst:getIsProstEquipped(limbName)
+            TOC_DEBUG.print(stoveObj:getCurrentTemperature())
 
             option.notAvailable = not(isPlayerCourageous and isTempHighEnough and isLimbFree)
             if not isTempHighEnough then

42/media/lua/server/TOC/Controllers/ItemsController.lua

@@ -1,5 +1,9 @@
+-- TODO Should be server side in 42.13
+
 local StaticData = require("TOC/StaticData")
 local CommonMethods = require("TOC/CommonMethods")
+local CommandsData = require("TOC/CommandsData")
+
 ---------------------------
 
 --- Submodule to handle spawning the correct items after certain actions (ie: cutting a hand). LOCAL ONLY!
@@ -17,7 +21,6 @@ ItemsController.Player = {}
 ---@return number
 ---@private
 function ItemsController.Player.GetAmputationTexturesIndex(playerObj, isCicatrized)
-    -- FIX Broken
     local textureString = playerObj:getHumanVisual():getSkinTexture()
     local isHairy = textureString:sub(-1) == "a"
 
@@ -48,6 +51,8 @@ function ItemsController.Player.RemoveClothingItem(playerObj, clothingItem)
 
         ---@diagnostic disable-next-line: param-type-mismatch
         playerObj:getInventory():Remove(clothingItem) -- Umbrella is wrong, can be an InventoryItem too
+        sendRemoveItemFromContainer(playerObj:getInventory(), clothingItem)
+
         TOC_DEBUG.print("found and deleted" .. tostring(clothingItem))
 
         -- Reset model
@@ -79,23 +84,22 @@ end
 ---Deletes all the old amputation items, used for resets
 ---@param playerObj IsoPlayer
 function ItemsController.Player.DeleteAllOldAmputationItems(playerObj)
+    -- TODO Fix visual bug
     -- This part is a workaround for a pretty shitty implementation on the java side. Check ProsthesisHandler for more infos
-    local group = BodyLocations.getGroup("Human")
+    -- local group = BodyLocations.getGroup("Human")
-    group:setMultiItem("TOC_Arm", false)
+    -- group:setMultiItem("TOC_Arm", false)
-    group:setMultiItem("TOC_ArmProst", false)
+    -- group:setMultiItem("TOC_ArmProst", false)
 
     for i = 1, #StaticData.LIMBS_STR do
         local limbName = StaticData.LIMBS_STR[i]
+
+        -- TODO Won't work with dedicated clothingItems for multi amps
         local clothItemName = StaticData.AMPUTATION_CLOTHING_ITEM_BASE .. limbName
         local clothItem = playerObj:getInventory():FindAndReturn(clothItemName)
         ---@cast clothItem InventoryItem
         ItemsController.Player.RemoveClothingItem(playerObj, clothItem)
     end
-    -- Reset model just in case
-    playerObj:resetModel()
 
-    group:setMultiItem("TOC_Arm", true)
-    group:setMultiItem("TOC_ArmProst", true)
 end
 
 ---Spawns and equips the correct amputation item to the player.
@@ -103,12 +107,15 @@ end
 ---@param limbName string
 function ItemsController.Player.SpawnAmputationItem(playerObj, limbName)
     TOC_DEBUG.print("clothing name " .. StaticData.AMPUTATION_CLOTHING_ITEM_BASE .. limbName)
-    local clothingItem = playerObj:getInventory():AddItem(StaticData.AMPUTATION_CLOTHING_ITEM_BASE .. limbName)
+    local itemName = StaticData.AMPUTATION_CLOTHING_ITEM_BASE .. limbName
+    local clothingItem = playerObj:getInventory():AddItem(itemName)
+
     local texId = ItemsController.Player.GetAmputationTexturesIndex(playerObj, false)
 
     ---@cast clothingItem InventoryItem
     clothingItem:getVisual():setTextureChoice(texId) -- it counts from 0, so we have to subtract 1
-    playerObj:setWornItem(clothingItem:getBodyLocation(), clothingItem)
+    sendAddItemToContainer(playerObj:getInventory(), clothingItem)
+    sendServerCommand(playerObj, CommandsData.modules.TOC_RELAY, CommandsData.client.Relay.ReceiveWearAmputation, {itemName = itemName, texId = texId})
 end
 
 ---Search through worn items and modifies a specific amputation item

42/media/lua/server/TOC/ServerItemsCommands.lua

@@ -0,0 +1,44 @@
+require ("TOC/Debug")
+local CommandsData = require("TOC/CommandsData")
+local ItemsController = require("TOC/Controllers/ItemsController")
+
+--------------------------------------------
+
+local ServerItemsCommands = {}
+
+function ServerItemsCommands.SpawnAmputationItem(_, args)
+    local playerObj = getPlayerByOnlineID(args.playerNum)
+    local limbName = args.limbName
+    ItemsController.Player.SpawnAmputationItem(playerObj, limbName)
+end
+
+function ServerItemsCommands.DeleteOldAmputationItem(_, args)
+    local patientPl = getPlayerByOnlineID(args.playerNum)
+    local limbName = args.limbName
+
+    ItemsController.Player.DeleteOldAmputationItem(patientPl, limbName)
+end
+
+function ServerItemsCommands.DeleteAllOldAmputationItems(_, args)
+    local playerObj = getPlayerByOnlineID(args.playerNum)
+    ItemsController.Player.DeleteAllOldAmputationItems(playerObj)
+end
+
+function ServerItemsCommands.OverrideAmputationItemVisuals(_, args)
+    local playerObj = getPlayerByOnlineID(args.playerNum)
+    local limbName = args.limbName
+    local isCicatrized = args.isCicatrized
+
+    ItemsController.Player.OverrideAmputationItemVisuals(playerObj, limbName, isCicatrized)
+end
+
+
+--------------------------------------------------------------------
+local function OnClientItemsCommands(module, command, playerObj, args)
+    if module == CommandsData.modules.TOC_ITEMS and ServerItemsCommands[command] then
+        TOC_DEBUG.print("Received ItemsController command - " .. tostring(command))
+        ServerItemsCommands[command](playerObj, args)
+    end
+end
+
+Events.OnClientCommand.Add(OnClientItemsCommands)

42/media/lua/server/TOC/ServerRelayCommands.lua

@@ -21,7 +21,7 @@ end
 ---@param args relayExecuteAmputationActionParams
 function ServerRelayCommands.RelayExecuteAmputationAction(surgeonPl, args)
     local patientPl = getPlayerByOnlineID(args.patientNum)
-    local surgeonNum = surgeonPl:getOnlineID()
+    local surgeonNum = surgeonPl:getPlayerNum()
 
     ---@type receiveDamageDuringAmputationParams
     local params = {surgeonNum = surgeonNum, limbName = args.limbName, damagePlayer = true}
@@ -43,7 +43,7 @@ end
 ---@param args relayForcedAmputationParams
 function ServerRelayCommands.RelayForcedAmputation(adminObj, args)
     local patientPl = getPlayerByOnlineID(args.patientNum)
-    local adminNum = adminObj:getOnlineID()
+    local adminNum = adminObj:getPlayerNum()
 
     ---@type receiveDamageDuringAmputationParams
     local ampParams = {surgeonNum = adminNum, limbName = args.limbName, damagePlayer = false}        -- the only difference between relayExecuteAmputationAction and this is the damage
@@ -53,7 +53,11 @@ function ServerRelayCommands.RelayForcedAmputation(adminObj, args)
     sendServerCommand(patientPl, CommandsData.modules.TOC_RELAY, CommandsData.client.Relay.ReceiveForcedCicatrization, {limbName = args.limbName})
 end
 
-
+function ServerRelayCommands.DeleteAllOldAmputationItems(_, args)
+    local playerObj = getPlayerByOnlineID(args.playerNum)
+    local ItemsController = require("TOC/Controllers/ItemsController")
+    ItemsController.Player.DeleteAllOldAmputationItems(playerObj)
+end
 
 -------------------------
 

42/media/lua/shared/TOC/BodyLocations.lua

@@ -0,0 +1,109 @@
+--Based on RabenRabo's bodylocation solution from their mod "Fantasy Bodyparts" and "Fantasy Legs" sub-mod.
+--Modified by GanydeBielovzki with permission for batch use for the Frockin' Splendor franchise and spin-offs.
+--To copy, further modify or otherwise use this code the original creator and the modifier must be credited.
+
+local function copyBodyLocationProperties(oldGroup, oldLocID, newGroup)
+	for k = 0, oldGroup:size()-1 do
+		local otherLocID = oldGroup:getLocationByIndex(k):getId()
+		if oldGroup:isExclusive(oldLocID, otherLocID)
+		then
+			newGroup:setExclusive(oldLocID, otherLocID)
+		end
+		if oldGroup:isHideModel(oldLocID, otherLocID)
+		then
+			newGroup:setHideModel(oldLocID, otherLocID)
+		end
+		if oldGroup:isAltModel(oldLocID, otherLocID)
+		then
+			newGroup:setAltModel(oldLocID, otherLocID)
+		end
+	end
+end
+
+local function addBodyLocationsAt(groupName, locationList)
+	local results = {}
+
+	-- get list (!!actually a view!!) of all groups and copy to array (BodyLocations.reset() will also clear the view)
+	local allGroupsList = BodyLocations.getAllGroups()
+	local allGroups = {}
+	for i = 0, allGroupsList:size()-1 do
+		allGroups[i + 1] = allGroupsList:get(i)
+	end
+
+	BodyLocations.reset()
+
+	-- recreate all groups/bodylocations and insert new bodylocations
+	for i = 1, #allGroups do
+		local oldGroup = allGroups[i]
+		local newGroup = BodyLocations.getGroup(oldGroup:getId())
+
+		-- FIRST: Process all original locations AND insert new ones at correct positions
+		for j = 0, oldGroup:size()-1 do
+			local oldLoc = oldGroup:getLocationByIndex(j)
+			local oldLocID = oldLoc:getId()
+
+			-- For each location definition, check if it should be inserted here
+			for _, locDef in ipairs(locationList) do
+				if oldGroup:getId() == groupName then
+					local newLocID = type(locDef.name) ~= "string" and locDef.name or 
+								   ItemBodyLocation.get(ResourceLocation.of(locDef.name))
+
+					local refLocID = type(locDef.reference) ~= "string" and locDef.reference or 
+								   ResourceLocation.of(locDef.reference)
+
+					local isTargetGroupAndLoc = refLocID == oldLocID
+
+					if isTargetGroupAndLoc and locDef.before then
+						results[locDef.name] = newGroup:getOrCreateLocation(newLocID)
+					end
+				end
+			end
+
+			-- Add the original location
+			newGroup:getOrCreateLocation(oldLocID)
+
+			-- Check for "after" insertions
+			for _, locDef in ipairs(locationList) do
+				if oldGroup:getId() == groupName then
+					local newLocID = type(locDef.name) ~= "string" and locDef.name or 
+								   ItemBodyLocation.get(ResourceLocation.of(locDef.name))
+
+					local refLocID = type(locDef.reference) ~= "string" and locDef.reference or 
+								   ResourceLocation.of(locDef.reference)
+
+					local isTargetGroupAndLoc = refLocID == oldLocID
+
+					if isTargetGroupAndLoc and not locDef.before then
+						results[locDef.name] = newGroup:getOrCreateLocation(newLocID)
+					end
+				end
+			end
+		end
+
+		-- SECOND: copy bodylocation properties from old groups to new groups
+		for j = 0, oldGroup:size()-1 do
+			local oldLocID = oldGroup:getLocationByIndex(j):getId()
+			newGroup:setMultiItem(oldLocID, oldGroup:isMultiItem(oldLocID))
+			copyBodyLocationProperties(oldGroup, oldLocID, newGroup)
+		end
+	end
+
+	return results
+end
+
+local results = addBodyLocationsAt("Human", {
+    {name = "toc:Arm_L", reference = ItemBodyLocation.FULL_TOP, before = false},
+    {name = "toc:Arm_R", reference = ItemBodyLocation.FULL_TOP, before = false},
+    {name = "toc:ArmProst_L", reference = ItemBodyLocation.FULL_TOP, before = false},
+    {name = "toc:ArmProst_R", reference = ItemBodyLocation.FULL_TOP, before = false},
+    {name = "toc:ArmAccessory_L", reference = ItemBodyLocation.FULL_TOP, before = false},
+    {name = "toc:ArmAccessory_R", reference = ItemBodyLocation.FULL_TOP, before = false},
+})
+
+
+results['toc:Arm_L']:setMultiItem(true)
+results['toc:Arm_R']:setMultiItem(true)
+results['toc:ArmProst_L']:setMultiItem(true)
+results['toc:ArmProst_R']:setMultiItem(true)
+results['toc:ArmAccessory_L']:setMultiItem(true)
+results['toc:ArmAccessory_R']:setMultiItem(true)

42/media/lua/shared/TOC/CommandsData.lua

@@ -5,7 +5,8 @@ local CommandsData = {}
 
 CommandsData.modules = {
     TOC_DEBUG = "TOC_DEBUG",
-    TOC_RELAY = "TOC_RELAY"
+    TOC_RELAY = "TOC_RELAY",
+    TOC_ITEMS = "TOC_ITEMS"
 }
 
 CommandsData.client = {
@@ -15,6 +16,7 @@ CommandsData.client = {
 
         --* APPLY *--
         ReceiveApplyFromServer = "ReceiveApplyFromServer",
+        ReceiveWearAmputation = "ReceiveWearAmputation",
 
         --* ADMIN ONLY --*
         ReceiveExecuteInitialization = "ReceiveExecuteInitialization",

42/media/lua/shared/TOC/Debug.lua

@@ -13,10 +13,12 @@ end
 ---Print debug
 ---@param string string
 function TOC_DEBUG.print(string)
-    --if isDebugEnabled() then
+    if isDebugEnabled() then
         local runningFile = TOC_DEBUG.getRunningFile()
         print("[TOC]" .. "[" .. runningFile .. "] " .. tostring(string))
-    --end
+    else
+        print(string)
+    end
 end
 
 ---Horrendous but I don't really care about performance for this

42/media/lua/shared/TOC/Registries.lua

@@ -0,0 +1 @@
+return _TOCRegistries

42/media/lua/shared/TOC/StaticData.lua

@@ -5,7 +5,6 @@
 ---@alias tocModDataType { limbs : limbsTable, prostheses : prosthesesTable, isIgnoredPartInfected : boolean, isAnyLimbCut : boolean}
 ---------------------------
 
-
 -- _STR = Only strings, no index
 -- _IND_STR =  indexed Strings
 -- _IND_BPT = Indexed BodyPartType
@@ -50,12 +49,6 @@ StaticData.PARTS_STR = {
 }
 
 
-StaticData.MOD_BODYLOCS_BASE_IND_STR = {
-    TOC_ArmProst = "TOC_ArmProst",
-    TOC_LegProst = "TOC_LegProst",
-    TOC_Arm = "TOC_Arm",
-}
-
 -- No "MAX" here.
 StaticData.IGNORED_BODYLOCS_BPT = {
     BodyPartType.Foot_L, BodyPartType.Foot_R, BodyPartType.Groin, BodyPartType.Head,
@@ -149,6 +142,7 @@ StaticData.AMP_GROUPS_BASE_IND_STR = {
     Bottom = "Bottom"
 }
 
+-- FIX This should be aligned with the body locs, no reason anymore to keep it separated
 StaticData.AMP_GROUPS_IND_STR = {}
 StaticData.AMP_GROUPS_STR = {}
 
@@ -189,8 +183,8 @@ end
 
 
 StaticData.TOURNIQUET_BODYLOCS_TO_GROUPS_IND_STR = {
-    ["HandsLeft"] = StaticData.AMP_GROUPS_IND_STR.Top_L,
+    [ItemBodyLocation.HANDS_LEFT] = StaticData.AMP_GROUPS_IND_STR.Top_L,
-    ["HandsRight"] = StaticData.AMP_GROUPS_IND_STR.Top_R
+    [ItemBodyLocation.HANDS_RIGHT] = StaticData.AMP_GROUPS_IND_STR.Top_R
 }
 
 
@@ -238,7 +232,7 @@ end
 StaticData.TRAITS_BP = {
     Amputee_Hand = "Hand_L",
     Amputee_ForeArm = "ForeArm_L",
-    Amputee_UpperArm = "UpperArm_L"
+    Amputee_UpperArm = "UpperArm_L",
 }
 
 -----------------

42/media/lua/shared/Translate/FR/ContextMenu_FR.txt

@@ -4,17 +4,17 @@ ContextMenu_FR = {
     ContextMenu_Amputate_Stitch = "Amputer et suturer",
     ContextMenu_Amputate_Stitch_Bandage = "Amputer, suturer et bander",
 
-    ContextMenu_Cauterize = "Cautériser",
+    ContextMenu_Cauterize = "Cautériser",
     
     ContextMenu_Limb_Hand_L = "Main gauche",
     ContextMenu_Limb_ForeArm_L = "Avant-bras gauche",
-    ContextMenu_Limb_UpperArm_L = "Bras supérieur gauche",
+    ContextMenu_Limb_UpperArm_L = "Bras supérieur gauche",
     ContextMenu_Limb_Hand_R = "Main droite",
     ContextMenu_Limb_ForeArm_R = "Avant-bras droit",
-    ContextMenu_Limb_UpperArm_R = "Bras supérieur droit",
+    ContextMenu_Limb_UpperArm_R = "Bras supérieur droit",
 
-    ContextMenu_InstallProstRight = "Installer une prothèse sur le bras droit",
+    ContextMenu_InstallProstRight = "Installer une prothèse sur le bras droit",
-    ContextMenu_InstallProstLeft = "Installer une prothèse sur le bras gauche",
+    ContextMenu_InstallProstLeft = "Installer une prothèse sur le bras gauche",
 
     ContextMenu_PutTourniquetArmLeft = "Mettre un garrot sur le bras gauche",
     ContextMenu_PutTourniquetLegL = "Mettre un garrot sur la jambe gauche",
@@ -24,6 +24,6 @@ ContextMenu_FR = {
     ContextMenu_CleanWound = "Nettoyer la plaie",
 
     ContextMenu_Admin_TOC = "TOC",
-    ContextMenu_Admin_ResetTOC = "Réinitialiser les amputations",
+    ContextMenu_Admin_ResetTOC = "Réinitialiser les amputations",
     ContextMenu_Admin_ForceAmputation = "Forcer l'amputation",
 }

42/media/lua/shared/Translate/FR/IG_UI_FR.txt

@@ -0,0 +1,21 @@
+IG_UI_FR = {
+    IGUI_Yes = "Oui",
+    IGUI_No = "Non",
+
+    IGUI_perks_Amputations = "Amputations",
+    IGUI_perks_Side_R = "Côté droit",
+    IGUI_perks_Side_L = "Côté gauche",
+    IGUI_perks_Prosthesis = "Prothèse",
+    IGUI_perks_ProstFamiliarity = "Familiarité",
+
+    IGUI_ItemCat_Prosthesis = "Prothèse",
+    IGUI_ItemCat_Surgery = "Chirurgie",
+    IGUI_ItemCat_Amputation = "Amputation",
+
+    IGUI_HealthPanel_Cicatrization = "Cicatrisation",
+    IGUI_HealthPanel_Cicatrized = "Cicatrisé",
+    IGUI_HealthPanel_Cauterized = "Cautérisé",
+    IGUI_HealthPanel_WoundDirtyness = "Saleté de la plaie",
+    IGUI_HealthPanel_ProstEquipped = "Prothèse équipée",
+
+}

42/media/lua/shared/Translate/FR/ItemName_FR.txt

@@ -0,0 +1,11 @@
+ItemName_FR = {
+
+    ItemName_TOC.Surg_Arm_Tourniquet_L = "Garrot",
+    ItemName_TOC.Surg_Arm_Tourniquet_R = "Garrot",
+
+    ItemName_TOC.Prost_NormalArm_L = "Bras prothétique",
+    ItemName_TOC.Prost_NormalArm_R = "Bras prothétique",
+
+    ItemName_TOC.Prost_HookArm_L = "Bras prothétique - Crochet",
+    ItemName_TOC.Prost_HookArm_R = "Bras prothétique - Crochet",
+}

42/media/lua/shared/Translate/FR/Recipes_FR.txt

@@ -0,0 +1,5 @@
+Recipes_FR = {
+    Recipe_Craft_Prosthetic_Arm = "Fabriquer un bras prothétique",
+    Recipe_Craft_Prosthetic_Hook = "Fabriquer un crochet prothétique",
+
+}

42/media/lua/shared/Translate/FR/Sandbox_FR.txt

@@ -1,10 +1,10 @@
 Sandbox_FR = {
-    Sandbox_TOC = "Le Seul Remède",
+    Sandbox_TOC = "Le Seul Remède",
     Sandbox_TOC_CicatrizationSpeed = "Vitesse de cicatrisation",
-    Sandbox_TOC_WoundDirtynessMultiplier = "Multiplicateur de saleté de la plaie",
+    Sandbox_TOC_WoundDirtynessMultiplier = "Multiplicateur de saleté de la plaie",
-    Sandbox_TOC_SurgeonAbilityImportance = "Importance de la compétence du chirurgien",
+    Sandbox_TOC_SurgeonAbilityImportance = "Importance de la compétence du chirurgien",
     Sandbox_TOC_EnableZombieAmputations = "Activer les amputations de zombies",
-    Sandbox_TOC_ZombieAmputationDamageThreshold = "Seuil de dégâts pour amputations de zombies",
+    Sandbox_TOC_ZombieAmputationDamageThreshold = "Seuil de dégâts pour amputations de zombies",
-    Sandbox_TOC_ZombieAmputationDamageChance = "Probabilité d'amputations de zombies",
+    Sandbox_TOC_ZombieAmputationDamageChance = "Probabilité d'amputations de zombies",
 
 }

42/media/lua/shared/Translate/FR/Tooltip_FR.txt

@@ -1,10 +1,10 @@
 Tooltip_FR = {
 
-    Tooltip_Surgery_CantCauterize = "Vous ne pouvez pas cautériser la plaie",
+    Tooltip_Surgery_CantCauterize = "Vous ne pouvez pas cautériser la plaie",
 
     Tooltip_Surgery_And = " et ",
-    Tooltip_Surgery_TempTooLow = "La température est encore trop basse",
+    Tooltip_Surgery_TempTooLow = "La température est encore trop basse",
     Tooltip_Surgery_Coward = "Vous n'avez pas le courage de le faire",
-    Tooltip_Surgery_LimbNotFree = "Vous devez d'abord retirer la prothèse",
+    Tooltip_Surgery_LimbNotFree = "Vous devez d'abord retirer la prothése",
 
 }

42/media/lua/shared/Translate/FR/UI_FR.txt

@@ -0,0 +1,16 @@
+UI_FR = {
+    UI_trait_Amputee_Hand = "Main gauche amputée",
+    UI_trait_Amputee_Hand_desc = "",
+
+    UI_trait_Amputee_ForeArm = "Avant-bras gauche amputée",
+    UI_trait_Amputee_ForeArm_desc = "",
+
+    UI_trait_Amputee_UpperArm = "Bras supérieur gauche amputée",
+    UI_trait_Amputee_UpperArm_desc = "",
+
+    UI_trait_Insensitive = "Insensible",
+    UI_trait_Insensitive_desc = "",
+
+    UI_Say_CantEquip = "Je ne peux pas l'équiper comme ça..."
+
+}

42/media/lua/shared/Translate/RU/ContextMenu_RU.txt

@@ -0,0 +1,33 @@
+ContextMenu_RU = {
+    ContextMenu_Amputate = "Ампутировать",
+    ContextMenu_Amputate_Bandage = "Ампутировать и перевязать",
+    ContextMenu_Amputate_Stitch = "Ампутировать и наложить швы",
+    ContextMenu_Amputate_Stitch_Bandage = "Ампутировать, наложить швы и перевязать",
+
+    ContextMenu_Cauterize = "Прижечь",
+    
+    ContextMenu_Limb_Hand_L = "Левая рука",
+    ContextMenu_Limb_ForeArm_L = "Левая предплечье",
+    ContextMenu_Limb_UpperArm_L = "Левое плечо"
+    ContextMenu_Limb_Hand_R = "Правая рука",
+    ContextMenu_Limb_ForeArm_R = "Правая предплечье",
+    ContextMenu_Limb_UpperArm_R = "Правая плечо",
+
+    ContextMenu_InstallProstRight = "Установить протез на правую руку",
+    ContextMenu_InstallProstLeft = "Установить протез на левую руку",
+
+    ContextMenu_PutTourniquetArmLeft = "Наложить жгут на левую руку",
+    ContextMenu_PutTourniquetLegL = "Наложить жгут на левую ногу",
+    ContextMenu_PutTourniquetArmRight = "Наложить жгут на правую руку",
+    ContextMenu_PutTourniquetLegR = "Наложить жгут на правую ногу",
+
+
+    ContextMenu_CleanWound = "Очистить рану",
+
+
+
+    ContextMenu_Admin_TOC = "TOC",
+    ContextMenu_Admin_ResetTOC = "Сбросить ампутации",
+    ContextMenu_Admin_ForceAmputation = "Моментально ампутировать",
+    
+}

42/media/lua/shared/Translate/RU/IG_UI_RU.txt

@@ -0,0 +1,18 @@
+IG_UI_RU = {
+    IGUI_perks_Amputations = "Ампутации",
+    IGUI_perks_Side_R = "Правая сторона",
+    IGUI_perks_Side_L = "Левая сторона",
+    IGUI_perks_Prosthesis = "Протез",
+    IGUI_perks_ProstFamiliarity= "Приспособленность",
+
+    IGUI_ItemCat_Prosthesis = "Протез",
+    IGUI_ItemCat_Surgery = "Хирургия",
+    IGUI_ItemCat_Amputation = "Ампутация"
+
+    IGUI_HealthPanel_Cicatrization = "Заживление",
+    IGUI_HealthPanel_Cicatrized = "Заживлено",
+    IGUI_HealthPanel_Cauterized = "Прижженно",
+    IGUI_HealthPanel_WoundDirtyness = "Загрезнённая рана",
+    IGUI_HealthPanel_ProstEquipped = "Протез экипирован",
+
+}

42/media/lua/shared/Translate/RU/ItemName_RU.txt

@@ -0,0 +1,11 @@
+ItemName_RU = {
+
+    ItemName_TOC.Surg_Arm_Tourniquet_L = "Жгут",
+    ItemName_TOC.Surg_Arm_Tourniquet_R = "Жгут",
+
+    ItemName_TOC.Prost_NormalArm_L = "Протез руки",
+    ItemName_TOC.Prost_NormalArm_R = "Протез руки",
+
+    ItemName_TOC.Prost_HookArm_L = "Протез руки - Крюк",
+    ItemName_TOC.Prost_HookArm_R = "Протез руки - Крюк",
+}

42/media/lua/shared/Translate/RU/Recipes_RU.txt

@@ -0,0 +1,4 @@
+Recipes_RU = {
+    Recipe_Craft_Prosthetic_Arm = "Изготовить протез руки",
+    Recipe_Craft_Prosthetic_Hook = "Изготовить протез ввиде крючка",
+}

42/media/lua/shared/Translate/RU/Sandbox_RU.txt

@@ -0,0 +1,7 @@
+Sandbox_RU = {
+    Sandbox_TOC = "Спасенье в Отсечении",
+    Sandbox_TOC_CicatrizationSpeed = "Скорость заживления",
+    Sandbox_TOC_WoundDirtynessMultiplier = "Множитель загрязнения ран",
+    Sandbox_TOC_SurgeonAbilityImportance = "Значимость способностей врача-хирурга",
+
+}

42/media/lua/shared/Translate/RU/Tooltip_RU.txt

@@ -0,0 +1,10 @@
+Tooltip_RU = {
+
+    Tooltip_Surgery_CantCauterize = "Нельзя прижигать рану",
+
+    Tooltip_Surgery_And = " и "
+    Tooltip_Surgery_TempTooLow = "Температура все еще слишком низкая",
+    Tooltip_Surgery_Coward = "У тебя не хватит смелости сделать это",
+    Tooltip_Surgery_LimbNotFree = "Сначала нужно снять протез",
+    
+}

42/media/lua/shared/Translate/RU/UI_RU.txt

@@ -0,0 +1,16 @@
+UI_RU = {
+    UI_trait_Amputee_Hand = "Ампутированная левая рука",
+    UI_trait_Amputee_Hand_desc = "Вы начинаете с ампутированной левой рукой.",
+
+    UI_trait_Amputee_ForeArm = "Ампутированное левое предплечье",
+    UI_trait_Amputee_ForeArm_desc = "Вы начинаете с ампутированным левым предплечьем.",
+
+    UI_trait_Amputee_UpperArm = "Ампутированное левое плечо",
+    UI_trait_Amputee_UpperArm_desc = "Вы начинаете с ампутированнвм левым плечём.",
+
+    UI_trait_Insensitive = "Нечувствительный",
+    UI_trait_Insensitive_desc = "",
+
+
+    UI_Say_CantEquip = "Я не могу его так экипировать..."
+}

42/media/lua/shared/Translate/TR/ContextMenu_TR.txt

@@ -0,0 +1,31 @@
+ContextMenu_TR = {
+    ContextMenu_Amputate = "Ampute Et",
+    ContextMenu_Amputate_Bandage = "Ampute Et ve Bandajla",
+    ContextMenu_Amputate_Stitch = "Ampute Et ve Dikiþ At",
+    ContextMenu_Amputate_Stitch_Bandage = "Ampute Et, Dikiþ At ve Bandajla",
+
+    ContextMenu_Cauterize = "Daðla",
+    
+    ContextMenu_Limb_Hand_L = "Sol El",
+    ContextMenu_Limb_ForeArm_L = "Sol Ön Kol",
+    ContextMenu_Limb_UpperArm_L = "Sol Üst Kol",
+    ContextMenu_Limb_Hand_R = "Sað El",
+    ContextMenu_Limb_ForeArm_R = "Sað Ön Kol",
+    ContextMenu_Limb_UpperArm_R = "Sað Üst Kol",
+
+    ContextMenu_InstallProstRight = "Sað kola protez tak",
+    ContextMenu_InstallProstLeft = "Sol kola protez tak",
+
+    ContextMenu_PutTourniquetArmLeft = "Sol kola turnike tak",
+    ContextMenu_PutTourniquetLegL = "Sol bacaðýna turnike tak",
+    ContextMenu_PutTourniquetArmRight = "Sað kola turnike tak",
+    ContextMenu_PutTourniquetLegR = "Sað bacaðýna turnike tak",
+
+
+    ContextMenu_CleanWound = "Yarayý Temizle",
+
+
+    ContextMenu_Admin_TOC = "TOC",
+    ContextMenu_Admin_ResetTOC = "Amputasyonlarý Sýfýrla",
+    ContextMenu_Admin_ForceAmputation = "Zorla Amputasyon Yap",
+}