Accuracy bonus to parts on downed targets

XeoNovaDan · Nov 27, 2018 · 7e109c7 · 7e109c7
1 parent 45369f4
commit 7e109c7
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 11 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -3,6 +3,6 @@
 	<name>[XND] Targeting Modes</name>
 	<author>XeoNovaDan</author>
 	<url>https://ludeon.com/forums/index.php?topic=29503.0</url>
-	<targetVersion>1.0.2059</targetVersion>
-	<description>Current Version: v1.1.4 (22nd November 2018)\n\nV.A.T.S for RimWorld! Allow your colonists, obedient animals and even some raiders to prioritize targeting certain body part groups of their enemies. Shoot those heads off in style!</description>
+	<targetVersion>1.0.2096</targetVersion>
+	<description>Current Version: v1.1.5 (27th November 2018)\n\nV.A.T.S for RimWorld! Allow your colonists, obedient animals and even some raiders to prioritize targeting certain body part groups of their enemies. Shoot those heads off in style!</description>
 </ModMetaData>
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,6 +1,6 @@
 <Manifest>
     <identifier>TargetingModes</identifier>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <manifestUri>https://rawgit.com/XeoNovaDan/TargetingModes/master/About/Manifest.xml</manifestUri>
     <downloadUri>https://github.com/XeoNovaDan/TargetingModes/releases</downloadUri>
 </Manifest>
diff --git a/Assemblies/TargetingModes.dll b/Assemblies/TargetingModes.dll
diff --git a/Patches/Bodies/Bodies_Humanlike.xml b/Patches/Bodies/Bodies_Humanlike.xml
@@ -1,7 +1,7 @@
 <Patch>
 
     <Operation Class="PatchOperationAddModExtension">
-        <xpath>*/BodyDef[defName="Human"]</xpath>
+        <xpath>Defs/BodyDef[defName="Human"]</xpath>
         <value>
             <li Class="TargetingModes.TargetModeRerollFactors">
                 <!-- Humans have a much lower coverageAbs % for neck + children than any other body type in the base game -->

diff --git a/Patches/ThingDefs_Races/Races_Animal_Base.xml b/Patches/ThingDefs_Races/Races_Animal_Base.xml
@@ -1,7 +1,7 @@
 <Patch>
 
     <Operation Class="PatchOperationAdd">
-        <xpath>*/ThingDef[thingClass="Pawn"]/comps</xpath>
+        <xpath>Defs/ThingDef[thingClass="Pawn"]/comps</xpath>
         <value>
             <li>
                 <compClass>TargetingModes.CompTargetingMode</compClass>

diff --git a/Source/TargetingModes/.vs/TargetingModes/v15/.suo b/Source/TargetingModes/.vs/TargetingModes/v15/.suo
diff --git a/Source/TargetingModes/.vs/TargetingModes/v15/Server/sqlite3/storage.ide-shm b/Source/TargetingModes/.vs/TargetingModes/v15/Server/sqlite3/storage.ide-shm
diff --git a/Source/TargetingModes/.vs/TargetingModes/v15/Server/sqlite3/storage.ide-wal b/Source/TargetingModes/.vs/TargetingModes/v15/Server/sqlite3/storage.ide-wal
diff --git a/Source/TargetingModes/Properties/AssemblyInfo.cs b/Source/TargetingModes/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4.0")]
-[assembly: AssemblyFileVersion("1.1.4.0")]
+[assembly: AssemblyVersion("1.1.5.0")]
+[assembly: AssemblyFileVersion("1.1.5.0")]
diff --git a/Source/TargetingModes/TargetingModeDef.cs b/Source/TargetingModes/TargetingModeDef.cs
@@ -53,10 +53,18 @@ public bool TagsListContains(List<BodyPartTagDef> partTags)
 
         public int RerollCount(Pawn pawn)
         {
-            var extensionValues = pawn.RaceProps.body.GetModExtension<TargetModeRerollFactors>();
-            return GenMath.RoundRandom(rerollCount *
-                ((extensionValues != null && extensionValues.targetModeRerollCountFactors.ContainsKey(this)) ?
-                extensionValues.targetModeRerollCountFactors[this] : 1f));
+            float finalizedRerollCount = rerollCount;
+
+            // Whether or not a reroll modifier is applied based on the target's BodyDef
+            if (pawn.RaceProps.body.GetModExtension<TargetModeRerollFactors>() is TargetModeRerollFactors extensionValues && 
+                extensionValues.targetModeRerollCountFactors.ContainsKey(this))
+                finalizedRerollCount *= extensionValues.targetModeRerollCountFactors[this];
+
+            // Whether or not a reroll bonus is applied for the target being downed
+            if (pawn.Downed)
+                finalizedRerollCount *= ShootTuning.ExecutionAccuracyFactor;
+
+            return GenMath.RoundRandom(finalizedRerollCount);
         }
 
         public override void PostLoad()

diff --git a/Source/TargetingModes/obj/Debug/TargetingModes.csprojAssemblyReference.cache b/Source/TargetingModes/obj/Debug/TargetingModes.csprojAssemblyReference.cache
diff --git a/Source/TargetingModes/obj/Debug/TargetingModes.dll b/Source/TargetingModes/obj/Debug/TargetingModes.dll