Hotfix

- fixed that new subscribers see all "old player" messages
- fixed reserving food for prisoners
- fixed "work settings not initialized" error

About/About.xml

@@ -3,7 +3,7 @@
 	<name>Prison Labor (Alpha)</name>
 	<author>Avius</author>
 	<targetVersion>0.17.0</targetVersion>
-	<description>Version 0.5
+	<description>Version 0.5a
 
 This mod force prisoners to work if Prisoner Interaction is set to "Force to work".
 Prisoner must be fed, and rested, or he(she) will refuse to work. Currently prisoners can only cook, mine, cut plants, craft, haul, clean and grow low-skilled plants.

README.md

@@ -1,7 +1,7 @@
 # PrisonLabor
 Prison Labor mod for "RimWorld" game
 
-## Version 0.5
+## Version 0.5a
 
 ## Description
 This mod force prisoners to work if Prisoner Interaction is set to "Work".

Source/HarmonyPatches.cs

@@ -208,10 +208,7 @@ public static IEnumerable<Pawn> Pawns(MainTabWindow mainTabWindow)
                 foreach (Pawn pawn in Find.VisibleMap.mapPawns.PrisonersOfColony)
                     if (pawn.guest.interactionMode == DefDatabase<PrisonerInteractionModeDef>.GetNamed("PrisonLabor_workOption"))
                     {
-                        if (!pawn.workSettings.EverWork)
-                            pawn.workSettings.EnableAndInitialize();
-                        foreach(WorkTypeDef def in PrisonerWorkDisabledUtility.DisabledWorks)
-                            pawn.workSettings.Disable(def);
+                        PrisonerWorkDisabledUtility.initWorkSettings(pawn);
                         yield return pawn;
                     }
             }

Source/Initialization.cs

@@ -25,6 +25,8 @@ static Initialization()
 
         private static void checkVersion()
         {
+            if (PrisonLaborPrefs.Version == 0)
+                PrisonLaborPrefs.Version = version;
             if (PrisonLaborPrefs.Version < 3)
             {
                 // only way to check if mod was installed before

Source/JobGiver_Labor.cs

@@ -68,6 +68,7 @@ public override ThinkResult TryIssueJobPackage(Pawn pawn, JobIssueParams jobPara
                 pawn.mindState.priorityWork.Clear();
             }
             //Work prisoners will do
+            PrisonerWorkDisabledUtility.initWorkSettings(pawn);
             List<WorkGiver> workList = pawn.workSettings.WorkGiversInOrderNormal;
             workList.RemoveAll(workGiver => workGiver.def.defName == "GrowerSow");
             pawn.needs.TryGetNeed<Need_Laziness>().Enabled = false;

Source/PrisonLabor.csproj

@@ -57,6 +57,7 @@
     <Compile Include="Need_Laziness.cs" />
     <Compile Include="PrisonerFoodReservation.cs" />
     <Compile Include="PrisonerWorkDisabledUtility.cs" />
+    <Compile Include="Tweaks\FoodUtility_Tweak.cs" />
     <Compile Include="Tweaks\JobDriver_FoodDeliver_Tweak.cs" />
     <Compile Include="Tweaks\JobDriver_Mine_Tweak.cs" />
     <Compile Include="JobDriver_Supervise.cs" />

Source/PrisonerWorkDisabledUtility.cs

@@ -49,5 +49,13 @@ public static bool Disabled(Pawn p, WorkTypeDef wt)
             else
                 return false;
         }
+
+        public static void initWorkSettings(Pawn pawn)
+        {
+            if (!pawn.workSettings.EverWork)
+                pawn.workSettings.EnableAndInitialize();
+            foreach (WorkTypeDef def in PrisonerWorkDisabledUtility.DisabledWorks)
+                pawn.workSettings.Disable(def);
+        }
     }
 }

Source/Tweaks/WorkGiver_Warden_DeliverFood_Tweak.cs

@@ -32,7 +32,8 @@ public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false)
             }
             Thing thing;
             ThingDef def;
-            if (!FoodUtility.TryFindBestFoodSourceFor(pawn, pawn2, pawn2.needs.food.CurCategory == HungerCategory.Starving, out thing, out def, false, true, false, false, false))
+            //Tweak: changes way of finding food
+            if (!FoodUtility_Tweak.TryFindBestFoodSourceFor(pawn, pawn2, pawn2.needs.food.CurCategory == HungerCategory.Starving, out thing, out def, false, true, false, false, false))
             {
                 return null;
             }
@@ -46,7 +47,7 @@ public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false)
             }
             return new Job(DefDatabase<JobDef>.GetNamed("PrisonLabor_DeliverFood_Tweak"), thing, pawn2)
             {
-                count = FoodUtility.WillIngestStackCountOf(pawn2, def),
+                count = FoodUtility_Tweak.WillIngestStackCountOf(pawn2, def),
                 targetC = RCellFinder.SpotToChewStandingNear(pawn2, thing)
             };
         }

changelog.txt

@@ -1,23 +1,33 @@
 Changelog:
-    0.5
-      - added growing to available jobs
-      - added prisoner work priorities to "Work" tab
-      - food is no longer reserved in prison cell unless is brought by warden
-      - food is now delivered by Wardens even if prisoner get out of his prison cell
-      - disabled passive "Laziness" when prisoner have no work to do
-    0.4
-      - added "Laziness" bar in "Needs" tab
-      - fixed plant cut / harvest result being forbidden
-      - added German translation
-		0.3b
-			- fixed "Forbidden" bug
-		0.3a
-			- wardens no longer watch over hungry or tired prisoners
-		0.3
-			- added work of Warden type that supervise prisoners
-			- prisoners will get lazy
-			- added version checker
-			- added stat laziness
-			- added "Work" prisoner interaction mode
-		0.2a
-			- added tutorial in "LearningHelper"
+0.5a
+- fixed that new subscribers see all "old player" messages
+- fixed reserving food for prisoners
+- fixed "work settings not initialized" error
+
+0.5
+- added growing to available jobs
+- added prisoner work priorities to "Work" tab
+- food is no longer reserved in prison cell unless is brought by warden
+- food is now delivered by Wardens even if prisoner get out of his prison cell
+- disabled passive "Laziness" when prisoner have no work to do
+
+0.4
+- added "Laziness" bar in "Needs" tab
+- fixed plant cut / harvest result being forbidden
+- added German translation
+
+0.3b
+- fixed "Forbidden" bug
+
+0.3a
+- wardens no longer watch over hungry or tired prisoners
+
+0.3
+- added work of Warden type that supervise prisoners
+- prisoners will get lazy
+- added version checker
+- added stat laziness
+- added "Work" prisoner interaction mode
+
+0.2a
+- added tutorial in "LearningHelper"