From c9f15d71ef4011d93f9dbcabae43db79bc134eda Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu, 11 Jan 2018 16:15:50 +0200
Subject: [PATCH] Husk limb rendering order fix (right arm is drawn in front of
 the torso), infected humans move their torso when attacking

---
 .../Characters/Human/huskappendage.xml        |  7 ++++---
 .../Content/Characters/Husk/husk.xml          | 20 +++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/Content/Characters/Human/huskappendage.xml b/Barotrauma/BarotraumaShared/Content/Characters/Human/huskappendage.xml
index a1ccc4dea..4270a7981 100644
--- a/Barotrauma/BarotraumaShared/Content/Characters/Human/huskappendage.xml
+++ b/Barotrauma/BarotraumaShared/Content/Characters/Human/huskappendage.xml
@@ -3,9 +3,10 @@
   <!-- spike/tentacle thingy -->
   <limb id = "13" width="10" height="30" mass = "6" attackpriority="2" flip="true" pullpos="0.0,25.0">
     <sprite texture="Content/Characters/Husk/DivingSuit.png" sourcerect="110,76,18,52" depth="0.5" origin="0.5,0.5"/>
-    <attack range="70" damagerange="35" duration="0.1" bleedingdamage="0.5" damage="10" stun="0.5" torque="-50" damagetype="slash" targetforce="10">
-      <StatusEffect type="OnUse" target="Character" HuskInfectionState="0.01"/>
-      <StatusEffect type="OnUse" target="This" Health="10.0" disabledeltatime="true"/>
+    <attack range="70" damagerange="35" duration="0.1" bleedingdamage="3" damage="10" stun="0.5" damagetype="slash" targetforce="10"
+        force="5" applyforceonlimbs="1" torque="-10">
+      <StatusEffect type="OnUse" target="Character" HuskInfectionState="0.01" disabledeltatime="true"/>
+      <StatusEffect type="OnUse" target="This" Health="20.0" disabledeltatime="true"/>
     </attack>
   </limb>
 
diff --git a/Barotrauma/BarotraumaShared/Content/Characters/Husk/husk.xml b/Barotrauma/BarotraumaShared/Content/Characters/Husk/husk.xml
index a94590bd6..64f66a84d 100644
--- a/Barotrauma/BarotraumaShared/Content/Characters/Husk/husk.xml
+++ b/Barotrauma/BarotraumaShared/Content/Characters/Husk/husk.xml
@@ -29,12 +29,12 @@
 
     <!-- head -->
     <limb id = "0" radius="13" mass = "6" type="Head" attackpriority="2">
-      <sprite texture="Content/Characters/Husk/DivingSuit.png" sourcerect="95,0,33,25" depth="0.04" origin="0.5,0.5"/>
+      <sprite texture="Content/Characters/Husk/DivingSuit.png" sourcerect="95,0,33,25" depth="0.051" origin="0.5,0.5"/>
     </limb>
 
     <!-- spike/tentacle thingy -->
     <limb id = "13" width="10" height="30" mass = "6" attackpriority="2" flip="true" pullpos="0.0,25.0">
-      <sprite texture="Content/Characters/Husk/DivingSuit.png" sourcerect="110,76,18,52" depth="0.05" origin="0.5,0.5"/>
+      <sprite texture="Content/Characters/Husk/DivingSuit.png" sourcerect="110,76,18,52" depth="0.052" origin="0.5,0.5"/>
       <attack range="70" damagerange="35" duration="0.2" bleedingdamage="0.5" damage="10" stun="0.5" damagetype="slash" targetforce="10"
               force="5" applyforceonlimbs="1" torque="-10">
         <StatusEffect type="OnUse" target="Character" HuskInfectionState="0.01" disabledeltatime="true"/>
@@ -44,7 +44,7 @@
 
     <!-- body -->
     <limb id = "1" radius="14" height="21" mass = "20" type="Torso" attackpriority="3">
-      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="Torso" sourcerect="41,1,42,96" origin="0.5,0.55"/>
+      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="Torso" sourcerect="41,1,42,96" depth="0.05" origin="0.5,0.55"/>
     </limb>
     <limb id = "12" radius="13" mass = "20" type="Waist">
       <sprite texture="Content/Characters/Husk/DivingSuit.png" sourcerect="0,0,1,1" depth="0.045" origin="0.5,0.5"/>
@@ -53,15 +53,15 @@
   
     <!-- left arm -->
     <limb id = "2" radius="8" height="20" mass="3" type="LeftArm">
-      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="LeftArm" sourcerect="0,0,19,43" origin="0.5,0.4" />
+      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="LeftArm" sourcerect="0,0,19,43" depth="0.15" origin="0.5,0.4" />
     </limb>
     <limb id = "3" radius="6" height="26" mass="3" type="LeftHand" pullpos="0.0,-18.0">
-      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="LeftHand" sourcerect="0,78,15,50" origin="0.45,0.4"/>
+      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="LeftHand" sourcerect="0,78,15,50" depth="0.16" origin="0.45,0.4"/>
     </limb>
 
     <!-- right arm -->
     <limb id = "4" radius="8" height="20" mass="3" type="RightArm">
-      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="LeftArm" sourcerect="0,0,19,43" origin="0.5,0.4" />
+      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="LeftArm" sourcerect="0,0,19,43" depth="0.01" origin="0.5,0.4" />
     </limb>
     <limb id = "5" radius="6" height="26" mass ="3" type="RightHand" pullpos="0.0,-18.0">
       <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="LeftHand" sourcerect="0,78,15,50" origin="0.45,0.4"/>
@@ -69,10 +69,10 @@
 
     <!-- left leg -->
     <limb id = "6" radius="10" height="30" mass = "8" type="LeftThigh">
-      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="RightThigh" sourcerect="22,0,18,44" origin="0.5,0.5" depth="0.01"/>
+      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="RightThigh" sourcerect="22,0,18,44" depth="0.15" origin="0.5,0.5"/>
     </limb>
     <limb id = "7" radius="6" height="39" mass = "5" type="LeftLeg">
-      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="RightLeg" sourcerect="17,47,21,51" origin="0.5,0.55" depth="0.02"/>
+      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="RightLeg" sourcerect="17,47,21,51" depth="0.16" origin="0.5,0.55"/>
     </limb>
     <limb id = "8" radius="5" height="13" mass = "2" type ="LeftFoot" flip="true" pullpos="-5.0,0.0">
       <sprite texture="Content/Characters/Husk/legs.png" sourcerect="35,53,16,25" depth="0.14" origin="0.5,0.5"/>
@@ -81,10 +81,10 @@
   
     <!-- right leg -->
     <limb id = "9" radius="10" height="30" mass = "8" type="RightThigh">
-      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="RightThigh" sourcerect="22,0,18,44" origin="0.5,0.5" depth="0.01"/>
+      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="RightThigh" sourcerect="22,0,18,44" depth="0.011" origin="0.5,0.5"/>
     </limb>
     <limb id = "10" radius="6" height="39" mass = "5" type="RightLeg">
-      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="RightLeg" sourcerect="17,47,21,51" origin="0.5,0.55" depth="0.02"/>
+      <sprite texture="Content/Characters/Husk/DivingSuit.png" limb="RightLeg" sourcerect="17,47,21,51" depth="0.12" origin="0.5,0.55"/>
     </limb>
     <limb id = "11" radius="5" height="13" mass = "2" type ="RightFoot" flip="true" pullpos="-5.0,0.0">
       <sprite texture="Content/Characters/Husk/legs.png" sourcerect="35,53,16,25" origin="0.5,0.5"/>