Some npr removal (#183)

* RC some npr fixes * Ver up * Add dlls Co-authored-by: Hazzer <[email protected]>
Aviuz · Jun 11, 2020 · fcc4fb6 · fcc4fb6
1 parent c97daf9
commit fcc4fb6
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 5 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -19,7 +19,7 @@
 	</li>
 	</modDependencies>
 
-	<description>Version 1.1.5
+	<description>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
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.1.5-orange.svg?style=flat" alt="v1.1.5" />
+    <img src="https://img.shields.io/badge/version-1.1.6-orange.svg?style=flat" alt="v1.1.6" />
   </a>
 </p>
 

diff --git 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
@@ -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
@@ -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
@@ -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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
         }
     }