Blood vials/packs are no longer forbidden in prisoner rooms Fixes #18 …

…-- Sleepers now are assigned coffins when sleeping in one #20 (needs further polish)
Rim-Of-Madness-Team · Jan 28, 2018 · 5edef0f · 5edef0f
1 parent 0114061
commit 5edef0f
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 15 deletions.
diff --git a/Assemblies/Vampire.dll b/Assemblies/Vampire.dll
diff --git a/Defs/ThingDefs_BloodItems/ROMV_Items.xml b/Defs/ThingDefs_BloodItems/ROMV_Items.xml
@@ -30,7 +30,7 @@
     </graphicData>
     <soundInteract>Standard_Drop</soundInteract>
     <soundDrop>Standard_Drop</soundDrop>
-    <socialPropernessMatters>true</socialPropernessMatters>
+    <socialPropernessMatters>false</socialPropernessMatters>
     <statBases>
       <MaxHitPoints>60</MaxHitPoints>
       <MarketValue>30</MarketValue>
@@ -62,7 +62,7 @@
     </graphicData>
     <soundInteract>Standard_Drop</soundInteract>
     <soundDrop>Standard_Drop</soundDrop>
-    <socialPropernessMatters>true</socialPropernessMatters>
+    <socialPropernessMatters>false</socialPropernessMatters>
     <statBases>
       <MaxHitPoints>60</MaxHitPoints>
       <MarketValue>60</MarketValue>

diff --git a/Source/Vampires/Components/CompVampBed.cs b/Source/Vampires/Components/CompVampBed.cs
@@ -96,30 +96,62 @@ private void SpawnBedAsNeeded()
             }
         }
 
+        private readonly bool harmonyPatchIsActiveForMultipleCharacters = false;
+
         /// <summary>
         /// Remove and add assignments to the bed as needed.
         /// </summary>
         /// <param name="g"></param>
         /// <param name="bedPawns"></param>
         private void AssignBedPawnsAsNeeded(Building_Grave g, List<Pawn> bedPawns)
         {
-            if (g.AssignedPawns != null && g.AssignedPawns.Any())
+            if (g.PositionHeld.GetFirstPawn(g.MapHeld) is Pawn p && !p.Awake())
             {
-                if (bedPawns.Any())
+                if (bedPawns.Contains(p))
+                    return;
+                else
                 {
-                    var tempBedPawns = new List<Pawn>(bedPawns);
-                    foreach (var bedPawn in tempBedPawns)
-                    {
-                        if (!g.AssignedPawns.Contains(bedPawn))
-                            bed.TryUnassignPawn(bedPawn);
-                    }
+                    bed.TryAssignPawn(p);
+                    g.TryAssignPawn(p);
+                }
+            }
+            else
+            {
+                HashSet<Pawn> gravePawns = new HashSet<Pawn>(g.AssignedPawns);
+                HashSet<Pawn> bedPawnsSet = new HashSet<Pawn>(bedPawns);
+                if (gravePawns.SetEquals(bedPawnsSet)) return;
+                else if (gravePawns.Count() >= bedPawnsSet.Count())
+                {
+                    if (bedPawnsSet.Any())
+                        foreach (var bp in bedPawnsSet)
+                            bed.TryUnassignPawn(bp);
+                    foreach (var gp in gravePawns)
+                        bed.TryAssignPawn(gp);
                 }
-                foreach (var gravePawn in g.AssignedPawns)
-                    bed.TryAssignPawn(gravePawn);
+                else if (gravePawns.Count() < bedPawnsSet.Count() && harmonyPatchIsActiveForMultipleCharacters)
+                {
+                    foreach (var bp in bedPawnsSet)
+                        g.TryAssignPawn(bp);
+                }   
             }
-            else if (bed.AssignedPawns.Any())
-                foreach (var pawn in bedPawns)
-                    bed.TryUnassignPawn(pawn);
+
+//            if (g.AssignedPawns != null && g.AssignedPawns.Count() > 0)
+//            {
+//                if (bedPawns.Any())
+//                {
+//                    var tempBedPawns = new List<Pawn>(bedPawns);
+//                    foreach (var bedPawn in tempBedPawns)
+//                    {
+//                        if (!g.AssignedPawns.Contains(bedPawn))
+//                            bed.TryUnassignPawn(bedPawn);
+//                    }
+//                }
+//                foreach (var gravePawn in g.AssignedPawns)
+//                    bed.TryAssignPawn(gravePawn);
+//            }
+//            else if (bed.AssignedPawns.Any())
+//                foreach (var pawn in bedPawns)
+//                    bed.TryUnassignPawn(pawn);
         }