Merge pull request #196 from Aviuz/fixes-tweakses

Version 1.1.10

About/About.xml

@@ -19,7 +19,7 @@
 	</li>
 	</modDependencies>
 
-	<description>Version 1.1.9
+	<description>Version 1.1.10
 
 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.

Languages/English/Keyed/Keys.xml

@@ -80,4 +80,7 @@
 
   <PrisonLabor_EnableSuicide>Enable prisoner suicide</PrisonLabor_EnableSuicide>
   <PrisonLabor_EnableSuicideDesc>Enables suicide of prisoners when they aren't very happy</PrisonLabor_EnableSuicideDesc>
+
+  <PrisonLabor_EnableFullHealRest>Enable prisoner full heal rest</PrisonLabor_EnableFullHealRest>
+  <PrisonLabor_EnableFullHealRestDesc>Prisoner will stay in bed until fully healed</PrisonLabor_EnableFullHealRestDesc>
 </LanguageData>

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.9-orange.svg?style=flat" alt="v1.1.9" />
+    <img src="https://img.shields.io/badge/version-1.1.10-orange.svg?style=flat" alt="v1.1.10" />
   </a>
 </p>
 

Source/Core/AI/JobGivers/JobGiver_Labor.cs

@@ -35,8 +35,13 @@ public override ThinkResult TryIssueJobPackage(Pawn pawn, JobIssueParams jobPara
 
             if (pawn.timetable == null)
                 WorkSettings.InitWorkSettings(pawn);
-            if (HealthAIUtility.ShouldHaveSurgeryDoneNow(pawn) || HealthAIUtility.ShouldBeTendedNowByPlayer(pawn) || HealthAIUtility.ShouldSeekMedicalRest(pawn))
+            if (HealthAIUtility.ShouldHaveSurgeryDoneNow(pawn))
                 return ThinkResult.NoJob;
+
+            if(PrisonLaborPrefs.EnableFullHealRest && (HealthAIUtility.ShouldBeTendedNowByPlayer(pawn) || HealthAIUtility.ShouldSeekMedicalRest(pawn)))
+            {
+                return ThinkResult.NoJob;
+            }
             //Check medical assistance, fed, and rest if not override
             if (!PrisonLaborUtility.WorkTime(pawn))
             {

Source/Core/Meta/Prefs.cs

@@ -154,6 +154,17 @@ public static string AllowedWorkTypes
             }
         }
 
+        public static bool EnableFullHealRest
+        {
+            get { return data.enable_full_heal_rest; }
+
+            set
+            {
+                data.enable_full_heal_rest = value;
+                Apply();
+            }
+        }
+
         public static void Init()
         {
             var flag = !new FileInfo(prefsFilePath).Exists;

Source/Core/Meta/PrefsData.cs

@@ -14,6 +14,7 @@ public class PrisonLaborPrefsData
         public bool enable_revolts = true;
         public bool show_treatment_happiness = false;
         public bool enable_suicide = true;
+        public bool enable_full_heal_rest = true;
 
         public Version last_version = Version.v0_0;
         public bool show_news = true;

Source/Core/Meta/Version.cs

@@ -59,6 +59,7 @@ public enum Version
         v1_1_6,
         v1_1_7,
         v1_1_8,
-        v1_1_9
+        v1_1_9,
+        v1_1_10
     }
 }

Source/Core/Meta/VersionUtility.cs

