Exclude electrical zombies from avoidance and make colonists attack t…

…hem via melee in auto attack response
pardeike · Sep 20, 2019 · aee778c · aee778c
1 parent a90d418
commit aee778c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/Assemblies/ZombieLand.dll b/Assemblies/ZombieLand.dll
diff --git a/Source/Patches.cs b/Source/Patches.cs
@@ -1134,6 +1134,21 @@ static bool Prefix(Pawn pawn, ref Job __result)
 				}
 				return true;
 			}
+
+			public static bool MyCanReachImmediate(Pawn pawn, LocalTargetInfo target, PathEndMode peMode)
+			{
+				if (target.Thing is Zombie zombie)
+					if (zombie.isElectrifier)
+						return true;
+				return pawn.CanReachImmediate(target, peMode);
+			}
+
+			static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+			{
+				var m_CanReachImmediate = SymbolExtensions.GetMethodInfo(() => ReachabilityImmediate.CanReachImmediate(null, default, default));
+				var m_MyCanReachImmediate = SymbolExtensions.GetMethodInfo(() => MyCanReachImmediate(null, default, default));
+				return Transpilers.MethodReplacer(instructions, m_CanReachImmediate, m_MyCanReachImmediate);
+			}
 		}
 		[HarmonyPatch(typeof(DangerUtility))]
 		[HarmonyPatch(nameof(DangerUtility.GetDangerFor))]

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -31,5 +31,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.16.7.0")]
-[assembly: AssemblyFileVersion("1.16.7.0")]
+[assembly: AssemblyVersion("1.16.8.0")]
+[assembly: AssemblyFileVersion("1.16.8.0")]
diff --git a/Source/TickManager.cs b/Source/TickManager.cs
@@ -55,7 +55,8 @@ public override void FinalizeInit()
 			var grid = map.GetGrid();
 			grid.IterateCellsQuick(cell => cell.zombieCount = 0);
 
-			RecalculateVisibleMap();
+			visibleGridUpdateCounter = -1;
+			RecalculateZombieWanderDestination();
 
 			var destinations = GetterSetters.reservedDestinationsByRef(map.pawnDestinationReservationManager);
 			var zombieFaction = Find.FactionManager.FirstFactionOfDef(ZombieDefOf.Zombies);
@@ -110,17 +111,7 @@ public override void ExposeData()
 				explosions = new List<IntVec3>();
 		}
 
-		public static void ForceRecalculate()
-		{
-			var tickManager = Find.CurrentMap?.GetComponent<TickManager>();
-			if (tickManager != null)
-			{
-				tickManager.visibleGridUpdateCounter = -1;
-				tickManager.RecalculateVisibleMap();
-			}
-		}
-
-		public void RecalculateVisibleMap()
+		public void RecalculateZombieWanderDestination()
 		{
 			Tools.UpdateStoryTellerDifficulty();
 
@@ -408,7 +399,7 @@ IEnumerator TickTasks()
 			yield return null;
 			FetchAvoidGrid();
 			yield return null;
-			RecalculateVisibleMap();
+			RecalculateZombieWanderDestination();
 			yield return null;
 			IncreaseZombiePopulation();
 			yield return null;

diff --git a/Source/Tools.cs b/Source/Tools.cs
@@ -252,6 +252,8 @@ public static bool ShouldAvoidZombies(Pawn pawn = null)
 
 		public static float ZombieAvoidRadius(Zombie zombie, bool squared = false)
 		{
+			if (zombie.isElectrifier)
+				return 0f;
 			if (zombie.wasMapPawnBefore)
 				return squared ? 64f : 8f;
 			if (zombie.raging > 0)