From 09583cd69647f087b49a24ae55a820b8154aa6b0 Mon Sep 17 00:00:00 2001
From: Kolton Noreen <21249976+noreenko@users.noreply.github.com>
Date: Sun, 23 Jun 2024 20:17:25 -0500
Subject: [PATCH 1/2] C# changes for IsUndead

---
 .../RimWorldOfMagic/HarmonyPatches.cs         | 43 +++++++++++++++++--
 .../RimWorldOfMagic/RimWorldOfMagic.csproj    |  3 +-
 RimWorldOfMagic/RimWorldOfMagic/TM_Calc.cs    | 39 +++++++----------
 3 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/RimWorldOfMagic/RimWorldOfMagic/HarmonyPatches.cs b/RimWorldOfMagic/RimWorldOfMagic/HarmonyPatches.cs
index d238e8b5..7eb79945 100644
--- a/RimWorldOfMagic/RimWorldOfMagic/HarmonyPatches.cs
+++ b/RimWorldOfMagic/RimWorldOfMagic/HarmonyPatches.cs
@@ -80,7 +80,6 @@ public TorannMagicMod(ModContentPack content) : base(content)
             harmonyInstance.Patch(AccessTools.Method(typeof(RecipeDef), "get_AvailableNow", null, null), null, new HarmonyMethod(typeof(TorannMagicMod), "Get_GolemsRecipeAvailable", null), null);
             harmonyInstance.Patch(AccessTools.Method(typeof(Pawn), "get_ShouldAvoidFences", null, null), new HarmonyMethod(typeof(TorannMagicMod), "Get_GolemShouldAvoidFences"), null, null);
             harmonyInstance.Patch(AccessTools.Method(typeof(PawnRenderer), "get_CurRotDrawMode", null, null), null, new HarmonyMethod(typeof(TorannMagicMod), "Get_RotBodyForUndead"), null, null);
-            harmonyInstance.Patch(AccessTools.Method(typeof(Pawn_HealthTracker), "get_CanBleed", null, null), null, new HarmonyMethod(typeof(TorannMagicMod), "Get_Undead_CanBleed"), null, null);
             //harmonyInstance.Patch(AccessTools.Method(typeof(Precept_Relic), "get_RelicInPlayerPossession", null, null),null, new HarmonyMethod(typeof(TorannMagicMod), "Get_DelayRelicLost"), null);
             //harmonyInstance.Patch(AccessTools.Method(typeof(Pawn), "get_InAggroMentalState", null, null), new HarmonyMethod(typeof(TorannMagicMod), "Get_UndeadAggroMentalState"), null, null);
             //harmonyInstance.Patch(AccessTools.Method(typeof(Pawn), "get_InMentalState", null, null), new HarmonyMethod(typeof(TorannMagicMod), "Get_UndeadMentalState"), null, null);
@@ -410,11 +409,47 @@ private static void Postfix(Pawn bloodfeeder, Pawn prisoner, ref AcceptanceRepor
             }
         }
 
