Execution distance checking

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

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/Assemblies/TargetingModes.dll b/Assemblies/TargetingModes.dll
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/TargetingModeDef.cs b/Source/TargetingModes/TargetingModeDef.cs
@@ -51,7 +51,7 @@ public bool TagsListContains(List<BodyPartTagDef> partTags)
             return false;
         }
 
-        public int RerollCount(Pawn pawn)
+        public int RerollCount(Pawn pawn, Thing instigator)
         {
             float finalizedRerollCount = rerollCount;
 
@@ -61,7 +61,7 @@ public int RerollCount(Pawn pawn)
                 finalizedRerollCount *= extensionValues.targetModeRerollCountFactors[this];
 
             // Whether or not a reroll bonus is applied for the target being downed
-            if (pawn.Downed)
+            if (pawn.Downed && (pawn.Position - instigator.Position).LengthHorizontal <= ShootTuning.ExecutionMaxDistance)
                 finalizedRerollCount *= ShootTuning.ExecutionAccuracyFactor;
 
             return GenMath.RoundRandom(finalizedRerollCount);

diff --git a/Source/TargetingModes/TargetingModesUtility.cs b/Source/TargetingModes/TargetingModesUtility.cs
@@ -68,7 +68,7 @@ public static BodyPartRecord ResolvePrioritizedPart_External(BodyPartRecord part
             {
                 TargetingModeDef targetingMode = targetingComp.GetTargetingMode();
                 if (!part.IsPrioritizedPart(targetingMode))
-                    newPart = RerollBodyPart(targetingMode, part, dinfo.Def, dinfo.Height, BodyPartDepth.Outside, pawn);
+                    newPart = RerollBodyPart(targetingMode, part, dinfo.Def, dinfo.Height, BodyPartDepth.Outside, pawn, dinfo.Instigator);
             }
             return newPart;
         }
@@ -81,11 +81,11 @@ public static bool IsPrioritizedPart(this BodyPartRecord part, TargetingModeDef
 
 
         public static BodyPartRecord RerollBodyPart(TargetingModeDef targetingMode, BodyPartRecord bodyPart, DamageInfo dinfo, Pawn pawn) =>
-            RerollBodyPart(targetingMode, bodyPart, dinfo.Def, dinfo.Height, dinfo.Depth, pawn);
+            RerollBodyPart(targetingMode, bodyPart, dinfo.Def, dinfo.Height, dinfo.Depth, pawn, dinfo.Instigator);
 
-        public static BodyPartRecord RerollBodyPart(TargetingModeDef targetingMode, BodyPartRecord bodyPart, DamageDef damDef, BodyPartHeight height, BodyPartDepth depth, Pawn pawn)
+        public static BodyPartRecord RerollBodyPart(TargetingModeDef targetingMode, BodyPartRecord bodyPart, DamageDef damDef, BodyPartHeight height, BodyPartDepth depth, Pawn pawn, Thing instigator)
         {
-            for (int i = 0; i < targetingMode.RerollCount(pawn); i++)
+            for (int i = 0; i < targetingMode.RerollCount(pawn, instigator); i++)
             {
                 BodyPartRecord newPart = pawn.health.hediffSet.GetRandomNotMissingPart(damDef, height, depth);
                 if (newPart.IsPrioritizedPart(targetingMode))

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