Merge pull request #247 from Aviuz/1.3.6

release candidate

1.3/Defs/WorkGiverDef.xml

@@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
-  <WorkGiverDef>
-    <defName>PrisonLabor_SupervisePrisonLabor</defName>
-    <label>watch prisoner</label>
-    <giverClass>PrisonLabor.Core.AI.WorkGivers.WorkGiver_Supervise</giverClass>
-    <workType>PrisonLabor_Jailor</workType>
-    <priorityInType>5</priorityInType>
-    <verb>watch prisoner</verb>
-    <gerund>watching prisoner</gerund>
-    <requiredCapacities>
-      <li>Talking</li>
-    </requiredCapacities>
-  </WorkGiverDef>
+    <WorkGiverDef>
+        <defName>PrisonLabor_SupervisePrisonLabor</defName>
+        <label>watch prisoner</label>
+        <giverClass>PrisonLabor.Core.AI.WorkGivers.WorkGiver_Supervise</giverClass>
+        <workType>PrisonLabor_Jailor</workType>
+        <priorityInType>5</priorityInType>
+        <verb>watch prisoner</verb>
+        <gerund>watching prisoner</gerund>
+        <requiredCapacities>
+            <li>Manipulation</li>
+        </requiredCapacities>
+        <workTags>
+            <li>Violent</li>
+        </workTags>
+    </WorkGiverDef>
+
+    <WorkGiverDef>
+        <defName>PrisonLabor_ChatWithPrisoner</defName>
+        <label>chat with working prisoners</label>
+        <giverClass>PrisonLabor.Core.AI.WorkGivers.WorkGivers_ManipulatePrisoner</giverClass>
+        <workType>Warden</workType>
+        <verb>chat with</verb>
+        <gerund>chatting with</gerund>
+        <priorityInType>61</priorityInType>
+        <requiredCapacities>
+            <li>Talking</li>
+        </requiredCapacities>
+    </WorkGiverDef>
 
     <WorkGiverDef>
         <defName>PrisonLabor_HandleChains</defName>

1.3/Defs/WorkTypes.xml

@@ -9,11 +9,8 @@
     <verb>Supervise</verb>
     <naturalPriority>1099</naturalPriority>
     <requireCapableColonist>true</requireCapableColonist>
-    <relevantSkills>
-      <li>Social</li>
-    </relevantSkills>
     <workTags>
-      <li>Social</li>
+      <li>Violent</li>
     </workTags>
   </WorkTypeDef>
 </Defs>

1.3/Patches/Designators.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Patch>
     <Operation Class="PatchOperationSequence">
-        <success>Always</success>
+        <success>Normal</success>
         <operations>
             <li Class="PatchOperationSequence">
                 <success>Always</success>

1.3/Patches/SetJailorJobsPatch.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+    <Operation Class="PatchOperationSequence">
+        <success>Normal</success>
+        <operations>
+            <li Class="PatchOperationReplace">
+                <xpath>*/WorkGiverDef[defName="DoExecution"]/workType</xpath>
+                <value>
+                    <workType>PrisonLabor_Jailor</workType>
+                </value>
+            </li>
+            <li Class="PatchOperationReplace">
+                <xpath>*/WorkGiverDef[defName="ExecuteGuiltyColonist"]/workType</xpath>
+                <value>
+                    <workType>PrisonLabor_Jailor</workType>
+                </value>
+            </li>
+            <li Class="PatchOperationReplace">
+                <xpath>*/WorkGiverDef[defName="ReleasePrisoner"]/workType</xpath>
+                <value>
+                    <workType>PrisonLabor_Jailor</workType>
+                </value>
+            </li>
+            <li Class="PatchOperationReplace">
+                <xpath>*/WorkGiverDef[defName="TakePrisonerToBed"]/workType</xpath>
+                <value>
+                    <workType>PrisonLabor_Jailor</workType>
+                </value>
+            </li>
+        </operations>
+    </Operation>
+
+</Patch>

About/About.xml

@@ -25,7 +25,7 @@
     </li>
   </modDependencies>
 
-  <description>Version 1.3.5
+  <description>Version 1.3.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.

