Vampire Attendance Hotfix

Fixes attendance issues with vampires and potentially other non-standard humanoids in attending cult worship and sacrifices.
Rim-Of-Madness-Team · Oct 14, 2021 · b809a9e · b809a9e
1 parent 69092a8
commit b809a9e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/1.3/Assemblies/CultOfCthulhu.dll b/1.3/Assemblies/CultOfCthulhu.dll
diff --git a/About/About.xml b/About/About.xml
@@ -29,7 +29,7 @@
     <li>CETeam.CombatExtended</li>
     <li>syrchalis.traitvalue</li>
   </loadAfter>
-  <description>1.0.23.4 (08-14-2021)
+  <description>1.0.23.5 (10-14-2021)
 
 
 [h1]Gameplay expansion for RimWorld.[/h1]
@@ -100,6 +100,10 @@ Michael Cailler, Jigsawjohn , Daniel Schott, Penelope Charli Whitman, Jerome Gon
 ========================
 Changelog
 ========================
+1.0.23.5 (10-14-2021)
+========================
+Fixes issue with vampires and potentially other non-standard humanoid pawn attendance for worship and sacrifices
+
 1.0.23.4 (08-14-2021)
 ========================
 Adds in empty trade tags list to prevent issues with debug incident list menus

diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -1,3 +1,7 @@
+1.0.23.5 (10-14-2021)
+========================
+Fixes issue with vampires and potentially other non-standard humanoid pawn attendance for worship and sacrifices
+
 1.0.23.4 (08-14-2021)
 ========================
 Adds in empty trade tags list to prevent issues with debug incident list menus

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>CallofCthulhuCults</identifier>
-  <version>1.0.23.4</version>
+  <version>1.0.23.5</version>
   <dependencies />
   <incompatibleWith />
   <loadBefore />

diff --git a/About/Version.txt b/About/Version.txt
@@ -1 +1 @@
-1.0.23.4
+1.0.23.5
diff --git a/Source/CultOfCthulhu/NewSystems/Worship/Building_SacrificialAltar_Worship.cs b/Source/CultOfCthulhu/NewSystems/Worship/Building_SacrificialAltar_Worship.cs
@@ -286,9 +286,7 @@ public void StartToWorship(bool forced = false)
 
         public void GetWorshipGroup(IEnumerable<IntVec3> inRangeCells, bool forced = false)
         {
-            _ = Faction;
-            _ = this.GetRoom();
-
+
             if (AvailableWorshippers == null || AvailableWorshippers.Count <= 0)
             {
                 return;

diff --git a/Source/CultOfCthulhu/Utilities/CultUtility.cs b/Source/CultOfCthulhu/Utilities/CultUtility.cs
@@ -1914,7 +1914,7 @@ public static Pawn DetermineBestPreacher(Map map)
 
         public static bool ShouldAttendeeKeepAttendingWorship(Pawn p)
         {
-            return !p.Downed && (p.needs == null || !p.needs.food.Starving) && p.health.hediffSet.BleedRateTotal <= 0f && (p.needs.rest == null || p.needs.rest.CurCategory < RestCategory.Exhausted) && !p.health.hediffSet.HasTendableNonInjuryNonMissingPartHediff(false) && p.Awake() && !p.InAggroMentalState && !p.IsPrisoner;
+            return !p.Downed && (p?.needs == null || p?.needs?.food?.Starving != true) && p?.health?.hediffSet?.BleedRateTotal <= 0f && (p?.needs?.rest == null || p?.needs?.rest?.CurCategory < RestCategory.Exhausted) && p?.health?.hediffSet?.HasTendableNonInjuryNonMissingPartHediff(false) != true && p?.Awake() == true && p?.InAggroMentalState != true && p?.IsPrisoner != true;
         }
 
         //Checkyoself