diff --git a/1.5/Assemblies/PrisonLabor.dll b/1.5/Assemblies/PrisonLabor.dll index b78c2b9..6fbf21f 100644 Binary files a/1.5/Assemblies/PrisonLabor.dll and b/1.5/Assemblies/PrisonLabor.dll differ diff --git a/1.5/CashRegistry/Assemblies/PrisonLaborCashRegistryCompatibility.dll b/1.5/CashRegistry/Assemblies/PrisonLaborCashRegistryCompatibility.dll index 221a335..0a94115 100644 Binary files a/1.5/CashRegistry/Assemblies/PrisonLaborCashRegistryCompatibility.dll and b/1.5/CashRegistry/Assemblies/PrisonLaborCashRegistryCompatibility.dll differ diff --git a/1.5/CleaningArea/Assemblies/PrisonLaborCleaningAreaCompatibility.dll b/1.5/CleaningArea/Assemblies/PrisonLaborCleaningAreaCompatibility.dll index fc44fc4..16216f0 100644 Binary files a/1.5/CleaningArea/Assemblies/PrisonLaborCleaningAreaCompatibility.dll and b/1.5/CleaningArea/Assemblies/PrisonLaborCleaningAreaCompatibility.dll differ diff --git a/1.5/ColonyGroups/Assemblies/PrisonLaborColonyGroupsCompatibility.dll b/1.5/ColonyGroups/Assemblies/PrisonLaborColonyGroupsCompatibility.dll index 623bbc0..7db590e 100644 Binary files a/1.5/ColonyGroups/Assemblies/PrisonLaborColonyGroupsCompatibility.dll and b/1.5/ColonyGroups/Assemblies/PrisonLaborColonyGroupsCompatibility.dll differ diff --git a/1.5/Hospitality/Assemblies/PrisonLaborHospitalityCompatibility.dll b/1.5/Hospitality/Assemblies/PrisonLaborHospitalityCompatibility.dll index 643689d..04af585 100644 Binary files a/1.5/Hospitality/Assemblies/PrisonLaborHospitalityCompatibility.dll and b/1.5/Hospitality/Assemblies/PrisonLaborHospitalityCompatibility.dll differ diff --git a/1.5/Kijin/Assemblies/PrisonLaborKijinCompatibility.dll b/1.5/Kijin/Assemblies/PrisonLaborKijinCompatibility.dll index cf0af43..894d161 100644 Binary files a/1.5/Kijin/Assemblies/PrisonLaborKijinCompatibility.dll and b/1.5/Kijin/Assemblies/PrisonLaborKijinCompatibility.dll differ diff --git a/1.5/Quarry/Assemblies/PrisonLaborQuarryCompatibility.dll b/1.5/Quarry/Assemblies/PrisonLaborQuarryCompatibility.dll index 491e7d9..d4c164a 100644 Binary files a/1.5/Quarry/Assemblies/PrisonLaborQuarryCompatibility.dll and b/1.5/Quarry/Assemblies/PrisonLaborQuarryCompatibility.dll differ diff --git a/1.5/Therapy/Assemblies/PrisonLaborTherapyCompatibility.dll b/1.5/Therapy/Assemblies/PrisonLaborTherapyCompatibility.dll index 68356a8..716a077 100644 Binary files a/1.5/Therapy/Assemblies/PrisonLaborTherapyCompatibility.dll and b/1.5/Therapy/Assemblies/PrisonLaborTherapyCompatibility.dll differ diff --git a/About/About.xml b/About/About.xml index afbc361..4de11c5 100644 --- a/About/About.xml +++ b/About/About.xml @@ -36,7 +36,7 @@ - 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 index bb9030d..01e1388 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- v1.5.0 + v1.5.1

diff --git a/Source/Core/Interrogation/Ritual/NonColonyPrisonerRole.cs b/Source/Core/Interrogation/Ritual/NonColonyPrisonerRole.cs index f5f884b..72bd381 100644 --- 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(); 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 index cce4643..505f1bd 100644 --- 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 index 0e31cb3..bb30e4e 100644 --- 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 index 42289d2..66f61d4 100644 --- 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