fixes healer balance, fixes space zombie regression

pardeike · Mar 3, 2022 · 84d9f35 · 84d9f35
1 parent b84361c
commit 84d9f35
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/1.3/Assemblies/ZombieLand.dll b/1.3/Assemblies/ZombieLand.dll
diff --git a/Source/Patches.cs b/Source/Patches.cs
@@ -3080,7 +3080,7 @@ static void Postfix(Map __instance)
 			{
 				if (WorldRendererUtility.WorldRenderedNow) return;
 				if (Find.CurrentMap != __instance) return;
-				if (__instance.IsBlacklisted()) return;
+				if (__instance.Biome != SoSTools.sosOuterSpaceBiomeDef) return;
 
 				var tickManager = __instance.GetComponent<TickManager>();
 				if (tickManager == null) return;

diff --git a/Source/Zombie.cs b/Source/Zombie.cs
@@ -11,10 +11,12 @@ namespace ZombieLand
 {
 	public enum NthTick
 	{
+		// never use one value more than once per tick cycle and zombie!
 		Every2,
 		Every10,
-		Every15,
-		Every30,
+		Every12,
+		Every45,
+		Every50,
 		Every60,
 		Every480,
 		Every960
@@ -537,17 +539,28 @@ public void CustomTick(float threatLevel)
 			if (threatLevel <= 0.002f && ZombieSettings.Values.zombiesDieOnZeroThreat && Rand.Chance(0.002f))
 				_ = TakeDamage(damageInfo);
 
-			if (isHealer && state != ZombieState.Emerging && EveryNTick(NthTick.Every15))
+			if (isHealer && state != ZombieState.Emerging && EveryNTick(NthTick.Every12))
 			{
 				var radius = 4 + ZombieLand.Tools.Difficulty() * 2;
+
+				var n = GenRadial.RadialDistinctThingsAround(Position, map, radius, false)
+					.OfType<Zombie>()
+					.Where(zombie => zombie.health.hediffSet.hediffs.Any()).Count();
+
 				GenRadial.RadialDistinctThingsAround(Position, map, radius, false)
 					.OfType<Zombie>()
-					.Where(zombie => zombie.health.hediffSet.hediffs.Any())
-					.Do(zombie =>
+					.Select(zombie => (zombie, zombie.health.hediffSet.hediffs))
+					.Where(pair => pair.hediffs.Any())
+					.OrderByDescending(pair => pair.hediffs.Count)
+					.Do(pair =>
 					{
-						zombie.health.hediffSet.Clear();
-						healInfo.Add(new HealerInfo(zombie));
-						map.debugDrawer.debugLines.Add(new DebugLine(DrawPos, zombie.DrawPos, 60, SimpleColor.Cyan));
+						if (healInfo.Count < 4)
+						{
+							var zombie = pair.zombie;
+							zombie.health.hediffSet.Clear();
+							healInfo.Add(new HealerInfo(zombie));
+							map.debugDrawer.debugLines.Add(new DebugLine(DrawPos, zombie.DrawPos, 60, SimpleColor.Cyan));
+						}
 					});
 			}
 		}

diff --git a/Source/ZombieStateHandler.cs b/Source/ZombieStateHandler.cs
@@ -91,7 +91,7 @@ public static bool Roping(this JobDriver_Stumble driver, Zombie zombie)
 				return false;
 			}
 
-			if (zombie.EveryNTick(NthTick.Every60))
+			if (zombie.EveryNTick(NthTick.Every45))
 				_ = HealthUtility.FixWorstHealthCondition(zombie);
 
 			driver.destination = IntVec3.Invalid;
@@ -168,7 +168,7 @@ public static bool DownedOrUnconsciousness(Zombie zombie)
 		//
 		public static void ApplyFire(Zombie zombie)
 		{
-			if (zombie.isOnFire || zombie.EveryNTick(NthTick.Every60) == false)
+			if (zombie.isOnFire || zombie.EveryNTick(NthTick.Every50) == false)
 				return;
 
 			var temp = GenTemperature.GetTemperatureForCell(zombie.Position, zombie.Map);