Merge pull request #53 from kbatbouta/development

Fixed a small bug
kbatbouta · Feb 10, 2023 · cc2b14e · cc2b14e
2 parents 4abda46 + 40d611e
commit cc2b14e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/1.4/Assemblies/CombatAI.dll b/1.4/Assemblies/CombatAI.dll
diff --git a/Source/Rule56/CombatAIMod.cs b/Source/Rule56/CombatAIMod.cs
@@ -329,6 +329,7 @@ private void FillCollapsible_Debugging(Listing_Collapsible collapsible)
 		{
 			collapsible.CheckboxLabeled(Keyed.CombatAI_Settings_Debugging_Enable, ref Finder.Settings.Debug);
 			collapsible.CheckboxLabeled("Disable quick setup menu", ref Finder.Settings.FinishedQuickSetup);
+			collapsible.CheckboxLabeled("Enable cinematic mode", ref Finder.Settings.Debug_DisablePawnGuiOverlay);
 			collapsible.CheckboxLabeled("Draw sight grid", ref Finder.Settings.Debug_DrawShadowCasts);
 			collapsible.CheckboxLabeled("Draw sight vector field", ref Finder.Settings.Debug_DrawShadowCastsVectors);
 			collapsible.CheckboxLabeled("Draw threat (pawn armor vs enemy)", ref Finder.Settings.Debug_DrawThreatCasts);

diff --git a/Source/Rule56/Comps/ThingComp_CombatAI.cs b/Source/Rule56/Comps/ThingComp_CombatAI.cs
@@ -975,8 +975,8 @@ public void Notify_SightReaderChanged(SightTracker.SightReader reader)
 		public override void PostExposeData()
 		{
 			base.PostExposeData();
-			Scribe_Deep.Look(ref duties, "duties");
-			Scribe_Deep.Look(ref abilities, "abilities");
+			Scribe_Deep.Look(ref duties, "duties2");
+			Scribe_Deep.Look(ref abilities, "abilities2");
 			Scribe_TargetInfo.Look(ref forcedTarget, "forcedTarget");
 			if (duties == null)
 			{

diff --git a/Source/Rule56/Patches/Pawn_Patch.cs b/Source/Rule56/Patches/Pawn_Patch.cs
@@ -45,7 +45,7 @@ private static class Pawn_DrawGUIOverlay_Patch
 		{
 			public static bool Prefix(Pawn __instance)
 			{
-				return !fogOverlay.IsFogged(__instance.Position);
+				return !fogOverlay.IsFogged(__instance.Position) && !Finder.Settings.Debug_DisablePawnGuiOverlay;
 			}
 		}
 

diff --git a/Source/Rule56/Settings.cs b/Source/Rule56/Settings.cs
@@ -30,6 +30,7 @@ public class Settings : ModSettings
 		public bool Debug_DrawShadowCasts;
 		public bool Debug_DrawShadowCastsVectors = false;
 		public bool Debug_DrawThreatCasts        = false;
+		public bool Debug_DisablePawnGuiOverlay  = false;
 		public bool Debug_ValidateSight;
 		public bool Enable_Groups = true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ private static class Pawn_DrawGUIOverlay_Patch @@
     		{
     			public static bool Prefix(Pawn __instance)
     			{
-    				return !fogOverlay.IsFogged(__instance.Position);
+    				return !fogOverlay.IsFogged(__instance.Position) && !Finder.Settings.Debug_DisablePawnGuiOverlay;
     			}
     		}
@@ Expand Down @@