diff --git a/About/About.xml b/About/About.xml index cd8bd8dd..12735016 100644 --- a/About/About.xml +++ b/About/About.xml @@ -19,7 +19,7 @@ - Version 1.1.5 + Version 1.1.6 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/Assemblies/PrisonLabor.dll b/Assemblies/PrisonLabor.dll index 5ae9f87e..911b21f4 100644 Binary files a/Assemblies/PrisonLabor.dll and b/Assemblies/PrisonLabor.dll differ diff --git a/README.md b/README.md index 8f56765c..c18191f8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- v1.1.5 + v1.1.6

diff --git a/Source/Core/Meta/Version.cs b/Source/Core/Meta/Version.cs index 84b65abd..fa4264c4 100644 --- a/Source/Core/Meta/Version.cs +++ b/Source/Core/Meta/Version.cs @@ -55,6 +55,7 @@ public enum Version v1_1_2, v1_1_3, v1_1_4, - v1_1_5 + v1_1_5, + v1_1_6 } } diff --git a/Source/Core/Meta/VersionUtility.cs b/Source/Core/Meta/VersionUtility.cs index 690b1843..30171a97 100644 --- a/Source/Core/Meta/VersionUtility.cs +++ b/Source/Core/Meta/VersionUtility.cs @@ -5,8 +5,8 @@ namespace PrisonLabor.Core.Meta { class VersionUtility { - public const Version versionNumber = Version.v1_1_5; - public const string versionString = "1.1.5"; + public const Version versionNumber = Version.v1_1_6; + public const string versionString = "1.1.6"; public static Version VersionOfSaveFile { get; set; } diff --git a/Source/HarmonyPatches/Patches_NPR/ListerBuildingsRepairable_Patch.cs b/Source/HarmonyPatches/Patches_NPR/ListerBuildingsRepairable_Patch.cs new file mode 100644 index 00000000..3c8d1e6a --- /dev/null +++ b/Source/HarmonyPatches/Patches_NPR/ListerBuildingsRepairable_Patch.cs @@ -0,0 +1,29 @@ +using HarmonyLib; +using RimWorld; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Verse; + +namespace PrisonLabor.HarmonyPatches.Patches_NPR +{ + [HarmonyPatch(typeof(WorkGiver_Repair))] + [HarmonyPatch("ShouldSkip")] + [HarmonyPatch(new[] { typeof(Pawn), typeof(bool) })] + class ListerBuildingsRepairable_Patch + { + + static bool Prefix(ref bool __result, Pawn pawn, bool forced) + { + if(pawn.Faction == null && pawn.IsPrisonerOfColony) + { + __result = pawn.Map.listerBuildingsRepairable.RepairableBuildings(Faction.OfPlayer).Count == 0; + return false; + } + return true; + + } + } +} diff --git a/changelog.txt b/changelog.txt index 2886b576..a47d05fa 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,7 @@ Changelog: +1.1.6 +- removed patching for mod SeedsPlease. Potientialy should work with PL without issue. (Not tested) +- added more checks to NPR exceptions 1.1.5 - remove wealth tracker from prisioners mining - updated part releated with seed please (no tested)