v3.8.5 fixes ignore forbidden/restrictions functions

pardeike · Sep 23, 2023 · 11163c8 · 11163c8
1 parent 22700ab
commit 11163c8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/1.4/Assemblies/AchtungMod.dll b/1.4/Assemblies/AchtungMod.dll
diff --git a/About/About.xml b/About/About.xml
@@ -18,7 +18,7 @@
     </li>
   </modDependencies>
   <packageId>brrainz.achtung</packageId>
-  <modVersion>3.8.4.0</modVersion>
+  <modVersion>3.8.5.0</modVersion>
   <steamAppId>730936602</steamAppId>
   <url>https://github.com/pardeike/Achtung2</url>
   <description>Command your colonists like a boss!

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>net.pardeike.rimworld.mod.achtung</identifier>
-  <version>3.8.4.0</version>
+  <version>3.8.5.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
 		<ModName>Achtung</ModName>
 		<ModFileName>Achtung</ModFileName>
 		<Repository>https://github.com/pardeike/Achtung2</Repository>
-		<ModVersion>3.8.4.0</ModVersion>
+		<ModVersion>3.8.5.0</ModVersion>
 		<ProjectGuid>{8BD5A28F-96C4-43B4-907F-600AA0162F84}</ProjectGuid>
 	</PropertyGroup>
 

diff --git a/Source/ForcedWork.cs b/Source/ForcedWork.cs
@@ -95,6 +95,8 @@ public void Unprepare(Pawn pawn)
 			_ = preparing.Remove(pawn);
 		}
 
+		public bool IsPreparing(Pawn pawn) => preparing.Contains(pawn);
+
 		public bool HasForcedJob(Pawn pawn, bool ignorePreparing = false)
 		{
 			if (pawn == null)

diff --git a/Source/Main.cs b/Source/Main.cs
@@ -451,11 +451,11 @@ static class ForbidUtility_InAllowedArea_Patch
 		public static void Postfix(/*IntVec3 c,*/ Pawn forPawn, ref bool __result)
 		{
 			var map = forPawn?.Map;
-			if (map == null || forPawn.RaceProps.Humanlike == false)
+			if (map == null || __result || forPawn.RaceProps.Humanlike == false)
 				return;
 
 			var forcedWork = ForcedWork.Instance;
-			if (forcedWork.hasForcedJobs == false)
+			if (forcedWork.hasForcedJobs == false && forcedWork.IsPreparing(forPawn) == false)
 				return;
 
 			if (forcedWork.HasForcedJob(forPawn))
@@ -727,13 +727,13 @@ public static void FixPatch()
 			}
 		}
 
-		[HarmonyPrefix]
-		public static bool Patch(Pawn pawn, ref bool __result)
+		public static bool Prefix(Thing t, Pawn pawn, ref bool __result)
 		{
-			if (pawn?.Map != null && pawn.RaceProps.Humanlike && Achtung.Settings.ignoreForbidden)
+			if (pawn?.Map != null && pawn.RaceProps.Humanlike)
 			{
 				var forcedWork = ForcedWork.Instance;
-				if (forcedWork.HasForcedJob(pawn))
+				// t.IsForbidden() is necessary or else we allow a lot more jobs as a side effect
+				if (forcedWork.HasForcedJob(pawn) && t.IsForbidden(pawn.Faction))
 				{
 					__result = false;
 					return false;