labor area changes (#250)

Aviuz · Apr 13, 2022 · 9a47195 · 9a47195
1 parent c68fd99
commit 9a47195
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/1.3/Assemblies/PrisonLabor.dll b/1.3/Assemblies/PrisonLabor.dll
diff --git a/About/About.xml b/About/About.xml
@@ -25,7 +25,7 @@
     </li>
   </modDependencies>
 
-  <description>Version 1.3.8
+  <description>Version 1.3.9
 
 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.3.8-orange.svg?style=flat" alt="v1.3.8" />
+    <img src="https://img.shields.io/badge/version-1.3.9-orange.svg?style=flat" alt="v1.3.9" />
   </a>
 </p>
 

diff --git a/Source/Core/Meta/Version.cs b/Source/Core/Meta/Version.cs
@@ -76,6 +76,7 @@ public enum Version
         v1_3_5,
         v1_3_6,
         v1_3_7,
-        v1_3_8
+        v1_3_8,
+        v1_3_9
     }
 }
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_3_8;
-        public const string versionString = "1.3.8";
+        public const Version versionNumber = Version.v1_3_9;
+        public const string versionString = "1.3.9";
 
         public static Version VersionOfSaveFile { get; set; }
 

diff --git a/Source/Core/PrisonLaborUtility.cs b/Source/Core/PrisonLaborUtility.cs
@@ -86,8 +86,7 @@ public static bool IsDisabledByLabor(IntVec3 pos, Pawn pawn, WorkTypeDef workTyp
 
         public static bool CanWorkHere(IntVec3 pos, Pawn pawn, WorkTypeDef workType)
         {
-            if ((!pawn.IsPrisonerOfColony || !pawn.IsSlaveOfColony) && pos != null && pawn.Map.areaManager.Get<Area_Labor>() != null &&
-                !WorkSettings.WorkDisabled(workType))
+            if (pawn.IsFreeNonSlaveColonist && pos != null && pawn.Map.areaManager.Get<Area_Labor>() != null && !WorkSettings.WorkDisabled(workType))
             {
                 bool result = true;
                 try

diff --git a/Source/Organizer/NewsFeed.xml b/Source/Organizer/NewsFeed.xml
@@ -4,6 +4,7 @@
   <!-- [img] ... [/img] for image (inside name of file) -->
   <!-- [gap] for gap -->
   <patches>
+      <patch version="1.3.9" silent="true"/>
       <patch version="1.3.8" silent="true"/>
       <patch version="1.3.7" silent="true"/>
       <patch version="1.3.6" silent="true"/>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,6 @@
 Changelog:
+1.3.9
+- Prisoner labor area fixes
 1.3.8
 - Harmony patches for clean and remove snow
 - Drugs policy tracker enabled for prisoners
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,7 @@ public enum Version @@
             v1_3_5,
             v1_3_6,
             v1_3_7,
-            v1_3_8
+            v1_3_8,
+            v1_3_9
         }
     }