Stock up skips if surgery is to be done

alextd · Oct 15, 2018 · 04b0f2d · 04b0f2d
1 parent 82ad29d
commit 04b0f2d
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Source/StockUp/JobGiver_StockUp.cs b/Source/StockUp/JobGiver_StockUp.cs
@@ -17,13 +17,23 @@ public static class SmartMedicineJobDefOf
 
 	public class JobGiver_StockUp : ThinkNode_JobGiver
 	{
+		public static bool Skip(Pawn pawn)
+		{
+			Log.Message($"Skip need tend?");
+			if (pawn.Map.mapPawns.AllPawnsSpawned.Any(p => HealthAIUtility.ShouldBeTendedNowByPlayer(p) && pawn.CanReserveAndReach(p, PathEndMode.ClosestTouch, Danger.Deadly)))
+				return true;
+
+			if (pawn.Map.mapPawns.AllPawnsSpawned.Any(p => p is IBillGiver billGiver && billGiver.BillStack.AnyShouldDoNow && pawn.CanReserveAndReach(p, PathEndMode.ClosestTouch, Danger.Deadly)))
+				return true;
+
+			return false;
+		}
 		protected override Job TryGiveJob(Pawn pawn)
 		{
 			Log.Message($"{pawn} JobGiver_StockUp");
 			if (pawn.StockUpIsFull()) return null;
 
-			Log.Message($"Skip need tend?");
-			if (pawn.Map.mapPawns.AllPawnsSpawned.Any(p => HealthAIUtility.ShouldBeTendedNowByPlayer(p) && pawn.CanReserveAndReach(p, PathEndMode.ClosestTouch, Danger.Deadly)))
+			if (Skip(pawn))
 				return null;
 
 			Log.Message($"any things?");