-        public static void Get_Undead_CanBleed(Pawn_HealthTracker __instance, Pawn ___pawn, ref bool __result)
+        [HarmonyPatch(typeof(Pawn_HealthTracker), "get_CanBleed", null)]
+        public static class Get_Undead_CanBleed
         {
-            if (TM_Calc.IsUndead(___pawn))
+            // Transpiler to avoid harmony overhead since Anomaly update added lots of calls to CanBleed
+            static IEnumerable<CodeInstruction> Transpiler(
+                IEnumerable<CodeInstruction> instructions,
+                ILGenerator generator)
             {
-                __result = false;
+                CodeInstruction[] codes = instructions.ToArray();
+                Label startOfOurCheck = generator.DefineLabel(); // Label for the if statement we are adding
+                Label returnFalse = generator.DefineLabel();
+
+                // We are keeping the method the same, but adding a final if condition
+                for (int i = 0; i < codes.Length - 1; i++)
+                {
+                    yield return codes[i];
+                }
+
+                // Add a jump to our code
+                // If IsFlesh, continue to our check. Else, return false
+                yield return new CodeInstruction(OpCodes.Brtrue_S, startOfOurCheck); // If true, jump
+                yield return new CodeInstruction(OpCodes.Ret); // return loaded value (0) aka, false
+
+                // Here is our if condition of TM_Calc.IsUndead
+                var startOfIfStatement = new CodeInstruction(OpCodes.Ldarg_0)
+                {
+                    labels = new List<Label> { startOfOurCheck } // Mark this instruction with label
+                }; // Load pawn ref into arg stack
+                yield return startOfIfStatement; // add the code to the function
+                yield return CodeInstruction.LoadField(typeof(Pawn_HealthTracker), "pawn"); // Get value from pawn ref
+                yield return new CodeInstruction(OpCodes.Callvirt,
+                    AccessTools.Method(typeof(TM_Calc), nameof(TM_Calc.IsUndead))); // TM_Calc.IsUndead(pawn)
+                // Invert result
+                yield return new CodeInstruction(OpCodes.Brtrue_S, returnFalse);
+                yield return new CodeInstruction(OpCodes.Ldc_I4_1); // Load
+                yield return new CodeInstruction(OpCodes.Ret); // Return result
+                yield return new CodeInstruction(OpCodes.Ldc_I4_0)
+                {
+                    labels = new List<Label> { returnFalse }
+                };
+                yield return new CodeInstruction(OpCodes.Ret);
             }
         }
 
diff --git a/RimWorldOfMagic/RimWorldOfMagic/RimWorldOfMagic.csproj b/RimWorldOfMagic/RimWorldOfMagic/RimWorldOfMagic.csproj
index cc9d998e..ef9ccb4e 100644
--- a/RimWorldOfMagic/RimWorldOfMagic/RimWorldOfMagic.csproj
+++ b/RimWorldOfMagic/RimWorldOfMagic/RimWorldOfMagic.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
+    <LangVersion>9</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
@@ -977,4 +978,4 @@
     <Compile Include="WorldTransport\TM_TravelingTransportPods.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/RimWorldOfMagic/RimWorldOfMagic/TM_Calc.cs b/RimWorldOfMagic/RimWorldOfMagic/TM_Calc.cs
index 9ab840ad..1764e1f4 100644
--- a/RimWorldOfMagic/RimWorldOfMagic/TM_Calc.cs
+++ b/RimWorldOfMagic/RimWorldOfMagic/TM_Calc.cs
@@ -92,12 +92,12 @@ public static bool IsNecromancer(Pawn pawn)
             }            
 
             CompAbilityUserMight compMight = pawn.GetCompAbilityUserMight();
-            if (compMight != null && compMight.customClass != null && compMight.customClass.isNecromancer)
+            if (compMight is { customClass: { isNecromancer: true } })
             {
                 return true;
             }
             CompAbilityUserMagic compMagic = pawn.GetCompAbilityUserMagic();
-            if (compMagic != null && compMagic.customClass != null && compMagic.customClass.isNecromancer)
+            if (compMagic is { customClass: { isNecromancer: true } })
             {
                 return true;
             }            
