Further job assignment changes

Haulers will now once again cut plants that are interferring with blueprint placement, but only if they're assigned to Plant Cutting. Otherwise, they will simply leave that blueprint untouched.

Source/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("2.7.18.0")]
-[assembly: AssemblyFileVersion("2.7.18.0")]
+[assembly: AssemblyVersion("2.8.18.0")]
+[assembly: AssemblyFileVersion("2.8.18.0")]

Source/Tools/Utilities.cs

@@ -4,8 +4,11 @@
 
 namespace HMTB
 {
+	[StaticConstructorOnStartup]
 	public static class Utilities
 	{
+		private static WorkTypeDef PlantCutting = DefDatabase<WorkTypeDef>.GetNamed("PlantCutting");
+
 		public static bool AllowedHaulDistance(Pawn pawn, Thing t)
 		{
 			OpportunityDistance distance = Controller.OpportunisticMode.Value;
@@ -33,30 +36,36 @@ public static bool AllowedHaulDistance(Pawn pawn, Thing t)
 			return t.Position.DistanceTo(pawn.Position) <= maxSearchDistance;
 		}
 
-		/* RimWorld.GenConstruct.CanConstruct
-		 * Tweaked vanilla code to disregard pawn skill */
-		public static bool CanDeliverResources(Thing t, Pawn p, Thing firstBlocking, bool forced = false)
+		/* RimWorld.GenConstruct.HandleBlockingThingJob
+		 * Tweaked vanilla code to disregard construction and only cut plants if the hauler is a PlantCutter */
+		public static Job HandleBlockingThingJob(Thing firstBlocking, Pawn p, bool forced = false)
 		{
-			if (firstBlocking != null)
+			if (firstBlocking.def.category == ThingCategory.Plant)
 			{
-				return false;
+				if (p.workSettings.GetPriority(PlantCutting) > 0)
+				{
+					if (p.CanReserveAndReach(new LocalTargetInfo(firstBlocking), PathEndMode.ClosestTouch, p.NormalMaxDanger(), 1, -1, null, forced))
+					{
+						return new Job(JobDefOf.CutPlant, firstBlocking);
+					}
+				}
 			}
 
-			LocalTargetInfo target = t;
-
-			Danger maxDanger = !forced ? p.NormalMaxDanger() : Danger.Deadly;
-
-			if (!p.CanReserveAndReach(target, PathEndMode.Touch, maxDanger, 1, -1, null, forced))
+			else if (firstBlocking.def.category == ThingCategory.Item && firstBlocking.def.EverHaulable)
 			{
-				return false;
+				return HaulAIUtility.HaulAsideJobFor(p, firstBlocking);
 			}
 
-			if (t.IsBurning())
-			{
-				return false;
-			}
+			return null;
+		}
+
+		/* RimWorld.GenConstruct.CanConstruct
+		 * Tweaked vanilla code to disregard pawn skill */
+		public static bool CanDeliverResources(Thing t, Pawn p, bool forced = false)
+		{
+			Danger maxDanger = !forced ? p.NormalMaxDanger() : Danger.Deadly;
 
-			return true;
+			return !t.IsBurning() && p.CanReserveAndReach(new LocalTargetInfo(t), PathEndMode.Touch, maxDanger, 1, -1, null, forced);
 		}
 	}
 }

Source/Work/WorkGiver_HaulDeliverResourcesToBlueprints.cs

@@ -41,12 +41,12 @@ public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false)
 
 			Thing firstBlockingThing = GenConstruct.FirstBlockingThing(blueprint, pawn);
 
-			if (firstBlockingThing != null && firstBlockingThing.def.category == ThingCategory.Item && firstBlockingThing.def.EverHaulable)
+			if (firstBlockingThing != null)
 			{
-				return HaulAIUtility.HaulAsideJobFor(pawn, firstBlockingThing);
+				return Utilities.HandleBlockingThingJob(firstBlockingThing, pawn, forced);
 			}
 
-			if (!Utilities.CanDeliverResources(blueprint, pawn, firstBlockingThing, forced))
+			if (!Utilities.CanDeliverResources(blueprint, pawn, forced))
 			{
 				return null;
 			}

Source/Work/WorkGiver_HaulDeliverResourcesToFrames.cs

@@ -38,12 +38,12 @@ public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false)
 
 			Thing firstBlockingThing = GenConstruct.FirstBlockingThing(frame, pawn);
 
-			if (firstBlockingThing != null && firstBlockingThing.def.category == ThingCategory.Item && firstBlockingThing.def.EverHaulable)
+			if (firstBlockingThing != null)
 			{
-				return HaulAIUtility.HaulAsideJobFor(pawn, firstBlockingThing);
+				return Utilities.HandleBlockingThingJob(firstBlockingThing, pawn, forced);
 			}
 
-			if (!Utilities.CanDeliverResources(frame, pawn, firstBlockingThing, forced))
+			if (!Utilities.CanDeliverResources(frame, pawn, forced))
 			{
 				return null;
 			}