version 1.5.1 (#270)

Aviuz · Jun 20, 2024 · 85c4940 · 85c4940
1 parent b84e040
commit 85c4940
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 6 deletions.
diff --git a/1.5/Assemblies/PrisonLabor.dll b/1.5/Assemblies/PrisonLabor.dll
diff --git a/1.5/CashRegistry/Assemblies/PrisonLaborCashRegistryCompatibility.dll b/1.5/CashRegistry/Assemblies/PrisonLaborCashRegistryCompatibility.dll
diff --git a/1.5/CleaningArea/Assemblies/PrisonLaborCleaningAreaCompatibility.dll b/1.5/CleaningArea/Assemblies/PrisonLaborCleaningAreaCompatibility.dll
diff --git a/1.5/ColonyGroups/Assemblies/PrisonLaborColonyGroupsCompatibility.dll b/1.5/ColonyGroups/Assemblies/PrisonLaborColonyGroupsCompatibility.dll
diff --git a/1.5/Hospitality/Assemblies/PrisonLaborHospitalityCompatibility.dll b/1.5/Hospitality/Assemblies/PrisonLaborHospitalityCompatibility.dll
diff --git a/1.5/Kijin/Assemblies/PrisonLaborKijinCompatibility.dll b/1.5/Kijin/Assemblies/PrisonLaborKijinCompatibility.dll
diff --git a/1.5/Quarry/Assemblies/PrisonLaborQuarryCompatibility.dll b/1.5/Quarry/Assemblies/PrisonLaborQuarryCompatibility.dll
diff --git a/1.5/Therapy/Assemblies/PrisonLaborTherapyCompatibility.dll b/1.5/Therapy/Assemblies/PrisonLaborTherapyCompatibility.dll
diff --git a/About/About.xml b/About/About.xml
@@ -36,7 +36,7 @@
   </modDependencies>
 
   <description>
-        Version 1.5.0
+        Version 1.5.1
 
         This mod force prisoners to work. To enable this feature prisoners must have "Force to work" option checked ("Prisoner" tab). Prison labor needs management that consist:
         - Motivation - prisoners need to be motivated by presence of colonists. Wardens have new job - supervising prisoners. Low motivation can lead to revolts.

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 </p>
 <p align="center">
   <a href="https://github.com/Aviuz/PrisonLabor/releases">
-    <img src="https://img.shields.io/badge/version-1.5.0-orange.svg?style=flat" alt="v1.5.0" />
+    <img src="https://img.shields.io/badge/version-1.5.1-orange.svg?style=flat" alt="v1.5.1" />
   </a>
 </p>
 

diff --git a/Source/Core/Interrogation/Ritual/NonColonyPrisonerRole.cs b/Source/Core/Interrogation/Ritual/NonColonyPrisonerRole.cs
@@ -17,7 +17,7 @@ public override bool AppliesToPawn(Pawn p, out string reason, TargetInfo selecte
       {
         return false;
       }
-      if (p.IsPrisonerOfColony && !p.Faction.IsPlayer)
+      if (p.IsPrisonerOfColony && NonPlayerFaction(p))
       {
         PrisonerComp prisonerComp = p.TryGetComp<PrisonerComp>();
         if (prisonerComp == null)
@@ -43,6 +43,11 @@ public override bool AppliesToPawn(Pawn p, out string reason, TargetInfo selecte
       return false;
     }
 
+    private bool NonPlayerFaction(Pawn p)
+    {
+      return p.Faction == null || !p.Faction.IsPlayer;
+    }
+
     private void PrepareReason(string baseReason, bool skipReason, out string reason)
     {
       reason = skipReason ? null : baseReason;

diff --git a/Source/Core/Meta/Version.cs b/Source/Core/Meta/Version.cs
@@ -90,6 +90,7 @@ public enum Version
         v1_4_7,
         v1_4_8,
         v1_4_9,
-        v1_5_0
+        v1_5_0,
+        v1_5_1
     }
 }
diff --git a/Source/Core/Meta/VersionUtility.cs b/Source/Core/Meta/VersionUtility.cs
@@ -5,8 +5,8 @@ namespace PrisonLabor.Core.Meta
 {
     public class VersionUtility
     {
-        public const Version versionNumber = Version.v1_5_0;
-        public const string versionString = "1.5.0";
+        public const Version versionNumber = Version.v1_5_1;
+        public const string versionString = "1.5.1";
 
         public static Version VersionOfSaveFile { get; set; }
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,6 @@
 Changelog:
+1.5.1
+- Interrogation fix for prisoners without faction
 1.5.0
 - Update for Rimworld 1.5
 - Almost all of mod's prisoner interactions were removed
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,6 +90,7 @@ public enum Version @@
             v1_4_7,
             v1_4_8,
             v1_4_9,
-            v1_5_0
+            v1_5_0,
+            v1_5_1
         }
     }