@@ -5,8 +5,8 @@ namespace PrisonLabor.Core.Meta
 {
     class VersionUtility
     {
-        public const Version versionNumber = Version.v1_1_9;
-        public const string versionString = "1.1.9";
+        public const Version versionNumber = Version.v1_1_10;
+        public const string versionString = "1.1.10";
 
         public static Version VersionOfSaveFile { get; set; }
 

Source/Core/Settings/SettingsMenu.cs

@@ -19,6 +19,7 @@ internal class SettingsMenu : Mod
         private static bool enableRevolts;
         private static bool showTreatmentHappiness;
         private static bool enableSuicide;
+        private static bool enableFullHealRest;
         private static bool advancedGrowing;
         private static int defaultInteractionMode;
 
@@ -38,6 +39,7 @@ public static void Init()
             enableRevolts = PrisonLaborPrefs.EnableRevolts;
             enableSuicide = PrisonLaborPrefs.EnableSuicide;
             showTreatmentHappiness = PrisonLaborPrefs.ShowTreatmentHappiness;
+            enableFullHealRest = PrisonLaborPrefs.EnableFullHealRest;
 
             interactionModeList = new List<PrisonerInteractionModeDef>(DefDatabase<PrisonerInteractionModeDef>.AllDefs);
             defaultInteractionMode = interactionModeList.IndexOf(DefDatabase<PrisonerInteractionModeDef>.GetNamed(PrisonLaborPrefs.DefaultInteractionMode));
@@ -102,6 +104,10 @@ public override void DoSettingsWindowContents(Rect inRect)
             listing_options.CheckboxLabeled("PrisonLabor_EnableSuicide".Translate(), ref enableSuicide,
                 "PrisonLabor_EnableSuicideDesc".Translate());
 
+            listing_options.CheckboxLabeled("PrisonLabor_EnableFullHealRest".Translate(), ref enableFullHealRest,
+                "PrisonLabor_EnableFullHealRestDesc".Translate());
+
+
             listing_options.GapLine();
 
             listing_options.CheckboxLabeled("PrisonLabor_ShowTreatmentHappiness".Translate(), ref showTreatmentHappiness,
@@ -169,6 +175,7 @@ public override void WriteSettings()
             PrisonLaborPrefs.ShowTreatmentHappiness = showTreatmentHappiness;
             PrisonLaborPrefs.AdvancedGrowing = advancedGrowing;
             PrisonLaborPrefs.EnableSuicide = enableSuicide;
+            PrisonLaborPrefs.EnableFullHealRest = enableFullHealRest;
             PrisonLaborPrefs.DefaultInteractionMode = interactionModeList[defaultInteractionMode].defName;
             PrisonLaborPrefs.Save();
             Log.Message("Prison Labor settings saved");

Source/HarmonyPatches/Patches_Construction/Patch_BlueprintsForPlayerFAction.cs

@@ -0,0 +1,32 @@
+using HarmonyLib;
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Instrumentation;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace PrisonLabor.HarmonyPatches.Patches_Construction
+{
+    [HarmonyPatch(typeof(Blueprint), "TryReplaceWithSolidThing")]
+    class Patch_BlueprintsForPlayerFaction
+    {
+
+        public static void Postfix(Pawn workerPawn, Thing createdThing, bool __result)
+        {
+
+            if (__result && createdThing != null && createdThing.def.CanHaveFaction && workerPawn.IsPrisonerOfColony)
+            {
+#if DEBUG
+                Log.Message($"Setting faction for: {createdThing}");
+#endif
+                createdThing.SetFactionDirect(Faction.OfPlayer);
+            }
+
+        }
+
+    }
+}

Source/HarmonyPatches/Patches_Construction/Patch_Smoothing.cs

@@ -0,0 +1,33 @@
+using HarmonyLib;
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+
+namespace PrisonLabor.HarmonyPatches.Patches_Construction
+{
+    [HarmonyPatch()]
+    class Patch_Smoothing
+    {
+        static IEnumerable<MethodBase> TargetMethods()
+        {
+            yield return (MethodBase)typeof(WorkGiver_ConstructSmoothWall).GetMethod("HasJobOnCell");
+            yield return (MethodBase)typeof(WorkGiver_ConstructAffectFloor).GetMethod("HasJobOnCell");
+        }
+
+        public static bool Postfix(bool __result, Pawn pawn, IntVec3 c)
+        {
+            if(__result && pawn.IsPrisonerOfColony)
+            {
+               return pawn.CanReach(c, PathEndMode.Touch, pawn.NormalMaxDanger());
+            }
+
+            return __result;
+        }
+    }
+}

Source/HarmonyPatches/Patches_Construction/Patch_WorkGiver_ConstructDeliverResourcesToFrames.cs

@@ -0,0 +1,57 @@
+using HarmonyLib;
+using PrisonLabor.WorkUtils;
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+
+namespace PrisonLabor.HarmonyPatches.Patches_Construction
+{
+    [HarmonyPatch(typeof(WorkGiver_ConstructDeliverResourcesToFrames))]
+    [HarmonyPatch("JobOnThing")]
+    [HarmonyPatch(new[] { typeof(Pawn), typeof(Thing), typeof(bool) })]
+    class Patch_WorkGiver_ConstructDeliverResourcesToFrames
+    {
+        static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        {
+
+            OpCode[] opCodes1 =
+            {
+                OpCodes.Ldarg_2,
+                OpCodes.Callvirt,
+                OpCodes.Ldarg_1,
+                OpCodes.Callvirt,
+                OpCodes.Beq_S,
+            };
+            string[] operands1 =
+            {
+                "",
+                "RimWorld.Faction get_Faction()",
+                "",
+                "RimWorld.Faction get_Faction()",
+                 "System.Reflection.Emit.Label",
+            };       
+
+
+            var label = HPatcher.FindOperandAfter(opCodes1, operands1, instructions, true);
+
+            //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.Brtrue, label);
+
+            foreach (var instr in instructions)
+            {
+                yield return instr;
+            }            
+
+        }
+    }
+}

Source/HarmonyPatches/Patches_Construction/Patch_WorkGiver_Repair.cs

@@ -0,0 +1,60 @@
+using HarmonyLib;
+using PrisonLabor.WorkUtils;
+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.HarmonyPatches.Patches_Construction
+{
+    [HarmonyPatch(typeof(WorkGiver_Repair))]
+    class Patch_WorkGiver_Repair
+    {
+        [HarmonyPrefix]
+        [HarmonyPatch("ShouldSkip")]
+        [HarmonyPatch(new[] { typeof(Pawn), typeof(bool) })]
+        static bool ShouldSKipPrefix(ref bool __result, Pawn pawn, bool forced)
+        {
+            if(pawn.IsPrisonerOfColony)
+            {
+                __result = pawn.Map.listerBuildingsRepairable.RepairableBuildings(Faction.OfPlayer).Count == 0;
+                return false;
+            }
+            return true;
+
+        }
+
+        [HarmonyPrefix]
+        [HarmonyPatch("PotentialWorkThingsGlobal")]
+        [HarmonyPatch(new[] { typeof(Pawn) })]
+        static bool PotentialWorkThingsGlobalPrefix(ref IEnumerable<Thing> __result, Pawn pawn)
+        {
+            if (pawn.IsPrisonerOfColony)
+            {
+                __result = pawn.Map.listerBuildingsRepairable.RepairableBuildings(Faction.OfPlayer);
+                return false;
+            }
+            return true;
+
+        }
+
+
+        [HarmonyPrefix]
+        [HarmonyPatch("HasJobOnThing")]
+        [HarmonyPatch(new[] { typeof(Pawn), typeof(Thing), typeof(bool) })]
+        static bool HasJobOnThingPrefix(ref bool __result, Pawn pawn,Thing t, bool forced)
+        {
+            if (pawn.IsPrisonerOfColony)
+            {
+                __result = ConstructionUtils.HasJobOnThingFixed(pawn, t, forced);
+                return false;
+            }
+            return true;
+
+        }
+    }
+}

Source/HarmonyPatches/Patches_Construction/WorkGiver_ConstructDeliverResourcesToBlueprints.cs

@@ -0,0 +1,57 @@
+using HarmonyLib;
+using PrisonLabor.WorkUtils;
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+using Verse.AI;
+
+namespace PrisonLabor.HarmonyPatches.Patches_Construction
+{
+    [HarmonyPatch(typeof(WorkGiver_ConstructDeliverResourcesToBlueprints))]
+    [HarmonyPatch("JobOnThing")]
+    [HarmonyPatch(new[] { typeof(Pawn), typeof(Thing), typeof(bool) })]
+    class Patch_WorkGiver_ConstructDeliverResourcesToBlueprints
+    {
+        static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
+        {
+
+            OpCode[] opCodes1 =
+            {
+                OpCodes.Ldarg_2,
+                OpCodes.Callvirt,
+                OpCodes.Ldarg_1,
+                OpCodes.Callvirt,
+                OpCodes.Beq_S,
+            };
+            string[] operands1 =
+            {
+                "",
+                "RimWorld.Faction get_Faction()",
+                "",
+                "RimWorld.Faction get_Faction()",
+                 "System.Reflection.Emit.Label",
+            };        
+
+
+            var label = HPatcher.FindOperandAfter(opCodes1, operands1, instructions, true);
+
+            //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.Brtrue, label);
+
+            foreach (var instr in instructions)
+            {
+                yield return instr;
+            }            
+
+        }
+    }
+}