Working tourniquet POC

media/clothing/clothingItems/Surgery_Left_Tourniquet.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <clothingItem>
-    <m_MaleModel>test_left_tourniquet</m_MaleModel>
+    <m_MaleModel>Surgery\Tourniquet_Left</m_MaleModel>
-    <m_FemaleModel>test_left_tourniquet</m_FemaleModel>
+    <m_FemaleModel>Surgery\Tourniquet_Left</m_FemaleModel>
     <m_GUID>afbab35d-8bd4-4d61-87c7-054651ead1bd</m_GUID>
     <m_Static>false</m_Static>
     <m_AllowRandomHue>false</m_AllowRandomHue>
     <m_AllowRandomTint>false</m_AllowRandomTint>
-    <textureChoices>Prosthesis\wood_base</textureChoices>
+    <textureChoices>Surgery\tourniquet</textureChoices>
 </clothingItem>

media/clothing/clothingItems/Surgery_Right_Tourniquet.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<clothingItem>
+    <m_MaleModel>Surgery\Tourniquet_Right</m_MaleModel>
+    <m_FemaleModel>Surgery\Tourniquet_Right</m_FemaleModel>
+    <m_GUID>9a5fe063-63c7-4e6f-81ca-ee77c6678e0d</m_GUID>
+    <m_Static>false</m_Static>
+    <m_AllowRandomHue>false</m_AllowRandomHue>
+    <m_AllowRandomTint>false</m_AllowRandomTint>
+    <textureChoices>Surgery\tourniquet</textureChoices>
+</clothingItem>

media/fileGuidTable.xml

@@ -78,9 +78,11 @@
     </files>
 
     <files>
-        <path>media/clothing/clothingItems/Test_Tourniquet_Left.xml</path>
+        <path>media/clothing/clothingItems/Surgery_Left_Tourniquet.xml</path>
         <guid>afbab35d-8bd4-4d61-87c7-054651ead1bd</guid>
     </files>
-
+    <files>
-
+        <path>media/clothing/clothingItems/Surgery_Right_Tourniquet.xml</path>
+        <guid>9a5fe063-63c7-4e6f-81ca-ee77c6678e0d</guid>
+    </files>
 </fileGuidTable>

media/lua/shared/NPCs/ExtraBodyLocations.lua

@@ -1,14 +1,14 @@
-local function addBodyLocationBefore(newLocation, movetoLocation)
+local function addBodyLocationBefore(new_location, move_to_location)
   -- FIXME This doesn't really move a body location, it just re-adds it to another index. Find a way to remove it entirely (maybe setExclusive?)
 
   local group = BodyLocations.getGroup("Human")
   local list = getClassFieldVal(group, getClassField(group, 1))
-  group:getOrCreateLocation(newLocation)
+  group:getOrCreateLocation(new_location)
   local newItem = list:get(list:size()-1)
   print("TOC: Created new body location" .. newItem:getId())
 
-  list:remove(list:size()-1)
+  list:remove(newItem)      -- We can't use the Index, it works if we pass the item though!
-  local i = group:indexOf(movetoLocation)
+  local i = group:indexOf(move_to_location)
   list:add(i, newItem)
 end
 

media/lua/shared/translate/EN/ContextMenu_EN.txt

@@ -1,4 +1,8 @@
 ContextMenu_EN = {
+	
 	ContextMenu_Cut_Arm = "Cut arm",
 	ContextMenu_Operate_Arm = "Operate arm",
+
+	ContextMenu_TourniquetRightSwitch = "Tourniquet on Right Arm",
+    ContextMenu_TourniquetLeftSwitch = "Tourniquet on Left Arm",
 } 

media/scripts/TOC_items.txt

@@ -442,19 +442,41 @@ item ProthesisMag3
     }
 
 
-    item Test_Tourniquet_Left
+item Surgery_Left_Tourniquet
     {
         Weight = 1,
         Type = Clothing,
-        DisplayCategory = Prosthesis,
+        DisplayCategory = Surgery,
-        DisplayName	= Tourniquet Left,
+        DisplayName	= Tourniquet - Left Arm,
-        ClothingItem = Test_Tourniquet_Left,
+        ClothingItem = Surgery_Left_Tourniquet,
         BodyLocation = Hands,
-        BloodLocation = Hands,
         Icon = tourniquet,
+        BloodLocation = Hands,
+        ClothingItemExtra = Surgery_Right_Tourniquet,
+        ClothingItemExtraOption = TourniquetRightSwitch,
+        clothingExtraSubmenu = TourniquetLeftSwitch,
         Tooltip = Test,
         CanHaveHoles = false,
+    }
 
+item Surgery_Right_Tourniquet
+    {
+        Weight = 1,
+        Type = Clothing,
+        DisplayCategory = Surgery,
+        DisplayName	= Tourniquet - Right Arm,
+        ClothingItem = Surgery_Right_Tourniquet,
+        BodyLocation = Hands,
+        Icon = tourniquet,
+        BloodLocation = Hands,
+        ClothingItemExtra = Surgery_Left_Tourniquet,
+        ClothingItemExtraOption = TourniquetLeftSwitch,
+        clothingExtraSubmenu = TourniquetRightSwitch,
+
+
+
+        Tooltip = Test,
+        CanHaveHoles = false,
     }
 }