Ideology/Patches/JailorForSlavesPatch.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+    <Operation Class="PatchOperationSequence">
+        <success>Normal</success>
+        <operations>
+            <li Class="PatchOperationReplace">
+                <xpath>*/WorkGiverDef[defName="ExecuteSlave"]/workType</xpath>
+                <value>
+                    <workType>PrisonLabor_Jailor</workType>
+                </value>
+            </li>
+        </operations>
+    </Operation>
+</Patch>

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.5-orange.svg?style=flat" alt="v1.3.5" />
+    <img src="https://img.shields.io/badge/version-1.3.6-orange.svg?style=flat" alt="v1.3.6" />
   </a>
 </p>
 

Source/CompatibilityPatches/CashRegister.cs

@@ -0,0 +1,68 @@
+using CashRegister.Shifts;
+using HarmonyLib;
+using PrisonLabor.Core.Other;
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace PrisonLabor.CompatibilityPatches
+{
+    static class CashRegister
+    {
+        private static ModSearcher modSeeker;
+        internal static void Init()
+        {
+            ModSearcher modSeeker = new ModSearcher("Cash Register");
+            if (modSeeker.LookForMod())
+            {
+                Patch();
+            }
+        }
+
+        private static void Patch()
+        {
+            try
+            {
+                MethodBase methodBase = GetTargetMethod();
+                if (methodBase != null)
+                {
+                    var harmony = new Harmony("Harmony_PrisonLabor_CashRegister");
+                    harmony.Patch(methodBase, postfix: new HarmonyMethod(typeof(CashRegister).GetMethod("PostFixCandidates")));
+                    Log.Message("Prison Labor: Cash Register mod patched");
+                }
+            }
+            catch (Exception e)
+            {
+                Log.Error($"PrisonLaborException: failed to proceed Cash Register mod patches: {e.ToString()}");
+            }
+
+        }
+
+        public static IEnumerable<Pawn> PostFixCandidates(IEnumerable<Pawn> __result, CompAssignableToPawn __instance)
+        {
+            foreach(Pawn pawn in __result)
+            {
+                yield return pawn;
+            }
+
+            if (__instance.parent.Spawned && __instance is CompAssignableToPawn_Shifts)
+            {
+                foreach(Pawn pawn in __instance.parent.Map.mapPawns.PrisonersOfColonySpawned)
+                {
+                    yield return pawn;
+                }
+            }          
+        }
+
+        private static MethodBase GetTargetMethod()
+        {
+            return AccessTools.Method(typeof(CompAssignableToPawn), "get_AssigningCandidates");
+        }
+    }
+
+}

Source/CompatibilityPatches/Initialization.cs

@@ -12,6 +12,7 @@ internal static void Run()
             //NoWaterNoLife.Init();
             Quarry.Init();
             Kajin2.Init();
+            CashRegister.Init();
         }
     }
 }

Source/Core/AI/WorkGivers/WorkGiver_Supervise.cs

@@ -25,12 +25,6 @@ public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false)
 
             if (!PrisonLaborUtility.LaborEnabled(prisoner) && prisonerComp != null && !prisonerComp.EscapeTracker.CanEscape)
                 return null;
-            if (PrisonLaborUtility.RecruitInLaborEnabled(prisoner))
-                return new Job(JobDefOf.PrisonerAttemptRecruit, t);
-            if (PrisonLaborUtility.ConvertInLaborEnabled(prisoner))
-                return new Job(JobDefOf.PrisonerConvert, t);
-            if (PrisonLaborUtility.EnslaveInLaborEnabled(prisoner))
-                return new Job(JobDefOf.PrisonerEnslave, t);
             if ((!PrisonLaborUtility.WorkTime(prisoner) || !need.ShouldBeMotivated) && prisonerComp != null && !prisonerComp.EscapeTracker.CanEscape)
                 return null;
 

Source/Core/AI/WorkGivers/WorkGivers_ManipulatePrisoner.cs