@@ -106,33 +106,24 @@ public static bool IsNecromancer(Pawn pawn)
 
         public static bool IsUndead(Pawn pawn)
         {
-            if (pawn == null) return false;
+            if (pawn?.health?.hediffSet == null) return false;  // Early Exit
 
-            if (pawn.story?.traits != null && pawn.story.traits.HasTrait(TorannMagicDefOf.Undead)) return true;
-
-            if (pawn.health?.hediffSet != null && pawn.health.hediffSet.hediffs.Any(hediff =>
-                hediff.def == TorannMagicDefOf.TM_UndeadAnimalHD
-                || hediff.def == TorannMagicDefOf.TM_UndeadHD
-                || hediff.def == TorannMagicDefOf.TM_LichHD
-                || hediff.def == TorannMagicDefOf.TM_UndeadStageHD
-                || hediff.def.defName.StartsWith("ROM_Vamp")
-            ))
-            {
-                return true;
-            }
-
-            if (pawn.def.defName == "SL_Runner" || pawn.def.defName == "SL_Peon" || pawn.def.defName == "SL_Archer" || pawn.def.defName == "SL_Hero" ||
-                pawn.def == TorannMagicDefOf.TM_GiantSkeletonR || pawn.def == TorannMagicDefOf.TM_SkeletonR || pawn.def == TorannMagicDefOf.TM_SkeletonLichR)
+            List<Hediff> hediffs = pawn.health.hediffSet.hediffs;
+            int hediffCount = hediffs.Count;
+            for (int i = 0; i < hediffCount; i++)
             {
-                return true;
+                // Use defName as string because constants are faster.
+                if (hediffs[i].def.defName is "TM_UndeadAnimalHD" or "TM_UndeadHD" or "TM_LichHD" or "TM_UndeadStageHD")
+                    return true;
             }
 
-            for (int i = 0; i < pawn.AllComps.Count; i++)
+            byte compsSeen = 0;
+            for (int i = pawn.AllComps.Count - 1; i >= 0; i--)
             {
-                if (pawn.AllComps[i] is CompAbilityUserTMBase comp)
-                {
-                    if (comp.customClass != null && comp.customClass.isUndead) return true;
-                }
+                if (pawn.AllComps[i] is not CompAbilityUserTMBase comp) continue;
+                if (comp.customClass is { isUndead: true }) return true;
+                if (compsSeen == 1) return false;  // Only 2 CompAbilityUserTMBases
+                compsSeen++;
             }
 
             return false;

From 307b648b895d4a42a2f74daa1c9dbd181e558334 Mon Sep 17 00:00:00 2001
From: Kolton Noreen <21249976+noreenko@users.noreply.github.com>
Date: Sun, 23 Jun 2024 20:18:13 -0500
Subject: [PATCH 2/2] XML changes for Skeletons to change BloodDef

---
 v1.5/Defs/PawnDefs/Races_Skeletal.xml | 300 +++++++++++++-------------
 1 file changed, 149 insertions(+), 151 deletions(-)

diff --git a/v1.5/Defs/PawnDefs/Races_Skeletal.xml b/v1.5/Defs/PawnDefs/Races_Skeletal.xml
index c799f103..f2e1506f 100644
--- a/v1.5/Defs/PawnDefs/Races_Skeletal.xml
+++ b/v1.5/Defs/PawnDefs/Races_Skeletal.xml
@@ -71,24 +71,25 @@
     </inspectorTabs>
     <race>
       <body>TM_Skeletal</body>
-	  <deathAction>
-		<workerClass>TorannMagic.DeathWorker_Skeletal</workerClass>
-	  </deathAction>
-	  <renderTree>Animal</renderTree>
-      <needsRest>false</needsRest>
-      <hasGenders>false</hasGenders>
-      <foodType>None</foodType>
-	  <fleshType>TM_SkeletalFlesh</fleshType>
-      <baseHungerRate>0.00</baseHungerRate>	  
-<!-- 	  <intelligence>ToolUser</intelligence> -->
-	  <trainability>None</trainability>
-      <thinkTreeConstant>TM_Elemental_AI_Constant</thinkTreeConstant>
-      <thinkTreeMain>TM_Elemental_AI</thinkTreeMain>
-      <baseBodySize>1</baseBodySize>
-	  <herdMigrationAllowed>false</herdMigrationAllowed>	 
-	  <wildness>10</wildness>		  
-	  <packAnimal>false</packAnimal>
-	  <herdAnimal>false</herdAnimal>
+      <deathAction>
+        <workerClass>TorannMagic.DeathWorker_Skeletal</workerClass>
+      </deathAction>
+      <renderTree>Animal</renderTree>
+        <needsRest>false</needsRest>
+        <hasGenders>false</hasGenders>
+        <foodType>None</foodType>
+      <fleshType>TM_SkeletalFlesh</fleshType>
+        <baseHungerRate>0.00</baseHungerRate>	  
+  <!-- 	  <intelligence>ToolUser</intelligence> -->
+      <trainability>None</trainability>
+        <thinkTreeConstant>TM_Elemental_AI_Constant</thinkTreeConstant>
+        <thinkTreeMain>TM_Elemental_AI</thinkTreeMain>
+        <baseBodySize>1</baseBodySize>
+      <herdMigrationAllowed>false</herdMigrationAllowed>	 
+      <wildness>10</wildness>		  
+      <packAnimal>false</packAnimal>
+      <herdAnimal>false</herdAnimal>
+      <bloodDef></bloodDef>
     </race>
     <drawGUIOverlay>false</drawGUIOverlay>
   </ThingDef>
@@ -104,44 +105,44 @@
       <ArmorRating_Sharp>0.7</ArmorRating_Sharp>
       <ArmorRating_Heat>2.5</ArmorRating_Heat>      
     </statBases>
-	<tools>
+    <tools>
+        <li>
+          <label>left hand</label>
+          <capacities>
+            <li>TM_ShadowBurn</li>
+          </capacities>
+          <power>19</power>
+          <cooldownTime>1.1</cooldownTime>
+          <linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+        </li>
       <li>
-        <label>left hand</label>
-        <capacities>
-          <li>TM_ShadowBurn</li>
-        </capacities>
-        <power>19</power>
-        <cooldownTime>1.1</cooldownTime>
-        <linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-      </li>
-	  <li>
-        <label>right hand</label>
-        <capacities>
-          <li>TM_ShadowBurn</li>
-        </capacities>
-        <power>19</power>
-        <cooldownTime>1.1</cooldownTime>
-        <linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-      </li>
-	  <li>
-        <label>death stare</label>
-        <capacities>
-          <li>TM_DeathGaze</li>
-        </capacities>
-        <power>20</power>
-		<chanceFactor>.1</chanceFactor>
-        <cooldownTime>2</cooldownTime>
-        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-      </li>
-	</tools>
+          <label>right hand</label>
+          <capacities>
+            <li>TM_ShadowBurn</li>
+          </capacities>
+          <power>19</power>
+          <cooldownTime>1.1</cooldownTime>
+          <linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+        </li>
+      <li>
+          <label>death stare</label>
+          <capacities>
+            <li>TM_DeathGaze</li>
+          </capacities>
+          <power>20</power>
+      <chanceFactor>.1</chanceFactor>
+          <cooldownTime>2</cooldownTime>
+          <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+        </li>
+    </tools>
     <race>
-	  <baseHealthScale>4.0</baseHealthScale>	
+	    <baseHealthScale>4.0</baseHealthScale>	
       <lifeExpectancy>2000</lifeExpectancy>
-		<lifeStageAges>
+		  <lifeStageAges>
         <li>
           <def>TM_SkeletonLich_Lifestage</def>
           <minAge>100</minAge>
-		  <soundCall>TM_SkeletonAngry</soundCall>
+		      <soundCall>TM_SkeletonAngry</soundCall>
           <soundAngry>TM_SkeletonAngry</soundAngry>
           <soundWounded>TM_SkeletonPain</soundWounded>
           <soundDeath>TM_SkeletonAngryLow</soundDeath>
@@ -149,33 +150,32 @@
       </lifeStageAges>
       <soundMeleeHitPawn>TM_SkeletonPain</soundMeleeHitPawn>
       <soundMeleeHitBuilding>TM_SkeletonPainLow</soundMeleeHitBuilding>
-      <soundMeleeMiss>TM_SkeletonPain</soundMeleeMiss>      
+      <soundMeleeMiss>TM_SkeletonPain</soundMeleeMiss>
+      <bloodDef></bloodDef>    
     </race>
-	<butcherProducts>
-
-    </butcherProducts>
-	<comps>
-		<li>
-			<compClass>CompAttachBase</compClass>
-		</li>
-	  <li Class="TorannMagic.CompProperties_SkeletonLichController">
-		<alwaysManhunter>false</alwaysManhunter>
-		<maxRangeForCloseThreat>5</maxRangeForCloseThreat>
-		<maxRangeForFarThreat>60</maxRangeForFarThreat>
-		<chargeCooldownTicks>1480</chargeCooldownTicks>
-		<rangedCooldownTicks>550</rangedCooldownTicks>
-		<rangedBurstCount>4</rangedBurstCount>
-		<rangedTicksBetweenBursts>4</rangedTicksBetweenBursts>
-		<rangedAttackDelay>150</rangedAttackDelay>
-		<aoeCooldownTicks>650</aoeCooldownTicks>
-		<aoeAttackDelay>130</aoeAttackDelay>
-		<knockbackCooldownTicks>1500</knockbackCooldownTicks>
-		<knockbackAttackDelay>240</knockbackAttackDelay>
-		<tauntCooldownTicks>600</tauntCooldownTicks>
-		<tauntAttackDelay>200</tauntAttackDelay>
-		<tauntChance>1</tauntChance>
-	  </li>
-	</comps>
+    <butcherProducts></butcherProducts>
+    <comps>
+      <li>
+        <compClass>CompAttachBase</compClass>
+      </li>
+      <li Class="TorannMagic.CompProperties_SkeletonLichController">
+      <alwaysManhunter>false</alwaysManhunter>
+      <maxRangeForCloseThreat>5</maxRangeForCloseThreat>
+      <maxRangeForFarThreat>60</maxRangeForFarThreat>
+      <chargeCooldownTicks>1480</chargeCooldownTicks>
+      <rangedCooldownTicks>550</rangedCooldownTicks>
+      <rangedBurstCount>4</rangedBurstCount>
+      <rangedTicksBetweenBursts>4</rangedTicksBetweenBursts>
+      <rangedAttackDelay>150</rangedAttackDelay>
+      <aoeCooldownTicks>650</aoeCooldownTicks>
+      <aoeAttackDelay>130</aoeAttackDelay>
+      <knockbackCooldownTicks>1500</knockbackCooldownTicks>
+      <knockbackAttackDelay>240</knockbackAttackDelay>
+      <tauntCooldownTicks>600</tauntCooldownTicks>
+      <tauntAttackDelay>200</tauntAttackDelay>
+      <tauntChance>1</tauntChance>
+      </li>
+    </comps>
   </ThingDef>
  
   <PawnKindDef>
@@ -184,25 +184,25 @@
     <race>TM_SkeletonLichR</race>
     <combatPower>1000</combatPower>
     <defaultFactionType>TM_SkeletalFaction</defaultFactionType>
-	<ecoSystemWeight>0</ecoSystemWeight>
-	<canArriveManhunter>false</canArriveManhunter>
+    <ecoSystemWeight>0</ecoSystemWeight>
+    <canArriveManhunter>false</canArriveManhunter>
     <lifeStages>
-	  <li>
-	    <label>skeleton lich</label>
-        <labelPlural>skeletal lich</labelPlural>
-        <bodyGraphicData>
-          <texPath>PawnKind/skeleton_lich</texPath>
-          <graphicClass>Graphic_Multi</graphicClass>
-		  <shaderType>TransparentPostLight</shaderType>
-          <drawSize>2</drawSize>
-<!-- 		  <color>(180, 180, 180)</color> -->
-          <shadowData>
-            <volume>(0, 0, 0)</volume>
-            <offset>(0,0,0)</offset>
-          </shadowData>
-        </bodyGraphicData>
+      <li>
+        <label>skeleton lich</label>
+          <labelPlural>skeletal lich</labelPlural>
+          <bodyGraphicData>
+            <texPath>PawnKind/skeleton_lich</texPath>
+            <graphicClass>Graphic_Multi</graphicClass>
+        <shaderType>TransparentPostLight</shaderType>
+            <drawSize>2</drawSize>
+  <!-- 		  <color>(180, 180, 180)</color> -->
+            <shadowData>
+              <volume>(0, 0, 0)</volume>
+              <offset>(0,0,0)</offset>
+            </shadowData>
+          </bodyGraphicData>
       </li>
-	</lifeStages>
+	  </lifeStages>
   </PawnKindDef>  
   
   <ThingDef ParentName="TM_Skeletal_Base" Name="TM_GiantSkeleton">
@@ -215,7 +215,7 @@
       <ArmorRating_Sharp>0.9</ArmorRating_Sharp>
       <ArmorRating_Heat>1.8</ArmorRating_Heat>      
     </statBases>
-	<tools>
+	  <tools>
       <li>
         <label>left fist</label>
         <capacities>
@@ -225,7 +225,7 @@
         <cooldownTime>2.1</cooldownTime>
         <linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
       </li>
-	  <li>
+	    <li>
         <label>right fist</label>
         <capacities>
           <li>Blunt</li>
@@ -234,7 +234,7 @@
         <cooldownTime>2.1</cooldownTime>
         <linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
       </li>
-	  <li>
+	    <li>
         <label>teeth</label>
         <capacities>
           <li>Bite</li>
@@ -243,15 +243,15 @@
         <cooldownTime>2.5</cooldownTime>
         <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
       </li>
-	</tools>
+	  </tools>
     <race>
-	  <baseHealthScale>4</baseHealthScale>	
-      <lifeExpectancy>2000</lifeExpectancy>
-		<lifeStageAges>
+      <baseHealthScale>4</baseHealthScale>	
+        <lifeExpectancy>2000</lifeExpectancy>
+      <lifeStageAges>
         <li>
           <def>TM_GiantSkeleton_Lifestage</def>
           <minAge>100</minAge>
-		  <soundCall>TM_SkeletonAngry</soundCall>
+		      <soundCall>TM_SkeletonAngry</soundCall>
           <soundAngry>TM_SkeletonAngry</soundAngry>
           <soundWounded>TM_SkeletonPain</soundWounded>
           <soundDeath>TM_SkeletonAngryLow</soundDeath>
@@ -259,29 +259,28 @@
       </lifeStageAges>
       <soundMeleeHitPawn>TM_SkeletonPain</soundMeleeHitPawn>
       <soundMeleeHitBuilding>TM_SkeletonPainLow</soundMeleeHitBuilding>
-      <soundMeleeMiss>TM_SkeletonPain</soundMeleeMiss>      
+      <soundMeleeMiss>TM_SkeletonPain</soundMeleeMiss>
+      <bloodDef></bloodDef>
     </race>
-	<butcherProducts>
-
-    </butcherProducts>
-	<comps>
-		<li>
-			<compClass>CompAttachBase</compClass>
-		</li>
-	  <li Class="TorannMagic.CompProperties_SkeletonController">
-		<alwaysManhunter>false</alwaysManhunter>
-		<maxRangeForCloseThreat>5</maxRangeForCloseThreat>
-		<maxRangeForFarThreat>60</maxRangeForFarThreat>
-		<chargeCooldownTicks>1480</chargeCooldownTicks>
-		<rangedCooldownTicks>625</rangedCooldownTicks>
-		<rangedBurstCount>1</rangedBurstCount>
-		<rangedTicksBetweenBursts>10</rangedTicksBetweenBursts>
-		<aoeCooldownTicks>400</aoeCooldownTicks>
-		<knockbackCooldownTicks>0</knockbackCooldownTicks>
-		<tauntCooldownTicks>600</tauntCooldownTicks>
-		<tauntChance>.6</tauntChance>
-	  </li>
-	</comps>
+	  <butcherProducts></butcherProducts>
+    <comps>
+      <li>
+        <compClass>CompAttachBase</compClass>
+      </li>
+      <li Class="TorannMagic.CompProperties_SkeletonController">
+        <alwaysManhunter>false</alwaysManhunter>
+        <maxRangeForCloseThreat>5</maxRangeForCloseThreat>
+        <maxRangeForFarThreat>60</maxRangeForFarThreat>
+        <chargeCooldownTicks>1480</chargeCooldownTicks>
+        <rangedCooldownTicks>625</rangedCooldownTicks>
+        <rangedBurstCount>1</rangedBurstCount>
+        <rangedTicksBetweenBursts>10</rangedTicksBetweenBursts>
+        <aoeCooldownTicks>400</aoeCooldownTicks>
+        <knockbackCooldownTicks>0</knockbackCooldownTicks>
+        <tauntCooldownTicks>600</tauntCooldownTicks>
+        <tauntChance>.6</tauntChance>
+      </li>
+    </comps>
   </ThingDef>
  
   <PawnKindDef>
@@ -321,7 +320,7 @@
       <ArmorRating_Sharp>0.5</ArmorRating_Sharp>
       <ArmorRating_Heat>1.5</ArmorRating_Heat>      
     </statBases>
-	<tools>
+	  <tools>
       <li>
         <label>left fist</label>
         <capacities>
@@ -349,15 +348,15 @@
         <cooldownTime>2.5</cooldownTime>
         <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
       </li>
-	</tools>
+	  </tools>
     <race>
-	  <baseHealthScale>1</baseHealthScale>	
-      <lifeExpectancy>2000</lifeExpectancy>
-		<lifeStageAges>
+      <baseHealthScale>1</baseHealthScale>	
+        <lifeExpectancy>2000</lifeExpectancy>
+      <lifeStageAges>
         <li>
           <def>TM_Skeleton_Lifestage</def>
           <minAge>100</minAge>
-		  <soundCall>TM_SkeletonAngry</soundCall>
+		      <soundCall>TM_SkeletonAngry</soundCall>
           <soundAngry>TM_SkeletonAngry</soundAngry>
           <soundWounded>TM_SkeletonPain</soundWounded>
           <soundDeath>TM_SkeletonAngryLow</soundDeath>
@@ -365,29 +364,28 @@
       </lifeStageAges>
       <soundMeleeHitPawn>TM_SkeletonPain</soundMeleeHitPawn>
       <soundMeleeHitBuilding>TM_SkeletonPainLow</soundMeleeHitBuilding>
-      <soundMeleeMiss>TM_SkeletonPain</soundMeleeMiss>   	  
+      <soundMeleeMiss>TM_SkeletonPain</soundMeleeMiss>
+      <bloodDef></bloodDef>	  
     </race>
-	<butcherProducts>
-
-    </butcherProducts>
-	<comps>
-	  <li>
-		<compClass>CompAttachBase</compClass>
-	  </li>
-	  <li Class="TorannMagic.CompProperties_SkeletonController">
-		<alwaysManhunter>false</alwaysManhunter>
-		<maxRangeForCloseThreat>4</maxRangeForCloseThreat>
-		<maxRangeForFarThreat>40</maxRangeForFarThreat>
-		<chargeCooldownTicks>0</chargeCooldownTicks>
-		<rangedCooldownTicks>0</rangedCooldownTicks>
-		<rangedBurstCount>0</rangedBurstCount>
-		<rangedTicksBetweenBursts>10</rangedTicksBetweenBursts>
-		<aoeCooldownTicks>0</aoeCooldownTicks>
-		<knockbackCooldownTicks>0</knockbackCooldownTicks>
-		<tauntCooldownTicks>0</tauntCooldownTicks>
-		<tauntChance>0</tauntChance>
-	  </li>
-	</comps>
+    <butcherProducts></butcherProducts>
+    <comps>
+      <li>
+      <compClass>CompAttachBase</compClass>
+      </li>
+      <li Class="TorannMagic.CompProperties_SkeletonController">
+      <alwaysManhunter>false</alwaysManhunter>
+      <maxRangeForCloseThreat>4</maxRangeForCloseThreat>
+      <maxRangeForFarThreat>40</maxRangeForFarThreat>
+      <chargeCooldownTicks>0</chargeCooldownTicks>
+      <rangedCooldownTicks>0</rangedCooldownTicks>
+      <rangedBurstCount>0</rangedBurstCount>
+      <rangedTicksBetweenBursts>10</rangedTicksBetweenBursts>
+      <aoeCooldownTicks>0</aoeCooldownTicks>
+      <knockbackCooldownTicks>0</knockbackCooldownTicks>
+      <tauntCooldownTicks>0</tauntCooldownTicks>
+      <tauntChance>0</tauntChance>
+      </li>
+    </comps>
   </ThingDef>
  
   <PawnKindDef>