git commit from PowerShell in C#Doors Expanded Player animals now pro…

…perly go to restricted areas that use doors from DoorsExpanded. Prisoners now properly go along with caravaners. Manhunters should not give errors when seeking targets hiding behind doors from Doors Expanded.

About/DiscordURL.txt

@@ -0,0 +1 @@
+https://discord.gg/AaVFA7V

About/LudeonURL.txt

@@ -0,0 +1 @@
+https://ludeon.com/forums/index.php?topic=39264.0

About/PatreonURL.txt

@@ -0,0 +1 @@
+https://www.patreon.com/posts/doors-expanded-0-21060058

Source/Building_DoorExpanded.cs

@@ -388,9 +388,11 @@ public bool SlowsPawns
         public virtual bool PawnCanOpen(Pawn p)
         {
             Lord lord = p.GetLord();
-            return !forbiddenComp.Forbidden && Def.doorType == DoorType.FreePassage || (lord != null && lord.LordJob != null && lord.LordJob.CanOpenAnyDoor(p)) || 
+            var result = !forbiddenComp.Forbidden || Def.doorType == DoorType.FreePassage || (lord != null && lord.LordJob != null && lord.LordJob.CanOpenAnyDoor(p)) || 
                    (p.IsWildMan() && !p.mindState.WildManEverReachedOutside) || base.Faction == null || 
                    (p.guest != null && p.guest.Released) || GenAI.MachinesLike(base.Faction, p);
+            if (!result && p.AnimalOrWildMan()) Console.WriteLine(p.def.ToString() + " cannot open " + this.def.ToString());
+            return result;
         }
 
 

Source/Building_DoorRegionHandler.cs

@@ -6,6 +6,7 @@
 using RimWorld;
 using Verse;
 using Verse.AI;
+using Verse.AI.Group;
 using Verse.Sound;
 
 namespace DoorsExpanded
@@ -23,19 +24,12 @@ namespace DoorsExpanded
     /// </summary>
     public class Building_DoorRegionHandler : Building_Door
     {
-
-
         private Building_DoorExpanded parentDoor;
+
         public Building_DoorExpanded ParentDoor
         {
-            get
-            {
-                return parentDoor;
-            }
-            set
-            {
-                parentDoor = value;
-            }
+            get { return parentDoor; }
+            set { parentDoor = value; }
         }
 
         public override string LabelMouseover => "";
@@ -53,7 +47,12 @@ public int TicksUntilClose
 
         public override bool PawnCanOpen(Pawn p)
         {
-            return base.PawnCanOpen(p) && ((p.Faction == this.Faction || !p.Faction.HostileTo(this.Faction)) && !this.IsForbidden(p));
+            Lord lord = p.GetLord();
+            if (lord != null && lord.LordJob != null && lord.LordJob.CanOpenAnyDoor(p) ||
+                (WildManUtility.WildManShouldReachOutsideNow(p) || this.Faction == null ||
+                 p.guest != null && p.guest.Released) || p.AnimalOrWildMan() && p.playerSettings != null)
+                return true;
+            return GenAI.MachinesLike(this.Faction, p);
         }
 
         public override void Tick()
@@ -102,7 +101,7 @@ public bool OpenValue
             get => Traverse.Create(this).Field("openInt").GetValue<bool>();
             set => Traverse.Create(this).Field("openInt").SetValue(value);
         }
-        
+
         public void OpenMe(int ticks)
         {
             this.ticksUntilClose = ticks;
@@ -126,7 +125,7 @@ public void OpenMe(int ticks)
                 }
             }
         }
-        
+
         public override void ExposeData()
         {
             base.ExposeData();
@@ -137,4 +136,4 @@ public override void ExposeData()
             }*/
         }
     }
-}
+}

Source/DiscordWebhookToken.txt

@@ -0,0 +1 @@
+https://discordapp.com/api/webhooks/487657430256451586/fQfntEHnahggdYmE4db0c0S_xc2MFgzHNyN7nUwIf91LSHqKPKhVi6ixUhkmL7oZf-BJ