@@ -0,0 +1,45 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+
+namespace PrisonLabor.Core.AI.WorkGivers
+{
+    class WorkGivers_ManipulatePrisoner : WorkGiver_Warden
+    {
+        public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false)
+        {
+            var prisoner = t as Pawn;
+
+            if (prisoner == null)
+                return null;
+            if (!ShouldTakeCareOfPrisoner(pawn, prisoner))
+                return null;
+            if (prisoner.Downed || !pawn.CanReserve(t, 1, -1, null, false) || !prisoner.Awake())
+                return null;
+            if (pawn.IsPrisoner)
+                return null;
+
+
+            if (PrisonLaborUtility.RecruitInLaborEnabled(prisoner))
+            {
+                return new Job(JobDefOf.PrisonerAttemptRecruit, t);
+            }
+            if (PrisonLaborUtility.ConvertInLaborEnabled(prisoner))
+            {
+                return new Job(JobDefOf.PrisonerConvert, t);
+            }
+            if (PrisonLaborUtility.EnslaveInLaborEnabled(prisoner))
+            {
+                return new Job(JobDefOf.PrisonerEnslave, t);
+            }
+
+            return null;
+        }
+    }
+}
+

Source/Core/Meta/Version.cs

@@ -73,6 +73,7 @@ public enum Version
         v1_3_2,
         v1_3_3,
         v1_3_4,
-        v1_3_5
+        v1_3_5,
+        v1_3_6
     }
 }

Source/Core/Meta/VersionUtility.cs

@@ -5,8 +5,8 @@ namespace PrisonLabor.Core.Meta
 {
     class VersionUtility
     {
-        public const Version versionNumber = Version.v1_3_5;
-        public const string versionString = "1.3.5";
+        public const Version versionNumber = Version.v1_3_6;
+        public const string versionString = "1.3.6";
 
         public static Version VersionOfSaveFile { get; set; }
 

Source/Core/PrisonLaborUtility.cs

@@ -9,7 +9,7 @@
 
 namespace PrisonLabor.Core
 {
-    internal static class PrisonLaborUtility
+    public static class PrisonLaborUtility
     {
         public static bool LaborEnabled(this Pawn pawn)
         {
@@ -83,7 +83,7 @@ public static bool IsDisabledByLabor(IntVec3 pos, Pawn pawn, WorkTypeDef workTyp
             return false;
         }
 
-        public static bool canWorkHere(IntVec3 pos, Pawn pawn, WorkTypeDef workType)
+        public static bool CanWorkHere(IntVec3 pos, Pawn pawn, WorkTypeDef workType)
         {
             if (!pawn.IsPrisonerOfColony && pos != null && pawn.Map.areaManager.Get<Area_Labor>() != null &&
                 !WorkSettings.WorkDisabled(workType))
@@ -101,5 +101,10 @@ public static bool canWorkHere(IntVec3 pos, Pawn pawn, WorkTypeDef workType)
             }
             return true;
         }
+
+        public static Faction GetPawnFaction(Pawn pawn)
+        {
+            return pawn.IsPrisonerOfColony ? Faction.OfPlayer : pawn.Faction;
+        }
     }
 }

Source/Core/Settings/CleanSaveDialog.cs

@@ -1,5 +1,4 @@
 using PrisonLabor.Core.GameSaves;
-using PrisonLabor.Tweaks;
 using UnityEngine;
 using Verse;
 

Source/Core/Settings/SelectSaveForCleaningDialog.cs

@@ -1,5 +1,4 @@
-using PrisonLabor.Tweaks;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using UnityEngine;

Source/HarmonyPatches/Patches_Construction/Patch_WorkGiver_ConstructDeliverResourcesToFrames.cs

@@ -44,7 +44,7 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
             //Add If(pawn.IsPrisonerOfColony) {jump next condition}
             yield return new CodeInstruction(OpCodes.Ldarg_2);
             yield return new CodeInstruction(OpCodes.Ldarg_1);
-            yield return new CodeInstruction(OpCodes.Call, typeof(ConstructionUtils).GetMethod("isPrisonerWork"));
+            yield return new CodeInstruction(OpCodes.Call, typeof(ConstructionUtils).GetMethod(nameof(ConstructionUtils.IsPrisonerWork)));
             yield return new CodeInstruction(OpCodes.Brtrue, label);
 
             foreach (var instr in instructions)